Commit f55ac304 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: x86: Drop @invalidate_gpa param from kvm_x86_ops' tlb_flush() 



Drop @invalidate_gpa from ->tlb_flush() and kvm_vcpu_flush_tlb() now
that all callers pass %true for said param, or ignore the param (SVM has
an internal call to svm_flush_tlb() in svm_flush_tlb_guest that somewhat
arbitrarily passes %false).

Remove __vmx_flush_tlb() as it is no longer used.

No functional change intended.

Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Message-Id: <20200320212833.3507-17-sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent ad104b5e

arch/x86/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -1103,7 +1103,7 @@ struct kvm_x86_ops { 
	unsigned long (*get_rflags)(struct kvm_vcpu *vcpu);

	void (*set_rflags)(struct kvm_vcpu *vcpu, unsigned long rflags);



	void (*tlb_flush)(struct kvm_vcpu *vcpu, bool invalidate_gpa);

	void (*tlb_flush)(struct kvm_vcpu *vcpu);

	int  (*tlb_remote_flush)(struct kvm *kvm);

	int  (*tlb_remote_flush_with_range)(struct kvm *kvm,

			struct kvm_tlb_range *range);

arch/x86/kvm/mmu/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -5179,7 +5179,7 @@ int kvm_mmu_load(struct kvm_vcpu *vcpu) 
	if (r)

		goto out;

	kvm_mmu_load_pgd(vcpu);

	kvm_x86_ops.tlb_flush(vcpu, true);

	kvm_x86_ops.tlb_flush(vcpu);

out:

	return r;

}

arch/x86/kvm/svm/nested.c

+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ void enter_svm_guest_mode(struct vcpu_svm *svm, u64 vmcb_gpa, 
	svm->nested.intercept_exceptions = nested_vmcb->control.intercept_exceptions;

	svm->nested.intercept            = nested_vmcb->control.intercept;



	svm_flush_tlb(&svm->vcpu, true);

	svm_flush_tlb(&svm->vcpu);

	svm->vmcb->control.int_ctl = nested_vmcb->control.int_ctl | V_INTR_MASKING_MASK;

	if (nested_vmcb->control.int_ctl & V_INTR_MASKING_MASK)

		svm->vcpu.arch.hflags |= HF_VINTR_MASK;

arch/x86/kvm/svm/svm.c

+3 −3
Original line number Diff line number Diff line
@@ -1603,7 +1603,7 @@ int svm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4) 
		return 1;



	if (npt_enabled && ((old_cr4 ^ cr4) & X86_CR4_PGE))

		svm_flush_tlb(vcpu, true);

		svm_flush_tlb(vcpu);



	vcpu->arch.cr4 = cr4;

	if (!npt_enabled)
@@ -3153,7 +3153,7 @@ static int svm_set_identity_map_addr(struct kvm *kvm, u64 ident_addr) 
	return 0;

}



void svm_flush_tlb(struct kvm_vcpu *vcpu, bool invalidate_gpa)

void svm_flush_tlb(struct kvm_vcpu *vcpu)

{

	struct vcpu_svm *svm = to_svm(vcpu);
@@ -3172,7 +3172,7 @@ static void svm_flush_tlb_gva(struct kvm_vcpu *vcpu, gva_t gva) 


static void svm_flush_tlb_guest(struct kvm_vcpu *vcpu)

{

	svm_flush_tlb(vcpu, false);

	svm_flush_tlb(vcpu);

}



static void svm_prepare_guest_switch(struct kvm_vcpu *vcpu)

arch/x86/kvm/svm/svm.h

+1 −1
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ u32 svm_msrpm_offset(u32 msr); 
void svm_set_efer(struct kvm_vcpu *vcpu, u64 efer);

void svm_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0);

int svm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4);

void svm_flush_tlb(struct kvm_vcpu *vcpu, bool invalidate_gpa);

void svm_flush_tlb(struct kvm_vcpu *vcpu);

void disable_nmi_singlestep(struct vcpu_svm *svm);



/* nested.c */

CRA Git | Maintained and supported by SUSTech CRA and CCSE