Skip to content

Commit 0bbc2ca

Browse files
sean-jcbonzini
authored andcommitted
KVM: KVM: Use cpumask_available() to check for NULL cpumask when kicking vCPUs
Check for a NULL cpumask_var_t when kicking multiple vCPUs via cpumask_available(), which performs a !NULL check if and only if cpumasks are configured to be allocated off-stack. This is a meaningless optimization, e.g. avoids a TEST+Jcc and TEST+CMOV on x86, but more importantly helps document that the NULL check is necessary even though all callers pass in a local variable. No functional change intended. Cc: Lai Jiangshan <[email protected]> Signed-off-by: Sean Christopherson <[email protected]> Signed-off-by: Vitaly Kuznetsov <[email protected]> Message-Id: <[email protected]> Signed-off-by: Paolo Bonzini <[email protected]>
1 parent 85b6404 commit 0bbc2ca

File tree

1 file changed

+15
-3
lines changed

1 file changed

+15
-3
lines changed

virt/kvm/kvm_main.c

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -235,9 +235,13 @@ static void ack_flush(void *_completed)
235235
{
236236
}
237237

238-
static inline bool kvm_kick_many_cpus(const struct cpumask *cpus, bool wait)
238+
static inline bool kvm_kick_many_cpus(cpumask_var_t tmp, bool wait)
239239
{
240-
if (unlikely(!cpus))
240+
const struct cpumask *cpus;
241+
242+
if (likely(cpumask_available(tmp)))
243+
cpus = tmp;
244+
else
241245
cpus = cpu_online_mask;
242246

243247
if (cpumask_empty(cpus))
@@ -267,6 +271,14 @@ bool kvm_make_vcpus_request_mask(struct kvm *kvm, unsigned int req,
267271
if (!(req & KVM_REQUEST_NO_WAKEUP) && kvm_vcpu_wake_up(vcpu))
268272
continue;
269273

274+
/*
275+
* tmp can be "unavailable" if cpumasks are allocated off stack
276+
* as allocation of the mask is deliberately not fatal and is
277+
* handled by falling back to kicking all online CPUs.
278+
*/
279+
if (!cpumask_available(tmp))
280+
continue;
281+
270282
/*
271283
* Note, the vCPU could get migrated to a different pCPU at any
272284
* point after kvm_request_needs_ipi(), which could result in
@@ -278,7 +290,7 @@ bool kvm_make_vcpus_request_mask(struct kvm *kvm, unsigned int req,
278290
* were reading SPTEs _before_ any changes were finalized. See
279291
* kvm_vcpu_kick() for more details on handling requests.
280292
*/
281-
if (tmp != NULL && kvm_request_needs_ipi(vcpu, req)) {
293+
if (kvm_request_needs_ipi(vcpu, req)) {
282294
cpu = READ_ONCE(vcpu->cpu);
283295
if (cpu != -1 && cpu != me)
284296
__cpumask_set_cpu(cpu, tmp);

0 commit comments

Comments
 (0)