KVM: arm64: Restore type-checking across the host/hyp hypercall boundary
Fuad Tabba
reviewerv3 cover KVM: arm64: Restore type-checking across the host/hyp hypercall boundary
Hi folks,
This is based on rc6, but in case it is easier to take on kvmarm/next (320840b34af2a), the same series applied there is at [1]. It passes the same checks: bisectable, sparse clean, npVM and pVM boot.
Patches 1-8 are identical. pkvm-7.3 reworked three of the handlers the series converts, so 9-11 deviate. Patch 9 also declares __pkvm_vcpu_sync_state, without which its caller has no generated stub. Patch 10 converts that handler too, and folds the two get_host_hyp_vcpus() macros into one function. Patch 11 moves the kern_hyp_va_host() unwrap out of __get_host_hyp_vcpus() to its callers, since container_of() casts through void * and drops the address space.
Changes since v2 [2]:
- Dropped the *_VOID() macro variants. void is spelled as the return type in the declaration and the definition, and the handler's return-register store dispatches on a per-type table instead. The table entry is pasted from the return type, so it has to be a single word: __pkvm_create_private_mapping is spelled ulong on both sides of the boundary. (Marc)
The SMCCC conversion of the host/hyp interface reduced every hypercall to a function number and a pile of registers: kvm_call_hyp_nvhe() never shows the compiler a callable, so the caller's arguments and the handler's DECLARE_REG() casts can disagree in type, count or order without a diagnostic. Reviewing a fix for exactly that class of bug, Marc wrote [3]:
"we lost all form of type-checking when everything was hastily
converted to SMCCC to avoid function pointers. Somehow, I feel that the cure was worse than the disease.
I wish we'd reintroduce some form of compile-time checks, maybe by having generated stubs?"
and sketched the shape he preferred [4]: a generated nvhe_hvc_##f() stub that does the type-checking, driven by "some form of declarative IDL", with "both the caller and callee stubs ... totally generated".
This series implements that, in plain preprocessor macros rather than an external generator, in the mold of the syscall wrappers. Each hypercall's signature is declared once, in kvm_hcall.h:kvm_call_hyp_nvhe() resolves to a typed nvhe_hvc_##f() stub generated from the declaration, and the hyp-main.c handlers unmarshal their arguments through glue that is type-checked against the same declaration. A mistyped or stale call, or a handler that drifts from its caller, now fails to compile. On top of that shared declaration, host-VA parameters gain a __kern sparse address space, so dereferencing one at EL2 without kern_hyp_va_host() translation is flagged by sparse. The address space is KVM-private and lives with the interface it annotates rather than in compiler_types.h, like x86's __seg_gs in asm/percpu.h. The deeper instances of that bug class, host VAs reached through struct fields after the boundary, are follow-up work.
The declarations do not also generate the function-number enum or the dispatch table. The enum carries the availability-band markers that decide when each hypercall becomes reachable, and its base entry is consumed from assembly, so generating it would hide the banding. The remaining duplication cannot drift silently: a name mismatch between declaration, caller and handler fails to compile, and a missing dispatch-table entry is rejected at run time as SMCCC_RET_NOT_SUPPORTED.
Along the way it turned out "make C=2" has never checked the nVHE objects at all: the custom %.nvhe.o rule reuses rule_cc_o_c, which only hooks the checker for C=1, and that only on a rebuild. Patches 2-5 fix the hook and the handful of pre-existing sparse warnings it flushes out, so the checker lands clean. The libfdt objects under arch/arm64/kernel/pi/ have the same gap through the same rule, so patch 6 gives them the same one-line fix; it touches arm64 core rather than KVM, so it can go through either tree. Patch 1 is
adjacent: trace_remote_event.h is not self-contained (it uses bool without including linux/types.h), which the nVHE include order had been silently working around; it can go through the tracing tree instead if preferred.
The first six patches do not depend on the type-checking work (the tracing-header fix, the sparse cleanups, and the two C=2 hook fixes), so they could be taken on their own, ahead of the rest of the series if that is easier.
The series is structured as follows:
01: Make trace_remote_event.h self-contained. 02-04: Fix the pre-existing sparse warnings in the nVHE code. 05: Run the source checker on nVHE objects under C=2. 06: Same for the libfdt objects under arch/arm64/kernel/pi/. 07: Pass the host-VA hypercall arguments as pointers at EL2. 08: Move the dispatch macros to a new kvm_hcall.h. 09: Declare the hypercall signatures, type-check the callers. 10: Generate the handler unmarshalling, type-check the handlers. 11: Tag host-VA parameters __kern for sparse.
The generated code is unchanged, checked by comparing the disassembly of every KVM object, function by function, against the base: the callers are identical apart from hypercall returns now being tested at their declared width and the stage-2 TLB-flush level argument now being sign-extended as it is loaded (an s8 passed as an int), and the handlers are instruction-for-instruction identical apart from flush_hyp_vcpu()/sync_hyp_vcpu() being inlined into their only caller. The extra argument that prompted the thread, a mistyped or reordered argument, and a handler that disagrees with its declaration all now fail to compile. checkpatch complains about the __KVM_HCALL_MAP() machinery, the (type, name) pair syntax and the generated signature typedefs, as it does about __MAP() in the syscall wrappers; the idiom cannot be parenthesized, and the typedef is what checks the handler against the declaration. Enforcing the __kern tag needs sparse v0.6.5-rc1 or later for __typeof_unqual__, as all sparse checking on current kernels does; no stable sparse release has it yet, so build from sparse.git (checker-valid.sh skips the check, with a warning, on anything older).
Based on Linux 7.2-rc6 (075b74841bd00).
Cheers,
/fuad
[1] https://android-kvm.googlesource.com/linux/+/refs/heads/tabba/pkvm-hostva-kvmarm-next
[2] https://lore.kernel.org/all/[email protected]/
[3] https://lore.kernel.org/all/[email protected]/
[4] https://lore.kernel.org/all/[email protected]/
Fuad Tabba (11):
tracing: Include linux/types.h in trace_remote_event.h
KVM: arm64: nVHE: Share the stacktrace per-CPU declarations with EL2
KVM: arm64: nVHE: Declare the hyp event IDs before defining them
KVM: arm64: nVHE: Use NULL to reset the trace buffer backing pointer
KVM: arm64: nVHE: Run the source checker under C=2
arm64: pi: Run the source checker on the libfdt objects under C=2
KVM: arm64: nVHE: Pass host VA arguments as pointers
KVM: arm64: Move the host hypercall interface to its own header
KVM: arm64: Type-check hypercall arguments at the caller
KVM: arm64: nVHE: Check hypercall handlers against the declared ABI
KVM: arm64: Tag host-VA hypercall parameters __kern
arch/arm64/include/asm/kvm_hcall.h | 240 +++++++++++++ arch/arm64/include/asm/kvm_host.h | 48 +-- arch/arm64/include/asm/kvm_mmu.h | 10 + arch/arm64/include/asm/stacktrace/nvhe.h | 10 +- arch/arm64/kernel/pi/Makefile | 1 + arch/arm64/kvm/hyp/include/nvhe/pkvm.h | 7 +- arch/arm64/kvm/hyp/include/nvhe/trace.h | 5 +- arch/arm64/kvm/hyp/nvhe/Makefile | 1 + arch/arm64/kvm/hyp/nvhe/events.c | 2 + arch/arm64/kvm/hyp/nvhe/hyp-main.c | 433 +++++++++++------------ arch/arm64/kvm/hyp/nvhe/pkvm.c | 12 +- arch/arm64/kvm/hyp/nvhe/stacktrace.c | 3 +- arch/arm64/kvm/hyp/nvhe/trace.c | 6 +- arch/arm64/kvm/hyp_trace.c | 2 +- arch/arm64/kvm/stacktrace.c | 3 - include/linux/trace_remote_event.h | 2 + 16 files changed, 481 insertions(+), 304 deletions(-) create mode 100644 arch/arm64/include/asm/kvm_hcall.h
base-commit: 075b74841bd0065a3bda3440873c747938e69b68
Signature · 1 line
2.39.5
Fuad Tabba
reviewerPATCH v3 1/11 tracing: Include linux/types.h in trace_remote_event.h
trace_remote_event.h uses bool without including linux/types.h, so a translation unit that includes it ahead of anything else that pulls types.h in fails to build, as with nvhe/trace.h at EL2.
--- include/linux/trace_remote_event.h | 2 ++ 1 file changed, 2 insertions(+)
include/linux/trace_remote_event.h +2 -0
@@ -3,6 +3,8 @@#ifndef _LINUX_TRACE_REMOTE_EVENTS_H#define _LINUX_TRACE_REMOTE_EVENTS_H +#include <linux/types.h> +struct trace_remote ;struct trace_event_fields ;struct trace_seq ;
Signature · 1 line
2.39.5
Steven Rostedt
maintainerRe: [PATCH v3 01/11] tracing: Include linux/types.h in trace_remote_event.h
Quoted 16 lines · On Tue, 4 Aug 2026 12:23:07 +0100 Fuad Tabba <[email protected]> wrote:
trace_remote_event.huses bool without includinglinux/types.h, so a translation unit that includes it ahead of anything else that pullstypes.hin fails to build, as withnvhe/trace.hat EL2.Fixes 072529158e60 ("tracing: Add events to trace remotes")Acked-by Steven Rostedt <[email protected]>Signed-off-by Fuad Tabba <[email protected]>--- include/linux/trace_remote_event.h | 2 ++ 1 file changed, 2 insertions(+)include/linux/trace_remote_event.h +0
-0
include/linux/trace_remote_event.h line 10
Quoted 8 lines
include/linux/trace_remote_event.h +2
-0@@ -3,6 +3,8 @@#ifndef _LINUX_TRACE_REMOTE_EVENTS_H#define _LINUX_TRACE_REMOTE_EVENTS_H +#include <linux/types.h> +struct trace_remote ;struct trace_event_fields ;struct trace_seq ;
My ack still stands, but I wonder if we should just not use the include and instead s/bool/_Bool/ ?
-- Steve
Fuad Tabba
reviewerRe: [PATCH v3 01/11] tracing: Include linux/types.h in trace_remote_event.h
Thanks Steve,
On Wed, 5 Aug 2026 at 21:53, Steven Rostedt <[email protected]> wrote:
...
Quoted 6 lines
Quoted 6 lines
include/linux/trace_remote_event.h +0
-0@@ -3,6 +3,8 @@#ifndef _LINUX_TRACE_REMOTE_EVENTS_H#define _LINUX_TRACE_REMOTE_EVENTS_H
Quoted 8 lines
include/linux/trace_remote_event.h line 10
Quoted 5 lines
include/linux/trace_remote_event.h +2
-0+#include <linux/types.h> +struct trace_remote ;struct trace_event_fields ;struct trace_seq ;My ack still stands, but I wonder if we should just not use the include and instead s/bool/_Bool/ ?
I'd prefer to keep the include, if you don't mind.
As far as I can tell, apart from the typedef itself, the only headers built into the kernel that use _Bool as a type are a uapi one and arch/um's user.h when it's built for the host, neither of which has bool available, plus what looks like a leftover in bcache_ondisk.h from when it was uapi.
The include also covers whatever field gets added next.
Happy to switch if you'd still prefer _Bool.
Cheers,
/fuad
Quoted 2 lines
-- Steve
Steven Rostedt
maintainerRe: [PATCH v3 01/11] tracing: Include linux/types.h in trace_remote_event.h
Quoted 11 lines · On Thu, 6 Aug 2026 09:43:00 +0100 Fuad Tabba <[email protected]> wrote:
Quoted 2 lines
My ack still stands, but I wonder if we should just not use the include and instead s/bool/_Bool/ ?
I'd prefer to keep the include, if you don't mind.
As far as I can tell, apart from the typedef itself, the only headers built into the kernel that use
_Boolas a type are a uapi one and arch/um'suser.hwhen it's built for the host, neither of which has bool available, plus what looks like a leftover inbcache_ondisk.hfrom when it was uapi.
Quoted 3 lines
The include also covers whatever field gets added next.
Happy to switch if you'd still prefer
_Bool.
The reason I suggested this is because I'm not sure how much we want to add Linux headers to files built for the hypervisor.
If Vincent is good with adding this, then so am I.
But I rather have him give an ack before we do.
-- Steve
Vincent Donnefort
Reviewed-byRe: [PATCH v3 01/11] tracing: Include linux/types.h in trace_remote_event.h
Quoted 18 lines · Steven Rostedt
Quoted 11 lines · On Thu, 6 Aug 2026 09:43:00 +0100 Fuad Tabba <[email protected]> wrote:
Quoted 2 lines
My ack still stands, but I wonder if we should just not use the include and instead s/bool/_Bool/ ?
I'd prefer to keep the include, if you don't mind.
As far as I can tell, apart from the typedef itself, the only headers built into the kernel that use
_Boolas a type are a uapi one and arch/um'suser.hwhen it's built for the host, neither of which has bool available, plus what looks like a leftover inbcache_ondisk.hfrom when it was uapi.Quoted 3 lines
The include also covers whatever field gets added next.
Happy to switch if you'd still prefer
_Bool.
Quoted 8 lines
The reason I suggested this is because I'm not sure how much we want to add Linux headers to files built for the hypervisor.
If Vincent is good with adding this, then so am I.
But I rather have him give an ack before we do.
-- Steve
We have types.h already in several places in the hypervisor, so I think it's alright to include it here also.
Signature · 1 line
Vincent
Steven Rostedt
maintainerRe: [PATCH v3 01/11] tracing: Include linux/types.h in trace_remote_event.h
In reply to Fuad TabbaQuoted 5 lines · On Tue, 4 Aug 2026 12:23:07 +0100 Fuad Tabba <[email protected]> wrote:
trace_remote_event.huses bool without includinglinux/types.h, so a translation unit that includes it ahead of anything else that pullstypes.hin fails to build, as withnvhe/trace.hat EL2.Fixes 072529158e60 ("tracing: Add events to trace remotes")
Is there a config that already fails the build without this change? Or is it that new code will fail without it?
If it is the former, please drop the fixes tag, as nothing is currently broken. If it is the latter, then sure, keep it, but you should mention what config options break with it.
-- Steve
Quoted 19 lines
Acked-by Steven Rostedt <[email protected]>Signed-off-by Fuad Tabba <[email protected]>--- include/linux/trace_remote_event.h | 2 ++ 1 file changed, 2 insertions(+)include/linux/trace_remote_event.h +2
-0@@ -3,6 +3,8 @@#ifndef _LINUX_TRACE_REMOTE_EVENTS_H#define _LINUX_TRACE_REMOTE_EVENTS_H +#include <linux/types.h> +struct trace_remote ;struct trace_event_fields ;struct trace_seq ;
Fuad Tabba
reviewerRe: [PATCH v3 01/11] tracing: Include linux/types.h in trace_remote_event.h
Hi Steve,
Quoted 8 lines · Steven Rostedt
Quoted 4 lines · On Tue, 4 Aug 2026 12:23:07 +0100 Fuad Tabba <[email protected]> wrote:
trace_remote_event.huses bool without includinglinux/types.h, so a translation unit that includes it ahead of anything else that pullstypes.hin fails to build, as withnvhe/trace.hat EL2.
Quoted 8 lines
Quoted 1 line
Fixes 072529158e60 ("tracing: Add events to trace remotes")Is there a config that already fails the build without this change? Or is it that new code will fail without it?
If it is the former, please drop the fixes tag, as nothing is currently broken. If it is the latter, then sure, keep it, but you should mention what config options break with it.
I checked the include graph and tested by building with configurations that could potentially fail. Nothing does. I dropped the fixes tag in the branch I have based on kvmarm/next in case Oliver/Marc want to go that route [1], or I'll respin it on the latest tag once kvmarm/next has gone in to the next tag.
Cheers,
/fuad
[1] https://android-kvm.googlesource.com/linux/+/refs/heads/tabba/pkvm-hostva-kvmarm-next
Quoted 24 lines
-- Steve
Quoted 19 lines
Acked-by Steven Rostedt <[email protected]>Signed-off-by Fuad Tabba <[email protected]>--- include/linux/trace_remote_event.h | 2 ++ 1 file changed, 2 insertions(+)include/linux/trace_remote_event.h +2
-0@@ -3,6 +3,8 @@#ifndef _LINUX_TRACE_REMOTE_EVENTS_H#define _LINUX_TRACE_REMOTE_EVENTS_H +#include <linux/types.h> +struct trace_remote ;struct trace_event_fields ;struct trace_seq ;
Fuad Tabba
reviewerPATCH v3 2/11 KVM: arm64: nVHE: Share the stacktrace per-CPU declarations with EL2
In reply to Fuad TabbaThe declarations for overflow_stack, kvm_stacktrace_info and pkvm_stacktrace are only visible to the host (the first two sit in the host-only section of stacktrace/nvhe.h, the last is private to kvm/stacktrace.c), so the definitions in nvhe/stacktrace.c compile with no declaration in sight and sparse suggests making them static. DECLARE_KVM_NVHE_PER_CPU() resolves to the right symbol name on both sides of the build: move the declarations where both can see them and include the header from the EL2 side unconditionally.
No functional change intended.
--- arch/arm64/include/asm/stacktrace/nvhe.h | 10 ++++++++-- arch/arm64/kvm/hyp/nvhe/stacktrace.c | 3 +-- arch/arm64/kvm/stacktrace.c | 3 --- 3 files changed, 9 insertions(+), 7 deletions(-)
arch/arm64/include/asm/stacktrace/nvhe.h +8 -2
@@ -37,6 +37,14 @@ static inline void kvm_nvhe_unwind_init(struct unwind_state *state, state->pc = pc; } +DECLARE_KVM_NVHE_PER_CPU(unsigned long [OVERFLOW_STACK_SIZE/sizeof(long)], overflow_stack); +DECLARE_KVM_NVHE_PER_CPU(struct kvm_nvhe_stacktrace_info, kvm_stacktrace_info); + +#ifdef CONFIG_PKVM_STACKTRACE +DECLARE_KVM_NVHE_PER_CPU(unsigned long [NVHE_STACKTRACE_SIZE/sizeof(long)], + pkvm_stacktrace); +#endif +#ifndef __KVM_NVHE_HYPERVISOR__/* * Conventional (non-protected) nVHE HYP stack unwinder
@@ -45,8 +53,6 @@ static inline void kvm_nvhe_unwind_init(struct unwind_state *state,* (by the host in EL1). */ -DECLARE_KVM_NVHE_PER_CPU(unsigned long [OVERFLOW_STACK_SIZE/sizeof(long)], overflow_stack); -DECLARE_KVM_NVHE_PER_CPU(struct kvm_nvhe_stacktrace_info, kvm_stacktrace_info); DECLARE_PER_CPU(unsigned long, kvm_arm_hyp_stack_base);void kvm_nvhe_dump_backtrace (unsigned long hyp_offset);
arch/arm64/kvm/hyp/nvhe/stacktrace.c +1 -2
@@ -8,6 +8,7 @@#include <asm/kvm_hyp.h> #include <asm/memory.h> #include <asm/percpu.h> +#include <asm/stacktrace/nvhe.h> DEFINE_PER_CPU(unsigned long [OVERFLOW_STACK_SIZE/sizeof(long)], overflow_stack)__aligned(16) ;
@@ -35,8 +36,6 @@ static void hyp_prepare_backtrace(unsigned long fp, unsigned long pc) }#ifdef CONFIG_PKVM_STACKTRACE -#include <asm/stacktrace/nvhe.h> - DEFINE_PER_CPU(unsigned long [NVHE_STACKTRACE_SIZE/sizeof(long)], pkvm_stacktrace);static struct stack_info stackinfo_get_overflow (void )
arch/arm64/kvm/stacktrace.c +0 -3
@@ -198,9 +198,6 @@ static void hyp_dump_backtrace(unsigned long hyp_offset) }#ifdef CONFIG_PKVM_STACKTRACE -DECLARE_KVM_NVHE_PER_CPU(unsigned long [NVHE_STACKTRACE_SIZE/sizeof(long)], - pkvm_stacktrace); -/* * pkvm_dump_backtrace - Dump the protected nVHE HYP backtrace. *
Signature · 1 line
2.39.5
Fuad Tabba
reviewerPATCH v3 3/11 KVM: arm64: nVHE: Declare the hyp event IDs before defining them
In reply to Fuad TabbaThe defining expansion of HYP_EVENT() in events.c is the first time its translation unit meets hyp_event_id_<name>, so sparse suggests making the symbols static. Include kvm_hypevents.h ahead of define_events.h so the extern declarations come first, as with the tracepoint headers.
No functional change intended.
--- arch/arm64/kvm/hyp/nvhe/events.c | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/kvm/hyp/nvhe/events.c +2 -0
@@ -7,6 +7,8 @@#include <nvhe/mm.h> #include <nvhe/trace.h> +#include <asm/kvm_hypevents.h> +#include <nvhe/define_events.h> int __tracing_enable_event (unsigned short id,bool enable)
Signature · 1 line
2.39.5
Fuad Tabba
reviewerPATCH v3 4/11 KVM: arm64: nVHE: Use NULL to reset the trace buffer backing pointer
In reply to Fuad Tabbabpages_backing_start is a pointer; resetting it to plain 0 triggers a sparse warning.
No functional change intended.
--- arch/arm64/kvm/hyp/nvhe/trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/kvm/hyp/nvhe/trace.c +1 -1
@@ -93,7 +93,7 @@ static void hyp_trace_buffer_unload_bpage_backing(struct hyp_trace_buffer *trace__release_host_mem (start, size); - trace_buffer->bpages_backing_start =0 ; + trace_buffer->bpages_backing_start =NULL ; trace_buffer->bpages_backing_size =0 ; }
Signature · 1 line
2.39.5
Fuad Tabba
reviewerPATCH v3 5/11 KVM: arm64: nVHE: Run the source checker under C=2
In reply to Fuad TabbaThe custom %.nvhe.o rule reuses rule_cc_o_c, which hooks the source checker only for C=1, and that only when the object is rebuilt. The C=2 hook, cmd_force_checksrc, hangs off the standard %.o rule that nVHE objects do not use, so "make C=2" silently skips every nVHE source file. Call cmd_force_checksrc after the compile rule, as the standard rule does.
--- arch/arm64/kvm/hyp/nvhe/Makefile | 1 + 1 file changed, 1 insertion(+)
arch/arm64/kvm/hyp/nvhe/Makefile +1 -0
@@ -49,6 +49,7 @@ targets += $(hyp-obj) kvm_nvhe.tmp.o kvm_nvhe.rel.o hyp.lds hyp-reloc.S hyp-relo # avoids file name clashes for files shared with VHE. $(obj)/%.nvhe.o: $(src)/%.c FORCE $(call if_changed_rule,cc_o_c) + $(call cmd,force_checksrc) $(obj)/%.nvhe.o: $(src)/%.S FORCE $(call if_changed_rule,as_o_S)
Signature · 1 line
2.39.5
Fuad Tabba
reviewerPATCH v3 6/11 arm64: pi: Run the source checker on the libfdt objects under C=2
In reply to Fuad TabbaThe custom lib-%.o rule reuses rule_cc_o_c, which hooks the source checker only for C=1, and that only when the object is rebuilt. The C=2 hook, cmd_force_checksrc, hangs off the standard %.o rule, so "make C=2" silently skips the two libfdt objects. Call cmd_force_checksrc after the compile rule, as the standard rule does.
--- arch/arm64/kernel/pi/Makefile | 1 + 1 file changed, 1 insertion(+)
arch/arm64/kernel/pi/Makefile +1 -0
@@ -34,6 +34,7 @@ $(obj)/lib-%.pi.o: OBJCOPYFLAGS += --prefix-alloc-sections=.init $(obj)/lib-%.o: $(srctree)/lib/%.c FORCE $(call if_changed_rule,cc_o_c) + $(call cmd,force_checksrc) obj-y := idreg-override.pi.o \ map_kernel.pi.o map_range.pi.o \
Signature · 1 line
2.39.5
Fuad Tabba
reviewerPATCH v3 7/11 KVM: arm64: nVHE: Pass host VA arguments as pointers
In reply to Fuad TabbaFour hypercalls take host VAs as unsigned long: the donated vm, pgd and vcpu regions, and the tracing descriptor. Retype the arguments and their EL2 consumers as void *, so that the typed hypercall declarations introduced later in the series can attach a sparse address space to them; an address space attaches only to pointers.
No functional change intended.
--- arch/arm64/kvm/hyp/include/nvhe/pkvm.h | 5 ++--- arch/arm64/kvm/hyp/include/nvhe/trace.h | 4 ++-- arch/arm64/kvm/hyp/nvhe/hyp-main.c | 8 ++++---- arch/arm64/kvm/hyp/nvhe/pkvm.c | 11 +++++------ arch/arm64/kvm/hyp/nvhe/trace.c | 4 ++-- 5 files changed, 15 insertions(+), 17 deletions(-)
arch/arm64/kvm/hyp/include/nvhe/pkvm.h +2 -3
@@ -69,10 +69,9 @@ void pkvm_hyp_vm_table_init(void *tbl);int __pkvm_reserve_vm (void );void __pkvm_unreserve_vm (pkvm_handle_t handle); -int __pkvm_init_vm (struct kvm *host_kvm,unsigned long vm_hva, -unsigned long pgd_hva); +int __pkvm_init_vm (struct kvm *host_kvm,void *vm_hva,void *pgd_hva);int __pkvm_init_vcpu (pkvm_handle_t handle,struct kvm_vcpu *host_vcpu, -unsigned long vcpu_hva); +void *vcpu_hva);int __pkvm_reclaim_dying_guest_page (pkvm_handle_t handle,u64 gfn);int __pkvm_start_teardown_vm (pkvm_handle_t handle);
arch/arm64/kvm/hyp/include/nvhe/trace.h +2 -2
@@ -46,7 +46,7 @@ static inline pid_t __tracing_get_vcpu_pid(struct kvm_cpu_context *host_ctxt)void *tracing_reserve_entry (unsigned long length);void tracing_commit_entry (void ); -int __tracing_load (unsigned long desc_va,size_t desc_size); +int __tracing_load (void *desc_va,size_t desc_size);void __tracing_unload (void );int __tracing_enable (bool enable);int __tracing_swap_reader (unsigned int cpu);
@@ -59,7 +59,7 @@ static inline void tracing_commit_entry(void) { }#define HYP_EVENT (__name, __proto, __struct, __assign, __printk) \ static inline void trace_##__name(__proto) {} -static inline int __tracing_load (unsigned long desc_va,size_t desc_size) {return -ENODEV ; } +static inline int __tracing_load (void *desc_va,size_t desc_size) {return -ENODEV ; }static inline void __tracing_unload (void ) { }static inline int __tracing_enable (bool enable) {return -ENODEV ; }static inline int __tracing_swap_reader (unsigned int cpu) {return -ENODEV ; }
arch/arm64/kvm/hyp/nvhe/hyp-main.c +4 -4
@@ -577,8 +577,8 @@ static void handle___pkvm_unreserve_vm(struct kvm_cpu_context *host_ctxt)static void handle___pkvm_init_vm (struct kvm_cpu_context *host_ctxt) { DECLARE_REG(struct kvm *, host_kvm, host_ctxt, 1); - DECLARE_REG(unsigned long, vm_hva, host_ctxt, 2); - DECLARE_REG(unsigned long, pgd_hva, host_ctxt, 3); + DECLARE_REG(void *, vm_hva, host_ctxt, 2); + DECLARE_REG(void *, pgd_hva, host_ctxt, 3); host_kvm =kern_hyp_va (host_kvm);cpu_reg (host_ctxt,1 ) =__pkvm_init_vm (host_kvm, vm_hva, pgd_hva);
@@ -588,7 +588,7 @@ static void handle___pkvm_init_vcpu(struct kvm_cpu_context *host_ctxt) {DECLARE_REG (pkvm_handle_t, handle, host_ctxt,1 ); DECLARE_REG(struct kvm_vcpu *, host_vcpu, host_ctxt, 2); - DECLARE_REG(unsigned long, vcpu_hva, host_ctxt, 3); + DECLARE_REG(void *, vcpu_hva, host_ctxt, 3); host_vcpu =kern_hyp_va (host_vcpu);cpu_reg (host_ctxt,1 ) =__pkvm_init_vcpu (handle, host_vcpu, vcpu_hva);
@@ -634,7 +634,7 @@ static void handle___pkvm_finalize_teardown_vm(struct kvm_cpu_context *host_ctxtstatic void handle___tracing_load (struct kvm_cpu_context *host_ctxt) { - DECLARE_REG(unsigned long, desc_hva, host_ctxt, 1); + DECLARE_REG(void *, desc_hva, host_ctxt, 1);DECLARE_REG (size_t, desc_size, host_ctxt,2 );cpu_reg (host_ctxt,1 ) =__tracing_load (desc_hva, desc_size);
arch/arm64/kvm/hyp/nvhe/pkvm.c +5 -6
@@ -644,9 +644,9 @@ static size_t pkvm_get_hyp_vm_size(unsigned int nr_vcpus) size_mul(sizeof(struct pkvm_hyp_vcpu *), nr_vcpus)); } -static void *map_donated_memory_noclear (unsigned long host_va,size_t size) +static void *map_donated_memory_noclear (void *host_va,size_t size) { -void *va = (void *)kern_hyp_va (host_va); +void *va =kern_hyp_va (host_va);if (!PAGE_ALIGNED (va))return NULL ;
@@ -658,7 +658,7 @@ static void *map_donated_memory_noclear(unsigned long host_va, size_t size)return va; } -static void *map_donated_memory (unsigned long host_va,size_t size) +static void *map_donated_memory (void *host_va,size_t size) {void *va =map_donated_memory_noclear (host_va, size);
@@ -805,8 +805,7 @@ void teardown_selftest_vm(void)* * Return 0 success, negative error code on failure. */ -int __pkvm_init_vm (struct kvm *host_kvm,unsigned long vm_hva, -unsigned long pgd_hva) +int __pkvm_init_vm (struct kvm *host_kvm,void *vm_hva,void *pgd_hva) {struct pkvm_hyp_vm *hyp_vm =NULL ;size_t vm_size, pgd_size;
@@ -897,7 +896,7 @@ static int register_hyp_vcpu(struct pkvm_hyp_vm *hyp_vm, }int __pkvm_init_vcpu (pkvm_handle_t handle,struct kvm_vcpu *host_vcpu, -unsigned long vcpu_hva) +void *vcpu_hva) {struct pkvm_hyp_vcpu *hyp_vcpu;struct pkvm_hyp_vm *hyp_vm;
arch/arm64/kvm/hyp/nvhe/trace.c +2 -2
@@ -206,9 +206,9 @@ static bool hyp_trace_desc_is_valid(struct hyp_trace_desc *desc, size_t desc_sizreturn true; } -int __tracing_load (unsigned long desc_hva,size_t desc_size) +int __tracing_load (void *desc_hva,size_t desc_size) { -struct hyp_trace_desc *desc = (struct hyp_trace_desc *)kern_hyp_va (desc_hva); +struct hyp_trace_desc *desc =kern_hyp_va (desc_hva);int ret; ret =__admit_host_mem (desc, desc_size);
Signature · 1 line
2.39.5
Fuad Tabba
reviewerPATCH v3 8/11 KVM: arm64: Move the host hypercall interface to its own header
In reply to Fuad TabbaMove the kvm_call_hyp() dispatch macros and pkvm_handle_t out of kvm_host.h into a new kvm_hcall.h, giving the host<->hyp hypercall interface a single home that subsequent patches build on to restore type-checking across the boundary. The only adjustment to the moved code is the checkpatch-mandated space in "while (0)".
No functional change intended.
--- arch/arm64/include/asm/kvm_hcall.h | 68 ++++++++++++++++++++++++++++++ arch/arm64/include/asm/kvm_host.h | 48 +-------------------- 2 files changed, 69 insertions(+), 47 deletions(-) create mode 100644 arch/arm64/include/asm/kvm_hcall.h
arch/arm64/include/asm/kvm_hcall.h new file +68 -0
@@ -0,0 +1,68 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* The host<->hyp hypercall interface. +* +* Copyright (C) 2026 Google LLC +* Author: Fuad Tabba <[email protected]> +*/ + +#ifndef __ARM64_KVM_HCALL_H__ +#define __ARM64_KVM_HCALL_H__ + +#include <linux/arm-smccc.h> +#include <linux/bug.h> +#include <linux/errno.h> +#include <linux/types.h> + +#include <asm/barrier.h> +#include <asm/kvm_asm.h> +#include <asm/virt.h> + +typedef u16 pkvm_handle_t ; + +#ifndef __KVM_NVHE_HYPERVISOR__ +#define kvm_call_hyp_nvhe (f, ...) \ + ({ \ + struct arm_smccc_res res; \ + \ + arm_smccc_1_1_hvc(KVM_HOST_SMCCC_FUNC(f), \ + ##__VA_ARGS__, &res); \ + if (WARN_ON(res.a0 != SMCCC_RET_SUCCESS)) \ + res.a1 = -EOPNOTSUPP; \ + \ + res.a1; \ + }) + +/* +* The isb() below is there to guarantee the same behaviour on VHE as on !VHE, +* where the eret to EL1 acts as a context synchronization event. +*/ +#define kvm_call_hyp (f, ...) \ + do { \ + if (has_vhe()) { \ + f(__VA_ARGS__); \ + isb(); \ + } else { \ + kvm_call_hyp_nvhe(f, ##__VA_ARGS__); \ + } \ + } while (0) + +#define kvm_call_hyp_ret (f, ...) \ + ({ \ + typeof(f(__VA_ARGS__)) ret; \ + \ + if (has_vhe()) { \ + ret = f(__VA_ARGS__); \ + } else { \ + ret = kvm_call_hyp_nvhe(f, ##__VA_ARGS__); \ + } \ + \ + ret; \ + }) +#else /* __KVM_NVHE_HYPERVISOR__ */ +#define kvm_call_hyp (f, ...) f(__VA_ARGS__) +#define kvm_call_hyp_ret (f, ...) f(__VA_ARGS__) +#define kvm_call_hyp_nvhe (f, ...) f(__VA_ARGS__) +#endif /* __KVM_NVHE_HYPERVISOR__ */ + +#endif /* __ARM64_KVM_HCALL_H__ */
arch/arm64/include/asm/kvm_host.h +1 -47
66 lines not on this page · raw message
Signature · 1 line
2.39.5
Fuad Tabba
reviewerPATCH v3 9/11 KVM: arm64: Type-check hypercall arguments at the caller
In reply to Fuad Tabbakvm_call_hyp_nvhe() reduces its target to an SMCCC function number, so the compiler never sees a callable: arguments that are wrong in number, type or order are silently marshalled into registers. The kvm_call_hyp() wrappers only catch this on the VHE branch, and the pKVM-only hypercalls have no such branch.
Declare each hypercall's signature once in kvm_hcall.h and generate a typed stub from it, in the mold of the syscall wrappers. Make kvm_call_hyp_nvhe() resolve to the stub so every caller is checked against the declared signature; a stale or mistyped call now fails to compile. The stubs inline to the same SMCCC call the untyped macro used to make: the compiled callers are unchanged, apart from hypercall returns now being tested at their declared width.
The stage-2 protection arguments are declared u64 rather than enum kvm_pgtable_prot, as kvm_pgtable.h includes linux/kvm_host.h and the enum cannot be completed here.
--- arch/arm64/include/asm/kvm_hcall.h | 152 ++++++++++++++++++++++++++++- arch/arm64/kvm/hyp_trace.c | 2 +- 2 files changed, 152 insertions(+), 2 deletions(-)
arch/arm64/include/asm/kvm_hcall.h +151 -1
@@ -9,6 +9,7 @@#ifndef __ARM64_KVM_HCALL_H__#define __ARM64_KVM_HCALL_H__ +#include <linux/args.h> #include <linux/arm-smccc.h> #include <linux/bug.h> #include <linux/errno.h>
@@ -16,12 +17,37 @@#include <asm/barrier.h> #include <asm/kvm_asm.h> +#include <asm/spectre.h> #include <asm/virt.h> typedef u16 pkvm_handle_t ; +struct kvm ; +struct kvm_s2_mmu ; +struct kvm_vcpu ; +struct vgic_v3_cpu_if ; +struct vgic_v5_cpu_if ; + +/* +* Hypercall signatures are declared as (type, name) argument pairs. +* __KVM_HCALL_MAP() applies a macro to each pair, in the mold of __MAP() +* in <linux/syscalls.h>. The ladder is indexed by list entries, two per +* argument; __KVM_HCALL_MAP_N() takes that count explicitly. +*/ +#define __KVM_HCALL_MAP2 (m, t, a, ...) m(t, a) +#define __KVM_HCALL_MAP4 (m, t, a, ...) m(t, a), __KVM_HCALL_MAP2(m, __VA_ARGS__) +#define __KVM_HCALL_MAP6 (m, t, a, ...) m(t, a), __KVM_HCALL_MAP4(m, __VA_ARGS__) +#define __KVM_HCALL_MAP8 (m, t, a, ...) m(t, a), __KVM_HCALL_MAP6(m, __VA_ARGS__) +#define __KVM_HCALL_MAP10 (m, t, a, ...) m(t, a), __KVM_HCALL_MAP8(m, __VA_ARGS__) +#define __KVM_HCALL_MAP12 (m, t, a, ...) m(t, a), __KVM_HCALL_MAP10(m, __VA_ARGS__) +#define __KVM_HCALL_MAP_N (n, m, ...) CONCATENATE(__KVM_HCALL_MAP, n)(m, __VA_ARGS__) +#define __KVM_HCALL_MAP (m, ...) __KVM_HCALL_MAP_N(COUNT_ARGS(__VA_ARGS__), m, __VA_ARGS__) + +#define __KVM_HCALL_DECL (t, a) t a +#define __KVM_HCALL_ARGS (t, a) a +#ifndef __KVM_NVHE_HYPERVISOR__ -#define kvm_call_hyp_nvhe (f, ...) \ +#define __kvm_call_hyp_nvhe (f, ...) \ ({ \ struct arm_smccc_res res; \ \
@@ -33,6 +59,29 @@ typedef u16 pkvm_handle_t; res.a1; \ }) +/* +* Generate a typed stub for each declared hypercall. kvm_call_hyp_nvhe() +* resolves to the stub, so a call with the wrong argument count or types +* fails to compile instead of being silently truncated to an SMCCC function +* number and a pile of registers. The stub inlines to the same SMCCC call +* the untyped macro used to make. +*/ +#define DECLARE_KVM_HOST_HCALL (ret, name, ...) \ + static __always_inline \ + ret nvhe_hvc_##name(__KVM_HCALL_MAP(__KVM_HCALL_DECL, __VA_ARGS__)) \ + { \ + return (ret)__kvm_call_hyp_nvhe(name, \ + __KVM_HCALL_MAP(__KVM_HCALL_ARGS, __VA_ARGS__));\ + } + +#define DECLARE_KVM_HOST_HCALL0 (ret, name) \ + static __always_inline ret nvhe_hvc_##name(void) \ + { \ + return (ret)__kvm_call_hyp_nvhe(name); \ + } + +#define kvm_call_hyp_nvhe (f, ...) nvhe_hvc_##f(__VA_ARGS__) +/* * The isb() below is there to guarantee the same behaviour on VHE as on !VHE, * where the eret to EL1 acts as a context synchronization event.
@@ -63,6 +112,107 @@ typedef u16 pkvm_handle_t;#define kvm_call_hyp (f, ...) f(__VA_ARGS__)#define kvm_call_hyp_ret (f, ...) f(__VA_ARGS__)#define kvm_call_hyp_nvhe (f, ...) f(__VA_ARGS__) + +#define DECLARE_KVM_HOST_HCALL (ret, name, ...) +#define DECLARE_KVM_HOST_HCALL0 (ret, name)#endif /* __KVM_NVHE_HYPERVISOR__ */ +/* Hypercalls that are unavailable once pKVM has finalised. */ +DECLARE_KVM_HOST_HCALL (int, __pkvm_init, + phys_addr_t, phys, unsigned long, size, + unsigned long *, per_cpu_base, u32, hyp_va_bits) +DECLARE_KVM_HOST_HCALL (ulong, __pkvm_create_private_mapping, + phys_addr_t, phys, size_t, size, u64, prot) +DECLARE_KVM_HOST_HCALL (int, __pkvm_cpu_set_vector, + enum arm64_hyp_spectre_vector, slot) +DECLARE_KVM_HOST_HCALL0(void, __kvm_enable_ssbs) +DECLARE_KVM_HOST_HCALL0(void, __vgic_v3_init_lrs) +DECLARE_KVM_HOST_HCALL0(u64, __vgic_v3_get_gic_config) + +DECLARE_KVM_HOST_HCALL0 (int, __pkvm_prot_finalize) + +/* Hypercalls that are always available and common to [nh]VHE/pKVM. */ +DECLARE_KVM_HOST_HCALL (void, __kvm_adjust_pc, + struct kvm_vcpu *, vcpu) +DECLARE_KVM_HOST_HCALL (int, __kvm_vcpu_run, + struct kvm_vcpu *, vcpu) +DECLARE_KVM_HOST_HCALL0(void, __kvm_flush_vm_context) +DECLARE_KVM_HOST_HCALL (void, __kvm_tlb_flush_vmid_ipa, + struct kvm_s2_mmu *, mmu, phys_addr_t, ipa, int, level) +DECLARE_KVM_HOST_HCALL (void, __kvm_tlb_flush_vmid_ipa_nsh, + struct kvm_s2_mmu *, mmu, phys_addr_t, ipa, int, level) +DECLARE_KVM_HOST_HCALL (void, __kvm_tlb_flush_vmid, + struct kvm_s2_mmu *, mmu) +DECLARE_KVM_HOST_HCALL (void, __kvm_tlb_flush_vmid_range, + struct kvm_s2_mmu *, mmu, phys_addr_t, start, unsigned long, pages) +DECLARE_KVM_HOST_HCALL (void, __kvm_flush_cpu_context, + struct kvm_s2_mmu *, mmu) +DECLARE_KVM_HOST_HCALL (void, __kvm_timer_set_cntvoff, + u64, cntvoff) +DECLARE_KVM_HOST_HCALL (int, __tracing_load, + void *, desc_hva, size_t, desc_size) +DECLARE_KVM_HOST_HCALL0(void, __tracing_unload) +DECLARE_KVM_HOST_HCALL (int, __tracing_enable, + bool, enable) +DECLARE_KVM_HOST_HCALL (int, __tracing_swap_reader, + unsigned int, cpu) +DECLARE_KVM_HOST_HCALL (void, __tracing_update_clock, + u32, mult, u32, shift, u64, epoch_ns, u64, epoch_cyc) +DECLARE_KVM_HOST_HCALL (int, __tracing_reset, + unsigned int, cpu) +DECLARE_KVM_HOST_HCALL (int, __tracing_enable_event, + unsigned short, id, bool, enable) +DECLARE_KVM_HOST_HCALL (void, __tracing_write_event, + u64, id) +DECLARE_KVM_HOST_HCALL (void, __vgic_v3_save_aprs, + struct vgic_v3_cpu_if *, cpu_if) +DECLARE_KVM_HOST_HCALL (void, __vgic_v3_restore_vmcr_aprs, + struct vgic_v3_cpu_if *, cpu_if) +DECLARE_KVM_HOST_HCALL (void, __vgic_v5_save_apr, + struct vgic_v5_cpu_if *, cpu_if) +DECLARE_KVM_HOST_HCALL (void, __vgic_v5_restore_vmcr_apr, + struct vgic_v5_cpu_if *, cpu_if) + +/* Hypercalls that are available only when pKVM has finalised. */ +DECLARE_KVM_HOST_HCALL (int, __pkvm_host_share_hyp, + u64, pfn) +DECLARE_KVM_HOST_HCALL (int, __pkvm_host_unshare_hyp, + u64, pfn) +DECLARE_KVM_HOST_HCALL (int, __pkvm_host_donate_guest, + u64, pfn, u64, gfn) +DECLARE_KVM_HOST_HCALL (int, __pkvm_host_share_guest, + u64, pfn, u64, gfn, u64, nr_pages, u64, prot) +DECLARE_KVM_HOST_HCALL (int, __pkvm_host_unshare_guest, + pkvm_handle_t, handle, u64, gfn, u64, nr_pages) +DECLARE_KVM_HOST_HCALL (int, __pkvm_host_relax_perms_guest, + u64, gfn, u64, prot) +DECLARE_KVM_HOST_HCALL (int, __pkvm_host_wrprotect_guest, + pkvm_handle_t, handle, u64, gfn, u64, nr_pages) +DECLARE_KVM_HOST_HCALL (int, __pkvm_host_test_clear_young_guest, + pkvm_handle_t, handle, u64, gfn, u64, nr_pages, bool, mkold) +DECLARE_KVM_HOST_HCALL (int, __pkvm_host_mkyoung_guest, + u64, gfn) +DECLARE_KVM_HOST_HCALL0(int, __pkvm_reserve_vm) +DECLARE_KVM_HOST_HCALL (void, __pkvm_unreserve_vm, + pkvm_handle_t, handle) +DECLARE_KVM_HOST_HCALL (int, __pkvm_init_vm, + struct kvm *, host_kvm, void *, vm_hva, void *, pgd_hva) +DECLARE_KVM_HOST_HCALL (int, __pkvm_init_vcpu, + pkvm_handle_t, handle, struct kvm_vcpu *, host_vcpu, + void *, vcpu_hva) +DECLARE_KVM_HOST_HCALL0(int, __pkvm_vcpu_in_poison_fault) +DECLARE_KVM_HOST_HCALL (int, __pkvm_force_reclaim_guest_page, + phys_addr_t, phys) +DECLARE_KVM_HOST_HCALL (int, __pkvm_reclaim_dying_guest_page, + pkvm_handle_t, handle, u64, gfn) +DECLARE_KVM_HOST_HCALL (int, __pkvm_start_teardown_vm, + pkvm_handle_t, handle) +DECLARE_KVM_HOST_HCALL (int, __pkvm_finalize_teardown_vm, + pkvm_handle_t, handle) +DECLARE_KVM_HOST_HCALL (void, __pkvm_vcpu_load, + pkvm_handle_t, handle, unsigned int, vcpu_idx, u64, hcr_el2) +DECLARE_KVM_HOST_HCALL0(void, __pkvm_vcpu_put) +DECLARE_KVM_HOST_HCALL (void, __pkvm_tlb_flush_vmid, + pkvm_handle_t, handle) +#endif /* __ARM64_KVM_HCALL_H__ */
arch/arm64/kvm/hyp_trace.c +1 -1
@@ -269,7 +269,7 @@ static struct trace_buffer_desc *hyp_trace_load(unsigned long size, void *priv)if (ret) goto err_free_buffer; - ret =kvm_call_hyp_nvhe (__tracing_load, (unsigned long )desc, desc_size); + ret =kvm_call_hyp_nvhe (__tracing_load, desc, desc_size);if (ret) goto err_unload_pages;
Signature · 1 line
2.39.5
Fuad Tabba
reviewerPATCH v3 10/11 KVM: arm64: nVHE: Check hypercall handlers against the declared ABI
In reply to Fuad TabbaEach hypercall handler unmarshals its arguments from the host context with hand-written DECLARE_REG() casts that nothing ties to what the caller passed: a handler can disagree with its caller in argument type, count or register index without a diagnostic.
Generate the unmarshalling instead. DEFINE_KVM_HOST_HCALL() expands to the handle_<name>() glue, modelled on the syscall wrappers, and checks the handler's parameter list against the signature declared in kvm_hcall.h, so both ends of every hypercall are now compiled against the same declaration. Handler bodies keep their logic and lose the DECLARE_REG() and return-register boilerplate. The compiled handlers are instruction-for-instruction identical, apart from flush_hyp_vcpu() and sync_hyp_vcpu() now being inlined into their only caller.
The return-register store is picked by the declared return type, so a void handler needs no macro of its own. The type is pasted into the store's name, which has to be a single word, so __pkvm_create_private_mapping is declared ulong.
--- arch/arm64/include/asm/kvm_hcall.h | 13 +- arch/arm64/kvm/hyp/nvhe/hyp-main.c | 410 +++++++++++++---------------- 2 files changed, 197 insertions(+), 226 deletions(-)
arch/arm64/include/asm/kvm_hcall.h +11 -2
@@ -44,6 +44,8 @@ struct vgic_v5_cpu_if;#define __KVM_HCALL_MAP (m, ...) __KVM_HCALL_MAP_N(COUNT_ARGS(__VA_ARGS__), m, __VA_ARGS__)#define __KVM_HCALL_DECL (t, a) t a +#define __KVM_HCALL_LONG (t, a) unsigned long a +#define __KVM_HCALL_CAST (t, a) (__force t) a#define __KVM_HCALL_ARGS (t, a) a#ifndef __KVM_NVHE_HYPERVISOR__
@@ -113,8 +115,15 @@ struct vgic_v5_cpu_if;#define kvm_call_hyp_ret (f, ...) f(__VA_ARGS__)#define kvm_call_hyp_nvhe (f, ...) f(__VA_ARGS__) -#define DECLARE_KVM_HOST_HCALL (ret, name, ...) -#define DECLARE_KVM_HOST_HCALL0 (ret, name) +/* +* At EL2 each declaration emits the canonical signature of the hypercall, +* which DEFINE_KVM_HOST_HCALL() in hyp-main.c checks the handler +* definition against. +*/ +#define DECLARE_KVM_HOST_HCALL (ret, name, ...) \ + typedef ret kvm_host_hcall_sig_##name(__KVM_HCALL_MAP(__KVM_HCALL_DECL, __VA_ARGS__)); +#define DECLARE_KVM_HOST_HCALL0 (ret, name) \ + typedef ret kvm_host_hcall_sig_##name(void);#endif /* __KVM_NVHE_HYPERVISOR__ */ /* Hypercalls that are unavailable once pKVM has finalised. */
arch/arm64/kvm/hyp/nvhe/hyp-main.c +186 -224
677 lines not on this page · raw message
Signature · 1 line
2.39.5
[email protected]
AI reviewRe: [PATCH v3 10/11] KVM: arm64: nVHE: Check hypercall handlers against the declared ABI
Thank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider:
Thank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider:
Pre-existing issues:
- [High] Missing context synchronization event (ISB) after writing to SYS_SCTLR.
- [High] Double-fetch of untrusted host memory in pkvm_refill_memcache() leading to a TOCTOU vulnerability. --
--- Patch [10]: [PATCH v3 10/11] KVM: arm64: nVHE: Check hypercall handlers against the declared ABI --- commit c02cd7851991d5d8c9aac5af1e86684fe8258ca4
Author: Fuad Tabba <[email protected]>
KVM: arm64: nVHE: Check hypercall handlers against the declared ABI
This patch replaces manually unmarshalled hypercall arguments using DECLARE_REG() with generated handlers via DEFINE_KVM_HOST_HCALL() and DEFINE_KVM_HOST_HCALL0(). This ensures that the parameter list is type-checked against the signature declared in <asm/kvm_hcall.h> to prevent mismatches between caller and handler.
Quoted 4 lines
arch/arm64/kvm/hyp/nvhe/hyp-main.c +0
-0
[ ... ]
arch/arm64/kvm/hyp/nvhe/hyp-main.c
Quoted 7 lines
static int
pkvm_refill_memcache(struct pkvm_hyp_vcpu *hyp_vcpu){arch/arm64/kvm/hyp/nvhe/hyp-main.c +0
-0struct kvm_vcpu *host_vcpu = hyp_vcpu->host_vcpu;return refill_memcache (&hyp_vcpu->vcpu.arch.pkvm_memcache, host_vcpu->arch.pkvm_memcache.nr_pages, &host_vcpu->arch.pkvm_memcache);
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
[Severity: High]
This is a pre-existing issue, but could this double-fetch of untrusted host memory lead to a TOCTOU race condition?
The host memory is dereferenced here to read nr_pages and then passed as a pointer to refill_memcache(), which fetches from it again:
arch/arm64/kvm/hyp/nvhe/mm.c:refill_memcache() {
...
struct kvm_hyp_memcache tmp = *host_mc;
...
}If the host concurrently modifies the struct between the fetches, EL2 might use a min_pages target that differs from the actual struct state. Should the struct be copied to EL2 private memory first before acting on it?
Quoted 1 line
}
[ ... ]
arch/arm64/kvm/hyp/nvhe/hyp-main.c static void handle___pkvm_tlb_flush_vmid(struct kvm_cpu_context *host_ctxt)
Quoted 9 lines
arch/arm64/kvm/hyp/nvhe/hyp-main.c +1
-1-static void handle___kvm_enable_ssbs (struct kvm_cpu_context *host_ctxt) +DEFINE_KVM_HOST_HCALL0(void, __kvm_enable_ssbs) {u64 tmp; tmp =read_sysreg_el2 (SYS_SCTLR ); tmp |= SCTLR_ELx_DSSBS;write_sysreg_el2 (tmp,SYS_SCTLR ); }
^
[Severity: High]
This isn't a bug introduced by this patch, but should an isb() instruction be issued after the write to SYS_SCTLR?
Updates to control-plane system registers like SYS_SCTLR require a Context Synchronization Event (CSE) to be visible to subsequent instructions. Returning without an immediate isb() might leave the processor operating with an architecturally undefined pipeline state.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=10
Fuad Tabba
reviewerRe: [PATCH v3 10/11] KVM: arm64: nVHE: Check hypercall handlers against the declared ABI
Quoted 5 lines · On Tue, 4 Aug 2026 at 12:41, <[email protected]> wrote:
Thank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider:
Pre-existing issues:
- [High] Missing context synchronization event (ISB) after writing toSYS_SCTLR.
I thought we'd covered this [1]. The ERET back to the host is itself a CSE, and SCTLR_EL2.DSSBS only sets the default PSTATE.SSBS on the *next* exception entry to EL2, nothing executing at EL2 consumes it before the return, so an ISB is redundant.
Quoted 1 line
- [High] Double-fetch of untrusted host memory in
pkvm_refill_memcache()leading to a TOCTOU vulnerability.
Not a TOCTOU: __pkvm_host_donate_hyp() does a host+hyp-locked ownership transition on each page before EL2 dereferences it, and nr_pages is only the loop's target count. Worst case the host under-donates its own pages and starves its own vCPU.
/fuad
[1] https://github.com/masoncl/review-prompts/blob/main/kernel/subsystem/arm64.md
Quoted 72 lines
--
--- Patch [10]: [PATCH v3 10/11] KVM: arm64: nVHE: Check hypercall handlers against the declared ABI --- commit
c02cd7851991d5d8c9aac5af1e86684fe8258ca4
Author: Fuad Tabba <[email protected]>
KVM: arm64: nVHE: Check hypercall handlers against the declared ABIThis patch replaces manually unmarshalled hypercall arguments using
DECLARE_REG()with generated handlers viaDEFINE_KVM_HOST_HCALL()andDEFINE_KVM_HOST_HCALL0(). This ensures that the parameter list is type-checked against the signature declared in <asm/kvm_hcall.h> to prevent mismatches between caller and handler.Quoted 4 lines
arch/arm64/kvm/hyp/nvhe/hyp-main.c +0
-0[ ... ]
Quoted 7 lines
static int
pkvm_refill_memcache(struct pkvm_hyp_vcpu *hyp_vcpu){ struct kvm_vcpu *host_vcpu = hyp_vcpu->host_vcpu; return refill_memcache(&hyp_vcpu->vcpu.arch.pkvm_memcache, host_vcpu->arch.pkvm_memcache.nr_pages, &host_vcpu->arch.pkvm_memcache);^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^[Severity: High]
This is a pre-existing issue, but could this double-fetch of untrusted host memory lead to a TOCTOU race condition?The host memory is dereferenced here to read
nr_pagesand then passed as a pointer torefill_memcache(), which fetches from it again:arch/arm64/kvm/hyp/nvhe/mm.c:refill_memcache() { ... struct kvm_hyp_memcache tmp = *host_mc; ... }If the host concurrently modifies the struct between the fetches, EL2 might use a
min_pagestarget that differs from the actual struct state. Should the struct be copied to EL2 private memory first before acting on it?Quoted 1 line
}
[ ... ]
arch/arm64/kvm/hyp/nvhe/hyp-main.c static void handle___pkvm_tlb_flush_vmid(struct kvm_cpu_context *host_ctxt)
Quoted 9 lines
arch/arm64/kvm/hyp/nvhe/hyp-main.c +1
-1-static void handle___kvm_enable_ssbs (struct kvm_cpu_context *host_ctxt) +DEFINE_KVM_HOST_HCALL0(void, __kvm_enable_ssbs) {u64 tmp; tmp =read_sysreg_el2 (SYS_SCTLR ); tmp |= SCTLR_ELx_DSSBS;write_sysreg_el2 (tmp,SYS_SCTLR ); }^
[Severity: High]
This isn't a bug introduced by this patch, but should anisb()instruction be issued after the write toSYS_SCTLR?Updates to control-plane system registers like
SYS_SCTLRrequire a Context Synchronization Event (CSE) to be visible to subsequent instructions. Returning without an immediateisb()might leave the processor operating with an architecturally undefined pipeline state.--
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=10
Fuad Tabba
reviewerPATCH v3 11/11 KVM: arm64: Tag host-VA hypercall parameters __kern
In reply to Fuad TabbaThe nVHE hypervisor takes host virtual addresses as hypercall arguments and translates each with kern_hyp_va() before use. Nothing marks them as host-owned, so dereferencing one untranslated at EL2 - a recurring bug class - is invisible to the compiler.
Add a __kern sparse address space, active only for EL2 code, and tag the host-VA parameters in the hypercall declarations. kern_hyp_va_host() is the only sanctioned unwrap: it translates the address, preserves the pointee type (stripped of qualifiers, as with the percpu accessors) and drops the tag with a __force cast, so an untranslated host VA fails sparse. The tag flows from the shared declaration into the generated handler and on into the donated-memory and tracing-descriptor helpers, so a handler cannot extract a host VA without it. Host code sees plain pointers, and the tag is checker-only: no code is generated.
--- arch/arm64/include/asm/kvm_hcall.h | 43 ++++++++++++------- arch/arm64/include/asm/kvm_mmu.h | 10 +++++ arch/arm64/kvm/hyp/include/nvhe/pkvm.h | 6 ++- arch/arm64/kvm/hyp/include/nvhe/trace.h | 5 ++- arch/arm64/kvm/hyp/nvhe/hyp-main.c | 57 +++++++++++++------------ arch/arm64/kvm/hyp/nvhe/pkvm.c | 11 ++--- arch/arm64/kvm/hyp/nvhe/trace.c | 4 +- 7 files changed, 82 insertions(+), 54 deletions(-)
arch/arm64/include/asm/kvm_hcall.h +28 -15
@@ -28,6 +28,18 @@ struct kvm_vcpu;struct vgic_v3_cpu_if ;struct vgic_v5_cpu_if ; +/* +* A host VA carried by a hypercall argument. At EL2 such a pointer must not +* be dereferenced until it is translated with kern_hyp_va_host(); sparse +* flags any use that skips the translation. The tag describes the EL2 view +* only: the host dereferences its own VAs freely. +*/ +#if defined(__KVM_NVHE_HYPERVISOR__) && defined(__CHECKER__) +#define __kern __attribute__((noderef, address_space(__kern))) +#else +#define __kern +#endif +/* * Hypercall signatures are declared as (type, name) argument pairs. * __KVM_HCALL_MAP() applies a macro to each pair, in the mold of __MAP()
@@ -142,24 +154,24 @@ DECLARE_KVM_HOST_HCALL0(int, __pkvm_prot_finalize)/* Hypercalls that are always available and common to [nh]VHE/pKVM. */ DECLARE_KVM_HOST_HCALL (void, __kvm_adjust_pc, - struct kvm_vcpu *, vcpu) + struct kvm_vcpu __kern *, vcpu)DECLARE_KVM_HOST_HCALL (int, __kvm_vcpu_run, - struct kvm_vcpu *, vcpu) + struct kvm_vcpu __kern *, vcpu) DECLARE_KVM_HOST_HCALL0(void, __kvm_flush_vm_context)DECLARE_KVM_HOST_HCALL (void, __kvm_tlb_flush_vmid_ipa, - struct kvm_s2_mmu *, mmu, phys_addr_t, ipa, int, level) + struct kvm_s2_mmu __kern *, mmu, phys_addr_t, ipa, int, level)DECLARE_KVM_HOST_HCALL (void, __kvm_tlb_flush_vmid_ipa_nsh, - struct kvm_s2_mmu *, mmu, phys_addr_t, ipa, int, level) + struct kvm_s2_mmu __kern *, mmu, phys_addr_t, ipa, int, level)DECLARE_KVM_HOST_HCALL (void, __kvm_tlb_flush_vmid, - struct kvm_s2_mmu *, mmu) + struct kvm_s2_mmu __kern *, mmu)DECLARE_KVM_HOST_HCALL (void, __kvm_tlb_flush_vmid_range, - struct kvm_s2_mmu *, mmu, phys_addr_t, start, unsigned long, pages) + struct kvm_s2_mmu __kern *, mmu, phys_addr_t, start, unsigned long, pages)DECLARE_KVM_HOST_HCALL (void, __kvm_flush_cpu_context, - struct kvm_s2_mmu *, mmu) + struct kvm_s2_mmu __kern *, mmu)DECLARE_KVM_HOST_HCALL (void, __kvm_timer_set_cntvoff, u64, cntvoff)DECLARE_KVM_HOST_HCALL (int, __tracing_load, - void *, desc_hva, size_t, desc_size) + void __kern *, desc_hva, size_t, desc_size) DECLARE_KVM_HOST_HCALL0(void, __tracing_unload)DECLARE_KVM_HOST_HCALL (int, __tracing_enable, bool, enable)
@@ -174,13 +186,13 @@ DECLARE_KVM_HOST_HCALL(int, __tracing_enable_event,DECLARE_KVM_HOST_HCALL (void, __tracing_write_event, u64, id)DECLARE_KVM_HOST_HCALL (void, __vgic_v3_save_aprs, - struct vgic_v3_cpu_if *, cpu_if) + struct vgic_v3_cpu_if __kern *, cpu_if)DECLARE_KVM_HOST_HCALL (void, __vgic_v3_restore_vmcr_aprs, - struct vgic_v3_cpu_if *, cpu_if) + struct vgic_v3_cpu_if __kern *, cpu_if)DECLARE_KVM_HOST_HCALL (void, __vgic_v5_save_apr, - struct vgic_v5_cpu_if *, cpu_if) + struct vgic_v5_cpu_if __kern *, cpu_if)DECLARE_KVM_HOST_HCALL (void, __vgic_v5_restore_vmcr_apr, - struct vgic_v5_cpu_if *, cpu_if) + struct vgic_v5_cpu_if __kern *, cpu_if) /* Hypercalls that are available only when pKVM has finalised. */ DECLARE_KVM_HOST_HCALL(int, __pkvm_host_share_hyp,
@@ -205,10 +217,11 @@ DECLARE_KVM_HOST_HCALL0(int, __pkvm_reserve_vm)DECLARE_KVM_HOST_HCALL (void, __pkvm_unreserve_vm, pkvm_handle_t, handle)DECLARE_KVM_HOST_HCALL (int, __pkvm_init_vm, - struct kvm *, host_kvm, void *, vm_hva, void *, pgd_hva) + struct kvm __kern *, host_kvm, void __kern *, vm_hva, + void __kern *, pgd_hva)DECLARE_KVM_HOST_HCALL (int, __pkvm_init_vcpu, - pkvm_handle_t, handle, struct kvm_vcpu *, host_vcpu, - void *, vcpu_hva) + pkvm_handle_t, handle, struct kvm_vcpu __kern *, host_vcpu, + void __kern *, vcpu_hva) DECLARE_KVM_HOST_HCALL0(int, __pkvm_vcpu_in_poison_fault)DECLARE_KVM_HOST_HCALL (int, __pkvm_force_reclaim_guest_page, phys_addr_t, phys)
arch/arm64/include/asm/kvm_mmu.h +10 -0
@@ -7,6 +7,8 @@#ifndef __ARM64_KVM_MMU_H__#define __ARM64_KVM_MMU_H__ +#include <linux/compiler.h> +#include <asm/page.h> #include <asm/memory.h> #include <asm/mmu.h>
@@ -140,6 +142,14 @@ static __always_inline unsigned long __kern_hyp_va(unsigned long v)#define kern_hyp_va (v) ((typeof(v))(__kern_hyp_va((unsigned long)(v)))) +/* +* Translate a __kern-tagged host VA, dropping the tag: the only sanctioned +* unwrap. Translation only, no ownership or bounds validation; the result +* carries the pointee type stripped of the tag and of any cv-qualifiers. +*/ +#define kern_hyp_va_host (v) \ + ((TYPEOF_UNQUAL(*(v)) *)__kern_hyp_va((unsigned long)(__force void *)(v))) +extern u32 __hyp_va_bits;/*
arch/arm64/kvm/hyp/include/nvhe/pkvm.h +4 -2
@@ -7,6 +7,7 @@#ifndef __ARM64_KVM_NVHE_PKVM_H__#define __ARM64_KVM_NVHE_PKVM_H__ +#include <asm/kvm_hcall.h> #include <asm/kvm_pkvm.h> #include <nvhe/gfp.h>
@@ -69,9 +70,10 @@ void pkvm_hyp_vm_table_init(void *tbl);int __pkvm_reserve_vm (void );void __pkvm_unreserve_vm (pkvm_handle_t handle); -int __pkvm_init_vm (struct kvm *host_kvm,void *vm_hva,void *pgd_hva); +int __pkvm_init_vm(struct kvm *host_kvm, void __kern *vm_hva, + void __kern *pgd_hva);int __pkvm_init_vcpu (pkvm_handle_t handle,struct kvm_vcpu *host_vcpu, -void *vcpu_hva); + void __kern *vcpu_hva);int __pkvm_reclaim_dying_guest_page (pkvm_handle_t handle,u64 gfn);int __pkvm_start_teardown_vm (pkvm_handle_t handle);
arch/arm64/kvm/hyp/include/nvhe/trace.h +3 -2
@@ -4,6 +4,7 @@#include <linux/trace_remote_event.h> +#include <asm/kvm_hcall.h> #include <asm/kvm_hyptrace.h> static inline pid_t __tracing_get_vcpu_pid (struct kvm_cpu_context *host_ctxt)
@@ -46,7 +47,7 @@ static inline pid_t __tracing_get_vcpu_pid(struct kvm_cpu_context *host_ctxt)void *tracing_reserve_entry (unsigned long length);void tracing_commit_entry (void ); -int __tracing_load (void *desc_va,size_t desc_size); +int __tracing_load(void __kern *desc_va, size_t desc_size);void __tracing_unload (void );int __tracing_enable (bool enable);int __tracing_swap_reader (unsigned int cpu);
@@ -59,7 +60,7 @@ static inline void tracing_commit_entry(void) { }#define HYP_EVENT (__name, __proto, __struct, __assign, __printk) \ static inline void trace_##__name(__proto) {} -static inline int __tracing_load (void *desc_va,size_t desc_size) {return -ENODEV ; } +static inline int __tracing_load(void __kern *desc_va, size_t desc_size) { return -ENODEV; }static inline void __tracing_unload (void ) { }static inline int __tracing_enable (bool enable) {return -ENODEV ; }static inline int __tracing_swap_reader (unsigned int cpu) {return -ENODEV ; }
arch/arm64/kvm/hyp/nvhe/hyp-main.c +29 -28
141 lines not on this page · raw message
arch/arm64/kvm/hyp/nvhe/pkvm.c +6 -5
@@ -644,9 +644,9 @@ static size_t pkvm_get_hyp_vm_size(unsigned int nr_vcpus) size_mul(sizeof(struct pkvm_hyp_vcpu *), nr_vcpus)); } -static void *map_donated_memory_noclear (void *host_va,size_t size) +static void *map_donated_memory_noclear(void __kern *host_va, size_t size) { -void *va =kern_hyp_va (host_va); +void *va =kern_hyp_va_host (host_va);if (!PAGE_ALIGNED (va))return NULL ;
@@ -658,7 +658,7 @@ static void *map_donated_memory_noclear(void *host_va, size_t size)return va; } -static void *map_donated_memory (void *host_va,size_t size) +static void *map_donated_memory(void __kern *host_va, size_t size) {void *va =map_donated_memory_noclear (host_va, size);
@@ -805,7 +805,8 @@ void teardown_selftest_vm(void)* * Return 0 success, negative error code on failure. */ -int __pkvm_init_vm (struct kvm *host_kvm,void *vm_hva,void *pgd_hva) +int __pkvm_init_vm(struct kvm *host_kvm, void __kern *vm_hva, + void __kern *pgd_hva) {struct pkvm_hyp_vm *hyp_vm =NULL ;size_t vm_size, pgd_size;
@@ -896,7 +897,7 @@ static int register_hyp_vcpu(struct pkvm_hyp_vm *hyp_vm, }int __pkvm_init_vcpu (pkvm_handle_t handle,struct kvm_vcpu *host_vcpu, -void *vcpu_hva) + void __kern *vcpu_hva) {struct pkvm_hyp_vcpu *hyp_vcpu;struct pkvm_hyp_vm *hyp_vm;
arch/arm64/kvm/hyp/nvhe/trace.c +2 -2
@@ -206,9 +206,9 @@ static bool hyp_trace_desc_is_valid(struct hyp_trace_desc *desc, size_t desc_sizreturn true; } -int __tracing_load (void *desc_hva,size_t desc_size) +int __tracing_load(void __kern *desc_hva, size_t desc_size) { -struct hyp_trace_desc *desc =kern_hyp_va (desc_hva); +struct hyp_trace_desc *desc =kern_hyp_va_host (desc_hva);int ret; ret =__admit_host_mem (desc, desc_size);
Signature · 1 line
2.39.5
Quoted 6 lines · Fuad Tabba
Hi folks,
This is based on rc6, but in case it is easier to take on kvmarm/next (
320840b34af2a), the same series applied there is at [1]. It passes the same checks: bisectable, sparse clean, npVM and pVM boot.
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.