Commit d6ecfe97 authored by David Matlack's avatar David Matlack Committed by Sean Christopherson
Browse files

KVM: x86/mmu: Use BIT{,_ULL}() for PFERR masks 



Use the preferred BIT() and BIT_ULL() to construct the PFERR masks
rather than open-coding the bit shifting.

No functional change intended.

Signed-off-by: default avatarDavid Matlack <dmatlack@google.com>
Reviewed-by: default avatarSean Christopherson <seanjc@google.com>
Link: https://lore.kernel.org/r/20221102184654.282799-6-dmatlack@google.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent 19a2b32f

arch/x86/include/asm/kvm_host.h

+10 −10
Original line number Original line Diff line number Diff line
@@ -256,16 +256,16 @@ enum x86_intercept_stage; 
#define PFERR_GUEST_PAGE_BIT 33

#define PFERR_GUEST_PAGE_BIT 33

#define PFERR_IMPLICIT_ACCESS_BIT 48

#define PFERR_IMPLICIT_ACCESS_BIT 48





#define PFERR_PRESENT_MASK (1U << PFERR_PRESENT_BIT)

#define PFERR_PRESENT_MASK	BIT(PFERR_PRESENT_BIT)

#define PFERR_WRITE_MASK (1U << PFERR_WRITE_BIT)

#define PFERR_WRITE_MASK	BIT(PFERR_WRITE_BIT)

#define PFERR_USER_MASK (1U << PFERR_USER_BIT)

#define PFERR_USER_MASK		BIT(PFERR_USER_BIT)

#define PFERR_RSVD_MASK (1U << PFERR_RSVD_BIT)

#define PFERR_RSVD_MASK		BIT(PFERR_RSVD_BIT)

#define PFERR_FETCH_MASK (1U << PFERR_FETCH_BIT)

#define PFERR_FETCH_MASK	BIT(PFERR_FETCH_BIT)

#define PFERR_PK_MASK (1U << PFERR_PK_BIT)

#define PFERR_PK_MASK		BIT(PFERR_PK_BIT)

#define PFERR_SGX_MASK (1U << PFERR_SGX_BIT)

#define PFERR_SGX_MASK		BIT(PFERR_SGX_BIT)

#define PFERR_GUEST_FINAL_MASK (1ULL << PFERR_GUEST_FINAL_BIT)

#define PFERR_GUEST_FINAL_MASK	BIT_ULL(PFERR_GUEST_FINAL_BIT)

#define PFERR_GUEST_PAGE_MASK (1ULL << PFERR_GUEST_PAGE_BIT)

#define PFERR_GUEST_PAGE_MASK	BIT_ULL(PFERR_GUEST_PAGE_BIT)

#define PFERR_IMPLICIT_ACCESS (1ULL << PFERR_IMPLICIT_ACCESS_BIT)

#define PFERR_IMPLICIT_ACCESS	BIT_ULL(PFERR_IMPLICIT_ACCESS_BIT)





#define PFERR_NESTED_GUEST_PAGE (PFERR_GUEST_PAGE_MASK |	\

#define PFERR_NESTED_GUEST_PAGE (PFERR_GUEST_PAGE_MASK |	\

				 PFERR_WRITE_MASK |		\

				 PFERR_WRITE_MASK |		\