Commit f6b8ea6d authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: x86/mmu: Use common macros to compute 32/64-bit paging masks 



Dedup the code for generating (most of) the per-type PT_* masks in
paging_tmpl.h.  The relevant macros only vary based on the number of bits
per level, and that smidge of info is already provided in a common form
as PT_LEVEL_BITS.

No functional change intended.

Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Message-Id: <20220614233328.3896033-7-seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 2ca3129e

arch/x86/kvm/mmu/paging.h

+0 −23
Original line number Diff line number Diff line
@@ -5,28 +5,5 @@ 


#define GUEST_PT64_BASE_ADDR_MASK (((1ULL << 52) - 1) & ~(u64)(PAGE_SIZE-1))



#define PT64_LEVEL_BITS 9



#define PT64_INDEX(address, level) __PT_INDEX(address, level, PT64_LEVEL_BITS)



#define PT64_LVL_ADDR_MASK(level) \

	__PT_LVL_ADDR_MASK(GUEST_PT64_BASE_ADDR_MASK, level, PT64_LEVEL_BITS)



#define PT64_LVL_OFFSET_MASK(level) \

	__PT_LVL_OFFSET_MASK(GUEST_PT64_BASE_ADDR_MASK, level, PT64_LEVEL_BITS)





#define PT32_LEVEL_SHIFT(level) __PT_LEVEL_SHIFT(level, PT32_LEVEL_BITS)



#define PT32_LVL_OFFSET_MASK(level) \

	__PT_LVL_OFFSET_MASK(PT32_BASE_ADDR_MASK, level, PT32_LEVEL_BITS)



#define PT32_INDEX(address, level) __PT_INDEX(address, level, PT32_LEVEL_BITS)



#define PT32_BASE_ADDR_MASK PAGE_MASK



#define PT32_LVL_ADDR_MASK(level) \

	__PT_LVL_ADDR_MASK(PT32_BASE_ADDR_MASK, level, PT32_LEVEL_BITS)



#endif /* __KVM_X86_PAGING_H */

arch/x86/kvm/mmu/paging_tmpl.h

+11 −14
Original line number Diff line number Diff line
@@ -16,8 +16,9 @@ 
 */



/*

 * We need the mmu code to access both 32-bit and 64-bit guest ptes,

 * so the code in this file is compiled twice, once per pte size.

 * The MMU needs to be able to access/walk 32-bit and 64-bit guest page tables,

 * as well as guest EPT tables, so the code in this file is compiled thrice,

 * once per guest PTE type.  The per-type defines are #undef'd at the end.

 */



#if PTTYPE == 64
@@ -25,10 +26,7 @@ 
	#define guest_walker guest_walker64

	#define FNAME(name) paging##64_##name

	#define PT_BASE_ADDR_MASK GUEST_PT64_BASE_ADDR_MASK

	#define PT_LVL_ADDR_MASK(lvl) PT64_LVL_ADDR_MASK(lvl)

	#define PT_LVL_OFFSET_MASK(lvl) PT64_LVL_OFFSET_MASK(lvl)

	#define PT_INDEX(addr, level) PT64_INDEX(addr, level)

	#define PT_LEVEL_BITS PT64_LEVEL_BITS

	#define PT_LEVEL_BITS 9

	#define PT_GUEST_DIRTY_SHIFT PT_DIRTY_SHIFT

	#define PT_GUEST_ACCESSED_SHIFT PT_ACCESSED_SHIFT

	#define PT_HAVE_ACCESSED_DIRTY(mmu) true
@@ -41,10 +39,7 @@ 
	#define pt_element_t u32

	#define guest_walker guest_walker32

	#define FNAME(name) paging##32_##name

	#define PT_BASE_ADDR_MASK PT32_BASE_ADDR_MASK

	#define PT_LVL_ADDR_MASK(lvl) PT32_LVL_ADDR_MASK(lvl)

	#define PT_LVL_OFFSET_MASK(lvl) PT32_LVL_OFFSET_MASK(lvl)

	#define PT_INDEX(addr, level) PT32_INDEX(addr, level)

	#define PT_BASE_ADDR_MASK PAGE_MASK

	#define PT_LEVEL_BITS 10

	#define PT_MAX_FULL_LEVELS 2

	#define PT_GUEST_DIRTY_SHIFT PT_DIRTY_SHIFT
@@ -60,10 +55,7 @@ 
	#define guest_walker guest_walkerEPT

	#define FNAME(name) ept_##name

	#define PT_BASE_ADDR_MASK GUEST_PT64_BASE_ADDR_MASK

	#define PT_LVL_ADDR_MASK(lvl) PT64_LVL_ADDR_MASK(lvl)

	#define PT_LVL_OFFSET_MASK(lvl) PT64_LVL_OFFSET_MASK(lvl)

	#define PT_INDEX(addr, level) PT64_INDEX(addr, level)

	#define PT_LEVEL_BITS PT64_LEVEL_BITS

	#define PT_LEVEL_BITS 9

	#define PT_GUEST_DIRTY_SHIFT 9

	#define PT_GUEST_ACCESSED_SHIFT 8

	#define PT_HAVE_ACCESSED_DIRTY(mmu) (!(mmu)->cpu_role.base.ad_disabled)
@@ -72,6 +64,11 @@ 
	#error Invalid PTTYPE value

#endif



/* Common logic, but per-type values.  These also need to be undefined. */

#define PT_LVL_ADDR_MASK(lvl)	__PT_LVL_ADDR_MASK(PT_BASE_ADDR_MASK, lvl, PT_LEVEL_BITS)

#define PT_LVL_OFFSET_MASK(lvl)	__PT_LVL_OFFSET_MASK(PT_BASE_ADDR_MASK, lvl, PT_LEVEL_BITS)

#define PT_INDEX(addr, lvl)	__PT_INDEX(addr, lvl, PT_LEVEL_BITS)



#define PT_GUEST_DIRTY_MASK    (1 << PT_GUEST_DIRTY_SHIFT)

#define PT_GUEST_ACCESSED_MASK (1 << PT_GUEST_ACCESSED_SHIFT)