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

Commit 748c0e31 authored by Lan Tianyu's avatar Lan Tianyu Committed by Paolo Bonzini
Browse files

KVM: Make kvm_set_spte_hva() return int 



The patch is to make kvm_set_spte_hva() return int and caller can
check return value to determine flush tlb or not.

Signed-off-by: default avatarLan Tianyu <Tianyu.Lan@microsoft.com>
Acked-by: default avatarPaul Mackerras <paulus@ozlabs.org>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent c3134ce2

arch/arm/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ int __kvm_arm_vcpu_set_events(struct kvm_vcpu *vcpu, 
#define KVM_ARCH_WANT_MMU_NOTIFIER

int kvm_unmap_hva_range(struct kvm *kvm,

			unsigned long start, unsigned long end);

void kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte);

int kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte);



unsigned long kvm_arm_num_regs(struct kvm_vcpu *vcpu);

int kvm_arm_copy_reg_indices(struct kvm_vcpu *vcpu, u64 __user *indices);

arch/arm64/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ int __kvm_arm_vcpu_set_events(struct kvm_vcpu *vcpu, 
#define KVM_ARCH_WANT_MMU_NOTIFIER

int kvm_unmap_hva_range(struct kvm *kvm,

			unsigned long start, unsigned long end);

void kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte);

int kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte);

int kvm_age_hva(struct kvm *kvm, unsigned long start, unsigned long end);

int kvm_test_age_hva(struct kvm *kvm, unsigned long hva);

arch/mips/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -933,7 +933,7 @@ enum kvm_mips_fault_result kvm_trap_emul_gva_fault(struct kvm_vcpu *vcpu, 
#define KVM_ARCH_WANT_MMU_NOTIFIER

int kvm_unmap_hva_range(struct kvm *kvm,

			unsigned long start, unsigned long end);

void kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte);

int kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte);

int kvm_age_hva(struct kvm *kvm, unsigned long start, unsigned long end);

int kvm_test_age_hva(struct kvm *kvm, unsigned long hva);

arch/mips/kvm/mmu.c

+2 −1
Original line number Diff line number Diff line
@@ -551,7 +551,7 @@ static int kvm_set_spte_handler(struct kvm *kvm, gfn_t gfn, gfn_t gfn_end, 
	       (pte_dirty(old_pte) && !pte_dirty(hva_pte));

}



void kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte)

int kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte)

{

	unsigned long end = hva + PAGE_SIZE;

	int ret;
@@ -559,6 +559,7 @@ void kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte) 
	ret = handle_hva_to_gpa(kvm, hva, end, &kvm_set_spte_handler, &pte);

	if (ret)

		kvm_mips_callbacks->flush_shadow_all(kvm);

	return 0;

}



static int kvm_age_hva_handler(struct kvm *kvm, gfn_t gfn, gfn_t gfn_end,

arch/powerpc/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ extern int kvm_unmap_hva_range(struct kvm *kvm, 
			       unsigned long start, unsigned long end);

extern int kvm_age_hva(struct kvm *kvm, unsigned long start, unsigned long end);

extern int kvm_test_age_hva(struct kvm *kvm, unsigned long hva);

extern void kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte);

extern int kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte);



#define HPTEG_CACHE_NUM			(1 << 15)

#define HPTEG_HASH_BITS_PTE		13