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

Commit 842bb26a authored by Tiejun Chen's avatar Tiejun Chen Committed by Paolo Bonzini
Browse files

kvm: x86: vmx: remove MMIO_MAX_GEN 



MMIO_MAX_GEN is the same as MMIO_GEN_MASK.  Use only one.

Signed-off-by: default avatarTiejun Chen <tiejun.chen@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 81ed33e4

arch/x86/kvm/mmu.c

+3 −4
Original line number Diff line number Diff line
@@ -214,13 +214,12 @@ EXPORT_SYMBOL_GPL(kvm_mmu_set_mmio_spte_mask); 
#define MMIO_GEN_LOW_SHIFT		10

#define MMIO_GEN_LOW_MASK		((1 << MMIO_GEN_LOW_SHIFT) - 2)

#define MMIO_GEN_MASK			((1 << MMIO_GEN_SHIFT) - 1)

#define MMIO_MAX_GEN			((1 << MMIO_GEN_SHIFT) - 1)



static u64 generation_mmio_spte_mask(unsigned int gen)

{

	u64 mask;



	WARN_ON(gen > MMIO_MAX_GEN);

	WARN_ON(gen & ~MMIO_GEN_MASK);



	mask = (gen & MMIO_GEN_LOW_MASK) << MMIO_SPTE_GEN_LOW_SHIFT;

	mask |= ((u64)gen >> MMIO_GEN_LOW_SHIFT) << MMIO_SPTE_GEN_HIGH_SHIFT;
@@ -263,13 +262,13 @@ static bool is_mmio_spte(u64 spte) 


static gfn_t get_mmio_spte_gfn(u64 spte)

{

	u64 mask = generation_mmio_spte_mask(MMIO_MAX_GEN) | shadow_mmio_mask;

	u64 mask = generation_mmio_spte_mask(MMIO_GEN_MASK) | shadow_mmio_mask;

	return (spte & ~mask) >> PAGE_SHIFT;

}



static unsigned get_mmio_spte_access(u64 spte)

{

	u64 mask = generation_mmio_spte_mask(MMIO_MAX_GEN) | shadow_mmio_mask;

	u64 mask = generation_mmio_spte_mask(MMIO_GEN_MASK) | shadow_mmio_mask;

	return (spte & ~mask) & ~PAGE_MASK;

}