selftests: KVM: Handle compiler optimizations in ucall
Subsystems (4)
Sasha Levin
maintainerPATCH 1/1 selftests: KVM: Handle compiler optimizations in ucall
From: Raghavendra Rao Ananta <[email protected]>
[ Upstream commit 9e2f6498efbbc880d7caa7935839e682b64fe5a6 ]
The selftests, when built with newer versions of clang, is found to have over optimized guests' ucall() function, and eliminating the stores for uc.cmd (perhaps due to no immediate readers). This resulted in the userspace side always reading a value of '0', and causing multiple test failures.
As a result, prevent the compiler from optimizing the stores in ucall() with WRITE_ONCE().
Suggested-by Ricardo Koller <[email protected]>
Suggested-by Reiji Watanabe <[email protected]>
Signed-off-by Raghavendra Rao Ananta <[email protected]>
Message-Id: <[email protected]>
Reviewed-by Andrew Jones <[email protected]>
Signed-off-by Paolo Bonzini <[email protected]>
Signed-off-by Sasha Levin <[email protected]>
--- tools/testing/selftests/kvm/lib/aarch64/ucall.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
tools/testing/selftests/kvm/lib/aarch64/ucall.c +4 -5
@@ -73,20 +73,19 @@ void ucall_uninit(struct kvm_vm *vm)void ucall (uint64_t cmd,int nargs, ...) { -struct ucall uc = { - .cmd = cmd, - }; +struct ucall uc = {};va_list va;int i; +WRITE_ONCE (uc.cmd, cmd); nargs = nargs <=UCALL_MAX_ARGS ? nargs :UCALL_MAX_ARGS ;va_start (va, nargs);for (i =0 ; i < nargs; ++i) - uc.args[i] =va_arg (va, uint64_t); +WRITE_ONCE (uc.args[i],va_arg (va, uint64_t));va_end (va); - *ucall_exit_mmio_addr = (vm_vaddr_t)&uc; +WRITE_ONCE (*ucall_exit_mmio_addr, (vm_vaddr_t)&uc); }uint64_t get_ucall (struct kvm_vm *vm,uint32_t vcpu_id,struct ucall *uc)
Signature · 1 line
2.35.1