Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49846896 authored by Rusty Russell's avatar Rusty Russell Committed by Avi Kivity
Browse files

KVM: Extract core of kvm_flush_remote_tlbs/kvm_reload_remote_mmus 



Avi said:
> Wow, code duplication from Rusty. Things must be bad.

Something about glass houses comes to mind.  But instead, a patch.

Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 3d3aab1b

virt/kvm/kvm_main.c

+15 −29
Original line number Diff line number Diff line
@@ -552,10 +552,11 @@ static void ack_flush(void *_completed) 
{

}



void kvm_flush_remote_tlbs(struct kvm *kvm)

static bool make_all_cpus_request(struct kvm *kvm, unsigned int req)

{

	int i, cpu, me;

	cpumask_t cpus;

	bool called = false;

	struct kvm_vcpu *vcpu;



	me = get_cpu();
@@ -564,45 +565,30 @@ void kvm_flush_remote_tlbs(struct kvm *kvm) 
		vcpu = kvm->vcpus[i];

		if (!vcpu)

			continue;

		if (test_and_set_bit(KVM_REQ_TLB_FLUSH, &vcpu->requests))

		if (test_and_set_bit(req, &vcpu->requests))

			continue;

		cpu = vcpu->cpu;

		if (cpu != -1 && cpu != me)

			cpu_set(cpu, cpus);

	}

	if (cpus_empty(cpus))

		goto out;

	++kvm->stat.remote_tlb_flush;

	if (!cpus_empty(cpus)) {

		smp_call_function_mask(cpus, ack_flush, NULL, 1);

out:

		called = true;

	}

	put_cpu();

	return called;

}



void kvm_reload_remote_mmus(struct kvm *kvm)

void kvm_flush_remote_tlbs(struct kvm *kvm)

{

	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];

		if (!vcpu)

			continue;

		if (test_and_set_bit(KVM_REQ_MMU_RELOAD, &vcpu->requests))

			continue;

		cpu = vcpu->cpu;

		if (cpu != -1 && cpu != me)

			cpu_set(cpu, cpus);

	}

	if (cpus_empty(cpus))

		goto out;

	smp_call_function_mask(cpus, ack_flush, NULL, 1);

out:

	put_cpu();

	if (make_all_cpus_request(kvm, KVM_REQ_TLB_FLUSH))

		++kvm->stat.remote_tlb_flush;

}



void kvm_reload_remote_mmus(struct kvm *kvm)

{

	make_all_cpus_request(kvm, KVM_REQ_MMU_RELOAD);

}



int kvm_vcpu_init(struct kvm_vcpu *vcpu, struct kvm *kvm, unsigned id)

{