FAILED: patch "[PATCH] KVM: x86: Disallow EFER.LME and EFER.LMA if long mode is not" failed to apply to 7.2-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 7.2-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-7.2.y
git checkout FETCH_HEAD
git cherry-pick -x e62392bf39ebfdf60d1d082799397fe1cbf8dfc5
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026090914-waviness-supermom-9b84@gregkh' --subject-prefix 'PATCH 7.2.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From e62392bf39ebfdf60d1d082799397fe1cbf8dfc5 Mon Sep 17 00:00:00 2001
From: Yosry Ahmed <[email protected]>
Date: Mon, 13 Jul 2026 18:10:17 +0000
Subject: [PATCH] KVM: x86: Disallow EFER.LME and EFER.LMA if long mode is not
supported
Remove EFER.LME and EFER.LMA from EFER reserved bits only if long mode is actually supported. KVM does check long-mode support before allowing the bits for guest writes and userspace writes through KVM_SET_SREGS* (in __kvm_valid_efer()), but userspace writes through KVM_SET_MSRS only check reserved bits.
In practice, this doesn't really matter. The true motiviation is getting rid of the #ifdeffery when initializing efer_reserved_bits.
arch/x86/kvm/msrs.c +1 -9
@@ -19,16 +19,8 @@ bool __read_mostly report_ignored_msrs = true;module_param (report_ignored_msrs, bool,0644 );EXPORT_SYMBOL_FOR_KVM_INTERNAL (report_ignored_msrs); -/* EFER defaults: -* - enable syscall per default because its emulated by KVM -* - enable LME and LMA per default on 64 bit KVM -*/ -#ifdef CONFIG_X86_64 -static -u64 __read_mostly efer_reserved_bits = ~((u64)(EFER_SCE |EFER_LME |EFER_LMA )); -#else +/* Enable syscall by default because its emulated by KVM */ static u64 __read_mostly efer_reserved_bits = ~((u64 )EFER_SCE ); -#endif #define MAX_IO_MSRS 256
arch/x86/kvm/x86.c +3 -0
@@ -6910,6 +6910,9 @@ EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_setup_xss_caps);static void kvm_setup_efer_caps (void ) { +if (kvm_cpu_cap_has (X86_FEATURE_LM )) +kvm_enable_efer_bits (EFER_LME |EFER_LMA ); +if (kvm_cpu_cap_has (X86_FEATURE_NX ))kvm_enable_efer_bits (EFER_NX );
Sasha Levin
maintainerPATCH 1/9 KVM: x86: Rename __{g,s}et_sregs2() => kvm_vcpu_ioctl_x86_{g,s}et_sregs2()
From: Sean Christopherson <[email protected]>
[ Upstream commit bd130c8d72a1c7dde5523b3f3fae9867eafaa1dc ]
Rename the KVM_{G,S}ET_SREGS2 helpers in anticipation of moving them out of x86.c (while leaving the ioctl dispatch behind). Having globally visible APIs named __{g,s}et_sregs2() would be "fine", but ugly, given that __{g,s}et_sregs() will NOT be globally visible. As a bonus, this makes it a bit more obvious that the helpers implement newer versions of kvm_arch_vcpu_ioctl_set_sregs().
No functional change intended.
Message-ID: <[email protected]>
Stable-dep-of: e62392bf39eb ("KVM: x86: Disallow EFER.LME and EFER.LMA if long mode is not supported")
--- arch/x86/kvm/x86.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
arch/x86/kvm/x86.c +10 -6
@@ -133,8 +133,10 @@ static void __kvm_set_rflags(struct kvm_vcpu *vcpu, unsigned long rflags);static void store_regs (struct kvm_vcpu *vcpu);static int sync_regs (struct kvm_vcpu *vcpu); -static int __set_sregs2 (struct kvm_vcpu *vcpu,struct kvm_sregs2 *sregs2); -static void __get_sregs2 (struct kvm_vcpu *vcpu,struct kvm_sregs2 *sregs2); +static int kvm_vcpu_ioctl_x86_set_sregs2 (struct kvm_vcpu *vcpu, +struct kvm_sregs2 *sregs2); +static void kvm_vcpu_ioctl_x86_get_sregs2 (struct kvm_vcpu *vcpu, +struct kvm_sregs2 *sregs2);static DEFINE_MUTEX (vendor_module_lock);static void kvm_load_guest_fpu (struct kvm_vcpu *vcpu);
@@ -6623,7 +6625,7 @@ long kvm_arch_vcpu_ioctl(struct file *filp, r = -ENOMEM ;if (!u.sregs2) goto out; -__get_sregs2 (vcpu, u.sregs2); +kvm_vcpu_ioctl_x86_get_sregs2 (vcpu, u.sregs2); r = -EFAULT ;if (copy_to_user (argp, u.sregs2,sizeof (struct kvm_sregs2 ))) goto out;
@@ -6642,7 +6644,7 @@ long kvm_arch_vcpu_ioctl(struct file *filp, u.sregs2 =NULL ; goto out; } - r =__set_sregs2 (vcpu, u.sregs2); + r =kvm_vcpu_ioctl_x86_set_sregs2 (vcpu, u.sregs2);break ; }case KVM_HAS_DEVICE_ATTR :
@@ -12215,7 +12217,8 @@ static void __get_sregs(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs) (unsigned long *)sregs->interrupt_bitmap); } -static void __get_sregs2 (struct kvm_vcpu *vcpu,struct kvm_sregs2 *sregs2) +static void kvm_vcpu_ioctl_x86_get_sregs2 (struct kvm_vcpu *vcpu, +struct kvm_sregs2 *sregs2) {int i;
@@ -12483,7 +12486,8 @@ static int __set_sregs(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs)return 0 ; } -static int __set_sregs2 (struct kvm_vcpu *vcpu,struct kvm_sregs2 *sregs2) +static int kvm_vcpu_ioctl_x86_set_sregs2 (struct kvm_vcpu *vcpu, +struct kvm_sregs2 *sregs2) {int mmu_reset_needed =0 ;bool valid_pdptrs = sregs2->flags &KVM_SREGS2_FLAGS_PDPTRS_VALID ;
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/9 KVM: x86: Move kvm_caps and kvm_host_values to asm/kvm_host.h
From: Sean Christopherson <[email protected]>
[ Upstream commit 9d2180ac561f9f7e73ec2b8f1834dfd0920c8e2e ]
Relocate the kvm_caps and kvm_host_values struct definitions and their associated global variable declarations to asm/kvm_host.h to allow for a variety of cleanups in x86.h and mmu.h, and to establish a (hopefully) maintainable rule that asm/kvm_host.h's role is to define common structures (and declare any associated globals), and anything needed by arch-neutral KVM.
While it would be lovely to trim kvm_host.h down to the point where it *only* holds things needed by arch-neutral and/or non-KVM code, multiple attempts to do just that have failed miserably. Trying to "hide" code from arch-neutral KVM is too restrictive (and ultimately pointless), and KVM x86 itself also needs a place to define common structures and their globals, e.g. to avoid inconsistent header include chains and/or misplaced helpers.
E.g. as pointed out by Kai, it's weird that x86.h, which is a kitchen sink of sorts, includes regs.h, but not mmu.h. Literally the only reason that x86.h doesn't include mmu.h is that mmu.h references kvm_host, which is currently defined in x86.h. As a result of odd include ordering, the very clearly MMU-specific helper mmu_is_nested() lives in x86.h, not mmu.h
"Fix" the kvm_host dependency so that x86.h can be the "central" include everyone expects it to be, and set KVM x86 on the path to having somewhat sensible "rules" for what goes where:
- asm/kvm_host.h holds "common" structure definitions and associated key global variables, and things that are referenced by arch-neutral KVM.
- <thing>.{c,h} holds relevant declarations and definitions.
- x86.{c,h} is the kitchen sink for everything else.
Message-ID: <[email protected]>
Stable-dep-of: e62392bf39eb ("KVM: x86: Disallow EFER.LME and EFER.LMA if long mode is not supported")
--- arch/x86/include/asm/kvm_host.h | 44 ++++++++++++++++++++++++++++++++ arch/x86/kvm/x86.h | 45 --------------------------------- 2 files changed, 44 insertions(+), 45 deletions(-)
arch/x86/include/asm/kvm_host.h +44 -0
@@ -315,6 +315,50 @@ enum x86_intercept_stage;struct kvm_kernel_irqfd ;struct kvm_kernel_irq_routing_entry ; +struct kvm_caps { +/* control of guest tsc rate supported? */ +bool has_tsc_control; +/* maximum supported tsc_khz for guests */ +u32 max_guest_tsc_khz; +/* number of bits of the fractional part of the TSC scaling ratio */ +u8 tsc_scaling_ratio_frac_bits; +/* maximum allowed value of TSC scaling ratio */ +u64 max_tsc_scaling_ratio; +/* 1ull << kvm_caps.tsc_scaling_ratio_frac_bits */ +u64 default_tsc_scaling_ratio; +/* bus lock detection supported? */ +bool has_bus_lock_exit; +/* notify VM exit supported? */ +bool has_notify_vmexit; +/* bit mask of VM types */ +u32 supported_vm_types; + +u64 supported_mce_cap; +u64 supported_xcr0; +u64 supported_xss; +u64 supported_perf_cap; + +u64 supported_quirks; +u64 inapplicable_quirks; +}; +extern struct kvm_caps kvm_caps; + +struct kvm_host_values { +/* +* The host's raw MAXPHYADDR, i.e. the number of non-reserved physical +* address bits irrespective of features that repurpose legal bits, +* e.g. MKTME. +*/ +u8 maxphyaddr; + +u64 efer; +u64 xcr0; +u64 xss; +u64 s_cet; +u64 arch_capabilities; +}; +extern struct kvm_host_values kvm_host; +/* * kvm_mmu_page_role tracks the properties of a shadow page (where shadow page * also includes TDP pages) to determine whether or not a page can be used in
arch/x86/kvm/x86.h +0 -45
57 lines not on this page · raw message
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 3/9 KVM: x86: Swap the include order between x86.h and mmu.h
In reply to Sasha LevinFrom: Sean Christopherson <[email protected]>
[ Upstream commit febae924e83017834994054916dd612266aa1e5d ]
Invert the include ordering between x86.h and mmu.h, and move mmu_is_nested() to mmu.h where it belongs (mmu_is_nested()'s placement in x86.h was solely responsible for the existing ordering), so that x86.h is not included by most KVM internal headers (but includes them).
No functional change intended.
Message-ID: <[email protected]>
Stable-dep-of: e62392bf39eb ("KVM: x86: Disallow EFER.LME and EFER.LMA if long mode is not supported")
--- arch/x86/kvm/mmu.h | 6 +++++- arch/x86/kvm/x86.h | 6 +----- 2 files changed, 6 insertions(+), 6 deletions(-)
arch/x86/kvm/mmu.h +5 -1
@@ -4,7 +4,6 @@#include <linux/kvm_host.h> #include "regs.h" -#include "x86.h" #include "cpuid.h" extern bool __read_mostly enable_mmio_caching;
@@ -300,6 +299,11 @@ static inline void kvm_update_page_stats(struct kvm *kvm, int level, int count)atomic64_add (count, &kvm->stat.pages[level -1 ]); } +static inline bool mmu_is_nested (struct kvm_vcpu *vcpu) +{ +return vcpu->arch.mmu == &vcpu->arch.guest_mmu; +} + static inline gpa_t kvm_translate_gpa(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu, gpa_t gpa, u64 access,
arch/x86/kvm/x86.h +1 -5
@@ -6,6 +6,7 @@#include <asm/fpu/xstate.h> #include <asm/mce.h> #include <asm/pvclock.h> +#include "mmu.h" #include "regs.h" #include "kvm_emulate.h" #include "cpuid.h"
@@ -210,11 +211,6 @@ static inline bool x86_exception_has_error_code(unsigned int vector)return (1U << vector) & exception_has_error_code; } -static inline bool mmu_is_nested (struct kvm_vcpu *vcpu) -{ -return vcpu->arch.mmu == &vcpu->arch.guest_mmu; -} -static inline u8 vcpu_virt_addr_bits (struct kvm_vcpu *vcpu) {return kvm_is_cr4_bit_set (vcpu,X86_CR4_LA57 ) ?57 :48 ;
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 4/9 KVM: x86: Move eager_page_split to mmu.{c,h}
In reply to Sasha LevinFrom: Sean Christopherson <[email protected]>
[ Upstream commit cde542b6526639571a848e1d70f8ff6817e40e4e ]
Move KVM's eager_page_split module param to the MMU, as it is very much an MMU knob.
No functional change intended.
Message-ID: <[email protected]>
Stable-dep-of: e62392bf39eb ("KVM: x86: Disallow EFER.LME and EFER.LMA if long mode is not supported")
--- arch/x86/kvm/mmu.h | 1 + arch/x86/kvm/mmu/mmu.c | 3 +++ arch/x86/kvm/x86.c | 3 --- arch/x86/kvm/x86.h | 2 -- 4 files changed, 4 insertions(+), 5 deletions(-)
arch/x86/kvm/mmu.h +1 -0
@@ -7,6 +7,7 @@#include "cpuid.h" extern bool __read_mostly enable_mmio_caching; +extern bool eager_page_split;#define PT_WRITABLE_SHIFT 1#define PT_USER_SHIFT 2
arch/x86/kvm/mmu/mmu.c +3 -0
@@ -115,6 +115,9 @@ module_param_named(tdp_mmu, tdp_mmu_enabled, bool, 0444);EXPORT_SYMBOL_FOR_KVM_INTERNAL (tdp_mmu_enabled);#endif +bool __read_mostly eager_page_split = true; +module_param (eager_page_split, bool,0644 ); +static int max_huge_page_level__read_mostly ;static int tdp_root_level__read_mostly ;static int max_tdp_level__read_mostly ;
arch/x86/kvm/x86.c +0 -3
@@ -183,9 +183,6 @@ module_param(force_emulation_prefix, int, 0644);int __read_mostly pi_inject_timer =-1 ;module_param (pi_inject_timer, bint,0644 ); -bool __read_mostly eager_page_split = true; -module_param (eager_page_split, bool,0644 ); -/* Enable/disable SMT_RSB bug mitigation */ static bool __read_mostly mitigate_smt_rsb;module_param (mitigate_smt_rsb, bool,0444 );
arch/x86/kvm/x86.h +0 -2
@@ -414,8 +414,6 @@ extern int pi_inject_timer;extern bool report_ignored_msrs; -extern bool eager_page_split; -static inline void kvm_pr_unimpl_wrmsr (struct kvm_vcpu *vcpu,u32 msr,u64 data) {if (report_ignored_msrs)
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 5/9 KVM: x86: Move kvm_{load,put}_guest_fpu() to fpu.h
In reply to Sasha LevinFrom: Sean Christopherson <[email protected]>
[ Upstream commit c392e508ffb0792b9e974ce65b10f5363aefc719 ]
Move the kvm_{load,put}_guest_fpu() helpers to fpu.h in anticipation of moving the bulk of KVM's MSR handling code out of x86.c. KVM needs to load and put the FPU when accessing MSRs that are managed via XSTATE, a.k.a. the so called "FPU".
No functional change intended.
Message-ID: <[email protected]>
Stable-dep-of: e62392bf39eb ("KVM: x86: Disallow EFER.LME and EFER.LMA if long mode is not supported")
--- arch/x86/kvm/fpu.h | 26 ++++++++++++++++++++++++++ arch/x86/kvm/x86.c | 24 ------------------------ 2 files changed, 26 insertions(+), 24 deletions(-)
arch/x86/kvm/fpu.h +26 -0
@@ -3,8 +3,34 @@#ifndef __KVM_FPU_H_#define __KVM_FPU_H_ +#include <linux/kvm_host.h> + +#include <trace/events/kvm.h> +#include <asm/fpu/api.h> +/* Swap (qemu) user FPU context for the guest FPU context. */ +static inline void kvm_load_guest_fpu (struct kvm_vcpu *vcpu) +{ +if (KVM_BUG_ON (vcpu->arch.guest_fpu.fpstate->in_use, vcpu->kvm)) +return ; + +/* Exclude PKRU, it's restored separately immediately after VM-Exit. */ +fpu_swap_kvm_fpstate (&vcpu->arch.guest_fpu, true); +trace_kvm_fpu (1 ); +} + +/* When vcpu_run ends, restore user space FPU context. */ +static inline void kvm_put_guest_fpu (struct kvm_vcpu *vcpu) +{ +if (KVM_BUG_ON (!vcpu->arch.guest_fpu.fpstate->in_use, vcpu->kvm)) +return ; + +fpu_swap_kvm_fpstate (&vcpu->arch.guest_fpu, false); + ++vcpu->stat.fpu_reload; +trace_kvm_fpu (0 ); +} + typedef u32 __attribute__((vector_size(16))) sse128_t;#define __sse128_u union { sse128_t vec; u64 as_u64[2]; u32 as_u32[4]; }#define sse128_lo (x) ({ __sse128_u t; t.vec = x; t.as_u64[0]; })
arch/x86/kvm/x86.c +0 -24
@@ -139,8 +139,6 @@ static void kvm_vcpu_ioctl_x86_get_sregs2(struct kvm_vcpu *vcpu, struct kvm_sregs2 *sregs2);static DEFINE_MUTEX (vendor_module_lock); -static void kvm_load_guest_fpu (struct kvm_vcpu *vcpu); -static void kvm_put_guest_fpu (struct kvm_vcpu *vcpu);struct kvm_x86_ops kvm_x86_ops__read_mostly ;
@@ -11901,28 +11899,6 @@ static int complete_emulated_mmio(struct kvm_vcpu *vcpu)return 0 ; } -/* Swap (qemu) user FPU context for the guest FPU context. */ -static void kvm_load_guest_fpu (struct kvm_vcpu *vcpu) -{ -if (KVM_BUG_ON (vcpu->arch.guest_fpu.fpstate->in_use, vcpu->kvm)) -return ; - -/* Exclude PKRU, it's restored separately immediately after VM-Exit. */ -fpu_swap_kvm_fpstate (&vcpu->arch.guest_fpu, true); -trace_kvm_fpu (1 ); -} - -/* When vcpu_run ends, restore user space FPU context. */ -static void kvm_put_guest_fpu (struct kvm_vcpu *vcpu) -{ -if (KVM_BUG_ON (!vcpu->arch.guest_fpu.fpstate->in_use, vcpu->kvm)) -return ; - -fpu_swap_kvm_fpstate (&vcpu->arch.guest_fpu, false); - ++vcpu->stat.fpu_reload; -trace_kvm_fpu (0 ); -} -static int kvm_x86_vcpu_pre_run (struct kvm_vcpu *vcpu) {/*
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 6/9 KVM: x86: Extract get/set MSR (list) ioctl logic to helpers
In reply to Sasha LevinFrom: Sean Christopherson <[email protected]>
[ Upstream commit 57412a311f8f575a97b64fdc46c9a45a40076559 ]
Extract the code for getting/setting MSRs and MSR lists to dedicated helpers in anticipation of moving the MSR code to a new msrs.c.
No functional change intended.
Message-ID: <[email protected]>
Stable-dep-of: e62392bf39eb ("KVM: x86: Disallow EFER.LME and EFER.LMA if long mode is not supported")
--- arch/x86/kvm/x86.c | 135 ++++++++++++++++++++++++++------------------- 1 file changed, 78 insertions(+), 57 deletions(-)
arch/x86/kvm/x86.c +78 -57
@@ -5016,6 +5016,61 @@ static int kvm_x86_dev_has_attr(struct kvm_device_attr *attr)return __kvm_x86_dev_get_attr (attr, &val); } +static int kvm_get_msr_index_list (struct kvm_msr_list __user *user_msr_list) +{ +struct kvm_msr_list msr_list; +unsigned int n; + +if (copy_from_user (&msr_list, user_msr_list,sizeof (msr_list))) +return -EFAULT ; + + n = msr_list.nmsrs; + msr_list.nmsrs = num_msrs_to_save + num_emulated_msrs; +if (copy_to_user (user_msr_list, &msr_list,sizeof (msr_list))) +return -EFAULT ; + +if (n < msr_list.nmsrs) +return -E2BIG ; + +if (copy_to_user (user_msr_list->indices, &msrs_to_save, + num_msrs_to_save *sizeof (u32))) +return -EFAULT ; + +if (copy_to_user (user_msr_list->indices + num_msrs_to_save, + &emulated_msrs, num_emulated_msrs *sizeof (u32))) +return -EFAULT ; + +return 0 ; +} + +static int kvm_get_feature_msr_index_list (struct kvm_msr_list __user *user_msr_list) +{ +struct kvm_msr_list msr_list; +unsigned int n; + +if (copy_from_user (&msr_list, user_msr_list,sizeof (msr_list))) +return -EFAULT ; + + n = msr_list.nmsrs; + msr_list.nmsrs = num_msr_based_features; +if (copy_to_user (user_msr_list, &msr_list,sizeof (msr_list))) +return -EFAULT ; + +if (n < msr_list.nmsrs) +return -E2BIG ; + +if (copy_to_user (user_msr_list->indices, &msr_based_features, + num_msr_based_features *sizeof (u32))) +return -EFAULT ; + +return 0 ; +} + +static int kvm_get_feature_msrs (struct kvm_msrs __user *user_msrs) +{ +return msr_io (NULL , user_msrs, do_get_feature_msr,1 ); +} +long kvm_arch_dev_ioctl (struct file *filp,unsigned int ioctl,unsigned long arg) {
@@ -5023,32 +5078,9 @@ long kvm_arch_dev_ioctl(struct file *filp,long r;switch (ioctl) { -case KVM_GET_MSR_INDEX_LIST : { -struct kvm_msr_list __user *user_msr_list = argp; -struct kvm_msr_list msr_list; -unsigned n; - - r = -EFAULT ; -if (copy_from_user (&msr_list, user_msr_list,sizeof (msr_list))) - goto out; - n = msr_list.nmsrs; - msr_list.nmsrs = num_msrs_to_save + num_emulated_msrs; -if (copy_to_user (user_msr_list, &msr_list,sizeof (msr_list))) - goto out; - r = -E2BIG ; -if (n < msr_list.nmsrs) - goto out; - r = -EFAULT ; -if (copy_to_user (user_msr_list->indices, &msrs_to_save, - num_msrs_to_save *sizeof (u32))) - goto out; -if (copy_to_user (user_msr_list->indices + num_msrs_to_save, - &emulated_msrs, - num_emulated_msrs *sizeof (u32))) - goto out; - r =0 ; +case KVM_GET_MSR_INDEX_LIST : + r =kvm_get_msr_index_list (argp);break ; - }case KVM_GET_SUPPORTED_CPUID :case KVM_GET_EMULATED_CPUID : {struct kvm_cpuid2 __user *cpuid_arg = argp;
@@ -5076,30 +5108,11 @@ long kvm_arch_dev_ioctl(struct file *filp, goto out; r =0 ;break ; -case KVM_GET_MSR_FEATURE_INDEX_LIST : { -struct kvm_msr_list __user *user_msr_list = argp; -struct kvm_msr_list msr_list; -unsigned int n; - - r = -EFAULT ; -if (copy_from_user (&msr_list, user_msr_list,sizeof (msr_list))) - goto out; - n = msr_list.nmsrs; - msr_list.nmsrs = num_msr_based_features; -if (copy_to_user (user_msr_list, &msr_list,sizeof (msr_list))) - goto out; - r = -E2BIG ; -if (n < msr_list.nmsrs) - goto out; - r = -EFAULT ; -if (copy_to_user (user_msr_list->indices, &msr_based_features, - num_msr_based_features *sizeof (u32))) - goto out; - r =0 ; +case KVM_GET_MSR_FEATURE_INDEX_LIST : + r =kvm_get_feature_msr_index_list (argp);break ; - }case KVM_GET_MSRS : - r =msr_io (NULL , argp, do_get_feature_msr,1 ); + r =kvm_get_feature_msrs (argp);break ;#ifdef CONFIG_KVM_HYPERV case KVM_GET_SUPPORTED_HV_CPUID :
@@ -6183,6 +6196,20 @@ static int kvm_get_reg_list(struct kvm_vcpu *vcpu,return 0 ; } +static int kvm_get_msrs (struct kvm_vcpu *vcpu,struct kvm_msrs __user *user_msrs) +{ +guard (srcu)(&vcpu->kvm->srcu); + +return msr_io (vcpu, user_msrs, do_get_msr,1 ); +} + +static int kvm_set_msrs (struct kvm_vcpu *vcpu,struct kvm_msrs __user *user_msrs) +{ +guard (srcu)(&vcpu->kvm->srcu); + +return msr_io (vcpu, user_msrs, do_set_msr,0 ); +} +long kvm_arch_vcpu_ioctl (struct file *filp,unsigned int ioctl,unsigned long arg) {
@@ -6287,18 +6314,12 @@ long kvm_arch_vcpu_ioctl(struct file *filp, r =0 ;break ; } -case KVM_GET_MSRS : { -int idx =srcu_read_lock (&vcpu->kvm->srcu); - r =msr_io (vcpu, argp, do_get_msr,1 ); -srcu_read_unlock (&vcpu->kvm->srcu, idx); +case KVM_GET_MSRS : + r =kvm_get_msrs (vcpu, argp);break ; - } -case KVM_SET_MSRS : { -int idx =srcu_read_lock (&vcpu->kvm->srcu); - r =msr_io (vcpu, argp, do_set_msr,0 ); -srcu_read_unlock (&vcpu->kvm->srcu, idx); +case KVM_SET_MSRS : + r =kvm_set_msrs (vcpu, argp);break ; - }case KVM_GET_ONE_REG :case KVM_SET_ONE_REG : r =kvm_get_set_one_reg (vcpu, ioctl, argp);
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 7/9 KVM: x86: Expose several TSC helpers via x86.h for use by MSR code
In reply to Sasha LevinFrom: Sean Christopherson <[email protected]>
[ Upstream commit 9d13832ced63160ca67b6c72868b794cbcda556d ]
Begrudgingly move adjust_tsc_offset_{guest,host}() to x86.h as inlines, and expose several other TSC helpers in anticipation of moving KVM's MSR code to a dedicated msrs.c. Unfortunately for KVM, several MSRs that KVM emulates can affect TSC state.
Opportunistically drop a superfluous local "tsc_offset" variable, whose existence causes checkpatch to complain about lack of a blank line.
No functional change intended.
Message-ID: <[email protected]>
Stable-dep-of: e62392bf39eb ("KVM: x86: Disallow EFER.LME and EFER.LMA if long mode is not supported")
--- arch/x86/kvm/x86.c | 22 +++------------------- arch/x86/kvm/x86.h | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 19 deletions(-)
arch/x86/kvm/x86.c +3 -19
@@ -2639,7 +2639,7 @@ u64 kvm_scale_tsc(u64 tsc, u64 ratio)return _tsc; } -static u64 kvm_compute_l1_tsc_offset (struct kvm_vcpu *vcpu,u64 target_tsc) +u64 kvm_compute_l1_tsc_offset (struct kvm_vcpu *vcpu,u64 target_tsc) {u64 tsc;
@@ -2680,7 +2680,7 @@ u64 kvm_calc_nested_tsc_multiplier(u64 l1_multiplier, u64 l2_multiplier) }EXPORT_SYMBOL_FOR_KVM_INTERNAL (kvm_calc_nested_tsc_multiplier); -static void kvm_vcpu_write_tsc_offset (struct kvm_vcpu *vcpu,u64 l1_offset) +void kvm_vcpu_write_tsc_offset (struct kvm_vcpu *vcpu,u64 l1_offset) {if (vcpu->arch.guest_tsc_protected)return ;
@@ -2794,7 +2794,7 @@ static void __kvm_synchronize_tsc(struct kvm_vcpu *vcpu, u64 offset, u64 tsc,kvm_track_tsc_matching (vcpu, !matched); } -static void kvm_synchronize_tsc (struct kvm_vcpu *vcpu,u64 *user_value) +void kvm_synchronize_tsc (struct kvm_vcpu *vcpu,u64 *user_value) {u64 data = user_value ? *user_value :0 ;struct kvm *kvm = vcpu->kvm;
@@ -2862,22 +2862,6 @@ static void kvm_synchronize_tsc(struct kvm_vcpu *vcpu, u64 *user_value)raw_spin_unlock_irqrestore (&kvm->arch.tsc_write_lock, flags); } -static inline void adjust_tsc_offset_guest (struct kvm_vcpu *vcpu, -s64 adjustment) -{ -u64 tsc_offset = vcpu->arch.l1_tsc_offset; -kvm_vcpu_write_tsc_offset (vcpu, tsc_offset + adjustment); -} - -static inline void adjust_tsc_offset_host (struct kvm_vcpu *vcpu,s64 adjustment) -{ -if (vcpu->arch.l1_tsc_scaling_ratio != kvm_caps.default_tsc_scaling_ratio) -WARN_ON (adjustment <0 ); - adjustment =kvm_scale_tsc ((u64 ) adjustment, - vcpu->arch.l1_tsc_scaling_ratio); -adjust_tsc_offset_guest (vcpu, adjustment); -} -#ifdef CONFIG_X86_64 static u64 read_tsc (void )
arch/x86/kvm/x86.h +19 -0
@@ -345,6 +345,25 @@ uint64_t kvm_get_wall_clock_epoch(struct kvm *kvm);bool kvm_get_monotonic_and_clockread (s64 *kernel_ns,u64 *tsc_timestamp);int kvm_guest_time_update (struct kvm_vcpu *v); +void kvm_synchronize_tsc (struct kvm_vcpu *vcpu,u64 *user_value); +u64 kvm_compute_l1_tsc_offset (struct kvm_vcpu *vcpu,u64 target_tsc); +void kvm_vcpu_write_tsc_offset (struct kvm_vcpu *vcpu,u64 l1_offset); + +static inline void adjust_tsc_offset_guest (struct kvm_vcpu *vcpu, +s64 adjustment) +{ +kvm_vcpu_write_tsc_offset (vcpu, vcpu->arch.l1_tsc_offset + adjustment); +} + +static inline void adjust_tsc_offset_host (struct kvm_vcpu *vcpu,s64 adjustment) +{ +if (vcpu->arch.l1_tsc_scaling_ratio != kvm_caps.default_tsc_scaling_ratio) +WARN_ON (adjustment <0 ); + adjustment =kvm_scale_tsc ((u64 ) adjustment, + vcpu->arch.l1_tsc_scaling_ratio); +adjust_tsc_offset_guest (vcpu, adjustment); +} +int kvm_read_guest_virt (struct kvm_vcpu *vcpu,gva_t addr,void *val,unsigned int bytes,struct x86_exception *exception);
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 8/9 KVM: x86: Move the bulk of MSR specific code from x86.c to msrs.{c,h}
In reply to Sasha LevinFrom: Sean Christopherson <[email protected]>
[ Upstream commit 7a268308015843c7e8b15dda588b2e9adf45223f ]
Introduce msrs.{c,h}, and move the vast majority of MSR specific code out of x86.{c,h}. Use a plural "msrs" instead of just "msr" to be consistent with regs.{c,h}, and to make it easier to differentiate KVM's code from the other 5+ msr.c files in the kernel.
Opportunistically drop the "x86.h" include from mtrr.c, mostly as proof that the bulk of the MSR code is indeed being relocated to msrs.c.
No functional change intended.
Message-ID: <[email protected]>
Stable adaptation: this tree retains the register code in x86.c and does not contain regs.c. Add msrs.o to its existing KVM object list without importing the upstream regs.o entry. Keep the MSR relocation so e62392bf39eb can update efer_reserved_bits in msrs.c and kvm_setup_efer_caps() in x86.c without conflicts.
Stable-dep-of: e62392bf39eb ("KVM: x86: Disallow EFER.LME and EFER.LMA if long mode is not supported")
--- arch/x86/kvm/Makefile | 2 +- arch/x86/kvm/msrs.c | 2732 +++++++++++++++++++++++ arch/x86/kvm/msrs.h | 128 ++ arch/x86/kvm/mtrr.c | 2 +- arch/x86/kvm/x86.c | 4816 +++++++++-------------------------------- arch/x86/kvm/x86.h | 87 +- 6 files changed, 3920 insertions(+), 3847 deletions(-) create mode 100644 arch/x86/kvm/msrs.c create mode 100644 arch/x86/kvm/msrs.h
arch/x86/kvm/Makefile +1 -1
@@ -5,7 +5,7 @@ ccflags-$(CONFIG_KVM_WERROR) += -Werror include $(srctree)/virt/kvm/Makefile.kvm -kvm-y += x86.o emulate.o irq.o lapic.o cpuid.o pmu.o mtrr.o \ +kvm-y += x86.o emulate.o irq.o lapic.o cpuid.o msrs.o pmu.o mtrr.o \ debugfs.o mmu/mmu.o mmu/page_track.o mmu/spte.o kvm-$(CONFIG_X86_64) += mmu/tdp_iter.o mmu/tdp_mmu.o
arch/x86/kvm/msrs.c new file +2732 -0
2,732 lines not on this page · raw message
arch/x86/kvm/msrs.h new file +128 -0
128 lines not on this page · raw message
arch/x86/kvm/mtrr.c +1 -1
@@ -19,7 +19,7 @@#include <asm/mtrr.h> #include "cpuid.h" -#include "x86.h" +#include "msrs.h" static u64 *find_mtrr (struct kvm_vcpu *vcpu,unsigned int msr) {
arch/x86/kvm/x86.c +1056 -3760
124 lines not on this page · raw message
arch/x86/kvm/x86.h +2 -85
87 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.53.0
Part of the diff is not shown here. View the raw message.
Sasha Levin
maintainerPATCH 9/9 KVM: x86: Disallow EFER.LME and EFER.LMA if long mode is not supported
In reply to Sasha LevinFrom: Yosry Ahmed <[email protected]>
[ Upstream commit e62392bf39ebfdf60d1d082799397fe1cbf8dfc5 ]
Remove EFER.LME and EFER.LMA from EFER reserved bits only if long mode is actually supported. KVM does check long-mode support before allowing the bits for guest writes and userspace writes through KVM_SET_SREGS* (in __kvm_valid_efer()), but userspace writes through KVM_SET_MSRS only check reserved bits.
In practice, this doesn't really matter. The true motiviation is getting rid of the #ifdeffery when initializing efer_reserved_bits.
--- arch/x86/kvm/msrs.c | 10 +--------- arch/x86/kvm/x86.c | 3 +++ 2 files changed, 4 insertions(+), 9 deletions(-)
arch/x86/kvm/msrs.c +1 -9
@@ -19,16 +19,8 @@ bool __read_mostly report_ignored_msrs = true;module_param (report_ignored_msrs, bool,0644 );EXPORT_SYMBOL_FOR_KVM_INTERNAL (report_ignored_msrs); -/* EFER defaults: -* - enable syscall per default because its emulated by KVM -* - enable LME and LMA per default on 64 bit KVM -*/ -#ifdef CONFIG_X86_64 -static -u64 __read_mostly efer_reserved_bits = ~((u64)(EFER_SCE |EFER_LME |EFER_LMA )); -#else +/* Enable syscall by default because its emulated by KVM */ static u64 __read_mostly efer_reserved_bits = ~((u64 )EFER_SCE ); -#endif #define MAX_IO_MSRS 256
arch/x86/kvm/x86.c +3 -0
@@ -7328,6 +7328,9 @@ EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_setup_xss_caps);static void kvm_setup_efer_caps (void ) { +if (kvm_cpu_cap_has (X86_FEATURE_LM )) +kvm_enable_efer_bits (EFER_LME |EFER_LMA ); +if (kvm_cpu_cap_has (X86_FEATURE_NX ))kvm_enable_efer_bits (EFER_NX );
Signature · 1 line
2.53.0
Re: [PATCH 7.2.y 1/9] KVM: x86: Rename __{g,s}et_sregs2() => kvm_vcpu_ioctl_x86_{g,s}et_sregs2()
In reply to Sasha LevinQuoted 83 lines · Sasha Levin
From: Sean Christopherson <[email protected]>
[ Upstream commit
bd130c8d72a1c7dde5523b3f3fae9867eafaa1dc]Rename the KVM_{G,S}ET_SREGS2 helpers in anticipation of moving them out of
x86.c(while leaving the ioctl dispatch behind). Having globally visible APIs named __{g,s}et_sregs2() would be "fine", but ugly, given that __{g,s}et_sregs() will NOT be globally visible. As a bonus, this makes it a bit more obvious that the helpers implement newer versions ofkvm_arch_vcpu_ioctl_set_sregs().No functional change intended.
Cc Yosry Ahmed <[email protected]>Signed-off-by Sean Christopherson <[email protected]>Reviewed-by Kai Huang <[email protected]>Message-ID: <[email protected]>
Signed-off-by Paolo Bonzini <[email protected]>Stable-dep-of:
e62392bf39eb("KVM: x86: Disallow EFER.LME and EFER.LMA if long mode is not supported")Signed-off-by Sasha Levin <[email protected]>--- arch/x86/kvm/x86.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)arch/x86/kvm/x86.c +10
-6@@ -133,8 +133,10 @@ static void __kvm_set_rflags(struct kvm_vcpu *vcpu, unsigned long rflags);static void store_regs (struct kvm_vcpu *vcpu);static int sync_regs (struct kvm_vcpu *vcpu); -static int __set_sregs2 (struct kvm_vcpu *vcpu,struct kvm_sregs2 *sregs2); -static void __get_sregs2 (struct kvm_vcpu *vcpu,struct kvm_sregs2 *sregs2); +static int kvm_vcpu_ioctl_x86_set_sregs2 (struct kvm_vcpu *vcpu, +struct kvm_sregs2 *sregs2); +static void kvm_vcpu_ioctl_x86_get_sregs2 (struct kvm_vcpu *vcpu, +struct kvm_sregs2 *sregs2);static DEFINE_MUTEX (vendor_module_lock);static void kvm_load_guest_fpu (struct kvm_vcpu *vcpu);@@ -6623,7 +6625,7 @@ long kvm_arch_vcpu_ioctl(struct file *filp, r = -ENOMEM ;if (!u.sregs2) goto out; -__get_sregs2 (vcpu, u.sregs2); +kvm_vcpu_ioctl_x86_get_sregs2 (vcpu, u.sregs2); r = -EFAULT ;if (copy_to_user (argp, u.sregs2,sizeof (struct kvm_sregs2 ))) goto out;@@ -6642,7 +6644,7 @@ long kvm_arch_vcpu_ioctl(struct file *filp, u.sregs2 =NULL ; goto out; } - r =__set_sregs2 (vcpu, u.sregs2); + r =kvm_vcpu_ioctl_x86_set_sregs2 (vcpu, u.sregs2);break ; }case KVM_HAS_DEVICE_ATTR :@@ -12215,7 +12217,8 @@ static void __get_sregs(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs) (unsigned long *)sregs->interrupt_bitmap); } -static void __get_sregs2 (struct kvm_vcpu *vcpu,struct kvm_sregs2 *sregs2) +static void kvm_vcpu_ioctl_x86_get_sregs2 (struct kvm_vcpu *vcpu, +struct kvm_sregs2 *sregs2) {int i;@@ -12483,7 +12486,8 @@ static int __set_sregs(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs)return 0 ; } -static int __set_sregs2 (struct kvm_vcpu *vcpu,struct kvm_sregs2 *sregs2) +static int kvm_vcpu_ioctl_x86_set_sregs2 (struct kvm_vcpu *vcpu, +struct kvm_sregs2 *sregs2) {int mmu_reset_needed =0 ;bool valid_pdptrs = sregs2->flags &KVM_SREGS2_FLAGS_PDPTRS_VALID ;Signature · 1 line
2.53.0
Series does not apply :(