Commit cecafc0a authored by Yu Zhang's avatar Yu Zhang Committed by Oliver Upton
Browse files

KVM: MMU: Make the definition of 'INVALID_GPA' common 



KVM already has a 'GPA_INVALID' defined as (~(gpa_t)0) in kvm_types.h,
and it is used by ARM code. We do not need another definition of
'INVALID_GPA' for X86 specifically.

Instead of using the common 'GPA_INVALID' for X86, replace it with
'INVALID_GPA', and change the users of 'GPA_INVALID' so that the diff
can be smaller. Also because the name 'INVALID_GPA' tells the user we
are using an invalid GPA, while the name 'GPA_INVALID' is emphasizing
the GPA is an invalid one.

No functional change intended.

Signed-off-by: default avatarYu Zhang <yu.c.zhang@linux.intel.com>
Reviewed-by: default avatarPaul Durrant <paul@xen.org>
Reviewed-by: default avatarSean Christopherson <seanjc@google.com>
Link: https://lore.kernel.org/r/20230105130127.866171-1-yu.c.zhang@linux.intel.com


Signed-off-by: default avatarOliver Upton <oliver.upton@linux.dev>
parent 016cbbd2

arch/arm64/include/asm/kvm_host.h

+2 −2
Original line number Diff line number Diff line
@@ -916,12 +916,12 @@ void kvm_arm_vmid_clear_active(void); 


static inline void kvm_arm_pvtime_vcpu_init(struct kvm_vcpu_arch *vcpu_arch)

{

	vcpu_arch->steal.base = GPA_INVALID;

	vcpu_arch->steal.base = INVALID_GPA;

}



static inline bool kvm_arm_is_pvtime_enabled(struct kvm_vcpu_arch *vcpu_arch)

{

	return (vcpu_arch->steal.base != GPA_INVALID);

	return (vcpu_arch->steal.base != INVALID_GPA);

}



void kvm_set_sei_esr(struct kvm_vcpu *vcpu, u64 syndrome);

arch/arm64/kvm/hypercalls.c

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ int kvm_hvc_call_handler(struct kvm_vcpu *vcpu) 
		break;

	case ARM_SMCCC_HV_PV_TIME_ST:

		gpa = kvm_init_stolen_time(vcpu);

		if (gpa != GPA_INVALID)

		if (gpa != INVALID_GPA)

			val[0] = gpa;

		break;

	case ARM_SMCCC_VENDOR_HYP_CALL_UID_FUNC_ID:

arch/arm64/kvm/pvtime.c

+4 −4
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ void kvm_update_stolen_time(struct kvm_vcpu *vcpu) 
	u64 steal = 0;

	int idx;



	if (base == GPA_INVALID)

	if (base == INVALID_GPA)

		return;



	idx = srcu_read_lock(&kvm->srcu);
@@ -40,7 +40,7 @@ long kvm_hypercall_pv_features(struct kvm_vcpu *vcpu) 
	switch (feature) {

	case ARM_SMCCC_HV_PV_TIME_FEATURES:

	case ARM_SMCCC_HV_PV_TIME_ST:

		if (vcpu->arch.steal.base != GPA_INVALID)

		if (vcpu->arch.steal.base != INVALID_GPA)

			val = SMCCC_RET_SUCCESS;

		break;

	}
@@ -54,7 +54,7 @@ gpa_t kvm_init_stolen_time(struct kvm_vcpu *vcpu) 
	struct kvm *kvm = vcpu->kvm;

	u64 base = vcpu->arch.steal.base;



	if (base == GPA_INVALID)

	if (base == INVALID_GPA)

		return base;



	/*
@@ -89,7 +89,7 @@ int kvm_arm_pvtime_set_attr(struct kvm_vcpu *vcpu, 
		return -EFAULT;

	if (!IS_ALIGNED(ipa, 64))

		return -EINVAL;

	if (vcpu->arch.steal.base != GPA_INVALID)

	if (vcpu->arch.steal.base != INVALID_GPA)

		return -EEXIST;



	/* Check the address is in a valid memslot */

arch/x86/include/asm/kvm_host.h

+0 −2
Original line number Diff line number Diff line
@@ -134,8 +134,6 @@ 
#define INVALID_PAGE (~(hpa_t)0)

#define VALID_PAGE(x) ((x) != INVALID_PAGE)



#define INVALID_GPA (~(gpa_t)0)



/* KVM Hugepage definitions for x86 */

#define KVM_MAX_HUGEPAGE_LEVEL	PG_LEVEL_1G

#define KVM_NR_PAGE_SIZES	(KVM_MAX_HUGEPAGE_LEVEL - PG_LEVEL_4K + 1)

include/linux/kvm_types.h

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ typedef unsigned long gva_t; 
typedef u64            gpa_t;

typedef u64            gfn_t;



#define GPA_INVALID	(~(gpa_t)0)

#define INVALID_GPA	(~(gpa_t)0)



typedef unsigned long  hva_t;

typedef u64            hpa_t;