| Message ID | 20200716031627.11492-1-weijiang.yang@intel.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | Introduce support for guest CET feature | expand |
On Thu, Jul 16, 2020 at 11:16:16AM +0800, Yang Weijiang wrote: > Control-flow Enforcement Technology (CET) provides protection against > Return/Jump-Oriented Programming (ROP/JOP) attack. There're two CET > sub-features: Shadow Stack (SHSTK) and Indirect Branch Tracking (IBT). > SHSTK is to prevent ROP programming and IBT is to prevent JOP programming. > > Several parts in KVM have been updated to provide VM CET support, including: > CPUID/XSAVES config, MSR pass-through, user space MSR access interface, > vmentry/vmexit config, nested VM etc. These patches have dependency on CET > kernel patches for xsaves support and CET definitions, e.g., MSR and related > feature flags. > > CET kernel patches are here: > https://lkml.kernel.org/r/20200429220732.31602-1-yu-cheng.yu@intel.com > > v13: > - Added CET definitions as a separate patch to facilitate KVM test. What I actually want to do is pull in actual kernel patches themselves so that we can upstream KVM support without having to wait for the kernel to sort out the ABI, which seems like it's going to drag on. I was thinking that we'd only need the MSR/CR4/CPUID definitions, but forgot that KVM also needs XSAVES context switching, so it's not as simple as I was thinking. It's still relatively simple, but it means there would be functional changes in the kernel. I'll respond to the main SSP series to pose the question of taking the two small-ish kernel patches through the KVM tree. > arch/x86/include/asm/kvm_host.h | 4 +- > arch/x86/include/asm/vmx.h | 8 + > arch/x86/include/uapi/asm/kvm.h | 1 + > arch/x86/include/uapi/asm/kvm_para.h | 7 +- > arch/x86/kvm/cpuid.c | 28 ++- > arch/x86/kvm/vmx/capabilities.h | 5 + > arch/x86/kvm/vmx/nested.c | 34 ++++ > arch/x86/kvm/vmx/vmcs12.c | 267 ++++++++++++++++----------- > arch/x86/kvm/vmx/vmcs12.h | 14 +- > arch/x86/kvm/vmx/vmx.c | 262 +++++++++++++++++++++++++- > arch/x86/kvm/x86.c | 53 +++++- > arch/x86/kvm/x86.h | 2 +- > include/linux/kvm_host.h | 32 ++++ > 13 files changed, 590 insertions(+), 127 deletions(-) I have quite a few comments/changes (will respond to individual patches), but have done all the updates/rework and, assuming I haven't broken things, we're nearing the point where I can carry this and push it past the finish line, e.g. get acks from tip/x86 maintainers for the kernel patches and send a pull request to Paolo. I pushed the result to: https://github.com/sean-jc/linux/releases/tag/kvm-cet-v14-rc1 can you please review and test? If everything looks good, I'll post v14. If not, I'll work offline with you to get it into shape. Thanks!
On Wed, Jul 22, 2020 at 12:48:05PM -0700, Sean Christopherson wrote: > On Thu, Jul 16, 2020 at 11:16:16AM +0800, Yang Weijiang wrote: > > Control-flow Enforcement Technology (CET) provides protection against > > Return/Jump-Oriented Programming (ROP/JOP) attack. There're two CET > > sub-features: Shadow Stack (SHSTK) and Indirect Branch Tracking (IBT). > > SHSTK is to prevent ROP programming and IBT is to prevent JOP programming. > > > > Several parts in KVM have been updated to provide VM CET support, including: > > CPUID/XSAVES config, MSR pass-through, user space MSR access interface, > > vmentry/vmexit config, nested VM etc. These patches have dependency on CET > > kernel patches for xsaves support and CET definitions, e.g., MSR and related > > feature flags. > > > > CET kernel patches are here: > > https://lkml.kernel.org/r/20200429220732.31602-1-yu-cheng.yu@intel.com > > > > v13: > > - Added CET definitions as a separate patch to facilitate KVM test. > > What I actually want to do is pull in actual kernel patches themselves so > that we can upstream KVM support without having to wait for the kernel to > sort out the ABI, which seems like it's going to drag on. That's an innovative idea and beyond my imagination, great!:-) > > I was thinking that we'd only need the MSR/CR4/CPUID definitions, but forgot > that KVM also needs XSAVES context switching, so it's not as simple as I was > thinking. It's still relatively simple, but it means there would be > functional changes in the kernel. > > I'll respond to the main SSP series to pose the question of taking the two > small-ish kernel patches through the KVM tree. > > > arch/x86/include/asm/kvm_host.h | 4 +- > > arch/x86/include/asm/vmx.h | 8 + > > arch/x86/include/uapi/asm/kvm.h | 1 + > > arch/x86/include/uapi/asm/kvm_para.h | 7 +- > > arch/x86/kvm/cpuid.c | 28 ++- > > arch/x86/kvm/vmx/capabilities.h | 5 + > > arch/x86/kvm/vmx/nested.c | 34 ++++ > > arch/x86/kvm/vmx/vmcs12.c | 267 ++++++++++++++++----------- > > arch/x86/kvm/vmx/vmcs12.h | 14 +- > > arch/x86/kvm/vmx/vmx.c | 262 +++++++++++++++++++++++++- > > arch/x86/kvm/x86.c | 53 +++++- > > arch/x86/kvm/x86.h | 2 +- > > include/linux/kvm_host.h | 32 ++++ > > 13 files changed, 590 insertions(+), 127 deletions(-) > > I have quite a few comments/changes (will respond to individual patches), > but have done all the updates/rework and, assuming I haven't broken things, > we're nearing the point where I can carry this and push it past the finish > line, e.g. get acks from tip/x86 maintainers for the kernel patches and > send a pull request to Paolo. > > I pushed the result to: > > https://github.com/sean-jc/linux/releases/tag/kvm-cet-v14-rc1 > > can you please review and test? If everything looks good, I'll post v14. > If not, I'll work offline with you to get it into shape. > Thanks a lot for the efforts! I'll review and test the new patches and let you know the status. > Thanks!
Control-flow Enforcement Technology (CET) provides protection against Return/Jump-Oriented Programming (ROP/JOP) attack. There're two CET sub-features: Shadow Stack (SHSTK) and Indirect Branch Tracking (IBT). SHSTK is to prevent ROP programming and IBT is to prevent JOP programming. Several parts in KVM have been updated to provide VM CET support, including: CPUID/XSAVES config, MSR pass-through, user space MSR access interface, vmentry/vmexit config, nested VM etc. These patches have dependency on CET kernel patches for xsaves support and CET definitions, e.g., MSR and related feature flags. CET kernel patches are here: https://lkml.kernel.org/r/20200429220732.31602-1-yu-cheng.yu@intel.com v13: - Added CET definitions as a separate patch to facilitate KVM test. - Disabled CET support in KVM if unrestricted_guest is turned off since in this case CET related instructions/infrastructure cannot be emulated well. - Don't expose CET feature to guest if host kernel doesn't support CET. - Rebased the series to v5.8-rc5, commit: 11ba468877bb v12: - Fixed a few issues per Sean and Paolo's review feeback. - Refactored patches to make them properly arranged. - Removed unnecessary hard-coded CET states for host/guest. - Added compile-time assertions for vmcs_field_to_offset_table to detect mismatch of the field type and field encoding number. - Added a custom MSR MSR_KVM_GUEST_SSP for guest active SSP save/restore. - Rebased patches to 5.7-rc3. v11: - Fixed a guest vmentry failure issue when guest reboots. - Used vm_xxx_control_{set, clear}bit() to avoid side effect, it'll clear cached data instead of pure VMCS field bits. - Added vcpu->arch.guest_supported_xss dedidated for guest runtime mask, this avoids supported_xss overwritten issue caused by an old qemu. - Separated vmentry/vmexit state setting with CR0/CR4 dependency check to make the patch more clear. - Added CET VMCS states in dump_vmcs() for debugging purpose. - Other refactor based on testing. - This patch serial is built on top of below branch and CET kernel patches for seeking xsaves support: https://git.kernel.org/pub/scm/virt/kvm/kvm.git/log/?h=cpu-caps v10: - Refactored code per Sean's review feedback. - Added CET support for nested VM. - Removed fix-patch for CPUID(0xd,N) enumeration as this part is done by Paolo and Sean. - This new patchset is based on Paolo's queued cpu_caps branch. - Modified patch per XSAVES related change. - Consolidated KVM unit-test patch with KVM patches. v9: - Refactored msr-check functions per Sean's feedback. - Fixed a few issues per Sean's suggestion. - Rebased patch to kernel-v5.4. - Moved CET CPUID feature bits and CR4.CET to last patch. v8: - Addressed Jim and Sean's feedback on: 1) CPUID(0xD,i) enumeration. 2) sanity check when configure guest CET. 3) function improvement. - Added more sanity check functions. - Set host vmexit default status so that guest won't leak CET status to host when vmexit. - Added CR0.WP vs. CR4.CET mutual constrains. v7: - Rebased patch to kernel v5.3 - Sean suggested to change CPUID(0xd, n) enumeration code as alined with existing one, and I think it's better to make the fix as an independent patch since XSS MSR are being used widely on X86 platforms. - Check more host and guest status before configure guest CET per Sean's feedback. - Add error-check before guest accesses CET MSRs per Sean's feedback. - Other minor fixes suggested by Sean. v6: - Rebase patch to kernel v5.2. - Move CPUID(0xD, n>=1) helper to a seperate patch. - Merge xsave size fix with other patch. - Other minor fixes per community feedback. v5: - Rebase patch to kernel v5.1. - Wrap CPUID(0xD, n>=1) code to a helper function. - Pass through MSR_IA32_PL1_SSP and MSR_IA32_PL2_SSP to Guest. - Add Co-developed-by expression in patch description. - Refine patch description. v4: - Add Sean's patch for loading Guest fpu state before access XSAVES managed CET MSRs. - Melt down CET bits setting into CPUID configuration patch. - Add VMX interface to query Host XSS. - Check Host and Guest XSS support bits before set Guest XSS. - Make Guest SHSTK and IBT feature enabling independent. - Do not report CET support to Guest when Host CET feature is Disabled. v3: - Modified patches to make Guest CET independent to Host enabling. - Added patch 8 to add user space access for Guest CET MSR access. - Modified code comments and patch description to reflect changes. v2: - Re-ordered patch sequence, combined one patch. - Added more description for CET related VMCS fields. - Added Host CET capability check while enabling Guest CET loading bit. - Added Host CET capability check while reporting Guest CPUID(EAX=7, EXC=0). - Modified code in reporting Guest CPUID(EAX=D,ECX>=1), make it clearer. - Added Host and Guest XSS mask check while setting bits for Guest XSS. Sean Christopherson (1): KVM: x86: Load guest fpu state when access MSRs managed by XSAVES Yang Weijiang (10): KVM: x86: Include CET definitions for KVM test purpose KVM: VMX: Introduce CET VMCS fields and flags KVM: VMX: Set guest CET MSRs per KVM and host configuration KVM: VMX: Configure CET settings upon guest CR0/4 changing KVM: x86: Refresh CPUID once guest changes XSS bits KVM: x86: Add userspace access interface for CET MSRs KVM: VMX: Enable CET support for nested VM KVM: VMX: Add VMCS dump and sanity check for CET states KVM: x86: Add #CP support in guest exception dispatch KVM: x86: Enable CET virtualization and advertise CET to userspace arch/x86/include/asm/kvm_host.h | 4 +- arch/x86/include/asm/vmx.h | 8 + arch/x86/include/uapi/asm/kvm.h | 1 + arch/x86/include/uapi/asm/kvm_para.h | 7 +- arch/x86/kvm/cpuid.c | 28 ++- arch/x86/kvm/vmx/capabilities.h | 5 + arch/x86/kvm/vmx/nested.c | 34 ++++ arch/x86/kvm/vmx/vmcs12.c | 267 ++++++++++++++++----------- arch/x86/kvm/vmx/vmcs12.h | 14 +- arch/x86/kvm/vmx/vmx.c | 262 +++++++++++++++++++++++++- arch/x86/kvm/x86.c | 53 +++++- arch/x86/kvm/x86.h | 2 +- include/linux/kvm_host.h | 32 ++++ 13 files changed, 590 insertions(+), 127 deletions(-)