mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-25 13:43:55 +08:00
KVM: MMU: move FNAME(is_rsvd_bits_set) to mmu.c
FNAME(is_rsvd_bits_set) does not depend on guest mmu mode, move it to mmu.c to stop being compiled multiple times Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
6f691251c0
commit
d2b0f98125
@ -3546,6 +3546,14 @@ static inline bool is_last_gpte(struct kvm_mmu *mmu, unsigned level, unsigned gp
|
||||
return mmu->last_pte_bitmap & (1 << index);
|
||||
}
|
||||
|
||||
static bool is_rsvd_bits_set(struct kvm_mmu *mmu, u64 gpte, int level)
|
||||
{
|
||||
int bit7 = (gpte >> 7) & 1, low6 = gpte & 0x3f;
|
||||
|
||||
return (gpte & mmu->rsvd_bits_mask[bit7][level-1]) |
|
||||
((mmu->bad_mt_xwr & (1ull << low6)) != 0);
|
||||
}
|
||||
|
||||
#define PTTYPE_EPT 18 /* arbitrary */
|
||||
#define PTTYPE PTTYPE_EPT
|
||||
#include "paging_tmpl.h"
|
||||
|
@ -128,14 +128,6 @@ static inline void FNAME(protect_clean_gpte)(unsigned *access, unsigned gpte)
|
||||
*access &= mask;
|
||||
}
|
||||
|
||||
static bool FNAME(is_rsvd_bits_set)(struct kvm_mmu *mmu, u64 gpte, int level)
|
||||
{
|
||||
int bit7 = (gpte >> 7) & 1, low6 = gpte & 0x3f;
|
||||
|
||||
return (gpte & mmu->rsvd_bits_mask[bit7][level-1]) |
|
||||
((mmu->bad_mt_xwr & (1ull << low6)) != 0);
|
||||
}
|
||||
|
||||
static inline int FNAME(is_present_gpte)(unsigned long pte)
|
||||
{
|
||||
#if PTTYPE != PTTYPE_EPT
|
||||
@ -172,7 +164,7 @@ static bool FNAME(prefetch_invalid_gpte)(struct kvm_vcpu *vcpu,
|
||||
struct kvm_mmu_page *sp, u64 *spte,
|
||||
u64 gpte)
|
||||
{
|
||||
if (FNAME(is_rsvd_bits_set)(&vcpu->arch.mmu, gpte, PT_PAGE_TABLE_LEVEL))
|
||||
if (is_rsvd_bits_set(&vcpu->arch.mmu, gpte, PT_PAGE_TABLE_LEVEL))
|
||||
goto no_present;
|
||||
|
||||
if (!FNAME(is_present_gpte)(gpte))
|
||||
@ -353,8 +345,7 @@ retry_walk:
|
||||
if (unlikely(!FNAME(is_present_gpte)(pte)))
|
||||
goto error;
|
||||
|
||||
if (unlikely(FNAME(is_rsvd_bits_set)(mmu, pte,
|
||||
walker->level))) {
|
||||
if (unlikely(is_rsvd_bits_set(mmu, pte, walker->level))) {
|
||||
errcode |= PFERR_RSVD_MASK | PFERR_PRESENT_MASK;
|
||||
goto error;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user