From: Lai Jiangshan <laijs@xxxxxxxxxxxxxxxxx>
There are two kinds of implicit supervisor access
implicit supervisor access when CPL = 3
implicit supervisor access when CPL < 3
Current permission_fault() handles only the first kind for SMAP.
But if the access is implicit when SMAP is on, data may not be read
nor write from any user-mode address regardless the current CPL.
So the second find should be also supported.
The first kind can be detect via CPL and access mode: if it is
supervisor access and CPL = 3, it must be implicit supervisor access.
But it is not possible to detect the second kind without extra
information, so this patch adds vcpu->arch.explicit_access for it. And
it is always set to KVM_EXPLICIT_ACCESS unless the vcpu is doing
implicit supervisor access. This extra information also works for
the first kind, so the logic is changed to use this information
for both cases.
The value of KVM_EXPLICIT_ACCESS is deliberately chosen to include
all bits so that the calculation in permission_fault() can be
simplified.
This patch removes the call to ->get_cpl() for it integrates both
implicit supervisor access kinds into one logic. Not only does it
reduce a function call, but also remove confusions when the permission
is checked for nested TDP. The nested TDP shouldn't have SMAP
checking nor even the L2's CPL have any bearing on it. The original
code works just because it is always user walk for NPT and SMAP fault
is not set for EPT in update_permission_bitmask.
Signed-off-by: Lai Jiangshan <laijs@xxxxxxxxxxxxxxxxx>
---
arch/x86/include/asm/kvm_host.h | 9 +++++++++
arch/x86/kvm/mmu.h | 17 ++++++++++-------
arch/x86/kvm/mmu/mmu.c | 4 ++--
arch/x86/kvm/x86.c | 20 +++++++++++++++++---
4 files changed, 38 insertions(+), 12 deletions(-)
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index e41ad1ead721..88ecf53f0d2b 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -261,6 +261,14 @@ enum x86_intercept_stage;
PFERR_WRITE_MASK | \
PFERR_PRESENT_MASK)
+
+/*
+ * KVM_EXPLICIT_ACCESS is set to contain all bits so that the calculation
+ * in permission_fault() can be simplified and branchless.
+ */
+#define KVM_EXPLICIT_ACCESS ((u32)~0)
+#define KVM_IMPLICIT_ACCESS ((u32)0)
+
/* apic attention bits */
#define KVM_APIC_CHECK_VAPIC 0
/*
@@ -630,6 +638,7 @@ struct kvm_vcpu_arch {
unsigned long cr8;
u32 host_pkru;
u32 pkru;
+ u32 explicit_access;
u32 hflags;
u64 efer;
u64 apic_base;
diff --git a/arch/x86/kvm/mmu.h b/arch/x86/kvm/mmu.h
index b70b36734bc0..0cb2c52377c8 100644
--- a/arch/x86/kvm/mmu.h
+++ b/arch/x86/kvm/mmu.h
@@ -252,23 +252,26 @@ static inline u8 permission_fault(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu,
unsigned pte_access, unsigned pte_pkey,
unsigned pfec)
{
- int cpl = static_call(kvm_x86_get_cpl)(vcpu);
unsigned long rflags = static_call(kvm_x86_get_rflags)(vcpu);
/*
- * If CPL < 3, SMAP prevention are disabled if EFLAGS.AC = 1.
+ * If explicit supervisor accesses, SMAP is disabled
+ * if EFLAGS.AC = 1.
*
- * If CPL = 3, SMAP applies to all supervisor-mode data accesses
- * (these are implicit supervisor accesses) regardless of the value
- * of EFLAGS.AC.
+ * If implicit supervisor accesses, SMAP can not be disabled
+ * regardless of the value EFLAGS.AC.
*
- * This computes (cpl < 3) && (rflags & X86_EFLAGS_AC), leaving
+ * SMAP works on supervisor accesses only, and not_smap can
+ * be set or not set when user access with neither has any bearing
+ * on the result.
+ *
+ * This computes explicit_access && (rflags & X86_EFLAGS_AC), leaving
* the result in X86_EFLAGS_AC. We then insert it in place of
* the PFERR_RSVD_MASK bit; this bit will always be zero in pfec,
* but it will be one in index if SMAP checks are being overridden.
* It is important to keep this branchless.
*/
- unsigned long not_smap = (cpl - 3) & (rflags & X86_EFLAGS_AC);
+ u32 not_smap = (rflags & X86_EFLAGS_AC) & vcpu->arch.explicit_access;
int index = (pfec >> 1) +
(not_smap >> (X86_EFLAGS_AC_BIT - PFERR_RSVD_BIT + 1));
bool fault = (mmu->permissions[index] >> pte_access) & 1;
diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
index 9d045395fe8d..11b06d536cc9 100644
--- a/arch/x86/kvm/mmu/mmu.c
+++ b/arch/x86/kvm/mmu/mmu.c
@@ -4547,8 +4547,8 @@ static void update_permission_bitmask(struct kvm_mmu *mmu, bool ept)
* - X86_CR4_SMAP is set in CR4
* - A user page is accessed
* - The access is not a fetch
- * - Page fault in kernel mode
- * - if CPL = 3 or X86_EFLAGS_AC is clear
+ * - The access is supervisor mode
+ * - If implicit supervisor access or X86_EFLAGS_AC is clear
*
* Here, we cover the first four conditions.
* The fifth is computed dynamically in permission_fault();
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 78c40ac3b197..a972e3ab98ec 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -6651,11 +6651,17 @@ static int emulator_read_std(struct x86_emulate_ctxt *ctxt,
{
struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);
u32 access = 0;
+ int ret;
if (!system && static_call(kvm_x86_get_cpl)(vcpu) == 3)
access |= PFERR_USER_MASK;
- return kvm_read_guest_virt_helper(addr, val, bytes, vcpu, access, exception);
+ if (system)
+ vcpu->arch.explicit_access = KVM_IMPLICIT_ACCESS;
+ ret = kvm_read_guest_virt_helper(addr, val, bytes, vcpu, access, exception);
+ if (system)
+ vcpu->arch.explicit_access = KVM_EXPLICIT_ACCESS;
+ return ret;
}
static int kvm_read_guest_phys_system(struct x86_emulate_ctxt *ctxt,
@@ -6703,12 +6709,18 @@ static int emulator_write_std(struct x86_emulate_ctxt *ctxt, gva_t addr, void *v
{
struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);
u32 access = PFERR_WRITE_MASK;
+ int ret;
if (!system && static_call(kvm_x86_get_cpl)(vcpu) == 3)
access |= PFERR_USER_MASK;
- return kvm_write_guest_virt_helper(addr, val, bytes, vcpu,
- access, exception);
+ if (system)
+ vcpu->arch.explicit_access = KVM_IMPLICIT_ACCESS;
+ ret = kvm_write_guest_virt_helper(addr, val, bytes, vcpu,
+ access, exception);
+ if (system)
+ vcpu->arch.explicit_access = KVM_EXPLICIT_ACCESS;
+ return ret;
}
int kvm_write_guest_virt_system(struct kvm_vcpu *vcpu, gva_t addr, void *val,
@@ -11104,6 +11116,8 @@ void kvm_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event)
kvm_async_pf_hash_reset(vcpu);
vcpu->arch.apf.halted = false;
+ vcpu->arch.explicit_access = KVM_EXPLICIT_ACCESS;
+
if (vcpu->arch.guest_fpu.fpstate && kvm_mpx_supported()) {
struct fpstate *fpstate = vcpu->arch.guest_fpu.fpstate;
--
2.19.1.6.gb485710b
