KVM: s390: Ensure kvm_arch_no_poll() is read once when blocking vCPU
authorSean Christopherson <seanjc@google.com>
Sat, 9 Oct 2021 02:11:56 +0000 (19:11 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 8 Mar 2022 18:12:34 +0000 (19:12 +0100)
commit32b758d12c24d7fc385e359d6a54ebbb29960485
tree245dcbbaf38a373d41336b2b8597852428cd7e8e
parentb63190d0203faf25491f83d28273facc7a333ecf
KVM: s390: Ensure kvm_arch_no_poll() is read once when blocking vCPU

[ Upstream commit 6f390916c4fb359507d9ac4bf1b28a4f8abee5c0 ]

Wrap s390's halt_poll_max_steal with READ_ONCE and snapshot the result of
kvm_arch_no_poll() in kvm_vcpu_block() to avoid a mostly-theoretical,
largely benign bug on s390 where the result of kvm_arch_no_poll() could
change due to userspace modifying halt_poll_max_steal while the vCPU is
blocking.  The bug is largely benign as it will either cause KVM to skip
updating halt-polling times (no_poll toggles false=>true) or to update
halt-polling times with a slightly flawed block_ns.

Note, READ_ONCE is unnecessary in the current code, add it in case the
arch hook is ever inlined, and to provide a hint that userspace can
change the param at will.

Fixes: 8b905d28ee17 ("KVM: s390: provide kvm_arch_no_poll function")
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Sean Christopherson <seanjc@google.com>
Message-Id: <20211009021236.4122790-4-seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/s390/kvm/kvm-s390.c
virt/kvm/kvm_main.c