Skip to contentSkip to conversation

KVM: arm64: Stop sparse from moaning at __hyp_this_cpu_ptr

PATCH In review Marc Zyngier 2 participants 3 messages Jun 8, 2020

Subsystems (3)
lore
Share & tools
lore

Marc Zyngier

author maintainer
#0 lore raw

PATCH 1/1 KVM: arm64: Stop sparse from moaning at __hyp_this_cpu_ptr

Sparse complains that __hyp_this_cpu_ptr() returns something that is flagged noderef and not in the correct address space (both being the result of the __percpu annotation).

Pretend that __hyp_this_cpu_ptr() knows what it is doing by forcefully casting the pointer with __kernel __force.

---
 arch/arm64/include/asm/kvm_asm.h | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
arch/arm64/include/asm/kvm_asm.h +7 -2
index 0c9b5fc4ba0a..82691406d493 100644
@@ -81,12 +81,17 @@ extern u32 __kvm_get_mdcr_el2(void);
 
 extern char __smccc_workaround_1_smc[__SMCCC_WORKAROUND_1_SMC_SZ];
 
-/* Home-grown __this_cpu_{ptr,read} variants that always work at HYP */
+/*
+ * Home-grown __this_cpu_{ptr,read} variants that always work at HYP,
+ * provided that sym is really a *symbol* and not a pointer obtained from
+ * a data structure. As for SHIFT_PERCPU_PTR(), the creative casting keeps
+ * sparse quiet.
+ */
 #define __hyp_this_cpu_ptr(sym)						\
 	({								\
 		void *__ptr = hyp_symbol_addr(sym);			\
 		__ptr += read_sysreg(tpidr_el2);			\
-		(typeof(&sym))__ptr;					\
+		(typeof(sym) __kernel __force *)__ptr;			\
 	 })
 
 #define __hyp_this_cpu_read(sym)					\
Signature · 1 line
2.26.2
#1 lore raw
Quoted 17 lines · Marc Zyngier

Sparse complains that __hyp_this_cpu_ptr() returns something that is flagged noderef and not in the correct address space (both being the result of the __percpu annotation).

Pretend that __hyp_this_cpu_ptr() knows what it is doing by forcefully casting the pointer with __kernel __force.

---
 arch/arm64/include/asm/kvm_asm.h | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
arch/arm64/include/asm/kvm_asm.h +0 -0
index 0c9b5fc4ba0a..82691406d493 100644

arch/arm64/include/asm/kvm_asm.h extern u32 __kvm_get_mdcr_el2(void); · line 86

Quoted 7 lines
arch/arm64/include/asm/kvm_asm.h +3 -1
@@ -81,12 +81,17 @@ extern u32 __kvm_get_mdcr_el2(void);
 
 extern char __smccc_workaround_1_smc[__SMCCC_WORKAROUND_1_SMC_SZ];
 
-/* Home-grown __this_cpu_{ptr,read} variants that always work at HYP */
+/*
+ * Home-grown __this_cpu_{ptr,read} variants that always work at HYP,
+ * provided that sym is really a *symbol* and not a pointer obtained from

Look at this_cpu_ptr one thing that stood out was __verify_pcpu_ptr that is documented to be suitable for used in custom per CPU macros. I didn't get how it worked (a type check?) but maybe it would work here to validate the argment was indeed a per CPU symbol?

Quoted 12 lines
arch/arm64/include/asm/kvm_asm.h +4 -1
+ * a data structure. As for SHIFT_PERCPU_PTR(), the creative casting keeps
+ * sparse quiet.
+ */
 #define __hyp_this_cpu_ptr(sym)						\
 	({								\
 		void *__ptr = hyp_symbol_addr(sym);			\
 		__ptr += read_sysreg(tpidr_el2);			\
-		(typeof(&sym))__ptr;					\
+		(typeof(sym) __kernel __force *)__ptr;			\
 	 })
 
 #define __hyp_this_cpu_read(sym)					\
author maintainer
#2 lore raw
Quoted 21 lines · Andrew Scull
Quoted 20 lines · Marc Zyngier

Sparse complains that __hyp_this_cpu_ptr() returns something that is flagged noderef and not in the correct address space (both being the result of the __percpu annotation).

Pretend that __hyp_this_cpu_ptr() knows what it is doing by forcefully casting the pointer with __kernel __force.

---
 arch/arm64/include/asm/kvm_asm.h | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
arch/arm64/include/asm/kvm_asm.h +0 -0
index 0c9b5fc4ba0a..82691406d493 100644
@@ -81,12 +81,17 @@ extern u32 __kvm_get_mdcr_el2(void);
 
 extern char __smccc_workaround_1_smc[__SMCCC_WORKAROUND_1_SMC_SZ];
 
Quoted 11 lines
Quoted 6 lines
arch/arm64/include/asm/kvm_asm.h +3 -1
-/* Home-grown __this_cpu_{ptr,read} variants that always work at HYP 
 */
+/*
+ * Home-grown __this_cpu_{ptr,read} variants that always work at HYP,
+ * provided that sym is really a *symbol* and not a pointer obtained 

from

Look at this_cpu_ptr one thing that stood out was __verify_pcpu_ptr that is documented to be suitable for used in custom per CPU macros. I didn't get how it worked (a type check?) but maybe it would work here to validate the argment was indeed a per CPU symbol?

It only works for sparse, but that is definitely a good addition while we're fixing the sparse compliance.

Thanks,

      M.
Signature · 1 line
Jazz is not dead. It just smells funny...