KVM: PKS Virtualization support
v4 cover KVM: PKS Virtualization support
Protection Keys for Supervisor Pages(PKS) is a feature that extends the Protection Keys architecture to support thread-specific permission restrictions on supervisor pages.
PKS works similar to an existing feature named PKU(protecting user pages). They both perform an additional check after all legacy access permissions checks are done. If violated, #PF occurs and PFEC.PK bit will be set. PKS introduces MSR IA32_PKRS to manage supervisor protection key rights. The MSR contains 16 pairs of ADi and WDi bits. Each pair advertises on a group of pages with the same key which is set in the leaf paging-structure entries(bits[62:59]). Currently, IA32_PKRS is not supported by XSAVES architecture.
This patchset aims to add the virtualization of PKS in KVM. It implemented PKS CPUID enumeration, vmentry/vmexit configuration, MSR exposure, nested supported etc. Currently, PKS is not yet supported for shadow paging.
PKS bare metal support:
https://lore.kernel.org/lkml/[email protected]/
Detailed information about PKS can be found in the latest Intel 64 and IA-32 Architectures Software Developer's Manual.
---
Changelogs:
v3->v4
- Make the MSR intercept and load-controls setting depend on CR4.PKS value
- shadow the guest pkrs and make it usable in PKS emultion
- add the cr4_pke and cr4_pks check in pkr_mask update
- squash PATCH 2 and PATCH 5 to make the dependencies read more clear
- v3: https://lore.kernel.org/lkml/[email protected]/
v2->v3:
- No function changes since last submit
- rebase on the latest PKS kernel support:
https://lore.kernel.org/lkml/[email protected]/
- add MSR_IA32_PKRS to the vmx_possible_passthrough_msrs[]
- RFC v2: https://lore.kernel.org/lkml/[email protected]/
v1->v2:
- rebase on the latest PKS kernel support:
https://github.com/weiny2/linux-kernel/tree/pks-rfc-v3
- add a kvm-unit-tests for PKS
- add the check in kvm_init_msr_list for PKRS
- place the X86_CR4_PKS in mmu_role_bits in kvm_set_cr4
- add the support to expose VM_{ENTRY, EXIT}_LOAD_IA32_PKRS in nested VMX MSR
- RFC v1: https://lore.kernel.org/lkml/[email protected]/
---
Chenyi Qiang (5):
KVM: VMX: Introduce PKS VMCS fields
KVM: X86: Expose PKS to guest
KVM: MMU: Rename the pkru to pkr
KVM: MMU: Add support for PKS emulation
KVM: VMX: Enable PKS for nested VM
arch/x86/include/asm/kvm_host.h | 17 +++--- arch/x86/include/asm/pkeys.h | 1 + arch/x86/include/asm/vmx.h | 6 ++ arch/x86/kvm/cpuid.c | 3 +- arch/x86/kvm/mmu.h | 23 ++++---- arch/x86/kvm/mmu/mmu.c | 81 +++++++++++++++------------ arch/x86/kvm/vmx/capabilities.h | 6 ++ arch/x86/kvm/vmx/nested.c | 38 ++++++++++++- arch/x86/kvm/vmx/vmcs.h | 1 + arch/x86/kvm/vmx/vmcs12.c | 2 + arch/x86/kvm/vmx/vmcs12.h | 6 +- arch/x86/kvm/vmx/vmx.c | 99 +++++++++++++++++++++++++++++++-- arch/x86/kvm/vmx/vmx.h | 1 + arch/x86/kvm/x86.c | 11 +++- arch/x86/kvm/x86.h | 8 +++ arch/x86/mm/pkeys.c | 6 ++ include/linux/pkeys.h | 4 ++ 17 files changed, 249 insertions(+), 64 deletions(-)
Signature · 1 line
2.17.1
PATCH v4 1/5 KVM: VMX: Introduce PKS VMCS fields
PKS(Protection Keys for Supervisor Pages) is a feature that extends the Protection Key architecture to support thread-specific permission restrictions on supervisor pages.
A new PKS MSR(PKRS) is defined in kernel to support PKS, which holds a set of permissions associated with each protection domian.
Two VMCS fields {HOST,GUEST}_IA32_PKRS are introduced in {host,guest}-state area to store the value of PKRS.
Every VM exit saves PKRS into guest-state area.
If VM_EXIT_LOAD_IA32_PKRS = 1, VM exit loads PKRS from the host-state area.
If VM_ENTRY_LOAD_IA32_PKRS = 1, VM entry loads PKRS from the guest-state area.
--- arch/x86/include/asm/vmx.h | 6 ++++++ 1 file changed, 6 insertions(+)
arch/x86/include/asm/vmx.h +6 -0
@@ -94,6 +94,7 @@#define VM_EXIT_CLEAR_BNDCFGS 0x00800000#define VM_EXIT_PT_CONCEAL_PIP 0x01000000#define VM_EXIT_CLEAR_IA32_RTIT_CTL 0x02000000 +#define VM_EXIT_LOAD_IA32_PKRS 0x20000000#define VM_EXIT_ALWAYSON_WITHOUT_TRUE_MSR 0x00036dff
@@ -107,6 +108,7 @@#define VM_ENTRY_LOAD_BNDCFGS 0x00010000#define VM_ENTRY_PT_CONCEAL_PIP 0x00020000#define VM_ENTRY_LOAD_IA32_RTIT_CTL 0x00040000 +#define VM_ENTRY_LOAD_IA32_PKRS 0x00400000#define VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR 0x000011ff
@@ -243,12 +245,16 @@ enum vmcs_field {GUEST_BNDCFGS_HIGH =0x00002813 ,GUEST_IA32_RTIT_CTL =0x00002814 ,GUEST_IA32_RTIT_CTL_HIGH =0x00002815 , +GUEST_IA32_PKRS =0x00002818 , +GUEST_IA32_PKRS_HIGH =0x00002819 ,HOST_IA32_PAT =0x00002c00 ,HOST_IA32_PAT_HIGH =0x00002c01 ,HOST_IA32_EFER =0x00002c02 ,HOST_IA32_EFER_HIGH =0x00002c03 ,HOST_IA32_PERF_GLOBAL_CTRL =0x00002c04 ,HOST_IA32_PERF_GLOBAL_CTRL_HIGH =0x00002c05 , +HOST_IA32_PKRS =0x00002c06 , +HOST_IA32_PKRS_HIGH =0x00002c07 ,PIN_BASED_VM_EXEC_CONTROL =0x00004000 ,CPU_BASED_VM_EXEC_CONTROL =0x00004002 , EXCEPTION_BITMAP = 0x00004004,
Signature · 1 line
2.17.1
PATCH v4 2/5 KVM: X86: Expose PKS to guest
In reply to Chenyi QiangProtection Keys for Supervisor Pages (PKS) is a feature that extends the Protection Keys architecture to support thread-specific permission restrictions on supervisor pages, which extends an existing feature named PKU (for user-mode pages).
PKS uses IA32_PKRS MSR (PKRS) at index 0x6E1 to allow software to manage supervisor key rights. For performance consideration, PKRS intercept will be disabled when guest CR4.PKS=1 so that the guest can access the PKRS without VM exits.
PKS introduces dedicated control fields in VMCS to switch PKRS, which only does the retore part. In addition, every VM exit saves PKRS into the guest-state area in VMCS, while VM enter won't save the host value due to the expectation that the host won't change the MSR often. Update the host's value in VMCS manually if the MSR has been changed by the kernel since the last time the VMCS was run.
Existence of PKS is enumerated via CPUID.(EAX=7H,ECX=0):ECX[31]. It is enabled by setting CR4.PKS when long mode is active. PKS is only implemented when EPT is enabled and requires the support of VM_{ENTRY, EXIT}_LOAD_IA32_PKRS currently.
The function get_current_pkrs() in arch/x86/mm/pkeys.c exports the per-cpu variable pkrs_cache to avoid frequent rdmsr of PKRS.
--- arch/x86/include/asm/kvm_host.h | 4 +- arch/x86/include/asm/pkeys.h | 1 + arch/x86/kvm/cpuid.c | 3 +- arch/x86/kvm/vmx/capabilities.h | 6 +++ arch/x86/kvm/vmx/nested.c | 1 + arch/x86/kvm/vmx/vmcs.h | 1 + arch/x86/kvm/vmx/vmx.c | 89 ++++++++++++++++++++++++++++++--- arch/x86/kvm/x86.c | 8 ++- arch/x86/kvm/x86.h | 8 +++ arch/x86/mm/pkeys.c | 6 +++ include/linux/pkeys.h | 4 ++ 11 files changed, 122 insertions(+), 9 deletions(-)
arch/x86/include/asm/kvm_host.h +3 -1
@@ -100,7 +100,8 @@ | X86_CR4_PGE | X86_CR4_PCE | X86_CR4_OSFXSR | X86_CR4_PCIDE \ | X86_CR4_OSXSAVE | X86_CR4_SMEP | X86_CR4_FSGSBASE \ | X86_CR4_OSXMMEXCPT | X86_CR4_LA57 | X86_CR4_VMXE \ - | X86_CR4_SMAP | X86_CR4_PKE | X86_CR4_UMIP)) + | X86_CR4_SMAP | X86_CR4_PKE | X86_CR4_UMIP \ + | X86_CR4_PKS))#define CR8_RESERVED_BITS (~(unsigned long)X86_CR8_TPR)
@@ -539,6 +540,7 @@ struct kvm_vcpu_arch {unsigned long cr8;u32 host_pkru;u32 pkru; +u32 pkrs;u32 hflags;u64 efer;u64 apic_base;
arch/x86/include/asm/pkeys.h +1 -0
@@ -142,6 +142,7 @@ u32 update_pkey_val(u32 pk_reg, int pkey, unsigned int flags);#ifdef CONFIG_ARCH_HAS_SUPERVISOR_PKEYS __must_check int pks_key_alloc (const char *const pkey_user,int flags);void pks_key_free (int pkey); +u32 get_current_pkrs (void );void pks_mk_noaccess (int pkey);void pks_mk_readonly (int pkey);
arch/x86/kvm/cpuid.c +2 -1
@@ -390,7 +390,8 @@ void kvm_set_cpu_caps(void)F (AVX512VBMI ) |F (LA57 ) |F (PKU ) |0 /*OSPKE*/ |F (RDPID ) |F (AVX512_VPOPCNTDQ ) |F (UMIP ) |F (AVX512_VBMI2 ) |F (GFNI ) |F (VAES ) |F (VPCLMULQDQ ) |F (AVX512_VNNI ) |F (AVX512_BITALG ) | -F (CLDEMOTE ) |F (MOVDIRI ) |F (MOVDIR64B ) |0 /*WAITPKG*/ +F (CLDEMOTE ) |F (MOVDIRI ) |F (MOVDIR64B ) |0 /*WAITPKG*/ | +0 /*PKS*/ );/* Set LA57 based on hardware capability. */ if (cpuid_ecx (7 ) &F (LA57 ))
arch/x86/kvm/vmx/capabilities.h +6 -0
@@ -103,6 +103,12 @@ static inline bool cpu_has_load_perf_global_ctrl(void) (vmcs_config.vmexit_ctrl &VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL ); } +static inline bool cpu_has_load_ia32_pkrs (void ) +{ +return (vmcs_config.vmentry_ctrl &VM_ENTRY_LOAD_IA32_PKRS ) && + (vmcs_config.vmexit_ctrl &VM_EXIT_LOAD_IA32_PKRS ); +} +static inline bool cpu_has_vmx_mpx (void ) { return (vmcs_config.vmexit_ctrl & VM_EXIT_CLEAR_BNDCFGS) &&
arch/x86/kvm/vmx/nested.c +1 -0
@@ -250,6 +250,7 @@ static void vmx_sync_vmcs_host_state(struct vcpu_vmx *vmx, dest->ds_sel = src->ds_sel; dest->es_sel = src->es_sel;#endif + dest->pkrs = src->pkrs; }static void vmx_switch_vmcs (struct kvm_vcpu *vcpu,struct loaded_vmcs *vmcs)
arch/x86/kvm/vmx/vmcs.h +1 -0
@@ -40,6 +40,7 @@ struct vmcs_host_state {#ifdef CONFIG_X86_64 u16 ds_sel, es_sel;#endif +u32 pkrs; };struct vmcs_controls_shadow {
arch/x86/kvm/vmx/vmx.c +83 -6
182 lines not on this page · raw message
arch/x86/kvm/x86.c +7 -1
@@ -1213,7 +1213,7 @@ static const u32 msrs_to_save_all[] = {MSR_IA32_RTIT_ADDR1_A ,MSR_IA32_RTIT_ADDR1_B ,MSR_IA32_RTIT_ADDR2_A ,MSR_IA32_RTIT_ADDR2_B ,MSR_IA32_RTIT_ADDR3_A ,MSR_IA32_RTIT_ADDR3_B , -MSR_IA32_UMWAIT_CONTROL , +MSR_IA32_UMWAIT_CONTROL ,MSR_IA32_PKRS ,MSR_ARCH_PERFMON_FIXED_CTR0 ,MSR_ARCH_PERFMON_FIXED_CTR1 , MSR_ARCH_PERFMON_FIXED_CTR0 + 2, MSR_ARCH_PERFMON_FIXED_CTR0 + 3,
@@ -5718,6 +5718,10 @@ static void kvm_init_msr_list(void) intel_pt_validate_hw_cap(PT_CAP_num_address_ranges) * 2)continue ;break ; +case MSR_IA32_PKRS : +if (!kvm_cpu_cap_has (X86_FEATURE_PKS )) +continue ; +break ; case MSR_ARCH_PERFMON_PERFCTR0 ... MSR_ARCH_PERFMON_PERFCTR0 + 17:if (msrs_to_save_all[i] -MSR_ARCH_PERFMON_PERFCTR0 >=min (INTEL_PMC_MAX_GENERIC , x86_pmu.num_counters_gp))
@@ -10026,6 +10030,8 @@ void kvm_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event) vcpu->arch.ia32_xss =0 ; + vcpu->arch.pkrs =0 ; + kvm_x86_ops.vcpu_reset (vcpu, init_event); }
arch/x86/kvm/x86.h +8 -0
@@ -366,6 +366,12 @@ static inline bool kvm_dr6_valid(u64 data)return !(data >>32 ); } +static inline bool kvm_pkrs_valid (u64 data) +{ +/* bit[63,32] must be zero */ +return !(data >>32 ); +} +void kvm_load_guest_xsave_state (struct kvm_vcpu *vcpu);void kvm_load_host_xsave_state (struct kvm_vcpu *vcpu);int kvm_spec_ctrl_test_value (u64 value);
@@ -398,6 +404,8 @@ bool kvm_msr_allowed(struct kvm_vcpu *vcpu, u32 index, u32 type); __reserved_bits |=X86_CR4_UMIP ; \if (!__cpu_has (__c,X86_FEATURE_VMX )) \ __reserved_bits |=X86_CR4_VMXE ; \ +if (!__cpu_has (__c,X86_FEATURE_PKS )) \ + __reserved_bits |=X86_CR4_PKS ; \ __reserved_bits; \ })
arch/x86/mm/pkeys.c +6 -0
@@ -390,3 +390,9 @@ void pks_key_free(int pkey)__clear_bit (pkey, &pks_key_allocation_map); }EXPORT_SYMBOL_GPL (pks_key_free); + +u32 get_current_pkrs (void ) +{ +return this_cpu_read (pkrs_cache); +} +EXPORT_SYMBOL_GPL (get_current_pkrs);
include/linux/pkeys.h +4 -0
@@ -72,6 +72,10 @@ static inline void pks_mk_readwrite(int pkey) {pr_err ("%s is not valid without PKS support\n" , __func__); } +static inline u32 get_current_pkrs (void ) +{ +return 0 ; +}#endif /* ! CONFIG_ARCH_HAS_SUPERVISOR_PKEYS */ #endif /* _LINUX_PKEYS_H */
Signature · 1 line
2.17.1
Paolo Bonzini
maintainerRe: [PATCH v4 2/5] KVM: X86: Expose PKS to guest
arch/x86/kvm/vmx/vmx.c static __init void vmx_set_cpu_caps(void) · line 7358
Quoted 7 lines · Chenyi Qiang
arch/x86/kvm/vmx/vmx.c +7
-0+/* +* PKS is not yet implemented for shadow paging. +* If not support VM_{ENTRY, EXIT}_LOAD_IA32_PKRS, +* don't expose the PKS as well. +*/ +if (enable_ept &&cpu_has_load_ia32_pkrs ()) +kvm_cpu_cap_check_and_set (X86_FEATURE_PKS );
This piece should be a separate patch, added after patch 4.
Paolo
Paolo Bonzini
maintainerRe: [PATCH v4 2/5] KVM: X86: Expose PKS to guest
In reply to Chenyi QiangQuoted 20 lines · Chenyi Qiang
arch/x86/mm/pkeys.c +6
-0@@ -390,3 +390,9 @@ void pks_key_free(int pkey)__clear_bit (pkey, &pks_key_allocation_map); }EXPORT_SYMBOL_GPL (pks_key_free); + +u32 get_current_pkrs (void ) +{ +return this_cpu_read (pkrs_cache); +} +EXPORT_SYMBOL_GPL (get_current_pkrs);include/linux/pkeys.h +0
-0
include/linux/pkeys.h static inline void pks_mk_readwrite(int pkey) · line 80
Quoted 9 lines
include/linux/pkeys.h +4
-0@@ -72,6 +72,10 @@ static inline void pks_mk_readwrite(int pkey) {pr_err ("%s is not valid without PKS support\n" , __func__); } +static inline u32 get_current_pkrs (void ) +{ +return 0 ; +}#endif /* ! CONFIG_ARCH_HAS_SUPERVISOR_PKEYS */
This would need an ack from the x86 people. Andy, Boris?
Paolo
Borislav Petkov
maintainerRe: [PATCH v4 2/5] KVM: X86: Expose PKS to guest
Quoted 23 lines · Paolo Bonzini
Quoted 22 lines · Chenyi Qiang
arch/x86/mm/pkeys.c +6
-0@@ -390,3 +390,9 @@ void pks_key_free(int pkey)__clear_bit (pkey, &pks_key_allocation_map); }EXPORT_SYMBOL_GPL (pks_key_free); + +u32 get_current_pkrs (void ) +{ +return this_cpu_read (pkrs_cache); +} +EXPORT_SYMBOL_GPL (get_current_pkrs);include/linux/pkeys.h +0
-0@@ -72,6 +72,10 @@ static inline void pks_mk_readwrite(int pkey) {pr_err ("%s is not valid without PKS support\n" , __func__);
Quoted 8 lines
include/linux/pkeys.h static inline void pks_mk_readwrite(int pkey) · line 79
Quoted 6 lines
include/linux/pkeys.h +4
-0} +static inline u32 get_current_pkrs (void ) +{ +return 0 ; +}#endif /* ! CONFIG_ARCH_HAS_SUPERVISOR_PKEYS */ This would need an ack from the x86 people. Andy, Boris?
This looks like the PKS baremetal pile needs to be upstream first.
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquettePaolo Bonzini
maintainerRe: [PATCH v4 2/5] KVM: X86: Expose PKS to guest
Quoted 33 lines · Borislav Petkov
Quoted 23 lines · Paolo Bonzini
Quoted 22 lines · Chenyi Qiang
arch/x86/mm/pkeys.c +6
-0@@ -390,3 +390,9 @@ void pks_key_free(int pkey)__clear_bit (pkey, &pks_key_allocation_map); }EXPORT_SYMBOL_GPL (pks_key_free); + +u32 get_current_pkrs (void ) +{ +return this_cpu_read (pkrs_cache); +} +EXPORT_SYMBOL_GPL (get_current_pkrs);include/linux/pkeys.h +0
-0@@ -72,6 +72,10 @@ static inline void pks_mk_readwrite(int pkey) {pr_err ("%s is not valid without PKS support\n" , __func__);Quoted 8 lines
include/linux/pkeys.h static inline void pks_mk_readwrite(int pkey) · line 79
Quoted 6 lines
include/linux/pkeys.h +4
-0} +static inline u32 get_current_pkrs (void ) +{ +return 0 ; +}#endif /* ! CONFIG_ARCH_HAS_SUPERVISOR_PKEYS */ This would need an ack from the x86 people. Andy, Boris?
Quoted 1 line
This looks like the PKS baremetal pile needs to be upstream first.
Yes, it does. I would like to have an ack for including the above two hunks once PKS is upstream.
I also have CET and bus lock #DB queued and waiting for the bare metal functionality, however they do not touch anything outside arch/x86/kvm.
Paolo
Re: [PATCH v4 2/5] KVM: X86: Expose PKS to guest
Quoted 10 lines · Paolo Bonzini
Quoted 3 lines · Borislav Petkov
Quoted 1 line
This would need an ack from the x86 people. Andy, Boris?
This looks like the PKS baremetal pile needs to be upstream first.
Yes, it does. I would like to have an ack for including the above two hunks once PKS is upstream.
I also have CET and bus lock #DB queued and waiting for the bare metal functionality, however they do not touch anything outside
arch/x86/kvm.
What's the exact point of queueing random stuff which lacks bare metal support?
Once PKS, CET or whatever is merged into tip then it's the point for resending the KVM patches for inclusion and that's the point where it gets acked and not $N month ahead when everything is still in flux.
Thanks,
tglx
Paolo Bonzini
maintainerRe: [PATCH v4 2/5] KVM: X86: Expose PKS to guest
Quoted 6 lines · Thomas Gleixner
Quoted 5 lines · Paolo Bonzini
Quoted 3 lines · Borislav Petkov
Quoted 1 line
This would need an ack from the x86 people. Andy, Boris?
This looks like the PKS baremetal pile needs to be upstream first.
Quoted 8 lines
Quoted 5 lines
Yes, it does. I would like to have an ack for including the above two hunks once PKS is upstream.
I also have CET and bus lock #DB queued and waiting for the bare metal functionality, however they do not touch anything outside
arch/x86/kvm.What's the exact point of queueing random stuff which lacks bare metal support?
The code is often completely independent of bare metal support even if it depends of it (CET and bus lock for example only share the #defines; for PKS this is not the case just because Intel decided not to use XSAVES *shrug*).
I prefer to queue early, because it keeps my backlog small and because every resend comes with the risk of random changes sneaking in since the version that I reviewed. An early ack would also mean that I don't have to bug you in the middle of the merge window. But it's not a problem, I'll ask for acks again once PKS is merged into tip.
Thanks,
Paolo
Quoted 3 lines
Once PKS, CET or whatever is merged into tip then it's the point for resending the KVM patches for inclusion and that's the point where it gets acked and not $N month ahead when everything is still in flux.
Sean Christopherson
maintainerRe: [PATCH v4 2/5] KVM: X86: Expose PKS to guest
In reply to Chenyi QiangQuoted 8 lines · Chenyi Qiang
arch/x86/include/asm/kvm_host.h +1
-0@@ -539,6 +540,7 @@ struct kvm_vcpu_arch {unsigned long cr8;u32 host_pkru;u32 pkru; +u32 pkrs;u32 hflags;u64 efer;u64 apic_base;
...
arch/x86/kvm/vmx/nested.c static void vmx_sync_vmcs_host_state(struct vcpu_vmx *vmx, · line 253
Quoted 9 lines
arch/x86/kvm/vmx/nested.c +1
-0@@ -250,6 +250,7 @@ static void vmx_sync_vmcs_host_state(struct vcpu_vmx *vmx, dest->ds_sel = src->ds_sel; dest->es_sel = src->es_sel;#endif + dest->pkrs = src->pkrs;
This is wrong. It also arguably belongs in patch 04.
The part that's missing is actually updating vmcs.HOST_IA32_PKRS. FS/GS are handled by vmx_set_host_fs_gs(), while LDT/DS/ES are oddballs where the selector is also the state that's restored.
In other words, this will cause nested VM-Exit to load the wrong PKRS.
Quoted 29 lines
arch/x86/kvm/vmx/nested.c +0
-0}static void vmx_switch_vmcs (struct kvm_vcpu *vcpu,struct loaded_vmcs *vmcs)arch/x86/kvm/vmx/vmcs.h +1
-0@@ -40,6 +40,7 @@ struct vmcs_host_state {#ifdef CONFIG_X86_64 u16 ds_sel, es_sel;#endif +u32 pkrs; };struct vmcs_controls_shadow {arch/x86/kvm/vmx/vmx.c +2
-0@@ -363,6 +363,8 @@ module_param_cb(vmentry_l1d_flush, &vmentry_l1d_flush_ops, NULL, 0644);static u32 vmx_segment_access_rights (struct kvm_segment *var); static __always_inline void vmx_disable_intercept_for_msr(struct kvm_vcpu *vcpu,u32 msr,int type); +static __always_inline void vmx_enable_intercept_for_msr(struct kvm_vcpu *vcpu, +u32 msr,int type);void vmx_vmexit (void );
arch/x86/kvm/vmx/vmx.c static bool is_valid_passthrough_msr(u32 msr) · line 666
Quoted 5 lines
arch/x86/kvm/vmx/vmx.c +2
-0@@ -660,6 +662,8 @@ static bool is_valid_passthrough_msr(u32 msr) case MSR_IA32_RTIT_ADDR0_A ... MSR_IA32_RTIT_ADDR3_B:/* PT MSRs. These are handled in pt_update_intercept_for_msr() */ return true; +case MSR_IA32_PKRS : +return true;
This is wrong with respect to MSR filtering, as KVM will fail to intercept the MSR in response to a filter change. See vmx_msr_filter_changed().. I also think that special casing PKRS is a bad idea in general. More later.
Quoted 3 lines
arch/x86/kvm/vmx/vmx.c +0
-0} r =possible_passthrough_msr_slot (msr) != -ENOENT ;
...
arch/x86/kvm/vmx/vmx.c static int vmx_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) · line 2226
Quoted 8 lines
arch/x86/kvm/vmx/vmx.c +8
-0+case MSR_IA32_PKRS : +if (!kvm_pkrs_valid (data)) +return 1 ; +if (!kvm_cpu_cap_has (X86_FEATURE_PKS ) || + (!msr_info->host_initiated && + !guest_cpuid_has (vcpu,X86_FEATURE_PKS ))) +return 1 ; +if (vcpu->arch.pkrs != data) {
This will need to be modified if we go with my below proposal.
Quoted 51 lines
arch/x86/kvm/vmx/vmx.c +11
-4+ vcpu->arch.pkrs = data; +vmcs_write64 (GUEST_IA32_PKRS , data); + } +break ;case MSR_TSC_AUX :if (!msr_info->host_initiated && !guest_cpuid_has (vcpu,X86_FEATURE_RDTSCP ))@@ -2479,7 +2518,8 @@ static __init int setup_vmcs_config(struct vmcs_config *vmcs_conf,VM_EXIT_LOAD_IA32_EFER |VM_EXIT_CLEAR_BNDCFGS |VM_EXIT_PT_CONCEAL_PIP | -VM_EXIT_CLEAR_IA32_RTIT_CTL ; +VM_EXIT_CLEAR_IA32_RTIT_CTL | +VM_EXIT_LOAD_IA32_PKRS ;if (adjust_vmx_controls (min, opt,MSR_IA32_VMX_EXIT_CTLS , &_vmexit_control) <0 )return -EIO ;@@ -2503,7 +2543,8 @@ static __init int setup_vmcs_config(struct vmcs_config *vmcs_conf,VM_ENTRY_LOAD_IA32_EFER |VM_ENTRY_LOAD_BNDCFGS |VM_ENTRY_PT_CONCEAL_PIP | -VM_ENTRY_LOAD_IA32_RTIT_CTL ; +VM_ENTRY_LOAD_IA32_RTIT_CTL | +VM_ENTRY_LOAD_IA32_PKRS ;if (adjust_vmx_controls (min, opt,MSR_IA32_VMX_ENTRY_CTLS , &_vmentry_control) <0 )return -EIO ;@@ -3103,8 +3144,9 @@ int vmx_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4)* is in force while we are in guest mode. Do not let guests control * this bit, even if host CR4.MCE == 0. */ -unsigned long hw_cr4; +unsigned long hw_cr4, old_cr4; + old_cr4 =kvm_read_cr4 (vcpu); hw_cr4 = (cr4_read_shadow () &X86_CR4_MCE ) | (cr4 & ~X86_CR4_MCE );if (is_unrestricted_guest (vcpu)) hw_cr4 |=KVM_VM_CR4_ALWAYS_ON_UNRESTRICTED_GUEST ;@@ -3152,7 +3194,7 @@ int vmx_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4) }/* -* SMEP/SMAP/PKU is disabled if CPU is in non-paging mode in +* SMEP/SMAP/PKU/PKS is disabled if CPU is in non-paging mode in * hardware. To emulate this behavior, SMEP/SMAP/PKU needs * to be manually disabled when guest switches to non-paging * mode. @@ -3160,10 +3202,29 @@ int vmx_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4)* If !enable_unrestricted_guest, the CPU is always running * with CR0.PG=1 and CR4 needs to be modified. * If enable_unrestricted_guest, the CPU automatically
arch/x86/kvm/vmx/vmx.c int vmx_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4) · line 3212
Quoted 10 lines
arch/x86/kvm/vmx/vmx.c +6
-2-* disables SMEP/SMAP/PKU when the guest sets CR0.PG=0. +* disables SMEP/SMAP/PKU/PKS when the guest sets CR0.PG=0. */ if (!is_paging (vcpu)) - hw_cr4 &= ~(X86_CR4_SMEP |X86_CR4_SMAP |X86_CR4_PKE ); + hw_cr4 &= ~(X86_CR4_SMEP |X86_CR4_SMAP |X86_CR4_PKE | +X86_CR4_PKS ); + } + +if ((hw_cr4 ^ old_cr4) &X86_CR4_PKS ) {
Comparing hw_cr4 and old_cr4 is wrong, they are representative of two different contexts. old_cr4 is the guest's previous CR4 irrespective of KVM maniuplations, whereas hw_cr4 does include KVM's modification, e.g. the is_paging() logic above may clear CR4.PKS and may lead to incorrect behavior.
E.g.:
guest.CR4.PKS = 1 guest.CR0.PG = 0 guest_hw.CR4.PKS = 0 // KVM vmcs.LOAD_PKRS = 0 // KVM guest.CR0.PG = 1 guest_hw.CR4.PKS = 1 // KVM vmcs.LOAD_PKRS not modified because guest.CR4.PKS == guest_hw.CR4.PKS == 1
This logic also fails to handle the case where L1 doesn't intercept CR4.PKS modifications for L2.
The VM-Exit path that does:
arch/x86/kvm/vmx/vmx.c static fastpath_t vmx_vcpu_run(struct kvm_vcpu *vcpu)
Quoted 3 lines
arch/x86/kvm/vmx/vmx.c +3
-0+if (static_cpu_has (X86_FEATURE_PKS ) && +kvm_read_cr4_bits (vcpu,X86_CR4_PKS )) + vcpu->arch.pkrs =vmcs_read64 (GUEST_IA32_PKRS )
is also flawed in that, per this scheme, it may unnecessarily read vmcs.GUEST_PKRS, though I don't think it can get the wrong value, unless of course it's running L2...
In short, IMO toggling PKRS interception/load on CR4 changes is a really, really bad idea. UMIP emulation attempted do fancy toggling and got it wrong multiple times, and this is more complicated than what UMIP was trying to do.
The only motiviation for toggling PKRS interception/load is to avoid the VMREAD in the VM-Exit path. Given that vcpu->arch.pkrs is rarely accessed by KVM, e.g. only on host userspace MSR reads and and GVA->GPA translation via permission_fault(), keeping vcpu->arch.pkrs up-to-date at all times is unnecessary, i.e. it can be synchronized on-demand. And regarding permission_fault(), that's indirectly gated by CR4.PKS=1, thus deferring the VMREAD to permission_fault() is guaranteed to be more performant than reading on every VM-Exit (with CR4.PKS=1).
So:
- Disable PKRS MSR interception if it's exposed to the guest.
- Load PKRS on entry/exit if it's exposed to the guest.
- Add VCPU_EXREG_PKRS and clear its bits in vmx_register_cache_reset().
- Add helpers to read/write/cache PKRS and use accordingly.
Quoted 18 lines
arch/x86/kvm/vmx/vmx.c +15
-0+/* pass through PKRS to guest when CR4.PKS=1 */ +if (guest_cpuid_has (vcpu,X86_FEATURE_PKS ) && hw_cr4 &X86_CR4_PKS ) { +vmx_disable_intercept_for_msr (vcpu,MSR_IA32_PKRS ,MSR_TYPE_RW ); +vm_entry_controls_setbit (vmx,VM_ENTRY_LOAD_IA32_PKRS ); +vm_exit_controls_setbit (vmx,VM_EXIT_LOAD_IA32_PKRS ); +/* +* Every vm exit saves guest pkrs automatically, sync vcpu->arch.pkrs +* to VMCS.GUEST_PKRS to avoid the pollution by host pkrs. +*/ +vmcs_write64 (GUEST_IA32_PKRS , vcpu->arch.pkrs); + }else { +vmx_enable_intercept_for_msr (vcpu,MSR_IA32_PKRS ,MSR_TYPE_RW ); +vm_entry_controls_clearbit (vmx,VM_ENTRY_LOAD_IA32_PKRS ); +vm_exit_controls_clearbit (vmx,VM_EXIT_LOAD_IA32_PKRS ); + } }vmcs_writel (CR4_READ_SHADOW , cr4);
...
Quoted 51 lines
arch/x86/kvm/vmx/vmx.c +12
-0@@ -6776,6 +6841,10 @@ static fastpath_t vmx_vcpu_run(struct kvm_vcpu *vcpu)pt_guest_exit (vmx); +if (static_cpu_has (X86_FEATURE_PKS ) && +kvm_read_cr4_bits (vcpu,X86_CR4_PKS )) + vcpu->arch.pkrs =vmcs_read64 (GUEST_IA32_PKRS ); +kvm_load_host_xsave_state (vcpu); vmx->nested.nested_run_pending =0 ;@@ -7280,6 +7349,14 @@ static __init void vmx_set_cpu_caps(void)if (vmx_pt_mode_is_host_guest ())kvm_cpu_cap_check_and_set (X86_FEATURE_INTEL_PT ); +/* +* PKS is not yet implemented for shadow paging. +* If not support VM_{ENTRY, EXIT}_LOAD_IA32_PKRS, +* don't expose the PKS as well. +*/ +if (enable_ept &&cpu_has_load_ia32_pkrs ()) +kvm_cpu_cap_check_and_set (X86_FEATURE_PKS ); +if (vmx_umip_emulated ())kvm_cpu_cap_set (X86_FEATURE_UMIP );arch/x86/kvm/x86.c +5
-1@@ -1213,7 +1213,7 @@ static const u32 msrs_to_save_all[] = {MSR_IA32_RTIT_ADDR1_A ,MSR_IA32_RTIT_ADDR1_B ,MSR_IA32_RTIT_ADDR2_A ,MSR_IA32_RTIT_ADDR2_B ,MSR_IA32_RTIT_ADDR3_A ,MSR_IA32_RTIT_ADDR3_B , -MSR_IA32_UMWAIT_CONTROL , +MSR_IA32_UMWAIT_CONTROL ,MSR_IA32_PKRS ,MSR_ARCH_PERFMON_FIXED_CTR0 ,MSR_ARCH_PERFMON_FIXED_CTR1 , MSR_ARCH_PERFMON_FIXED_CTR0 + 2, MSR_ARCH_PERFMON_FIXED_CTR0 + 3,@@ -5718,6 +5718,10 @@ static void kvm_init_msr_list(void) intel_pt_validate_hw_cap(PT_CAP_num_address_ranges) * 2)continue ;break ; +case MSR_IA32_PKRS : +if (!kvm_cpu_cap_has (X86_FEATURE_PKS )) +continue ; +break ; case MSR_ARCH_PERFMON_PERFCTR0 ... MSR_ARCH_PERFMON_PERFCTR0 + 17:if (msrs_to_save_all[i] -MSR_ARCH_PERFMON_PERFCTR0 >=min (INTEL_PMC_MAX_GENERIC , x86_pmu.num_counters_gp))
arch/x86/kvm/x86.c void kvm_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event) · line 10033
Quoted 4 lines
arch/x86/kvm/x86.c +1
-0@@ -10026,6 +10030,8 @@ void kvm_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event) vcpu->arch.ia32_xss =0 ; + vcpu->arch.pkrs =0 ;
This is wrong and also unreviewable. It's wrong because the write isn't propagted to vmcs.GUEST_PKRS, e.g. if the guest enables CR0.PG and CR4.PKS without writing PKRS, KVM will run the guest with a stale value.
It's unreviewable because the SDM doesn't specify whether PKRS is cleared or preserved on INIT. The SDM needs an entry for PRKS in Table 9-1. "IA-32 and Intel 64 Processor States Following Power-up, Reset, or INIT" before this can be merged.
Quoted 3 lines
arch/x86/kvm/x86.c +1
-0+ kvm_x86_ops.vcpu_reset (vcpu, init_event); }
Re: [PATCH v4 2/5] KVM: X86: Expose PKS to guest
Thanks Sean for your review.
Quoted 24 lines · Sean Christopherson
Quoted 8 lines · Chenyi Qiang
arch/x86/include/asm/kvm_host.h +1
-0@@ -539,6 +540,7 @@ struct kvm_vcpu_arch {unsigned long cr8;u32 host_pkru;u32 pkru; +u32 pkrs;u32 hflags;u64 efer;u64 apic_base;...
arch/x86/kvm/vmx/nested.c static void vmx_sync_vmcs_host_state(struct vcpu_vmx *vmx, · line 253
Quoted 9 lines
arch/x86/kvm/vmx/nested.c +1
-0@@ -250,6 +250,7 @@ static void vmx_sync_vmcs_host_state(struct vcpu_vmx *vmx, dest->ds_sel = src->ds_sel; dest->es_sel = src->es_sel;#endif + dest->pkrs = src->pkrs;This is wrong. It also arguably belongs in patch 04.
Quoted 4 lines
The part that's missing is actually updating vmcs.HOST_IA32_PKRS. FS/GS are handled by
vmx_set_host_fs_gs(), while LDT/DS/ES are oddballs where the selector is also the state that's restored.
Will fix it. I guess it should belong in patch 05.
Quoted 30 lines
In other words, this will cause nested VM-Exit to load the wrong PKRS.
Quoted 28 lines
arch/x86/kvm/vmx/nested.c +0
-0}static void vmx_switch_vmcs (struct kvm_vcpu *vcpu,struct loaded_vmcs *vmcs)arch/x86/kvm/vmx/vmcs.h +1
-0@@ -40,6 +40,7 @@ struct vmcs_host_state {#ifdef CONFIG_X86_64 u16 ds_sel, es_sel;#endif +u32 pkrs; };struct vmcs_controls_shadow {arch/x86/kvm/vmx/vmx.c +2
-0@@ -363,6 +363,8 @@ module_param_cb(vmentry_l1d_flush, &vmentry_l1d_flush_ops, NULL, 0644);static u32 vmx_segment_access_rights (struct kvm_segment *var); static __always_inline void vmx_disable_intercept_for_msr(struct kvm_vcpu *vcpu,u32 msr,int type); +static __always_inline void vmx_enable_intercept_for_msr(struct kvm_vcpu *vcpu, +u32 msr,int type);void vmx_vmexit (void );
Quoted 11 lines
arch/x86/kvm/vmx/vmx.c static bool is_valid_passthrough_msr(u32 msr) · line 666
Quoted 6 lines
arch/x86/kvm/vmx/vmx.c +2
-0@@ -660,6 +662,8 @@ static bool is_valid_passthrough_msr(u32 msr) case MSR_IA32_RTIT_ADDR0_A ... MSR_IA32_RTIT_ADDR3_B:/* PT MSRs. These are handled in pt_update_intercept_for_msr() */ return true; +case MSR_IA32_PKRS : +return true;This is wrong with respect to MSR filtering, as KVM will fail to intercept the MSR in response to a filter change. See
vmx_msr_filter_changed().. I also think that special casing PKRS is a bad idea in general. More later.
Yes, msr filter support for PKRS was missing. Will add the support in vmx_msr_filter_changed().
Quoted 118 lines
Quoted 3 lines
arch/x86/kvm/vmx/vmx.c +0
-0} r =possible_passthrough_msr_slot (msr) != -ENOENT ;...
arch/x86/kvm/vmx/vmx.c static int vmx_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) · line 2226
Quoted 8 lines
arch/x86/kvm/vmx/vmx.c +8
-0+case MSR_IA32_PKRS : +if (!kvm_pkrs_valid (data)) +return 1 ; +if (!kvm_cpu_cap_has (X86_FEATURE_PKS ) || + (!msr_info->host_initiated && + !guest_cpuid_has (vcpu,X86_FEATURE_PKS ))) +return 1 ; +if (vcpu->arch.pkrs != data) {This will need to be modified if we go with my below proposal.
Quoted 51 lines
arch/x86/kvm/vmx/vmx.c +11
-4+ vcpu->arch.pkrs = data; +vmcs_write64 (GUEST_IA32_PKRS , data); + } +break ;case MSR_TSC_AUX :if (!msr_info->host_initiated && !guest_cpuid_has (vcpu,X86_FEATURE_RDTSCP ))@@ -2479,7 +2518,8 @@ static __init int setup_vmcs_config(struct vmcs_config *vmcs_conf,VM_EXIT_LOAD_IA32_EFER |VM_EXIT_CLEAR_BNDCFGS |VM_EXIT_PT_CONCEAL_PIP | -VM_EXIT_CLEAR_IA32_RTIT_CTL ; +VM_EXIT_CLEAR_IA32_RTIT_CTL | +VM_EXIT_LOAD_IA32_PKRS ;if (adjust_vmx_controls (min, opt,MSR_IA32_VMX_EXIT_CTLS , &_vmexit_control) <0 )return -EIO ;@@ -2503,7 +2543,8 @@ static __init int setup_vmcs_config(struct vmcs_config *vmcs_conf,VM_ENTRY_LOAD_IA32_EFER |VM_ENTRY_LOAD_BNDCFGS |VM_ENTRY_PT_CONCEAL_PIP | -VM_ENTRY_LOAD_IA32_RTIT_CTL ; +VM_ENTRY_LOAD_IA32_RTIT_CTL | +VM_ENTRY_LOAD_IA32_PKRS ;if (adjust_vmx_controls (min, opt,MSR_IA32_VMX_ENTRY_CTLS , &_vmentry_control) <0 )return -EIO ;@@ -3103,8 +3144,9 @@ int vmx_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4)* is in force while we are in guest mode. Do not let guests control * this bit, even if host CR4.MCE == 0. */ -unsigned long hw_cr4; +unsigned long hw_cr4, old_cr4; + old_cr4 =kvm_read_cr4 (vcpu); hw_cr4 = (cr4_read_shadow () &X86_CR4_MCE ) | (cr4 & ~X86_CR4_MCE );if (is_unrestricted_guest (vcpu)) hw_cr4 |=KVM_VM_CR4_ALWAYS_ON_UNRESTRICTED_GUEST ;@@ -3152,7 +3194,7 @@ int vmx_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4) }/* -* SMEP/SMAP/PKU is disabled if CPU is in non-paging mode in +* SMEP/SMAP/PKU/PKS is disabled if CPU is in non-paging mode in * hardware. To emulate this behavior, SMEP/SMAP/PKU needs * to be manually disabled when guest switches to non-paging * mode. @@ -3160,10 +3202,29 @@ int vmx_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4)* If !enable_unrestricted_guest, the CPU is always running * with CR0.PG=1 and CR4 needs to be modified. * If enable_unrestricted_guest, the CPU automatically arch/x86/kvm/vmx/vmx.c int vmx_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4) · line 3212
Quoted 10 lines
arch/x86/kvm/vmx/vmx.c +6
-2-* disables SMEP/SMAP/PKU when the guest sets CR0.PG=0. +* disables SMEP/SMAP/PKU/PKS when the guest sets CR0.PG=0. */ if (!is_paging (vcpu)) - hw_cr4 &= ~(X86_CR4_SMEP |X86_CR4_SMAP |X86_CR4_PKE ); + hw_cr4 &= ~(X86_CR4_SMEP |X86_CR4_SMAP |X86_CR4_PKE | +X86_CR4_PKS ); + } + +if ((hw_cr4 ^ old_cr4) &X86_CR4_PKS ) {Comparing
hw_cr4andold_cr4is wrong, they are representative of two different contexts.old_cr4is the guest's previous CR4 irrespective of KVM maniuplations, whereashw_cr4does include KVM's modification, e.g. theis_paging()logic above may clear CR4.PKS and may lead to incorrect behavior.E.g.:
guest.CR4.PKS = 1 guest.CR0.PG = 0 guest_hw.CR4.PKS = 0 // KVM vmcs.LOAD_PKRS = 0 // KVM guest.CR0.PG = 1 guest_hw.CR4.PKS = 1 // KVM vmcs.LOAD_PKRS not modified because guest.CR4.PKS == guest_hw.CR4.PKS == 1This logic also fails to handle the case where L1 doesn't intercept CR4.PKS modifications for L2.
The VM-Exit path that does:
arch/x86/kvm/vmx/vmx.c static fastpath_t vmx_vcpu_run(struct kvm_vcpu *vcpu)
Quoted 3 lines
arch/x86/kvm/vmx/vmx.c +3
-0+if (static_cpu_has (X86_FEATURE_PKS ) && +kvm_read_cr4_bits (vcpu,X86_CR4_PKS )) + vcpu->arch.pkrs =vmcs_read64 (GUEST_IA32_PKRS )is also flawed in that, per this scheme, it may unnecessarily read vmcs.GUEST_PKRS, though I don't think it can get the wrong value, unless of course it's running L2...
In short, IMO toggling PKRS interception/load on CR4 changes is a really, really bad idea. UMIP emulation attempted do fancy toggling and got it wrong multiple times, and this is more complicated than what UMIP was trying to do.
The only motiviation for toggling PKRS interception/load is to avoid the VMREAD in the VM-Exit path. Given that
vcpu->arch.pkrsis rarely accessed by KVM, e.g. only on host userspace MSR reads and andGVA->GPAtranslation viapermission_fault(), keepingvcpu->arch.pkrsup-to-date at all times is unnecessary, i.e. it can be synchronized on-demand. And regardingpermission_fault(), that's indirectly gated by CR4.PKS=1, thus deferring the VMREAD topermission_fault()is guaranteed to be more performant than reading on every VM-Exit (with CR4.PKS=1).
Quoted 7 lines
So:
- Disable PKRS MSR interception if it's exposed to the guest.
- Load PKRS on entry/exit if it's exposed to the guest.
- AddVCPU_EXREG_PKRSand clear its bits invmx_register_cache_reset().
- Add helpers to read/write/cache PKRS and use accordingly.
Make sense. Will refactor all these mentioned in next version.
Quoted 73 lines
Quoted 18 lines
arch/x86/kvm/vmx/vmx.c +15
-0+/* pass through PKRS to guest when CR4.PKS=1 */ +if (guest_cpuid_has (vcpu,X86_FEATURE_PKS ) && hw_cr4 &X86_CR4_PKS ) { +vmx_disable_intercept_for_msr (vcpu,MSR_IA32_PKRS ,MSR_TYPE_RW ); +vm_entry_controls_setbit (vmx,VM_ENTRY_LOAD_IA32_PKRS ); +vm_exit_controls_setbit (vmx,VM_EXIT_LOAD_IA32_PKRS ); +/* +* Every vm exit saves guest pkrs automatically, sync vcpu->arch.pkrs +* to VMCS.GUEST_PKRS to avoid the pollution by host pkrs. +*/ +vmcs_write64 (GUEST_IA32_PKRS , vcpu->arch.pkrs); + }else { +vmx_enable_intercept_for_msr (vcpu,MSR_IA32_PKRS ,MSR_TYPE_RW ); +vm_entry_controls_clearbit (vmx,VM_ENTRY_LOAD_IA32_PKRS ); +vm_exit_controls_clearbit (vmx,VM_EXIT_LOAD_IA32_PKRS ); + } }vmcs_writel (CR4_READ_SHADOW , cr4);...
Quoted 52 lines
arch/x86/kvm/vmx/vmx.c +12
-0@@ -6776,6 +6841,10 @@ static fastpath_t vmx_vcpu_run(struct kvm_vcpu *vcpu)pt_guest_exit (vmx); +if (static_cpu_has (X86_FEATURE_PKS ) && +kvm_read_cr4_bits (vcpu,X86_CR4_PKS )) + vcpu->arch.pkrs =vmcs_read64 (GUEST_IA32_PKRS ); +kvm_load_host_xsave_state (vcpu); vmx->nested.nested_run_pending =0 ;@@ -7280,6 +7349,14 @@ static __init void vmx_set_cpu_caps(void)if (vmx_pt_mode_is_host_guest ())kvm_cpu_cap_check_and_set (X86_FEATURE_INTEL_PT ); +/* +* PKS is not yet implemented for shadow paging. +* If not support VM_{ENTRY, EXIT}_LOAD_IA32_PKRS, +* don't expose the PKS as well. +*/ +if (enable_ept &&cpu_has_load_ia32_pkrs ()) +kvm_cpu_cap_check_and_set (X86_FEATURE_PKS ); +if (vmx_umip_emulated ())kvm_cpu_cap_set (X86_FEATURE_UMIP );arch/x86/kvm/x86.c +5
-1@@ -1213,7 +1213,7 @@ static const u32 msrs_to_save_all[] = {MSR_IA32_RTIT_ADDR1_A ,MSR_IA32_RTIT_ADDR1_B ,MSR_IA32_RTIT_ADDR2_A ,MSR_IA32_RTIT_ADDR2_B ,MSR_IA32_RTIT_ADDR3_A ,MSR_IA32_RTIT_ADDR3_B , -MSR_IA32_UMWAIT_CONTROL , +MSR_IA32_UMWAIT_CONTROL ,MSR_IA32_PKRS ,MSR_ARCH_PERFMON_FIXED_CTR0 ,MSR_ARCH_PERFMON_FIXED_CTR1 , MSR_ARCH_PERFMON_FIXED_CTR0 + 2, MSR_ARCH_PERFMON_FIXED_CTR0 + 3,@@ -5718,6 +5718,10 @@ static void kvm_init_msr_list(void) intel_pt_validate_hw_cap(PT_CAP_num_address_ranges) * 2)continue ;break ; +case MSR_IA32_PKRS : +if (!kvm_cpu_cap_has (X86_FEATURE_PKS )) +continue ; +break ; case MSR_ARCH_PERFMON_PERFCTR0 ... MSR_ARCH_PERFMON_PERFCTR0 + 17:if (msrs_to_save_all[i] -MSR_ARCH_PERFMON_PERFCTR0 >=min (INTEL_PMC_MAX_GENERIC , x86_pmu.num_counters_gp))@@ -10026,6 +10030,8 @@ void kvm_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event)
Quoted 8 lines
arch/x86/kvm/x86.c void kvm_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event) · line 10033
Quoted 3 lines
arch/x86/kvm/x86.c +1
-0vcpu->arch.ia32_xss =0 ; + vcpu->arch.pkrs =0 ;This is wrong and also unreviewable. It's wrong because the write isn't propagted to vmcs.GUEST_PKRS, e.g. if the guest enables CR0.PG and CR4.PKS without writing PKRS, KVM will run the guest with a stale value.
Yes, should write to vmcs to do reset.
Quoted 1 line
It's unreviewable because the SDM doesn't specify whether PKRS is
cleared or
Quoted 3 lines
preserved on INIT. The SDM needs an entry for PRKS in Table 9-1. "IA-32 and Intel 64 Processor States Following Power-up, Reset, or INIT" before this can be merged.
PKRS is missing in Table 9-1. It will be updated in next version of SDM, just let you know to help current review:
"PKRS is cleared on INIT. It should be 0 in all cases."
Quoted 3 lines
Quoted 3 lines
arch/x86/kvm/x86.c +1
-0+ kvm_x86_ops.vcpu_reset (vcpu, init_event); }
PATCH v4 3/5 KVM: MMU: Rename the pkru to pkr
In reply to Chenyi QiangPKRU represents the PKU register utilized in the protection key rights check for user pages. Protection Keys for Superviosr Pages (PKS) extends the protection key architecture to cover supervisor pages.
Rename the *pkru* related variables and functions to *pkr* which stands for both of the PKRU and PKRS. It makes sense because both registers have the same format. PKS and PKU can also share the same bitmap to cache the conditions where protection key checks are needed.
--- arch/x86/include/asm/kvm_host.h | 2 +- arch/x86/kvm/mmu.h | 12 ++++++------ arch/x86/kvm/mmu/mmu.c | 18 +++++++++--------- 3 files changed, 16 insertions(+), 16 deletions(-)
arch/x86/include/asm/kvm_host.h +1 -1
@@ -383,7 +383,7 @@ struct kvm_mmu {* with PFEC.RSVD replaced by ACC_USER_MASK from the page tables. * Each domain has 2 bits which are ANDed with AD and WD from PKRU. */ -u32 pkru_mask; +u32 pkr_mask;u64 *pae_root;u64 *lm_root;
arch/x86/kvm/mmu.h +6 -6
@@ -190,8 +190,8 @@ static inline u8 permission_fault(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu,u32 errcode =PFERR_PRESENT_MASK ;WARN_ON (pfec & (PFERR_PK_MASK |PFERR_RSVD_MASK )); -if (unlikely (mmu->pkru_mask)) { -u32 pkru_bits, offset; +if (unlikely (mmu->pkr_mask)) { +u32 pkr_bits, offset;/* * PKRU defines 32 bits, there are 16 domains and 2
@@ -199,15 +199,15 @@ static inline u8 permission_fault(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu,* index of the protection domain, so pte_pkey * 2 is * is the index of the first bit for the domain. */ - pkru_bits = (vcpu->arch.pkru >> (pte_pkey *2 )) &3 ; + pkr_bits = (vcpu->arch.pkru >> (pte_pkey *2 )) &3 ;/* clear present bit, replace PFEC.RSVD with ACC_USER_MASK. */ offset = (pfec & ~1 ) + ((pte_access &PT_USER_MASK ) << (PFERR_RSVD_BIT -PT_USER_SHIFT )); - pkru_bits &= mmu->pkru_mask >> offset; - errcode |= -pkru_bits &PFERR_PK_MASK ; - fault |= (pkru_bits !=0 ); + pkr_bits &= mmu->pkr_mask >> offset; + errcode |= -pkr_bits &PFERR_PK_MASK ; + fault |= (pkr_bits !=0 ); }return -(u32 )fault & errcode;
arch/x86/kvm/mmu/mmu.c +9 -9
@@ -4301,20 +4301,20 @@ static void update_permission_bitmask(struct kvm_vcpu *vcpu,* away both AD and WD. For all reads or if the last condition holds, WD * only will be masked away. */ -static void update_pkru_bitmask (struct kvm_vcpu *vcpu,struct kvm_mmu *mmu, +static void update_pkr_bitmask (struct kvm_vcpu *vcpu,struct kvm_mmu *mmu,bool ept) {unsigned bit;bool wp;if (ept) { - mmu->pkru_mask =0 ; + mmu->pkr_mask =0 ;return ; }/* PKEY is enabled only if CR4.PKE and EFER.LMA are both set. */ if (!kvm_read_cr4_bits (vcpu,X86_CR4_PKE ) || !is_long_mode (vcpu)) { - mmu->pkru_mask =0 ; + mmu->pkr_mask =0 ;return ; }
@@ -4348,7 +4348,7 @@ static void update_pkru_bitmask(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu,/* PKRU.WD stops write access. */ pkey_bits |= (!!check_write) <<1 ; - mmu->pkru_mask |= (pkey_bits &3 ) << pfec; + mmu->pkr_mask |= (pkey_bits &3 ) << pfec; } }
@@ -4370,7 +4370,7 @@ static void paging64_init_context_common(struct kvm_vcpu *vcpu,reset_rsvds_bits_mask (vcpu, context);update_permission_bitmask (vcpu, context, false); -update_pkru_bitmask (vcpu, context, false); +update_pkr_bitmask (vcpu, context, false);update_last_nonleaf_level (vcpu, context);MMU_WARN_ON (!is_pae (vcpu));
@@ -4400,7 +4400,7 @@ static void paging32_init_context(struct kvm_vcpu *vcpu,reset_rsvds_bits_mask (vcpu, context);update_permission_bitmask (vcpu, context, false); -update_pkru_bitmask (vcpu, context, false); +update_pkr_bitmask (vcpu, context, false);update_last_nonleaf_level (vcpu, context); context->page_fault = paging32_page_fault;
@@ -4519,7 +4519,7 @@ static void init_kvm_tdp_mmu(struct kvm_vcpu *vcpu) }update_permission_bitmask (vcpu, context, false); -update_pkru_bitmask (vcpu, context, false); +update_pkr_bitmask (vcpu, context, false);update_last_nonleaf_level (vcpu, context);reset_tdp_shadow_zero_bits_mask (vcpu, context); }
@@ -4667,7 +4667,7 @@ void kvm_init_shadow_ept_mmu(struct kvm_vcpu *vcpu, bool execonly, context->mmu_role.as_u64 = new_role.as_u64;update_permission_bitmask (vcpu, context, true); -update_pkru_bitmask (vcpu, context, true); +update_pkr_bitmask (vcpu, context, true);update_last_nonleaf_level (vcpu, context);reset_rsvds_bits_mask_ept (vcpu, context, execonly);reset_ept_shadow_zero_bits_mask (vcpu, context, execonly);
@@ -4738,7 +4738,7 @@ static void init_kvm_nested_mmu(struct kvm_vcpu *vcpu) }update_permission_bitmask (vcpu, g_context, false); -update_pkru_bitmask (vcpu, g_context, false); +update_pkr_bitmask (vcpu, g_context, false);update_last_nonleaf_level (vcpu, g_context); }
Signature · 1 line
2.17.1
PATCH v4 4/5 KVM: MMU: Add support for PKS emulation
In reply to Chenyi QiangIn addition to the pkey check for user pages, advertise pkr_mask also to cache the conditions where protection key checks for supervisor pages are needed. Add CR4_PKS in mmu_role_bits to track the pkr_mask update on a per-mmu basis.
In original cache conditions of pkr_mask, U/S bit in page tables is a judgement condition and replace the PFEC.RSVD in page fault error code to form the index of 16 domains. PKS support would extend the U/S bits (if U/S=0, PKS check required). It adds an additional check for cr4_pke/cr4_pks to ensure the necessity and distinguish PKU and PKS from each other.
--- arch/x86/include/asm/kvm_host.h | 11 +++--- arch/x86/kvm/mmu.h | 13 ++++--- arch/x86/kvm/mmu/mmu.c | 63 +++++++++++++++++++-------------- arch/x86/kvm/x86.c | 3 +- 4 files changed, 53 insertions(+), 37 deletions(-)
arch/x86/include/asm/kvm_host.h +6 -5
@@ -294,7 +294,7 @@ union kvm_mmu_extended_role { unsigned int cr0_pg:1; unsigned int cr4_pae:1; unsigned int cr4_pse:1; - unsigned int cr4_pke:1; + unsigned int cr4_pkr:1; unsigned int cr4_smap:1; unsigned int cr4_smep:1; unsigned int maxphyaddr:6;
@@ -378,10 +378,11 @@ struct kvm_mmu {u8 permissions[16 ];/* -* The pkru_mask indicates if protection key checks are needed. It -* consists of 16 domains indexed by page fault error code bits [4:1], -* with PFEC.RSVD replaced by ACC_USER_MASK from the page tables. -* Each domain has 2 bits which are ANDed with AD and WD from PKRU. +* The pkr_mask indicates if protection key checks are needed. +* It consists of 16 domains indexed by page fault error code +* bits[4:1] with PFEC.RSVD replaced by ACC_USER_MASK from the +* page tables. Each domain has 2 bits which are ANDed with AD +* and WD from PKRU/PKRS. */ u32 pkr_mask;
arch/x86/kvm/mmu.h +8 -5
@@ -192,14 +192,17 @@ static inline u8 permission_fault(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu,WARN_ON (pfec & (PFERR_PK_MASK |PFERR_RSVD_MASK ));if (unlikely (mmu->pkr_mask)) {u32 pkr_bits, offset; +u64 pkr;/* -* PKRU defines 32 bits, there are 16 domains and 2 -* attribute bits per domain in pkru. pte_pkey is the -* index of the protection domain, so pte_pkey * 2 is -* is the index of the first bit for the domain. +* PKRU and PKRS both define 32 bits. There are 16 domains +* and 2 attribute bits per domain in them. pte_key is the +* index of the protection domain, so pte_pkey * 2 is the +* index of the first bit for the domain. The choice of +* PKRU and PKRS is determined by the accessed pages. */ - pkr_bits = (vcpu->arch.pkru >> (pte_pkey *2 )) &3 ; + pkr = pte_access &PT_USER_MASK ? vcpu->arch.pkru : vcpu->arch.pkrs; + pkr_bits = (pkr >> pte_pkey *2 ) &3 ;/* clear present bit, replace PFEC.RSVD with ACC_USER_MASK. */ offset = (pfec & ~1) +
arch/x86/kvm/mmu/mmu.c +37 -26
105 lines not on this page · raw message
arch/x86/kvm/x86.c +2 -1
@@ -982,7 +982,8 @@ int kvm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4)unsigned long old_cr4 =kvm_read_cr4 (vcpu);unsigned long pdptr_bits =X86_CR4_PGE |X86_CR4_PSE |X86_CR4_PAE |X86_CR4_SMEP ; -unsigned long mmu_role_bits = pdptr_bits |X86_CR4_SMAP |X86_CR4_PKE ; +unsigned long mmu_role_bits = pdptr_bits |X86_CR4_SMAP |X86_CR4_PKE | +X86_CR4_PKS ;if (kvm_valid_cr4 (vcpu, cr4))return 1 ;
Signature · 1 line
2.17.1
Paolo Bonzini
maintainerRe: [PATCH v4 4/5] KVM: MMU: Add support for PKS emulation
Quoted 1 line · Chenyi Qiang
|In addition to the pkey check for user pages, advertise
pkr_maskalso to cache the conditions where protection key checks for supervisor pages are needed. AddCR4_PKSinmmu_role_bitsto track thepkr_maskupdate on a per-mmu basis. In original cache conditions ofpkr_mask, U/S bit in page tables is a judgement condition and replace the PFEC.RSVD in page fault error code to form the index of 16 domains. PKS support would extend the U/S bits (if U/S=0, PKS check required). It adds an additional check for cr4_pke/cr4_pks to ensure the necessity and distinguish PKU and PKS from each other. |
Slight changes to the commit message:
Up until now, pkr_mask had 0 bits for supervisor pages (the U/S bit in page tables replaces the PFEC.RSVD in page fault error code). For PKS support, fill in the bits using the same algorithm used for user mode pages, but with CR4.PKE replaced by CR4.PKS. Because of this change, CR4.PKS must also be included in the MMU role.
Paolo
Sean Christopherson
maintainerRe: [PATCH v4 4/5] KVM: MMU: Add support for PKS emulation
In reply to Chenyi QiangQuoted 25 lines · Chenyi Qiang
In addition to the pkey check for user pages, advertise
pkr_maskalso to cache the conditions where protection key checks for supervisor pages are needed. AddCR4_PKSinmmu_role_bitsto track thepkr_maskupdate on a per-mmu basis.In original cache conditions of
pkr_mask, U/S bit in page tables is a judgement condition and replace the PFEC.RSVD in page fault error code to form the index of 16 domains. PKS support would extend the U/S bits (if U/S=0, PKS check required). It adds an additional check for cr4_pke/cr4_pks to ensure the necessity and distinguish PKU and PKS from each other.Signed-off-by Chenyi Qiang <[email protected]>--- arch/x86/include/asm/kvm_host.h | 11 +++--- arch/x86/kvm/mmu.h | 13 ++++--- arch/x86/kvm/mmu/mmu.c | 63 +++++++++++++++++++-------------- arch/x86/kvm/x86.c | 3 +- 4 files changed, 53 insertions(+), 37 deletions(-)arch/x86/include/asm/kvm_host.h +0
-0
arch/x86/include/asm/kvm_host.h union kvm_mmu_extended_role { · line 297
Quoted 5 lines
arch/x86/include/asm/kvm_host.h +1
-1@@ -294,7 +294,7 @@ union kvm_mmu_extended_role { unsigned int cr0_pg:1; unsigned int cr4_pae:1; unsigned int cr4_pse:1; - unsigned int cr4_pke:1; + unsigned int cr4_pkr:1;
Smushing these together will not work, as this code (from below)
arch/x86/include/asm/kvm_host.h union kvm_mmu_extended_role { · line 299
Quoted 3 lines
arch/x86/include/asm/kvm_host.h +2
-1- ext.cr4_pke = !!kvm_read_cr4_bits (vcpu,X86_CR4_PKE ); + ext.cr4_pkr = !!kvm_read_cr4_bits (vcpu,X86_CR4_PKE ) || + !!kvm_read_cr4_bits (vcpu,X86_CR4_PKS );
will generate the same mmu_role for CR4.PKE=0,PKS=1 and CR4.PKE=1,PKS=1 (and other combinations). I.e. KVM will fail to reconfigure the MMU and thus skip update_pkr_bitmask() if the guest toggles PKE or PKS while the other PK* bit is set.
Quoted 3 lines
arch/x86/include/asm/kvm_host.h +0
-0unsigned int cr4_smap:1; unsigned int cr4_smep:1; unsigned int maxphyaddr:6;
Paolo Bonzini
maintainerRe: [PATCH v4 4/5] KVM: MMU: Add support for PKS emulation
Quoted 11 lines · Sean Christopherson
arch/x86/include/asm/kvm_host.h union kvm_mmu_extended_role { · line 297
Quoted 2 lines
arch/x86/include/asm/kvm_host.h +1
-1- unsigned int cr4_pke:1; + unsigned int cr4_pkr:1;Smushing these together will not work, as this code (from below)
arch/x86/kvm/mmu/mmu.c static union kvm_mmu_extended_role kvm_calc_mmu_role_ext(struct kvm_vcpu *vcpu) · line 4441
Quoted 3 lines
arch/x86/kvm/mmu/mmu.c +2
-1- ext.cr4_pke = !!kvm_read_cr4_bits (vcpu,X86_CR4_PKE ); + ext.cr4_pkr = !!kvm_read_cr4_bits (vcpu,X86_CR4_PKE ) || + !!kvm_read_cr4_bits (vcpu,X86_CR4_PKS );will generate the same
mmu_rolefor CR4.PKE=0,PKS=1 and CR4.PKE=1,PKS=1 (and other combinations). I.e. KVM will fail to reconfigure the MMU and thus skipupdate_pkr_bitmask()if the guest toggles PKE or PKS while the other PK* bit is set.
I'm also not sure why there would be issues in just using cr4_pks.
Paolo
Re: [PATCH v4 4/5] KVM: MMU: Add support for PKS emulation
Quoted 8 lines · Paolo Bonzini
Quoted 7 lines · Sean Christopherson
Quoted 2 lines
- unsigned int cr4_pke:1;
+ unsigned int cr4_pkr:1;Smushing these together will not work, as this code (from below)
Quoted 3 lines
- ext.cr4_pke = !!kvm_read_cr4_bits(vcpu,
X86_CR4_PKE); + ext.cr4_pkr = !!kvm_read_cr4_bits(vcpu,X86_CR4_PKE) || + !!kvm_read_cr4_bits(vcpu,X86_CR4_PKS);
Quoted 7 lines
Quoted 4 lines
will generate the same
mmu_rolefor CR4.PKE=0,PKS=1 and CR4.PKE=1,PKS=1 (and other combinations). I.e. KVM will fail to reconfigure the MMU and thus skipupdate_pkr_bitmask()if the guest toggles PKE or PKS while the other PK* bit is set.I'm also not sure why there would be issues in just using
cr4_pks.
Will split out the pke and pks.
Thanks
Chenyi
Quoted 2 lines
Paolo
PATCH v4 5/5 KVM: VMX: Enable PKS for nested VM
In reply to Chenyi QiangPKS MSR passes through guest directly. Configure the MSR to match the L0/L1 settings so that nested VM runs PKS properly.
--- arch/x86/kvm/vmx/nested.c | 37 +++++++++++++++++++++++++++++++++++-- arch/x86/kvm/vmx/vmcs12.c | 2 ++ arch/x86/kvm/vmx/vmcs12.h | 6 +++++- arch/x86/kvm/vmx/vmx.c | 10 ++++++++++ arch/x86/kvm/vmx/vmx.h | 1 + 5 files changed, 53 insertions(+), 3 deletions(-)
arch/x86/kvm/vmx/nested.c +35 -2
@@ -653,6 +653,12 @@ static inline bool nested_vmx_prepare_msr_bitmap(struct kvm_vcpu *vcpu,MSR_IA32_PRED_CMD , MSR_TYPE_W); +if (!msr_write_intercepted_l01 (vcpu,MSR_IA32_PKRS )) +nested_vmx_disable_intercept_for_msr ( + msr_bitmap_l1, msr_bitmap_l0, +MSR_IA32_PKRS , +MSR_TYPE_R |MSR_TYPE_W ); +kvm_vcpu_unmap (vcpu, &to_vmx (vcpu)->nested.msr_bitmap_map, false);return true;
@@ -2439,6 +2445,10 @@ static void prepare_vmcs02_rare(struct vcpu_vmx *vmx, struct vmcs12 *vmcs12)if (kvm_mpx_supported () && vmx->nested.nested_run_pending && (vmcs12->vm_entry_controls &VM_ENTRY_LOAD_BNDCFGS ))vmcs_write64 (GUEST_BNDCFGS , vmcs12->guest_bndcfgs); + +if (vmx->nested.nested_run_pending && + (vmcs12->vm_entry_controls &VM_ENTRY_LOAD_IA32_PKRS )) +vmcs_write64 (GUEST_IA32_PKRS , vmcs12->guest_ia32_pkrs); }if (nested_cpu_has_xsaves (vmcs12))
@@ -2527,6 +2537,11 @@ static int prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12,if (kvm_mpx_supported () && (!vmx->nested.nested_run_pending || !(vmcs12->vm_entry_controls &VM_ENTRY_LOAD_BNDCFGS )))vmcs_write64 (GUEST_BNDCFGS , vmx->nested.vmcs01_guest_bndcfgs); + +if (kvm_cpu_cap_has (X86_FEATURE_PKS ) && + (!vmx->nested.nested_run_pending || + !(vmcs12->vm_entry_controls &VM_ENTRY_LOAD_IA32_PKRS ))) +vmcs_write64 (GUEST_IA32_PKRS , vmx->nested.vmcs01_guest_pkrs);vmx_set_rflags (vcpu, vmcs12->guest_rflags);/* EXCEPTION_BITMAP and CR0_GUEST_HOST_MASK should basically be the
@@ -2867,6 +2882,10 @@ static int nested_vmx_check_host_state(struct kvm_vcpu *vcpu, vmcs12->host_ia32_perf_global_ctrl)))return -EINVAL ; +if ((vmcs12->vm_exit_controls &VM_EXIT_LOAD_IA32_PKRS ) && +CC (!kvm_pkrs_valid (vmcs12->host_ia32_pkrs))) +return -EINVAL ; +#ifdef CONFIG_X86_64 ia32e = !!(vcpu->arch.efer &EFER_LMA );#else
@@ -3016,6 +3035,10 @@ static int nested_vmx_check_guest_state(struct kvm_vcpu *vcpu,if (nested_check_guest_non_reg_state (vmcs12))return -EINVAL ; +if ((vmcs12->vm_entry_controls &VM_ENTRY_LOAD_IA32_PKRS ) && +CC (!kvm_pkrs_valid (vmcs12->guest_ia32_pkrs))) +return -EINVAL ; +return 0 ; }
@@ -3326,6 +3349,9 @@ enum nvmx_vmentry_status nested_vmx_enter_non_root_mode(struct kvm_vcpu *vcpu,if (kvm_mpx_supported () && !(vmcs12->vm_entry_controls &VM_ENTRY_LOAD_BNDCFGS )) vmx->nested.vmcs01_guest_bndcfgs =vmcs_read64 (GUEST_BNDCFGS ); +if (kvm_cpu_cap_has (X86_FEATURE_PKS ) && + !(vmcs12->vm_entry_controls &VM_ENTRY_LOAD_IA32_PKRS )) + vmx->nested.vmcs01_guest_pkrs =vmcs_read64 (GUEST_IA32_PKRS );/* * Overwrite vmcs01.GUEST_CR3 with L1's CR3 if EPT is disabled *and*
@@ -3929,6 +3955,7 @@ static bool is_vmcs12_ext_field(unsigned long field)case GUEST_IDTR_BASE :case GUEST_PENDING_DBG_EXCEPTIONS :case GUEST_BNDCFGS : +case GUEST_IA32_PKRS :return true;default :break ;
@@ -3980,6 +4007,8 @@ static void sync_vmcs02_to_vmcs12_rare(struct kvm_vcpu *vcpu,vmcs_readl (GUEST_PENDING_DBG_EXCEPTIONS );if (kvm_mpx_supported ()) vmcs12->guest_bndcfgs =vmcs_read64 (GUEST_BNDCFGS ); +if (guest_cpuid_has (vcpu,X86_FEATURE_PKS )) + vmcs12->guest_ia32_pkrs =vmcs_read64 (GUEST_IA32_PKRS ); vmx->nested.need_sync_vmcs02_to_vmcs12_rare = false; }
@@ -4215,6 +4244,9 @@ static void load_vmcs12_host_state(struct kvm_vcpu *vcpu,WARN_ON_ONCE (kvm_set_msr (vcpu,MSR_CORE_PERF_GLOBAL_CTRL , vmcs12->host_ia32_perf_global_ctrl)); +if (vmcs12->vm_exit_controls &VM_EXIT_LOAD_IA32_PKRS ) +vmcs_write64 (GUEST_IA32_PKRS , vmcs12->host_ia32_pkrs); +/* Set L1 segment info according to Intel SDM 27.5.2 Loading Host Segment and Descriptor-Table Registers */ seg = (struct kvm_segment ) {
@@ -6330,7 +6362,8 @@ void nested_vmx_setup_ctls_msrs(struct nested_vmx_msrs *msrs, u32 ept_caps)VM_EXIT_HOST_ADDR_SPACE_SIZE | #endifVM_EXIT_LOAD_IA32_PAT |VM_EXIT_SAVE_IA32_PAT | -VM_EXIT_CLEAR_BNDCFGS |VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL ; +VM_EXIT_CLEAR_BNDCFGS |VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL | +VM_EXIT_LOAD_IA32_PKRS ; msrs->exit_ctls_high |=VM_EXIT_ALWAYSON_WITHOUT_TRUE_MSR | VM_EXIT_LOAD_IA32_EFER | VM_EXIT_SAVE_IA32_EFER |
@@ -6350,7 +6383,7 @@ void nested_vmx_setup_ctls_msrs(struct nested_vmx_msrs *msrs, u32 ept_caps)VM_ENTRY_IA32E_MODE | #endifVM_ENTRY_LOAD_IA32_PAT |VM_ENTRY_LOAD_BNDCFGS | -VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL ; +VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL |VM_ENTRY_LOAD_IA32_PKRS ; msrs->entry_ctls_high |= (VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR |VM_ENTRY_LOAD_IA32_EFER );
arch/x86/kvm/vmx/vmcs12.c +2 -0
@@ -61,9 +61,11 @@ const unsigned short vmcs_field_to_offset_table[] = {FIELD64 (GUEST_PDPTR2 , guest_pdptr2),FIELD64 (GUEST_PDPTR3 , guest_pdptr3),FIELD64 (GUEST_BNDCFGS , guest_bndcfgs), +FIELD64 (GUEST_IA32_PKRS , guest_ia32_pkrs),FIELD64 (HOST_IA32_PAT , host_ia32_pat),FIELD64 (HOST_IA32_EFER , host_ia32_efer),FIELD64 (HOST_IA32_PERF_GLOBAL_CTRL , host_ia32_perf_global_ctrl), +FIELD64 (HOST_IA32_PKRS , host_ia32_pkrs),FIELD (PIN_BASED_VM_EXEC_CONTROL , pin_based_vm_exec_control),FIELD (CPU_BASED_VM_EXEC_CONTROL , cpu_based_vm_exec_control), FIELD(EXCEPTION_BITMAP, exception_bitmap),
arch/x86/kvm/vmx/vmcs12.h +5 -1
@@ -69,7 +69,9 @@ struct __packed vmcs12 {u64 vm_function_control;u64 eptp_list_address;u64 pml_address; -u64 padding64[3 ];/* room for future expansion */ +u64 guest_ia32_pkrs; +u64 host_ia32_pkrs; +u64 padding64[1 ];/* room for future expansion */ /* * To allow migration of L1 (complete with its L2 guests) between * machines of different natural widths (32 or 64 bit), we cannot have
@@ -256,6 +258,8 @@ static inline void vmx_check_vmcs12_offsets(void)CHECK_OFFSET (vm_function_control,296 );CHECK_OFFSET (eptp_list_address,304 );CHECK_OFFSET (pml_address,312 ); +CHECK_OFFSET (guest_ia32_pkrs,320 ); +CHECK_OFFSET (host_ia32_pkrs,328 );CHECK_OFFSET (cr0_guest_host_mask,344 );CHECK_OFFSET (cr4_guest_host_mask,352 );CHECK_OFFSET (cr0_read_shadow,360 );
arch/x86/kvm/vmx/vmx.c +10 -0
@@ -7198,6 +7198,7 @@ static void nested_vmx_cr_fixed1_bits_update(struct kvm_vcpu *vcpu)cr4_fixed1_update (X86_CR4_PKE , ecx,feature_bit (PKU ));cr4_fixed1_update (X86_CR4_UMIP , ecx,feature_bit (UMIP ));cr4_fixed1_update (X86_CR4_LA57 , ecx,feature_bit (LA57 )); +cr4_fixed1_update (X86_CR4_PKS , ecx,feature_bit (PKS ));#undef cr4_fixed1_update }
@@ -7217,6 +7218,15 @@ static void nested_vmx_entry_exit_ctls_update(struct kvm_vcpu *vcpu) vmx->nested.msrs.exit_ctls_high &= ~VM_EXIT_CLEAR_BNDCFGS ; } } + +if (kvm_cpu_cap_has (X86_FEATURE_PKS ) && +guest_cpuid_has (vcpu,X86_FEATURE_PKS )) { + vmx->nested.msrs.entry_ctls_high |=VM_ENTRY_LOAD_IA32_PKRS ; + vmx->nested.msrs.exit_ctls_high |=VM_EXIT_LOAD_IA32_PKRS ; + }else { + vmx->nested.msrs.entry_ctls_high &= ~VM_ENTRY_LOAD_IA32_PKRS ; + vmx->nested.msrs.exit_ctls_high &= ~VM_EXIT_LOAD_IA32_PKRS ; + } }static void update_intel_pt_cfg (struct kvm_vcpu *vcpu)
arch/x86/kvm/vmx/vmx.h +1 -0
@@ -155,6 +155,7 @@ struct nested_vmx {/* to migrate it to L2 if VM_ENTRY_LOAD_DEBUG_CONTROLS is off */ u64 vmcs01_debugctl;u64 vmcs01_guest_bndcfgs; +u64 vmcs01_guest_pkrs;/* to migrate it to L1 if L2 writes to L1's CR8 directly */ int l1_tpr_threshold;
Signature · 1 line
2.17.1
Paolo Bonzini
maintainerQuoted 71 lines · Chenyi Qiang
Protection Keys for Supervisor Pages(PKS) is a feature that extends the Protection Keys architecture to support thread-specific permission restrictions on supervisor pages.
PKS works similar to an existing feature named PKU(protecting user pages). They both perform an additional check after all legacy access permissions checks are done. If violated, #PF occurs and PFEC.PK bit will be set. PKS introduces MSR
IA32_PKRSto manage supervisor protection key rights. The MSR contains 16 pairs of ADi and WDi bits. Each pair advertises on a group of pages with the same key which is set in the leaf paging-structureentries(bits[62:59]). Currently,IA32_PKRSis not supported by XSAVES architecture.This patchset aims to add the virtualization of PKS in KVM. It implemented PKS CPUID enumeration, vmentry/vmexit configuration, MSR exposure, nested supported etc. Currently, PKS is not yet supported for shadow paging.
PKS bare metal support:
https://lore.kernel.org/lkml/[email protected]/Detailed information about PKS can be found in the latest Intel 64 and IA-32 Architectures Software Developer's Manual.
---
Changelogs:
v3->v4
- Make the MSR intercept and load-controls setting depend on CR4.PKS value
- shadow the guest pkrs and make it usable in PKS emultion
- add thecr4_pkeandcr4_pkscheck inpkr_maskupdate
- squash PATCH 2 and PATCH 5 to make the dependencies read more clear
- v3: https://lore.kernel.org/lkml/[email protected]/
v2->v3:
- No function changes since last submit
- rebase on the latest PKS kernel support:https://lore.kernel.org/lkml/[email protected]/- add
MSR_IA32_PKRSto the vmx_possible_passthrough_msrs[]
- RFC v2: https://lore.kernel.org/lkml/[email protected]/
v1->v2:
- rebase on the latest PKS kernel support:
https://github.com/weiny2/linux-kernel/tree/pks-rfc-v3
- add a kvm-unit-tests for PKS
- add the check inkvm_init_msr_listfor PKRS
- place theX86_CR4_PKSinmmu_role_bitsinkvm_set_cr4
- add the support to expose VM_{ENTRY, EXIT}_LOAD_IA32_PKRS in nested VMX MSR
- RFC v1: https://lore.kernel.org/lkml/[email protected]/---
Chenyi Qiang (5):
KVM: VMX: Introduce PKS VMCS fields
KVM: X86: Expose PKS to guest
KVM: MMU: Rename the pkru to pkr
KVM: MMU: Add support for PKS emulation
KVM: VMX: Enable PKS for nested VMarch/x86/include/asm/kvm_host.h | 17 +++--- arch/x86/include/asm/pkeys.h | 1 + arch/x86/include/asm/vmx.h | 6 ++ arch/x86/kvm/cpuid.c | 3 +- arch/x86/kvm/mmu.h | 23 ++++---- arch/x86/kvm/mmu/mmu.c | 81 +++++++++++++++------------ arch/x86/kvm/vmx/capabilities.h | 6 ++ arch/x86/kvm/vmx/nested.c | 38 ++++++++++++- arch/x86/kvm/vmx/vmcs.h | 1 + arch/x86/kvm/vmx/vmcs12.c | 2 +
Quoted 9 lines
arch/x86/kvm/vmx/vmcs12.h | 6 +- arch/x86/kvm/vmx/vmx.c | 99 +++++++++++++++++++++++++++++++-- arch/x86/kvm/vmx/vmx.h | 1 + arch/x86/kvm/x86.c | 11 +++- arch/x86/kvm/x86.h | 8 +++ arch/x86/mm/pkeys.c | 6 ++ include/linux/pkeys.h | 4 ++ 17 files changed, 249 insertions(+), 64 deletions(-)
Looks mostly good, but I'll only be able to include it after the bare metal implementation is in.
Paolo