Paths

Table of Contentst

Differential D56556

arm64/vmm: Make remaining registers use hypctx_*_sys_reg
ClosedPublic
Actions

Authored by kajetan.puchalski_arm.com on Apr 21 2026, 11:09 AM.

Tags

None

Referenced Files

	Unknown Object (File)
	Thu, Jul 16, 3:59 AM

	Unknown Object (File)
	Wed, Jul 15, 7:19 AM

	Unknown Object (File)
	Wed, Jul 15, 7:18 AM

	Unknown Object (File)
	Mon, Jul 13, 11:36 PM

	Unknown Object (File)
	Mon, Jul 13, 5:40 PM

	Unknown Object (File)
	Sun, Jul 12, 5:30 PM

	Unknown Object (File)
	Sun, Jul 12, 12:51 PM

	Unknown Object (File)
	Sat, Jul 11, 5:45 PM

Subscribers

Details

Reviewers

andrew
manu

Group Reviewers

Commits

rG35164034e390: arm64/vmm: Make remaining registers use hypctx_*_sys_reg

Summary

Move vgic, timer and trapframe registers into sys_regs to handle them
in the same way as all the other registers.

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 73280
Build 70163: 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

Harbormaster completed remote builds in B72415: Diff 175979.Apr 21 2026, 11:09 AM

kajetan.puchalski_arm.com requested review of this revision.Apr 21 2026, 11:09 AM

kajetan.puchalski_arm.com added a parent revision: D56555: arm64/vmm: Move host-side EL2 regs into sys_regs.

Update

Harbormaster completed remote builds in B72440: Diff 176101.Apr 22 2026, 1:00 PM

Encode VNCR values into enum hypctx_sysreg as 64-bit offsets

Harbormaster completed remote builds in B72446: Diff 176107.Apr 22 2026, 1:24 PM

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

Harbormaster completed remote builds in B72474: Diff 176256.Apr 23 2026, 2:28 PM

Fix non-VHE omission

Harbormaster completed remote builds in B72480: Diff 176262.Apr 23 2026, 2:39 PM

Fix omission

Harbormaster completed remote builds in B72492: Diff 176278.Apr 23 2026, 5:31 PM

Use char* for ptr arithmetic

Harbormaster completed remote builds in B72512: Diff 176320.Apr 24 2026, 11:09 AM

Address remaining style review comments

Harbormaster completed remote builds in B72613: Diff 176728.Apr 28 2026, 2:14 PM

Correct register name

Harbormaster completed remote builds in B72615: Diff 176738.Apr 28 2026, 4:32 PM

Use Static_assert to ensure correct struct hypctx size

Harbormaster completed remote builds in B72700: Diff 176988.May 1 2026, 11:10 AM

Correct nVHE omission

Harbormaster completed remote builds in B72932: Diff 177461.May 8 2026, 2:45 PM

andrew added inline comments.May 18 2026, 1:47 PM

sys/arm64/vmm/hyp.h
113–115	We should create and use `hyp_genassym.c` if we need access to the enum from assembly.

Address review comments

Harbormaster completed remote builds in B73280: Diff 178193.May 20 2026, 11:42 AM

Use genassym for assembly offsets

Herald added a subscriber: rgrimes. · View Herald TranscriptMay 20 2026, 1:12 PM

Harbormaster completed remote builds in B73282: Diff 178197.May 20 2026, 1:12 PM

andrew added inline comments.Jun 4 2026, 2:53 PM

sys/arm64/vmm/arm64.h
65–71	We might need to think about these to not break CHERI
88	Extra whitespace change

Fix indentation

Harbormaster completed remote builds in B73762: Diff 179458.Jun 9 2026, 3:28 PM

Fix indentation

Harbormaster completed remote builds in B73767: Diff 179463.Jun 9 2026, 3:33 PM

Fix indentation

Harbormaster completed remote builds in B73770: Diff 179466.Jun 9 2026, 4:35 PM

kajetan.puchalski_arm.com marked an inline comment as done.Jun 9 2026, 4:42 PM

kajetan.puchalski_arm.com added inline comments.

sys/arm64/vmm/arm64.h
65–71	Should I just put these in a separate array as part of this patch then?

Put potentially exotic registers in a separate array

Harbormaster completed remote builds in B74149: Diff 180378.Tue, Jun 23, 2:43 PM

kajetan.puchalski_arm.com marked an inline comment as done.Tue, Jun 23, 2:47 PM

Only separate out registers relevant for morello

Harbormaster completed remote builds in B74414: Diff 180985.Tue, Jun 30, 2:17 PM

andrew added inline comments.Wed, Jul 1, 10:57 AM

sys/arm64/vmm/vmm_hyp_exception.S
89–104	It should be the `x0` offset + 2 8 byte registers (and the same below). It will work when `HYPCTX_GPR_X0` == 0, but if we ever move it for some reason it won't.

Make hyp_genassym generate offsets

Harbormaster completed remote builds in B74464: Diff 181181.Wed, Jul 1, 2:57 PM

Canged hyp_genassym to generate offsets instead of indices into the array for clarity

andrew accepted this revision.Fri, Jul 3, 2:11 PM

This revision is now accepted and ready to land.Fri, Jul 3, 2:11 PM

Closed by commit rG35164034e390: arm64/vmm: Make remaining registers use hypctx_*_sys_reg (authored by kajetan.puchalski_arm.com, committed by andrew). · Explain WhyMon, Jul 6, 3:25 PM

This revision was automatically updated to reflect the committed changes.

andrew added a commit: rG35164034e390: arm64/vmm: Make remaining registers use hypctx_*_sys_reg.

Revision Contents
Changeset List

Path

Size

sys/

arm64/

vmm/

60 lines

4 lines

io/

22 lines

46 lines

5 lines

36 lines

6 lines

110 lines

137 lines

vmm_hyp_exception.S

68 lines

6 lines

Diff 178193

sys/arm64/vmm/arm64.h

Loading...

sys/arm64/vmm/hyp.h

Loading...

sys/arm64/vmm/io/vgic_v3.h

Loading...

sys/arm64/vmm/io/vgic_v3.c

Loading...

sys/arm64/vmm/io/vtimer.h

Loading...

sys/arm64/vmm/io/vtimer.c

Loading...

sys/arm64/vmm/vmm.c

Loading...

sys/arm64/vmm/vmm_arm64.c

Loading...

sys/arm64/vmm/vmm_hyp.c

Loading...

sys/arm64/vmm/vmm_hyp_exception.S

Loading...

sys/arm64/vmm/vmm_reset.c

Loading...