diff options
| author | Marc Zyngier <maz@kernel.org> | 2020-06-07 11:55:28 +0200 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2020-06-09 11:59:52 +0200 |
| commit | b990d37fdf6781fd0907ffd14d0dff16b5d58ffa (patch) | |
| tree | a5ddf6f6f821829ba47b6634ff9e4493d46c1ae2 /arch/arm64 | |
| parent | KVM: arm64: Handle PtrAuth traps early (diff) | |
| download | linux-b990d37fdf6781fd0907ffd14d0dff16b5d58ffa.tar.xz linux-b990d37fdf6781fd0907ffd14d0dff16b5d58ffa.zip | |
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.
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/include/asm/kvm_asm.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/arch/arm64/include/asm/kvm_asm.h b/arch/arm64/include/asm/kvm_asm.h index 0c9b5fc4ba0a..d9b7da15dbca 100644 --- a/arch/arm64/include/asm/kvm_asm.h +++ b/arch/arm64/include/asm/kvm_asm.h @@ -81,12 +81,19 @@ 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); \ + void *__ptr; \ + __verify_pcpu_ptr(&sym); \ + __ptr = hyp_symbol_addr(sym); \ __ptr += read_sysreg(tpidr_el2); \ - (typeof(&sym))__ptr; \ + (typeof(sym) __kernel __force *)__ptr; \ }) #define __hyp_this_cpu_read(sym) \ |