Page MenuHomeFreeBSD
Differential D56552

arm64/vmm: Store non-VNCR registers in an array
AcceptedPublic
Actions

Authored by kajetan.puchalski_arm.com on Apr 21 2026, 11:09 AM.
Tags
None
Referenced Files
F161523117: D56552.id180981.diff
Sat, Jul 4, 12:57 PM
Unknown Object (File)
Thu, Jul 2, 12:49 AM
Unknown Object (File)
Fri, Jun 26, 9:50 PM
Unknown Object (File)
Fri, Jun 26, 10:07 AM
Unknown Object (File)
Fri, Jun 26, 6:17 AM
Unknown Object (File)
Thu, Jun 25, 3:50 PM
Unknown Object (File)
Thu, Jun 25, 11:11 AM
Unknown Object (File)
Thu, Jun 25, 10:20 AM
View All 65 Files
Subscribers
emaste
imp

Details

Reviewers
andrew
manu
Group Reviewers
arm64
Summary

Move non-VNCR EL0 and EL1 registers into a dedicated array inside of
hypctx. This enables uniform accesses to both VNCR and non-VNCR guest
register state through hypctx_[read|write]_sys_reg().

Signed-off-by: Kajetan Puchalski <kajetan.puchalski@arm.com>

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Skipped
Unit
Tests Skipped
Build Status
Buildable 73763
Build 70646: arc lint + arc unit

Event Timeline

kajetan.puchalski_arm.com created this revision.Apr 21 2026, 11:09 AM
Herald added a reviewer: andrew. · View Herald TranscriptApr 21 2026, 11:09 AM
Herald added a reviewer: andrew. · View Herald Transcript
Herald added a reviewer: manu. · View Herald Transcript
Herald added subscribers: emaste, imp. · View Herald Transcript
kajetan.puchalski_arm.com requested review of this revision.Apr 21 2026, 11:09 AM
Harbormaster completed remote builds in B72411: Diff 175975.Apr 21 2026, 11:09 AM
kajetan.puchalski_arm.com added a parent revision: D56551: arm64/vmm: Use the VNCR_EL2 memory page to store guest registers.Apr 21 2026, 11:09 AM
kajetan.puchalski_arm.com added a child revision: D56553: arm64/vmm: Refactor vmm_hyp.c.
kajetan.puchalski_arm.com edited the summary of this revision. (Show Details)Apr 21 2026, 11:30 AM
kajetan.puchalski_arm.com updated this revision to Diff 176097.Apr 22 2026, 12:57 PM

Update with changes to other commits in the stack

Harbormaster completed remote builds in B72436: Diff 176097.Apr 22 2026, 12:57 PM
kajetan.puchalski_arm.com updated this revision to Diff 176103.Apr 22 2026, 1:23 PM

Encode VNCR values into enum hypctx_sysreg as 64-bit offsets

Harbormaster completed remote builds in B72442: Diff 176103.Apr 22 2026, 1:23 PM
kajetan.puchalski_arm.com updated this revision to Diff 176252.Apr 23 2026, 2:28 PM

Handle non-VHE, store the vncr page as a pointer

Harbormaster completed remote builds in B72470: Diff 176252.Apr 23 2026, 2:28 PM
kajetan.puchalski_arm.com updated this revision to Diff 176258.Apr 23 2026, 2:38 PM

Fix non-VHE omission

Harbormaster completed remote builds in B72476: Diff 176258.Apr 23 2026, 2:38 PM
kajetan.puchalski_arm.com updated this revision to Diff 176316.Apr 24 2026, 11:09 AM

Use char* for ptr arithmetic

Harbormaster completed remote builds in B72508: Diff 176316.Apr 24 2026, 11:09 AM
kajetan.puchalski_arm.com updated this revision to Diff 176724.Apr 28 2026, 2:14 PM

Address remaining style review comments

Harbormaster completed remote builds in B72609: Diff 176724.Apr 28 2026, 2:14 PM
kajetan.puchalski_arm.com updated this revision to Diff 176984.May 1 2026, 11:09 AM

Use Static_assert to ensure correct struct hypctx size

Harbormaster completed remote builds in B72696: Diff 176984.May 1 2026, 11:09 AM
andrew added a comment.May 18 2026, 1:05 PM

It looks like a few lines passed 80 characters so will need to be split.

sys/arm64/vmm/vmm_hyp.c
123–124

Did this line pass 80 characters?

127–128

Why is an extra tab added here? (and other similar places below)

kajetan.puchalski_arm.com updated this revision to Diff 178189.May 20 2026, 11:42 AM

Address review comments

Harbormaster completed remote builds in B73276: Diff 178189.May 20 2026, 11:42 AM
kajetan.puchalski_arm.com marked 2 inline comments as done.May 20 2026, 11:45 AM
andrew added inline comments.Jun 4 2026, 2:34 PM
sys/arm64/vmm/vmm_hyp.c
123–125

The second line should be indented the to the same number of tabs + 4 spaces (and below)

kajetan.puchalski_arm.com updated this revision to Diff 179454.Tue, Jun 9, 3:28 PM

Fix indentation

Harbormaster completed remote builds in B73758: Diff 179454.Tue, Jun 9, 3:28 PM
kajetan.puchalski_arm.com updated this revision to Diff 179459.Tue, Jun 9, 3:33 PM
kajetan.puchalski_arm.com marked an inline comment as done.

Fix indentation

Harbormaster completed remote builds in B73763: Diff 179459.Tue, Jun 9, 3:33 PM
andrew added inline comments.Tue, Jun 23, 10:54 AM
sys/arm64/vmm/arm64.h
63–66

These should be in a separate array so the type can be change for Morello

kajetan.puchalski_arm.com updated this revision to Diff 180374.Tue, Jun 23, 2:43 PM

Put potentially exotic registers in a separate array

Harbormaster completed remote builds in B74145: Diff 180374.Tue, Jun 23, 2:43 PM
kajetan.puchalski_arm.com marked an inline comment as done.Tue, Jun 23, 2:45 PM
andrew added inline comments.Wed, Jun 24, 3:46 PM
sys/arm64/vmm/arm64.h
194–202

This is confusing two things, one is registers holding a virtual address that will be larger with Morello, the other is physical address registers that will be larger with FEAT_D128.

PAR_EL1 is the only physical address register in this list, so could be removed from here & the range renamed something like VA_REGS.

kajetan.puchalski_arm.com updated this revision to Diff 180981.Tue, Jun 30, 2:17 PM

Only separate out registers relevant for morello

Harbormaster completed remote builds in B74410: Diff 180981.Tue, Jun 30, 2:17 PM
kajetan.puchalski_arm.com marked an inline comment as done.Tue, Jun 30, 2:17 PM
andrew accepted this revision.Tue, Jun 30, 2:53 PM
This revision is now accepted and ready to land.Tue, Jun 30, 2:53 PM

Revision Contents
Changeset List

PathSize
sys/
arm64/
vmm/
86 lines
199 lines
32 lines

Diff 179459

View Options

sys/arm64/vmm/arm64.h

Loading...
View Options

sys/arm64/vmm/vmm_hyp.c

Loading...
View Options

sys/arm64/vmm/vmm_reset.c

Loading...