KVM: Adjust smp_call_function_mask() callers to new requirements
smp_call_function_mask() now complains when called in a preemptible context; adjust its callers accordingly. Signed-off-by: Avi Kivity <avi@qumranet.com>
This commit is contained in:
parent
722c05f219
commit
597a5f551e
1 changed files with 12 additions and 6 deletions
|
@ -105,10 +105,11 @@ static void ack_flush(void *_completed)
|
|||
|
||||
void kvm_flush_remote_tlbs(struct kvm *kvm)
|
||||
{
|
||||
int i, cpu;
|
||||
int i, cpu, me;
|
||||
cpumask_t cpus;
|
||||
struct kvm_vcpu *vcpu;
|
||||
|
||||
me = get_cpu();
|
||||
cpus_clear(cpus);
|
||||
for (i = 0; i < KVM_MAX_VCPUS; ++i) {
|
||||
vcpu = kvm->vcpus[i];
|
||||
|
@ -117,21 +118,24 @@ void kvm_flush_remote_tlbs(struct kvm *kvm)
|
|||
if (test_and_set_bit(KVM_REQ_TLB_FLUSH, &vcpu->requests))
|
||||
continue;
|
||||
cpu = vcpu->cpu;
|
||||
if (cpu != -1 && cpu != raw_smp_processor_id())
|
||||
if (cpu != -1 && cpu != me)
|
||||
cpu_set(cpu, cpus);
|
||||
}
|
||||
if (cpus_empty(cpus))
|
||||
return;
|
||||
goto out;
|
||||
++kvm->stat.remote_tlb_flush;
|
||||
smp_call_function_mask(cpus, ack_flush, NULL, 1);
|
||||
out:
|
||||
put_cpu();
|
||||
}
|
||||
|
||||
void kvm_reload_remote_mmus(struct kvm *kvm)
|
||||
{
|
||||
int i, cpu;
|
||||
int i, cpu, me;
|
||||
cpumask_t cpus;
|
||||
struct kvm_vcpu *vcpu;
|
||||
|
||||
me = get_cpu();
|
||||
cpus_clear(cpus);
|
||||
for (i = 0; i < KVM_MAX_VCPUS; ++i) {
|
||||
vcpu = kvm->vcpus[i];
|
||||
|
@ -140,12 +144,14 @@ void kvm_reload_remote_mmus(struct kvm *kvm)
|
|||
if (test_and_set_bit(KVM_REQ_MMU_RELOAD, &vcpu->requests))
|
||||
continue;
|
||||
cpu = vcpu->cpu;
|
||||
if (cpu != -1 && cpu != raw_smp_processor_id())
|
||||
if (cpu != -1 && cpu != me)
|
||||
cpu_set(cpu, cpus);
|
||||
}
|
||||
if (cpus_empty(cpus))
|
||||
return;
|
||||
goto out;
|
||||
smp_call_function_mask(cpus, ack_flush, NULL, 1);
|
||||
out:
|
||||
put_cpu();
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue