Skip to content

Commit 11d9846

Browse files
gaochaointelsean-jc
authored andcommitted
KVM: x86: Allocate/free user_return_msrs at kvm.ko (un)loading time
Move user_return_msrs allocation/free from vendor modules (kvm-intel.ko and kvm-amd.ko) (un)loading time to kvm.ko's to make it less risky to access user_return_msrs in kvm.ko. Tying the lifetime of user_return_msrs to vendor modules makes every access to user_return_msrs prone to use-after-free issues as vendor modules may be unloaded at any time. Opportunistically turn the per-CPU variable into full structs, as there's no practical difference between statically allocating the memory and allocating it unconditionally during module_init(). Zero out kvm_nr_uret_msrs on vendor module exit to further minimize the chances of consuming stale data, and WARN on vendor module load if KVM thinks there are existing user-return MSRs. Note! The user-return MSRs also need to be "destroyed" if ops->hardware_setup() fails, as both SVM and VMX expect common KVM to clean up (because common code, not vendor code, is responsible for kvm_nr_uret_msrs). Signed-off-by: Chao Gao <chao.gao@intel.com> Co-developed-by: Sean Christopherson <seanjc@google.com> Link: https://patch.msgid.link/20251108013601.902918-1-seanjc@google.com Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent e78fb96 commit 11d9846

File tree

1 file changed

+13
-27
lines changed

1 file changed

+13
-27
lines changed

arch/x86/kvm/x86.c

Lines changed: 13 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ struct kvm_user_return_msrs {
209209
u32 __read_mostly kvm_nr_uret_msrs;
210210
EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_nr_uret_msrs);
211211
static u32 __read_mostly kvm_uret_msrs_list[KVM_MAX_NR_USER_RETURN_MSRS];
212-
static struct kvm_user_return_msrs __percpu *user_return_msrs;
212+
static DEFINE_PER_CPU(struct kvm_user_return_msrs, user_return_msrs);
213213

214214
#define KVM_SUPPORTED_XCR0 (XFEATURE_MASK_FP | XFEATURE_MASK_SSE \
215215
| XFEATURE_MASK_YMM | XFEATURE_MASK_BNDREGS \
@@ -572,25 +572,14 @@ static inline void kvm_async_pf_hash_reset(struct kvm_vcpu *vcpu)
572572
vcpu->arch.apf.gfns[i] = ~0;
573573
}
574574

575-
static int kvm_init_user_return_msrs(void)
576-
{
577-
user_return_msrs = alloc_percpu(struct kvm_user_return_msrs);
578-
if (!user_return_msrs) {
579-
pr_err("failed to allocate percpu user_return_msrs\n");
580-
return -ENOMEM;
581-
}
582-
kvm_nr_uret_msrs = 0;
583-
return 0;
584-
}
585-
586-
static void kvm_free_user_return_msrs(void)
575+
static void kvm_destroy_user_return_msrs(void)
587576
{
588577
int cpu;
589578

590579
for_each_possible_cpu(cpu)
591-
WARN_ON_ONCE(per_cpu_ptr(user_return_msrs, cpu)->registered);
580+
WARN_ON_ONCE(per_cpu(user_return_msrs, cpu).registered);
592581

593-
free_percpu(user_return_msrs);
582+
kvm_nr_uret_msrs = 0;
594583
}
595584

596585
static void kvm_on_user_return(struct user_return_notifier *urn)
@@ -653,7 +642,7 @@ EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_find_user_return_msr);
653642

654643
static void kvm_user_return_msr_cpu_online(void)
655644
{
656-
struct kvm_user_return_msrs *msrs = this_cpu_ptr(user_return_msrs);
645+
struct kvm_user_return_msrs *msrs = this_cpu_ptr(&user_return_msrs);
657646
u64 value;
658647
int i;
659648

@@ -675,7 +664,7 @@ static void kvm_user_return_register_notifier(struct kvm_user_return_msrs *msrs)
675664

676665
int kvm_set_user_return_msr(unsigned slot, u64 value, u64 mask)
677666
{
678-
struct kvm_user_return_msrs *msrs = this_cpu_ptr(user_return_msrs);
667+
struct kvm_user_return_msrs *msrs = this_cpu_ptr(&user_return_msrs);
679668
int err;
680669

681670
value = (value & mask) | (msrs->values[slot].host & ~mask);
@@ -693,13 +682,13 @@ EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_set_user_return_msr);
693682

694683
u64 kvm_get_user_return_msr(unsigned int slot)
695684
{
696-
return this_cpu_ptr(user_return_msrs)->values[slot].curr;
685+
return this_cpu_ptr(&user_return_msrs)->values[slot].curr;
697686
}
698687
EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_get_user_return_msr);
699688

700689
static void drop_user_return_notifiers(void)
701690
{
702-
struct kvm_user_return_msrs *msrs = this_cpu_ptr(user_return_msrs);
691+
struct kvm_user_return_msrs *msrs = this_cpu_ptr(&user_return_msrs);
703692

704693
if (msrs->registered)
705694
kvm_on_user_return(&msrs->urn);
@@ -10022,13 +10011,9 @@ int kvm_x86_vendor_init(struct kvm_x86_init_ops *ops)
1002210011
return -ENOMEM;
1002310012
}
1002410013

10025-
r = kvm_init_user_return_msrs();
10026-
if (r)
10027-
goto out_free_x86_emulator_cache;
10028-
1002910014
r = kvm_mmu_vendor_module_init();
1003010015
if (r)
10031-
goto out_free_percpu;
10016+
goto out_free_x86_emulator_cache;
1003210017

1003310018
kvm_caps.supported_vm_types = BIT(KVM_X86_DEFAULT_VM);
1003410019
kvm_caps.supported_mce_cap = MCG_CTL_P | MCG_SER_P;
@@ -10053,6 +10038,8 @@ int kvm_x86_vendor_init(struct kvm_x86_init_ops *ops)
1005310038
if (boot_cpu_has(X86_FEATURE_ARCH_CAPABILITIES))
1005410039
rdmsrq(MSR_IA32_ARCH_CAPABILITIES, kvm_host.arch_capabilities);
1005510040

10041+
WARN_ON_ONCE(kvm_nr_uret_msrs);
10042+
1005610043
r = ops->hardware_setup();
1005710044
if (r != 0)
1005810045
goto out_mmu_exit;
@@ -10125,9 +10112,8 @@ int kvm_x86_vendor_init(struct kvm_x86_init_ops *ops)
1012510112
kvm_x86_ops.enable_virtualization_cpu = NULL;
1012610113
kvm_x86_call(hardware_unsetup)();
1012710114
out_mmu_exit:
10115+
kvm_destroy_user_return_msrs();
1012810116
kvm_mmu_vendor_module_exit();
10129-
out_free_percpu:
10130-
kvm_free_user_return_msrs();
1013110117
out_free_x86_emulator_cache:
1013210118
kmem_cache_destroy(x86_emulator_cache);
1013310119
return r;
@@ -10155,8 +10141,8 @@ void kvm_x86_vendor_exit(void)
1015510141
cancel_work_sync(&pvclock_gtod_work);
1015610142
#endif
1015710143
kvm_x86_call(hardware_unsetup)();
10144+
kvm_destroy_user_return_msrs();
1015810145
kvm_mmu_vendor_module_exit();
10159-
kvm_free_user_return_msrs();
1016010146
kmem_cache_destroy(x86_emulator_cache);
1016110147
#ifdef CONFIG_KVM_XEN
1016210148
static_key_deferred_flush(&kvm_xen_enabled);

0 commit comments

Comments
 (0)