KVM: Move x86 init ops to separate struct
v2 cover KVM: Move x86 init ops to separate struct
The non-x86 part of this series is wholly contained in patch 01. Compared to other recent kvm-wide changes, this one is very straightforward (famous last words).
Like a few other architectures, e.g. PPC, x86 uses a set of global hooks to call back into vendor code on demand. A handlful of the x86 hooks are used only within the scope of kvm_init(). This series moves the init-only hooks to a separate struct, partly to clean up the code a bit, but mainly so that the runtime hooks can be made available only after the x86 vendor has completed its ->hardware_setup(). While working on a different series I spent a fair bit of time scratching my as to why a kvm_x86_ops wasn't working, and eventually realized VMX's callback wasn't "ready" because the vmcs_config hadn't yet been populated.
Due to lack of a cross-compiling setup, the non-x86 changes in patch 01 are untested.
The SVM changes in patch 02 are fairly well tested, e.g. fudged things enough to ensure KVM didn't explode on a null pointer.
Patch 05 is a bit scary as a rogue dereference of kvm_x86_ops before ->hardware_setup() will crash KVM (maybe the kernel?). I didn't find any obvious ways to use kvm_x86_ops on AMD, and tested on a few different Intel CPUs, so I'm reasonably confident that there are no existing violations.
v2:
- Rebase to kvm/queue, 2c2787938512 ("KVM: selftests: Stop ...")
- Collect tags. [Cornelia]
- Add a patch to make kvm_x86_ops its own instance and copy {vmx,svm}_x86_ops by value, which saves a memory access on every invocation of a kvm_x86_ops hook. [Paolo]
- Add patches to tag {vmx,svm}_x86_ops as __initdata after they're copied by value.
Sean Christopherson (9):
KVM: Pass kvm_init()'s opaque param to additional arch funcs
KVM: x86: Move init-only kvm_x86_ops to separate struct
KVM: VMX: Move hardware_setup() definition below vmx_x86_ops
KVM: VMX: Configure runtime hooks using vmx_x86_ops
KVM: x86: Set kvm_x86_ops only after ->hardware_setup() completes
KVM: x86: Copy kvm_x86_ops by value to eliminate layer of indirection
KVM: x86: Drop __exit from kvm_x86_ops' hardware_unsetup()
KVM: VMX: Annotate vmx_x86_ops as __initdata
KVM: SVM: Annotate svm_x86_ops as __initdata
arch/mips/kvm/mips.c | 4 +- arch/powerpc/kvm/powerpc.c | 4 +- arch/s390/kvm/kvm-s390.c | 4 +- arch/x86/include/asm/kvm_host.h | 35 +-- arch/x86/kvm/cpuid.c | 24 +- arch/x86/kvm/hyperv.c | 8 +- arch/x86/kvm/kvm_cache_regs.h | 10 +- arch/x86/kvm/lapic.c | 30 +-- arch/x86/kvm/mmu.h | 4 +- arch/x86/kvm/mmu/mmu.c | 38 ++-- arch/x86/kvm/pmu.c | 30 +-- arch/x86/kvm/pmu.h | 2 +- arch/x86/kvm/svm.c | 21 +- arch/x86/kvm/trace.h | 4 +- arch/x86/kvm/vmx/nested.c | 17 +- arch/x86/kvm/vmx/nested.h | 3 +- arch/x86/kvm/vmx/pmu_intel.c | 2 +- arch/x86/kvm/vmx/vmx.c | 353 +++++++++++++++-------------- arch/x86/kvm/x86.c | 384 ++++++++++++++++---------------- arch/x86/kvm/x86.h | 4 +- include/linux/kvm_host.h | 4 +- virt/kvm/arm/arm.c | 4 +- virt/kvm/kvm_main.c | 18 +- 23 files changed, 519 insertions(+), 488 deletions(-)
Signature · 1 line
2.24.1
PATCH v2 1/9 KVM: Pass kvm_init()'s opaque param to additional arch funcs
Pass @opaque to kvm_arch_hardware_setup() and kvm_arch_check_processor_compat() to allow architecture specific code to reference @opaque without having to stash it away in a temporary global variable. This will enable x86 to separate its vendor specific callback ops, which are passed via @opaque, into "init" and "runtime" ops without having to stash away the "init" ops.
No functional change intended.
--- arch/mips/kvm/mips.c | 4 ++-- arch/powerpc/kvm/powerpc.c | 4 ++-- arch/s390/kvm/kvm-s390.c | 4 ++-- arch/x86/kvm/x86.c | 4 ++-- include/linux/kvm_host.h | 4 ++-- virt/kvm/arm/arm.c | 4 ++-- virt/kvm/kvm_main.c | 18 ++++++++++++++---- 7 files changed, 26 insertions(+), 16 deletions(-)
arch/mips/kvm/mips.c +2 -2
@@ -118,12 +118,12 @@ void kvm_arch_hardware_disable(void) kvm_mips_callbacks->hardware_disable (); } -int kvm_arch_hardware_setup (void ) +int kvm_arch_hardware_setup (void *opaque) {return 0 ; } -int kvm_arch_check_processor_compat (void ) +int kvm_arch_check_processor_compat (void *opaque) {return 0 ; }
arch/powerpc/kvm/powerpc.c +2 -2
@@ -416,12 +416,12 @@ int kvm_arch_hardware_enable(void)return 0 ; } -int kvm_arch_hardware_setup (void ) +int kvm_arch_hardware_setup (void *opaque) {return 0 ; } -int kvm_arch_check_processor_compat (void ) +int kvm_arch_check_processor_compat (void *opaque) {return kvmppc_core_check_processor_compat (); }
arch/s390/kvm/kvm-s390.c +2 -2
@@ -228,7 +228,7 @@ int kvm_arch_hardware_enable(void)return 0 ; } -int kvm_arch_check_processor_compat (void ) +int kvm_arch_check_processor_compat (void *opaque) {return 0 ; }
@@ -293,7 +293,7 @@ static struct notifier_block kvm_clock_notifier = { .notifier_call = kvm_clock_sync, }; -int kvm_arch_hardware_setup (void ) +int kvm_arch_hardware_setup (void *opaque) { gmap_notifier.notifier_call = kvm_gmap_notifier;gmap_register_pte_notifier (&gmap_notifier);
arch/x86/kvm/x86.c +2 -2
@@ -9591,7 +9591,7 @@ void kvm_arch_hardware_disable(void)drop_user_return_notifiers (); } -int kvm_arch_hardware_setup (void ) +int kvm_arch_hardware_setup (void *opaque) {int r;
@@ -9627,7 +9627,7 @@ void kvm_arch_hardware_unsetup(void) kvm_x86_ops->hardware_unsetup (); } -int kvm_arch_check_processor_compat (void ) +int kvm_arch_check_processor_compat (void *opaque) {struct cpuinfo_x86 *c = &cpu_data (smp_processor_id ());
include/linux/kvm_host.h +2 -2
@@ -882,9 +882,9 @@ void kvm_arch_create_vcpu_debugfs(struct kvm_vcpu *vcpu);int kvm_arch_hardware_enable (void );void kvm_arch_hardware_disable (void ); -int kvm_arch_hardware_setup (void ); +int kvm_arch_hardware_setup (void *opaque);void kvm_arch_hardware_unsetup (void ); -int kvm_arch_check_processor_compat (void ); +int kvm_arch_check_processor_compat (void *opaque);int kvm_arch_vcpu_runnable (struct kvm_vcpu *vcpu);bool kvm_arch_vcpu_in_kernel (struct kvm_vcpu *vcpu);int kvm_arch_vcpu_should_kick (struct kvm_vcpu *vcpu);
virt/kvm/arm/arm.c +2 -2
@@ -64,12 +64,12 @@ int kvm_arch_vcpu_should_kick(struct kvm_vcpu *vcpu)return kvm_vcpu_exiting_guest_mode (vcpu) =IN_GUEST_MODE ; } -int kvm_arch_hardware_setup (void ) +int kvm_arch_hardware_setup (void *opaque) {return 0 ; } -int kvm_arch_check_processor_compat (void ) +int kvm_arch_check_processor_compat (void *opaque) {return 0 ; }
virt/kvm/kvm_main.c +14 -4
@@ -4425,14 +4425,22 @@ struct kvm_vcpu * __percpu *kvm_get_running_vcpus(void)return &kvm_running_vcpu; } -static void check_processor_compat (void *rtn) +struct kvm_cpu_compat_check { +void *opaque; +int *ret; +}; + +static void check_processor_compat (void *data) { - *(int *)rtn =kvm_arch_check_processor_compat (); +struct kvm_cpu_compat_check *c = data; + + *c->ret =kvm_arch_check_processor_compat (c->opaque); }int kvm_init (void *opaque,unsigned vcpu_size,unsigned vcpu_align,struct module *module) { +struct kvm_cpu_compat_check c;int r;int cpu;
@@ -4456,12 +4464,14 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align, goto out_free_0; } - r =kvm_arch_hardware_setup (); + r =kvm_arch_hardware_setup (opaque);if (r <0 ) goto out_free_1; + c.ret = &r; + c.opaque = opaque;for_each_online_cpu (cpu) { -smp_call_function_single (cpu, check_processor_compat, &r,1 ); +smp_call_function_single (cpu, check_processor_compat, &c,1 );if (r <0 ) goto out_free_2; }
Signature · 1 line
2.24.1
Re: [PATCH v2 1/9] KVM: Pass kvm_init()'s opaque param to additional arch funcs
Quoted 7 lines · On Tue, 18 Feb 2020 15:54:29 -0800 Sean Christopherson…
Pass @opaque to
kvm_arch_hardware_setup()andkvm_arch_check_processor_compat()to allow architecture specific code to reference @opaque without having to stash it away in a temporary global variable. This will enable x86 to separate its vendor specific callback ops, which are passed via @opaque, into "init" and "runtime" ops without having to stash away the "init" ops.
Quoted 5 lines
No functional change intended.
Reviewed-by Cornelia Huck <[email protected]>Tested-by Cornelia Huck <[email protected]> #s390Signed-off-by Sean Christopherson <[email protected]>
M.
Signature · 1 line
Jazz is not dead. It just smells funny...
PATCH v2 2/9 KVM: x86: Move init-only kvm_x86_ops to separate struct
In reply to Sean ChristophersonMove the kvm_x86_ops functions that are used only within the scope of kvm_init() into a separate struct, kvm_x86_init_ops. In addition to identifying the init-only functions without restorting to code comments, this also sets the stage for waiting until after ->hardware_setup() to set kvm_x86_ops. Setting kvm_x86_ops after ->hardware_setup() is desirable as many of the hooks are not usable until ->hardware_setup() completes.
No functional change intended.
--- arch/x86/include/asm/kvm_host.h | 13 +++++++++---- arch/x86/kvm/svm.c | 15 ++++++++++----- arch/x86/kvm/vmx/vmx.c | 16 +++++++++++----- arch/x86/kvm/x86.c | 10 ++++++---- 4 files changed, 36 insertions(+), 18 deletions(-)
arch/x86/include/asm/kvm_host.h +9 -4
@@ -1042,12 +1042,8 @@ static inline u16 kvm_lapic_irq_dest_mode(bool dest_mode_logical) }struct kvm_x86_ops { -int (*cpu_has_kvm_support)(void );/* __init */ -int (*disabled_by_bios)(void );/* __init */ int (*hardware_enable)(void );void (*hardware_disable)(void ); -int (*check_processor_compatibility)(void );/* __init */ -int (*hardware_setup)(void );/* __init */ void (*hardware_unsetup)(void );/* __exit */ bool (*cpu_has_accelerated_tpr)(void );bool (*has_emulated_msr)(int index);
@@ -1258,6 +1254,15 @@ struct kvm_x86_ops {int (*enable_direct_tlbflush)(struct kvm_vcpu *vcpu); }; +struct kvm_x86_init_ops { +int (*cpu_has_kvm_support)(void ); +int (*disabled_by_bios)(void ); +int (*check_processor_compatibility)(void ); +int (*hardware_setup)(void ); + +struct kvm_x86_ops *runtime_ops; +}; +struct kvm_arch_async_pf {u32 token;gfn_t gfn;
arch/x86/kvm/svm.c +10 -5
@@ -7375,11 +7375,7 @@ static void svm_pre_update_apicv_exec_ctrl(struct kvm *kvm, bool activate) }static struct kvm_x86_ops svm_x86_ops__ro_after_init = { - .cpu_has_kvm_support = has_svm, - .disabled_by_bios = is_disabled, - .hardware_setup = svm_hardware_setup, .hardware_unsetup = svm_hardware_unsetup, - .check_processor_compatibility = svm_check_processor_compat, .hardware_enable = svm_hardware_enable, .hardware_disable = svm_hardware_disable, .cpu_has_accelerated_tpr = svm_cpu_has_accelerated_tpr,
@@ -7515,9 +7511,18 @@ static struct kvm_x86_ops svm_x86_ops __ro_after_init = { .apic_init_signal_blocked = svm_apic_init_signal_blocked, }; +static struct kvm_x86_init_ops svm_init_ops__initdata = { + .cpu_has_kvm_support = has_svm, + .disabled_by_bios = is_disabled, + .hardware_setup = svm_hardware_setup, + .check_processor_compatibility = svm_check_processor_compat, + + .runtime_ops = &svm_x86_ops, +}; +static int __init svm_init (void ) { -return kvm_init (&svm_x86_ops,sizeof (struct vcpu_svm ), +return kvm_init (&svm_init_ops,sizeof (struct vcpu_svm ), __alignof__(struct vcpu_svm ),THIS_MODULE ); }
arch/x86/kvm/vmx/vmx.c +11 -5
@@ -7729,11 +7729,8 @@ static bool vmx_check_apicv_inhibit_reasons(ulong bit) }static struct kvm_x86_ops vmx_x86_ops__ro_after_init = { - .cpu_has_kvm_support = cpu_has_kvm_support, - .disabled_by_bios = vmx_disabled_by_bios, - .hardware_setup = hardware_setup, .hardware_unsetup = hardware_unsetup, - .check_processor_compatibility = vmx_check_processor_compat, + .hardware_enable = hardware_enable, .hardware_disable = hardware_disable, .cpu_has_accelerated_tpr = report_flexpriority,
@@ -7881,6 +7878,15 @@ static struct kvm_x86_ops vmx_x86_ops __ro_after_init = { .apic_init_signal_blocked = vmx_apic_init_signal_blocked, }; +static struct kvm_x86_init_ops vmx_init_ops__initdata = { + .cpu_has_kvm_support = cpu_has_kvm_support, + .disabled_by_bios = vmx_disabled_by_bios, + .check_processor_compatibility = vmx_check_processor_compat, + .hardware_setup = hardware_setup, + + .runtime_ops = &vmx_x86_ops, +}; +static void vmx_cleanup_l1d_flush (void ) {if (vmx_l1d_flush_pages) {
@@ -7965,7 +7971,7 @@ static int __init vmx_init(void) }#endif - r =kvm_init (&vmx_x86_ops,sizeof (struct vcpu_vmx ), + r =kvm_init (&vmx_init_ops,sizeof (struct vcpu_vmx ), __alignof__(struct vcpu_vmx ),THIS_MODULE );if (r)return r;
arch/x86/kvm/x86.c +6 -4
@@ -7285,8 +7285,8 @@ static struct notifier_block pvclock_gtod_notifier = {int kvm_arch_init (void *opaque) { +struct kvm_x86_init_ops *ops = opaque;int r; -struct kvm_x86_ops *ops = opaque;if (kvm_x86_ops) {printk (KERN_ERR "kvm: already loaded the other module\n" );
@@ -7335,7 +7335,7 @@ int kvm_arch_init(void *opaque)if (r) goto out_free_percpu; - kvm_x86_ops = ops; + kvm_x86_ops = ops->runtime_ops; kvm_mmu_set_mask_ptes(PT_USER_MASK, PT_ACCESSED_MASK, PT_DIRTY_MASK, PT64_NX_MASK, 0,
@@ -9593,9 +9593,10 @@ void kvm_arch_hardware_disable(void)int kvm_arch_hardware_setup (void *opaque) { +struct kvm_x86_init_ops *ops = opaque;int r; - r = kvm_x86_ops->hardware_setup (); + r = ops->hardware_setup ();if (r !=0 )return r;
@@ -9630,13 +9631,14 @@ void kvm_arch_hardware_unsetup(void)int kvm_arch_check_processor_compat (void *opaque) {struct cpuinfo_x86 *c = &cpu_data (smp_processor_id ()); +struct kvm_x86_init_ops *ops = opaque;WARN_ON (!irqs_disabled ());if (kvm_host_cr4_reserved_bits (c) != cr4_reserved_bits)return -EIO ; -return kvm_x86_ops->check_processor_compatibility (); +return ops->check_processor_compatibility (); }bool kvm_vcpu_is_reset_bsp (struct kvm_vcpu *vcpu)
Signature · 1 line
2.24.1
PATCH v2 3/9 KVM: VMX: Move hardware_setup() definition below vmx_x86_ops
In reply to Sean ChristophersonMove VMX's hardware_setup() below its vmx_x86_ops definition so that a future patch can refactor hardware_setup() to modify vmx_x86_ops directly instead of indirectly modifying the ops via the global kvm_x86_ops.
No functional change intended.
--- arch/x86/kvm/vmx/vmx.c | 328 ++++++++++++++++++++--------------------- 1 file changed, 164 insertions(+), 164 deletions(-)
arch/x86/kvm/vmx/vmx.c +162 -162
@@ -7548,170 +7548,6 @@ static bool vmx_apic_init_signal_blocked(struct kvm_vcpu *vcpu)return to_vmx (vcpu)->nested.vmxon; } -static __init int hardware_setup (void ) -{ -unsigned long host_bndcfgs; -struct desc_ptr dt; -int r, i; - -rdmsrl_safe (MSR_EFER , &host_efer); - -store_idt (&dt); - host_idt_base = dt.address; - -for (i =0 ; i <ARRAY_SIZE (vmx_msr_index); ++i) -kvm_define_shared_msr (i, vmx_msr_index[i]); - -if (setup_vmcs_config (&vmcs_config, &vmx_capability) <0 ) -return -EIO ; - -if (boot_cpu_has (X86_FEATURE_NX )) -kvm_enable_efer_bits (EFER_NX ); - -if (boot_cpu_has (X86_FEATURE_MPX )) { -rdmsrl (MSR_IA32_BNDCFGS , host_bndcfgs); -WARN_ONCE (host_bndcfgs,"KVM: BNDCFGS in host will be lost" ); - } - -if (!cpu_has_vmx_vpid () || !cpu_has_vmx_invvpid () || - !(cpu_has_vmx_invvpid_single () ||cpu_has_vmx_invvpid_global ())) - enable_vpid =0 ; - -if (!cpu_has_vmx_ept () || - !cpu_has_vmx_ept_4levels () || - !cpu_has_vmx_ept_mt_wb () || - !cpu_has_vmx_invept_global ()) - enable_ept =0 ; - -if (!cpu_has_vmx_ept_ad_bits () || !enable_ept) - enable_ept_ad_bits =0 ; - -if (!cpu_has_vmx_unrestricted_guest () || !enable_ept) - enable_unrestricted_guest =0 ; - -if (!cpu_has_vmx_flexpriority ()) - flexpriority_enabled =0 ; - -if (!cpu_has_virtual_nmis ()) - enable_vnmi =0 ; - -/* -* set_apic_access_page_addr() is used to reload apic access -* page upon invalidation. No need to do anything if not -* using the APIC_ACCESS_ADDR VMCS field. -*/ -if (!flexpriority_enabled) - kvm_x86_ops->set_apic_access_page_addr =NULL ; - -if (!cpu_has_vmx_tpr_shadow ()) - kvm_x86_ops->update_cr8_intercept =NULL ; - -if (enable_ept && !cpu_has_vmx_ept_2m_page ()) -kvm_disable_largepages (); - -#if IS_ENABLED (CONFIG_HYPERV ) -if (ms_hyperv.nested_features &HV_X64_NESTED_GUEST_MAPPING_FLUSH - && enable_ept) { - kvm_x86_ops->tlb_remote_flush = hv_remote_flush_tlb; - kvm_x86_ops->tlb_remote_flush_with_range - hv_remote_flush_tlb_with_range; - } -#endif - -if (!cpu_has_vmx_ple ()) { - ple_gap =0 ; - ple_window =0 ; - ple_window_grow =0 ; - ple_window_max =0 ; - ple_window_shrink =0 ; - } - -if (!cpu_has_vmx_apicv ()) { - enable_apicv =0 ; - kvm_x86_ops->sync_pir_to_irr =NULL ; - } - -if (cpu_has_vmx_tsc_scaling ()) { - kvm_has_tsc_control = true; - kvm_max_tsc_scaling_ratio =KVM_VMX_TSC_MULTIPLIER_MAX ; - kvm_tsc_scaling_ratio_frac_bits =48 ; - } - -set_bit (0 , vmx_vpid_bitmap);/* 0 is reserved for host */ - -if (enable_ept) -vmx_enable_tdp (); -else -kvm_disable_tdp (); - -/* -* Only enable PML when hardware supports PML feature, and both EPT -* and EPT A/D bit features are enabled -- PML depends on them to work. -*/ -if (!enable_ept || !enable_ept_ad_bits || !cpu_has_vmx_pml ()) - enable_pml =0 ; - -if (!enable_pml) { - kvm_x86_ops->slot_enable_log_dirty =NULL ; - kvm_x86_ops->slot_disable_log_dirty =NULL ; - kvm_x86_ops->flush_log_dirty =NULL ; - kvm_x86_ops->enable_log_dirty_pt_masked =NULL ; - } - -if (!cpu_has_vmx_preemption_timer ()) - enable_preemption_timer = false; - -if (enable_preemption_timer) { -u64 use_timer_freq =5000ULL *1000 *1000 ; -u64 vmx_msr; - -rdmsrl (MSR_IA32_VMX_MISC , vmx_msr); - cpu_preemption_timer_multi - vmx_msr &VMX_MISC_PREEMPTION_TIMER_RATE_MASK ; - -if (tsc_khz) - use_timer_freq = (u64 )tsc_khz *1000 ; - use_timer_freq >>= cpu_preemption_timer_multi; - -/* -* KVM "disables" the preemption timer by setting it to its max -* value. Don't use the timer if it might cause spurious exits -* at a rate faster than 0.1 Hz (of uninterrupted guest time). -*/ -if (use_timer_freq >0xffffffffu /10 ) - enable_preemption_timer = false; - } - -if (!enable_preemption_timer) { - kvm_x86_ops->set_hv_timer =NULL ; - kvm_x86_ops->cancel_hv_timer =NULL ; - kvm_x86_ops->request_immediate_exit = __kvm_request_immediate_exit; - } - -kvm_set_posted_intr_wakeup_handler (wakeup_handler); - - kvm_mce_cap_supported |=MCG_LMCE_P ; - -if (pt_mode !=PT_MODE_SYSTEM && pt_mode !=PT_MODE_HOST_GUEST ) -return -EINVAL ; -if (!enable_ept || !cpu_has_vmx_intel_pt ()) - pt_mode =PT_MODE_SYSTEM ; - -if (nested) { -nested_vmx_setup_ctls_msrs (&vmcs_config.nested, - vmx_capability.ept, enable_apicv); - - r =nested_vmx_hardware_setup (kvm_vmx_exit_handlers); -if (r) -return r; - } - - r =alloc_kvm_area (); -if (r) -nested_vmx_hardware_unsetup (); -return r; -} - static __exit void hardware_unsetup(void) {if (nested)
@@ -7878,6 +7714,170 @@ static struct kvm_x86_ops vmx_x86_ops __ro_after_init = { .apic_init_signal_blocked = vmx_apic_init_signal_blocked, }; +static __init int hardware_setup (void ) +{ +unsigned long host_bndcfgs; +struct desc_ptr dt; +int r, i; + +rdmsrl_safe (MSR_EFER , &host_efer); + +store_idt (&dt); + host_idt_base = dt.address; + +for (i =0 ; i <ARRAY_SIZE (vmx_msr_index); ++i) +kvm_define_shared_msr (i, vmx_msr_index[i]); + +if (setup_vmcs_config (&vmcs_config, &vmx_capability) <0 ) +return -EIO ; + +if (boot_cpu_has (X86_FEATURE_NX )) +kvm_enable_efer_bits (EFER_NX ); + +if (boot_cpu_has (X86_FEATURE_MPX )) { +rdmsrl (MSR_IA32_BNDCFGS , host_bndcfgs); +WARN_ONCE (host_bndcfgs,"KVM: BNDCFGS in host will be lost" ); + } + +if (!cpu_has_vmx_vpid () || !cpu_has_vmx_invvpid () || + !(cpu_has_vmx_invvpid_single () ||cpu_has_vmx_invvpid_global ())) + enable_vpid =0 ; + +if (!cpu_has_vmx_ept () || + !cpu_has_vmx_ept_4levels () || + !cpu_has_vmx_ept_mt_wb () || + !cpu_has_vmx_invept_global ()) + enable_ept =0 ; + +if (!cpu_has_vmx_ept_ad_bits () || !enable_ept) + enable_ept_ad_bits =0 ; + +if (!cpu_has_vmx_unrestricted_guest () || !enable_ept) + enable_unrestricted_guest =0 ; + +if (!cpu_has_vmx_flexpriority ()) + flexpriority_enabled =0 ; + +if (!cpu_has_virtual_nmis ()) + enable_vnmi =0 ; + +/* +* set_apic_access_page_addr() is used to reload apic access +* page upon invalidation. No need to do anything if not +* using the APIC_ACCESS_ADDR VMCS field. +*/ +if (!flexpriority_enabled) + kvm_x86_ops->set_apic_access_page_addr =NULL ; + +if (!cpu_has_vmx_tpr_shadow ()) + kvm_x86_ops->update_cr8_intercept =NULL ; + +if (enable_ept && !cpu_has_vmx_ept_2m_page ()) +kvm_disable_largepages (); + +#if IS_ENABLED (CONFIG_HYPERV ) +if (ms_hyperv.nested_features &HV_X64_NESTED_GUEST_MAPPING_FLUSH + && enable_ept) { + kvm_x86_ops->tlb_remote_flush = hv_remote_flush_tlb; + kvm_x86_ops->tlb_remote_flush_with_range + hv_remote_flush_tlb_with_range; + } +#endif + +if (!cpu_has_vmx_ple ()) { + ple_gap =0 ; + ple_window =0 ; + ple_window_grow =0 ; + ple_window_max =0 ; + ple_window_shrink =0 ; + } + +if (!cpu_has_vmx_apicv ()) { + enable_apicv =0 ; + kvm_x86_ops->sync_pir_to_irr =NULL ; + } + +if (cpu_has_vmx_tsc_scaling ()) { + kvm_has_tsc_control = true; + kvm_max_tsc_scaling_ratio =KVM_VMX_TSC_MULTIPLIER_MAX ; + kvm_tsc_scaling_ratio_frac_bits =48 ; + } + +set_bit (0 , vmx_vpid_bitmap);/* 0 is reserved for host */ + +if (enable_ept) +vmx_enable_tdp (); +else +kvm_disable_tdp (); + +/* +* Only enable PML when hardware supports PML feature, and both EPT +* and EPT A/D bit features are enabled -- PML depends on them to work. +*/ +if (!enable_ept || !enable_ept_ad_bits || !cpu_has_vmx_pml ()) + enable_pml =0 ; + +if (!enable_pml) { + kvm_x86_ops->slot_enable_log_dirty =NULL ; + kvm_x86_ops->slot_disable_log_dirty =NULL ; + kvm_x86_ops->flush_log_dirty =NULL ; + kvm_x86_ops->enable_log_dirty_pt_masked =NULL ; + } + +if (!cpu_has_vmx_preemption_timer ()) + enable_preemption_timer = false; + +if (enable_preemption_timer) { +u64 use_timer_freq =5000ULL *1000 *1000 ; +u64 vmx_msr; + +rdmsrl (MSR_IA32_VMX_MISC , vmx_msr); + cpu_preemption_timer_multi + vmx_msr &VMX_MISC_PREEMPTION_TIMER_RATE_MASK ; + +if (tsc_khz) + use_timer_freq = (u64 )tsc_khz *1000 ; + use_timer_freq >>= cpu_preemption_timer_multi; + +/* +* KVM "disables" the preemption timer by setting it to its max +* value. Don't use the timer if it might cause spurious exits +* at a rate faster than 0.1 Hz (of uninterrupted guest time). +*/ +if (use_timer_freq >0xffffffffu /10 ) + enable_preemption_timer = false; + } + +if (!enable_preemption_timer) { + kvm_x86_ops->set_hv_timer =NULL ; + kvm_x86_ops->cancel_hv_timer =NULL ; + kvm_x86_ops->request_immediate_exit = __kvm_request_immediate_exit; + } + +kvm_set_posted_intr_wakeup_handler (wakeup_handler); + + kvm_mce_cap_supported |=MCG_LMCE_P ; + +if (pt_mode !=PT_MODE_SYSTEM && pt_mode !=PT_MODE_HOST_GUEST ) +return -EINVAL ; +if (!enable_ept || !cpu_has_vmx_intel_pt ()) + pt_mode =PT_MODE_SYSTEM ; + +if (nested) { +nested_vmx_setup_ctls_msrs (&vmcs_config.nested, + vmx_capability.ept, enable_apicv); + + r =nested_vmx_hardware_setup (kvm_vmx_exit_handlers); +if (r) +return r; + } + + r =alloc_kvm_area (); +if (r) +nested_vmx_hardware_unsetup (); +return r; +} +static struct kvm_x86_init_ops vmx_init_ops__initdata = { .cpu_has_kvm_support = cpu_has_kvm_support, .disabled_by_bios = vmx_disabled_by_bios,
Signature · 1 line
2.24.1
PATCH v2 4/9 KVM: VMX: Configure runtime hooks using vmx_x86_ops
In reply to Sean ChristophersonConfigure VMX's runtime hooks by modifying vmx_x86_ops directly instead of using on the global kvm_x86_ops. This sets the stage for waiting until after ->hardware_setup() to set kvm_x86_ops with the vendor's implementation.
--- arch/x86/kvm/vmx/nested.c | 15 ++++++++------- arch/x86/kvm/vmx/nested.h | 3 ++- arch/x86/kvm/vmx/vmx.c | 27 ++++++++++++++------------- 3 files changed, 24 insertions(+), 21 deletions(-)
arch/x86/kvm/vmx/nested.c +8 -7
@@ -6160,7 +6160,8 @@ void nested_vmx_hardware_unsetup(void) } } -__init int nested_vmx_hardware_setup (int (*exit_handlers[])(struct kvm_vcpu *)) +__init int nested_vmx_hardware_setup (struct kvm_x86_ops *ops, +int (*exit_handlers[])(struct kvm_vcpu *)) {int i;
@@ -6196,12 +6197,12 @@ __init int nested_vmx_hardware_setup(int (*exit_handlers[])(struct kvm_vcpu *)) exit_handlers[EXIT_REASON_INVVPID ] = handle_invvpid; exit_handlers[EXIT_REASON_VMFUNC ] = handle_vmfunc; - kvm_x86_ops->check_nested_events = vmx_check_nested_events; - kvm_x86_ops->get_nested_state = vmx_get_nested_state; - kvm_x86_ops->set_nested_state = vmx_set_nested_state; - kvm_x86_ops->get_vmcs12_pages = nested_get_vmcs12_pages; - kvm_x86_ops->nested_enable_evmcs = nested_enable_evmcs; - kvm_x86_ops->nested_get_evmcs_version = nested_get_evmcs_version; + ops->check_nested_events = vmx_check_nested_events; + ops->get_nested_state = vmx_get_nested_state; + ops->set_nested_state = vmx_set_nested_state; + ops->get_vmcs12_pages = nested_get_vmcs12_pages; + ops->nested_enable_evmcs = nested_enable_evmcs; + ops->nested_get_evmcs_version = nested_get_evmcs_version;return 0 ; }
arch/x86/kvm/vmx/nested.h +2 -1
@@ -20,7 +20,8 @@ void vmx_leave_nested(struct kvm_vcpu *vcpu);void nested_vmx_setup_ctls_msrs (struct nested_vmx_msrs *msrs,u32 ept_caps,bool apicv);void nested_vmx_hardware_unsetup (void ); -__init int nested_vmx_hardware_setup (int (*exit_handlers[])(struct kvm_vcpu *)); +__init int nested_vmx_hardware_setup (struct kvm_x86_ops *ops, +int (*exit_handlers[])(struct kvm_vcpu *));void nested_vmx_set_vmcs_shadowing_bitmap (void );void nested_vmx_free_vcpu (struct kvm_vcpu *vcpu); enum nvmx_vmentry_status nested_vmx_enter_non_root_mode(struct kvm_vcpu *vcpu,
arch/x86/kvm/vmx/vmx.c +13 -13
@@ -7767,10 +7767,10 @@ static __init int hardware_setup(void)* using the APIC_ACCESS_ADDR VMCS field. */ if (!flexpriority_enabled) - kvm_x86_ops->set_apic_access_page_addr =NULL ; + vmx_x86_ops.set_apic_access_page_addr =NULL ;if (!cpu_has_vmx_tpr_shadow ()) - kvm_x86_ops->update_cr8_intercept =NULL ; + vmx_x86_ops.update_cr8_intercept =NULL ;if (enable_ept && !cpu_has_vmx_ept_2m_page ())kvm_disable_largepages ();
@@ -7778,8 +7778,8 @@ static __init int hardware_setup(void)#if IS_ENABLED (CONFIG_HYPERV )if (ms_hyperv.nested_features &HV_X64_NESTED_GUEST_MAPPING_FLUSH && enable_ept) { - kvm_x86_ops->tlb_remote_flush = hv_remote_flush_tlb; - kvm_x86_ops->tlb_remote_flush_with_range + vmx_x86_ops.tlb_remote_flush = hv_remote_flush_tlb; + vmx_x86_ops.tlb_remote_flush_with_range hv_remote_flush_tlb_with_range; }#endif
@@ -7794,7 +7794,7 @@ static __init int hardware_setup(void)if (!cpu_has_vmx_apicv ()) { enable_apicv =0 ; - kvm_x86_ops->sync_pir_to_irr =NULL ; + vmx_x86_ops.sync_pir_to_irr =NULL ; }if (cpu_has_vmx_tsc_scaling ()) {
@@ -7818,10 +7818,10 @@ static __init int hardware_setup(void) enable_pml =0 ;if (!enable_pml) { - kvm_x86_ops->slot_enable_log_dirty =NULL ; - kvm_x86_ops->slot_disable_log_dirty =NULL ; - kvm_x86_ops->flush_log_dirty =NULL ; - kvm_x86_ops->enable_log_dirty_pt_masked =NULL ; + vmx_x86_ops.slot_enable_log_dirty =NULL ; + vmx_x86_ops.slot_disable_log_dirty =NULL ; + vmx_x86_ops.flush_log_dirty =NULL ; + vmx_x86_ops.enable_log_dirty_pt_masked =NULL ; }if (!cpu_has_vmx_preemption_timer ())
@@ -7849,9 +7849,9 @@ static __init int hardware_setup(void) }if (!enable_preemption_timer) { - kvm_x86_ops->set_hv_timer =NULL ; - kvm_x86_ops->cancel_hv_timer =NULL ; - kvm_x86_ops->request_immediate_exit = __kvm_request_immediate_exit; + vmx_x86_ops.set_hv_timer =NULL ; + vmx_x86_ops.cancel_hv_timer =NULL ; + vmx_x86_ops.request_immediate_exit = __kvm_request_immediate_exit; }kvm_set_posted_intr_wakeup_handler (wakeup_handler);
@@ -7867,7 +7867,8 @@ static __init int hardware_setup(void)nested_vmx_setup_ctls_msrs (&vmcs_config.nested, vmx_capability.ept, enable_apicv); - r =nested_vmx_hardware_setup (kvm_vmx_exit_handlers); + r =nested_vmx_hardware_setup (&vmx_x86_ops, + kvm_vmx_exit_handlers);if (r)return r; }
Signature · 1 line
2.24.1
PATCH v2 5/9 KVM: x86: Set kvm_x86_ops only after ->hardware_setup() completes
In reply to Sean ChristophersonSet kvm_x86_ops with the vendor's ops only after ->hardware_setup() completes to "prevent" using kvm_x86_ops before they are ready, i.e. to generate a null pointer fault instead of silently consuming unconfigured state.
An alternative implementation would be to have ->hardware_setup() return the vendor's ops, but that would require non-trivial refactoring, and would arguably result in less readable code, e.g. ->hardware_setup() would need to use ERR_PTR() in multiple locations, and each vendor's declaration of the runtime ops would be less obvious.
No functional change intended.
--- arch/x86/kvm/x86.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kvm/x86.c +2 -2
@@ -7335,8 +7335,6 @@ int kvm_arch_init(void *opaque)if (r) goto out_free_percpu; - kvm_x86_ops = ops->runtime_ops; -kvm_mmu_set_mask_ptes (PT_USER_MASK ,PT_ACCESSED_MASK ,PT_DIRTY_MASK ,PT64_NX_MASK ,0 ,PT_PRESENT_MASK ,0 , sme_me_mask);
@@ -9600,6 +9598,8 @@ int kvm_arch_hardware_setup(void *opaque)if (r !=0 )return r; + kvm_x86_ops = ops->runtime_ops; + cr4_reserved_bits =kvm_host_cr4_reserved_bits (&boot_cpu_data);if (kvm_has_tsc_control) {
Signature · 1 line
2.24.1
PATCH v2 6/9 KVM: x86: Copy kvm_x86_ops by value to eliminate layer of indirection
In reply to Sean ChristophersonReplace the kvm_x86_ops pointer in common x86 with an instance of the struct to save one memory instance when invoking function. Copy the struct by value to set the ops during kvm_init().
Arbitrarily use kvm_x86_ops.hardware_enable to track whether or not the ops have been initialized, i.e. a vendor KVM module has been loaded.
--- arch/x86/include/asm/kvm_host.h | 20 +- arch/x86/kvm/cpuid.c | 24 +-- arch/x86/kvm/hyperv.c | 8 +- arch/x86/kvm/kvm_cache_regs.h | 10 +- arch/x86/kvm/lapic.c | 30 +-- arch/x86/kvm/mmu.h | 4 +- arch/x86/kvm/mmu/mmu.c | 38 ++-- arch/x86/kvm/pmu.c | 30 +-- arch/x86/kvm/pmu.h | 2 +- arch/x86/kvm/svm.c | 2 +- arch/x86/kvm/trace.h | 4 +- arch/x86/kvm/vmx/nested.c | 2 +- arch/x86/kvm/vmx/pmu_intel.c | 2 +- arch/x86/kvm/vmx/vmx.c | 4 +- arch/x86/kvm/x86.c | 370 ++++++++++++++++---------------- arch/x86/kvm/x86.h | 4 +- 16 files changed, 277 insertions(+), 277 deletions(-)
arch/x86/include/asm/kvm_host.h +10 -10
@@ -1270,25 +1270,25 @@ struct kvm_arch_async_pf {bool direct_map; }; -extern struct kvm_x86_ops *kvm_x86_ops; +extern struct kvm_x86_ops kvm_x86_ops;extern struct kmem_cache *x86_fpu_cache;#define __KVM_HAVE_ARCH_VM_ALLOCstatic inline struct kvm *kvm_arch_alloc_vm (void ) { -return kvm_x86_ops->vm_alloc (); +return kvm_x86_ops.vm_alloc (); }static inline void kvm_arch_free_vm (struct kvm *kvm) { -return kvm_x86_ops->vm_free (kvm); +return kvm_x86_ops.vm_free (kvm); }#define __KVM_HAVE_ARCH_FLUSH_REMOTE_TLBstatic inline int kvm_arch_flush_remote_tlb (struct kvm *kvm) { -if (kvm_x86_ops->tlb_remote_flush && - !kvm_x86_ops->tlb_remote_flush (kvm)) +if (kvm_x86_ops.tlb_remote_flush && + !kvm_x86_ops.tlb_remote_flush (kvm))return 0 ;else return -ENOTSUPP ;
@@ -1373,7 +1373,7 @@ extern u64 kvm_mce_cap_supported;* * EMULTYPE_SKIP - Set when emulating solely to skip an instruction, i.e. to * decode the instruction length. For use *only* by -* kvm_x86_ops->skip_emulated_instruction() implementations. +* kvm_x86_ops.skip_emulated_instruction() implementations. * * EMULTYPE_ALLOW_RETRY - Set when the emulator should resume the guest to * retry native execution under certain conditions.
@@ -1664,14 +1664,14 @@ static inline bool kvm_irq_is_postable(struct kvm_lapic_irq *irq)static inline void kvm_arch_vcpu_blocking (struct kvm_vcpu *vcpu) { -if (kvm_x86_ops->vcpu_blocking) - kvm_x86_ops->vcpu_blocking (vcpu); +if (kvm_x86_ops.vcpu_blocking) + kvm_x86_ops.vcpu_blocking (vcpu); }static inline void kvm_arch_vcpu_unblocking (struct kvm_vcpu *vcpu) { -if (kvm_x86_ops->vcpu_unblocking) - kvm_x86_ops->vcpu_unblocking (vcpu); +if (kvm_x86_ops.vcpu_unblocking) + kvm_x86_ops.vcpu_unblocking (vcpu); }static inline void kvm_arch_vcpu_block_finish (struct kvm_vcpu *vcpu) {}
arch/x86/kvm/cpuid.c +7 -7
@@ -48,7 +48,7 @@ static u32 xstate_required_size(u64 xstate_bv, bool compacted)bool kvm_mpx_supported (void ) {return ((host_xcr0 & (XFEATURE_MASK_BNDREGS |XFEATURE_MASK_BNDCSR )) - && kvm_x86_ops->mpx_supported ()); + && kvm_x86_ops.mpx_supported ()); }EXPORT_SYMBOL_GPL (kvm_mpx_supported);
@@ -232,7 +232,7 @@ int kvm_vcpu_ioctl_set_cpuid(struct kvm_vcpu *vcpu, vcpu->arch.cpuid_nent = cpuid->nent;cpuid_fix_nx_cap (vcpu);kvm_apic_set_version (vcpu); - kvm_x86_ops->cpuid_update (vcpu); + kvm_x86_ops.cpuid_update (vcpu); r =kvm_update_cpuid (vcpu); out:
@@ -255,7 +255,7 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu, goto out; vcpu->arch.cpuid_nent = cpuid->nent;kvm_apic_set_version (vcpu); - kvm_x86_ops->cpuid_update (vcpu); + kvm_x86_ops.cpuid_update (vcpu); r =kvm_update_cpuid (vcpu); out:return r;
@@ -348,12 +348,12 @@ static int __do_cpuid_func_emulated(struct kvm_cpuid_entry2 *entry,static inline void do_cpuid_7_mask (struct kvm_cpuid_entry2 *entry,int index) { -unsigned f_invpcid = kvm_x86_ops->invpcid_supported () ?F (INVPCID ) :0 ; +unsigned f_invpcid = kvm_x86_ops.invpcid_supported () ?F (INVPCID ) :0 ;unsigned f_mpx =kvm_mpx_supported () ?F (MPX ) :0 ; -unsigned f_umip = kvm_x86_ops->umip_emulated () ?F (UMIP ) :0 ; -unsigned f_intel_pt = kvm_x86_ops->pt_supported () ?F (INTEL_PT ) :0 ; +unsigned f_umip = kvm_x86_ops.umip_emulated () ?F (UMIP ) :0 ; +unsigned f_intel_pt = kvm_x86_ops.pt_supported () ?F (INTEL_PT ) :0 ;unsigned f_la57; -unsigned f_pku = kvm_x86_ops->pku_supported () ?F (PKU ) :0 ; +unsigned f_pku = kvm_x86_ops.pku_supported () ?F (PKU ) :0 ;/* cpuid 7.0.ebx */ const u32 kvm_cpuid_7_0_ebx_x86_features @@ -436,16 +436,16 @@ static inline int __do_cpuid_func(struct kvm_cpuid_entry2 *entry, u32 function,
int r;
unsigned f_nx = is_efer_nx() ? F(NX) : 0;
#ifdef CONFIG_X86_64
- unsigned f_gbpages = (kvm_x86_ops->get_lpage_level() = PT_PDPE_LEVEL)
+ unsigned f_gbpages = (kvm_x86_ops.get_lpage_level() = PT_PDPE_LEVEL)
? F(GBPAGES) : 0;
unsigned f_lm = F(LM);
#else
unsigned f_gbpages = 0;
unsigned f_lm = 0;
#endif
- unsigned f_rdtscp = kvm_x86_ops->rdtscp_supported() ? F(RDTSCP) : 0;
- unsigned f_xsaves = kvm_x86_ops->xsaves_supported() ? F(XSAVES) : 0;
- unsigned f_intel_pt = kvm_x86_ops->pt_supported() ? F(INTEL_PT) : 0;
+ unsigned f_rdtscp = kvm_x86_ops.rdtscp_supported() ? F(RDTSCP) : 0;
+ unsigned f_xsaves = kvm_x86_ops.xsaves_supported() ? F(XSAVES) : 0;
+ unsigned f_intel_pt = kvm_x86_ops.pt_supported() ? F(INTEL_PT) : 0;
/* cpuid 1.edx */
const u32 kvm_cpuid_1_edx_x86_features @@ -807,7 +807,7 @@ static inline int __do_cpuid_func(struct kvm_cpuid_entry2 *entry, u32 function,
break;
}
- kvm_x86_ops->set_supported_cpuid(function, entry);
+ kvm_x86_ops.set_supported_cpuid(function, entry);
r = 0;
arch/x86/kvm/hyperv.c +4 -4
@@ -1022,7 +1022,7 @@ static int kvm_hv_set_msr_pw(struct kvm_vcpu *vcpu, u32 msr, u64 data, addr =gfn_to_hva (kvm, gfn);if (kvm_is_error_hva (addr))return 1 ; - kvm_x86_ops->patch_hypercall (vcpu, instructions); + kvm_x86_ops.patch_hypercall (vcpu, instructions); ((unsigned char *)instructions)[3 ] =0xc3 ;/* ret */ if (__copy_to_user ((void __user *)addr, instructions,4 ))return 1 ;
@@ -1607,7 +1607,7 @@ int kvm_hv_hypercall(struct kvm_vcpu *vcpu)* hypercall generates UD from non zero cpl and real mode * per HYPER-V spec */ -if (kvm_x86_ops->get_cpl (vcpu) !=0 || !is_protmode (vcpu)) { +if (kvm_x86_ops.get_cpl (vcpu) !=0 || !is_protmode (vcpu)) {kvm_queue_exception (vcpu,UD_VECTOR );return 1 ; }
@@ -1800,8 +1800,8 @@ int kvm_vcpu_ioctl_get_hv_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid2 *cpuid, };int i, nent =ARRAY_SIZE (cpuid_entries); -if (kvm_x86_ops->nested_get_evmcs_version) - evmcs_ver = kvm_x86_ops->nested_get_evmcs_version (vcpu); +if (kvm_x86_ops.nested_get_evmcs_version) + evmcs_ver = kvm_x86_ops.nested_get_evmcs_version (vcpu);/* Skip NESTED_FEATURES if eVMCS is not supported */ if (!evmcs_ver)
arch/x86/kvm/kvm_cache_regs.h +5 -5
@@ -68,7 +68,7 @@ static inline unsigned long kvm_register_read(struct kvm_vcpu *vcpu, int reg)return 0 ;if (!kvm_register_is_available (vcpu, reg)) - kvm_x86_ops->cache_reg (vcpu, reg); + kvm_x86_ops.cache_reg (vcpu, reg);return vcpu->arch.regs[reg]; }
@@ -108,7 +108,7 @@ static inline u64 kvm_pdptr_read(struct kvm_vcpu *vcpu, int index)might_sleep ();/* on svm */ if (!kvm_register_is_available (vcpu,VCPU_EXREG_PDPTR )) - kvm_x86_ops->cache_reg (vcpu,VCPU_EXREG_PDPTR ); + kvm_x86_ops.cache_reg (vcpu,VCPU_EXREG_PDPTR );return vcpu->arch.walk_mmu->pdptrs[index]; }
@@ -117,7 +117,7 @@ static inline ulong kvm_read_cr0_bits(struct kvm_vcpu *vcpu, ulong mask) {ulong tmask = mask &KVM_POSSIBLE_CR0_GUEST_BITS ;if (tmask & vcpu->arch.cr0_guest_owned_bits) - kvm_x86_ops->decache_cr0_guest_bits (vcpu); + kvm_x86_ops.decache_cr0_guest_bits (vcpu);return vcpu->arch.cr0 & mask; }
@@ -130,14 +130,14 @@ static inline ulong kvm_read_cr4_bits(struct kvm_vcpu *vcpu, ulong mask) {ulong tmask = mask &KVM_POSSIBLE_CR4_GUEST_BITS ;if (tmask & vcpu->arch.cr4_guest_owned_bits) - kvm_x86_ops->decache_cr4_guest_bits (vcpu); + kvm_x86_ops.decache_cr4_guest_bits (vcpu);return vcpu->arch.cr4 & mask; }static inline ulong kvm_read_cr3 (struct kvm_vcpu *vcpu) {if (!kvm_register_is_available (vcpu,VCPU_EXREG_CR3 )) - kvm_x86_ops->cache_reg (vcpu,VCPU_EXREG_CR3 ); + kvm_x86_ops.cache_reg (vcpu,VCPU_EXREG_CR3 );return vcpu->arch.cr3; }
arch/x86/kvm/lapic.c +15 -15
@@ -448,7 +448,7 @@ static inline void apic_clear_irr(int vec, struct kvm_lapic *apic)if (unlikely (vcpu->arch.apicv_active)) {/* need to update RVI */ kvm_lapic_clear_vector (vec, apic->regs +APIC_IRR ); - kvm_x86_ops->hwapic_irr_update (vcpu, + kvm_x86_ops.hwapic_irr_update (vcpu,apic_find_highest_irr (apic)); }else { apic->irr_pending = false;
@@ -473,7 +473,7 @@ static inline void apic_set_isr(int vec, struct kvm_lapic *apic)* just set SVI. */ if (unlikely (vcpu->arch.apicv_active)) - kvm_x86_ops->hwapic_isr_update (vcpu, vec); + kvm_x86_ops.hwapic_isr_update (vcpu, vec);else { ++apic->isr_count;BUG_ON (apic->isr_count >MAX_APIC_VECTOR );
@@ -521,7 +521,7 @@ static inline void apic_clear_isr(int vec, struct kvm_lapic *apic)* and must be left alone. */ if (unlikely (vcpu->arch.apicv_active)) - kvm_x86_ops->hwapic_isr_update (vcpu, + kvm_x86_ops.hwapic_isr_update (vcpu,apic_find_highest_isr (apic));else { --apic->isr_count;
@@ -657,7 +657,7 @@ static int apic_has_interrupt_for_ppr(struct kvm_lapic *apic, u32 ppr) {int highest_irr;if (apic->vcpu->arch.apicv_active) - highest_irr = kvm_x86_ops->sync_pir_to_irr (apic->vcpu); + highest_irr = kvm_x86_ops.sync_pir_to_irr (apic->vcpu);else highest_irr =apic_find_highest_irr (apic);if (highest_irr =-1 || (highest_irr &0xF0 ) <= ppr)
@@ -1047,7 +1047,7 @@ static int __apic_accept_irq(struct kvm_lapic *apic, int delivery_mode, }if (vcpu->arch.apicv_active) - kvm_x86_ops->deliver_posted_interrupt (vcpu, vector); + kvm_x86_ops.deliver_posted_interrupt (vcpu, vector);else {kvm_lapic_set_irr (vector, apic);
@@ -1735,7 +1735,7 @@ static void cancel_hv_timer(struct kvm_lapic *apic) {WARN_ON (preemptible ());WARN_ON (!apic->lapic_timer.hv_timer_in_use); - kvm_x86_ops->cancel_hv_timer (apic->vcpu); + kvm_x86_ops.cancel_hv_timer (apic->vcpu); apic->lapic_timer.hv_timer_in_use = false; }
@@ -1746,13 +1746,13 @@ static bool start_hv_timer(struct kvm_lapic *apic)bool expired;WARN_ON (preemptible ()); -if (!kvm_x86_ops->set_hv_timer) +if (!kvm_x86_ops.set_hv_timer)return false;if (!ktimer->tscdeadline)return false; -if (kvm_x86_ops->set_hv_timer (vcpu, ktimer->tscdeadline, &expired)) +if (kvm_x86_ops.set_hv_timer (vcpu, ktimer->tscdeadline, &expired))return false; ktimer->hv_timer_in_use = true;
@@ -2177,7 +2177,7 @@ void kvm_lapic_set_base(struct kvm_vcpu *vcpu, u64 value)kvm_apic_set_x2apic_id (apic, vcpu->vcpu_id);if ((old_value ^ value) & (MSR_IA32_APICBASE_ENABLE |X2APIC_ENABLE )) - kvm_x86_ops->set_virtual_apic_mode (vcpu); + kvm_x86_ops.set_virtual_apic_mode (vcpu); apic->base_address = apic->vcpu->arch.apic_base &MSR_IA32_APICBASE_BASE ;
@@ -2254,9 +2254,9 @@ void kvm_lapic_reset(struct kvm_vcpu *vcpu, bool init_event) vcpu->arch.pv_eoi.msr_val =0 ;apic_update_ppr (apic);if (vcpu->arch.apicv_active) { - kvm_x86_ops->apicv_post_state_restore (vcpu); - kvm_x86_ops->hwapic_irr_update (vcpu,-1 ); - kvm_x86_ops->hwapic_isr_update (vcpu,-1 ); + kvm_x86_ops.apicv_post_state_restore (vcpu); + kvm_x86_ops.hwapic_irr_update (vcpu,-1 ); + kvm_x86_ops.hwapic_isr_update (vcpu,-1 ); } vcpu->arch.apic_arb_prio =0 ;
@@ -2504,10 +2504,10 @@ int kvm_apic_set_state(struct kvm_vcpu *vcpu, struct kvm_lapic_state *s)kvm_apic_update_apicv (vcpu); apic->highest_isr_cache =-1 ;if (vcpu->arch.apicv_active) { - kvm_x86_ops->apicv_post_state_restore (vcpu); - kvm_x86_ops->hwapic_irr_update (vcpu, + kvm_x86_ops.apicv_post_state_restore (vcpu); + kvm_x86_ops.hwapic_irr_update (vcpu,apic_find_highest_irr (apic)); - kvm_x86_ops->hwapic_isr_update (vcpu, + kvm_x86_ops.hwapic_isr_update (vcpu,apic_find_highest_isr (apic)); }kvm_make_request (KVM_REQ_EVENT , vcpu);
arch/x86/kvm/mmu.h +2 -2
@@ -157,8 +157,8 @@ static inline u8 permission_fault(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu, unsigned pte_access, unsigned pte_pkey, unsigned pfec) { - int cpl = kvm_x86_ops->get_cpl(vcpu); -unsigned long rflags = kvm_x86_ops->get_rflags (vcpu); + int cpl = kvm_x86_ops.get_cpl(vcpu); +unsigned long rflags = kvm_x86_ops.get_rflags (vcpu);/* * If CPL < 3, SMAP prevention are disabled if EFLAGS.AC = 1.
arch/x86/kvm/mmu/mmu.c +19 -19
@@ -313,7 +313,7 @@ kvm_mmu_calc_root_page_role(struct kvm_vcpu *vcpu);static inline bool kvm_available_flush_tlb_with_range (void ) { -return kvm_x86_ops->tlb_remote_flush_with_range; +return kvm_x86_ops.tlb_remote_flush_with_range; } static void kvm_flush_remote_tlbs_with_range(struct kvm *kvm,
@@ -321,8 +321,8 @@ static void kvm_flush_remote_tlbs_with_range(struct kvm *kvm, {int ret = -ENOTSUPP ; -if (range && kvm_x86_ops->tlb_remote_flush_with_range) - ret = kvm_x86_ops->tlb_remote_flush_with_range (kvm, range); +if (range && kvm_x86_ops.tlb_remote_flush_with_range) + ret = kvm_x86_ops.tlb_remote_flush_with_range (kvm, range);if (ret)kvm_flush_remote_tlbs (kvm);
@@ -1650,7 +1650,7 @@ static bool spte_set_dirty(u64 *sptep)rmap_printk ("rmap_set_dirty: spte %p %llx\n" , sptep, *sptep);/* -* Similar to the !kvm_x86_ops->slot_disable_log_dirty case, +* Similar to the !kvm_x86_ops.slot_disable_log_dirty case, * do not bother adding back write access to pages marked * SPTE_AD_WRPROT_ONLY_MASK. */
@@ -1739,8 +1739,8 @@ void kvm_arch_mmu_enable_log_dirty_pt_masked(struct kvm *kvm,struct kvm_memory_slot *slot, gfn_t gfn_offset, unsigned long mask) { - if (kvm_x86_ops->enable_log_dirty_pt_masked) - kvm_x86_ops->enable_log_dirty_pt_masked(kvm, slot, gfn_offset, + if (kvm_x86_ops.enable_log_dirty_pt_masked) + kvm_x86_ops.enable_log_dirty_pt_masked(kvm, slot, gfn_offset, mask); elsekvm_mmu_write_protect_pt_masked (kvm ,slot ,gfn_offset ,mask );
@@ -1755,8 +1755,8 @@ void kvm_arch_mmu_enable_log_dirty_pt_masked(struct kvm *kvm,*/ int kvm_arch_write_log_dirty (struct kvm_vcpu *vcpu) { -if (kvm_x86_ops->write_log_dirty) -return kvm_x86_ops->write_log_dirty (vcpu); +if (kvm_x86_ops.write_log_dirty) +return kvm_x86_ops.write_log_dirty (vcpu);return 0 ; }
@@ -3044,7 +3044,7 @@ static int set_spte(struct kvm_vcpu *vcpu, u64 *sptep,if (level >PT_PAGE_TABLE_LEVEL ) spte |=PT_PAGE_SIZE_MASK ;if (tdp_enabled) - spte |= kvm_x86_ops->get_mt_mask (vcpu, gfn, + spte |= kvm_x86_ops.get_mt_mask (vcpu, gfn,kvm_is_mmio_pfn (pfn));if (host_writable)
@@ -3292,7 +3292,7 @@ static int kvm_mmu_hugepage_adjust(struct kvm_vcpu *vcpu, gfn_t gfn,if (!slot)return PT_PAGE_TABLE_LEVEL ; - max_level =min (max_level, kvm_x86_ops->get_lpage_level ()); + max_level =min (max_level, kvm_x86_ops.get_lpage_level ());for ( ; max_level >PT_PAGE_TABLE_LEVEL ; max_level--) { linfo =lpage_info_slot (gfn, slot, max_level);if (!linfo->disallow_lpage)
@@ -4907,7 +4907,7 @@ kvm_calc_tdp_mmu_root_page_role(struct kvm_vcpu *vcpu, bool base_only)union kvm_mmu_role role =kvm_calc_mmu_role_common (vcpu, base_only); role.base.ad_disabled = (shadow_accessed_mask =0 ); - role.base.level = kvm_x86_ops->get_tdp_level (vcpu); + role.base.level = kvm_x86_ops.get_tdp_level (vcpu); role.base.direct = true; role.base.gpte_is_8_bytes = true;
@@ -4929,9 +4929,9 @@ static void init_kvm_tdp_mmu(struct kvm_vcpu *vcpu) context->sync_page = nonpaging_sync_page; context->invlpg = nonpaging_invlpg; context->update_pte = nonpaging_update_pte; - context->shadow_root_level = kvm_x86_ops->get_tdp_level (vcpu); + context->shadow_root_level = kvm_x86_ops.get_tdp_level (vcpu); context->direct_map = true; - context->set_cr3 = kvm_x86_ops->set_tdp_cr3; + context->set_cr3 = kvm_x86_ops.set_tdp_cr3; context->get_cr3 = get_cr3; context->get_pdptr = kvm_pdptr_read; context->inject_page_fault = kvm_inject_page_fault;
@@ -5079,7 +5079,7 @@ static void init_kvm_softmmu(struct kvm_vcpu *vcpu)struct kvm_mmu *context = vcpu->arch.mmu;kvm_init_shadow_mmu (vcpu); - context->set_cr3 = kvm_x86_ops->set_cr3; + context->set_cr3 = kvm_x86_ops.set_cr3; context->get_cr3 = get_cr3; context->get_pdptr = kvm_pdptr_read; context->inject_page_fault = kvm_inject_page_fault;
@@ -5186,7 +5186,7 @@ int kvm_mmu_load(struct kvm_vcpu *vcpu)if (r) goto out;kvm_mmu_load_cr3 (vcpu); - kvm_x86_ops->tlb_flush (vcpu, true); + kvm_x86_ops.tlb_flush (vcpu, true); out:return r; }
@@ -5482,7 +5482,7 @@ int kvm_mmu_page_fault(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, u64 error_code,* guest, with the exception of AMD Erratum 1096 which is unrecoverable. */ if (unlikely (insn && !insn_len)) { -if (!kvm_x86_ops->need_emulation_on_page_fault (vcpu)) +if (!kvm_x86_ops.need_emulation_on_page_fault (vcpu))return 1 ; }
@@ -5517,7 +5517,7 @@ void kvm_mmu_invlpg(struct kvm_vcpu *vcpu, gva_t gva)if (VALID_PAGE (mmu->prev_roots[i].hpa)) mmu->invlpg (vcpu, gva, mmu->prev_roots[i].hpa); - kvm_x86_ops->tlb_flush_gva (vcpu, gva); + kvm_x86_ops.tlb_flush_gva (vcpu, gva); ++vcpu->stat.invlpg; }EXPORT_SYMBOL_GPL (kvm_mmu_invlpg);
@@ -5542,7 +5542,7 @@ void kvm_mmu_invpcid_gva(struct kvm_vcpu *vcpu, gva_t gva, unsigned long pcid) }if (tlb_flush) - kvm_x86_ops->tlb_flush_gva (vcpu, gva); + kvm_x86_ops.tlb_flush_gva (vcpu, gva); ++vcpu->stat.invlpg;
@@ -5659,7 +5659,7 @@ static int alloc_mmu_pages(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu)* SVM's 32-bit NPT support, TDP paging doesn't use PAE paging and can * skip allocating the PDP table. */ -if (tdp_enabled && kvm_x86_ops->get_tdp_level (vcpu) >PT32E_ROOT_LEVEL ) +if (tdp_enabled && kvm_x86_ops.get_tdp_level (vcpu) >PT32E_ROOT_LEVEL )return 0 ; page =alloc_page (GFP_KERNEL_ACCOUNT | __GFP_DMA32);
arch/x86/kvm/pmu.c +15 -15
@@ -211,7 +211,7 @@ void reprogram_gp_counter(struct kvm_pmc *pmc, u64 eventsel) ARCH_PERFMON_EVENTSEL_CMASK | HSW_IN_TX | HSW_IN_TX_CHECKPOINTED))) { - config = kvm_x86_ops->pmu_ops->find_arch_event (pmc_to_pmu (pmc), + config = kvm_x86_ops.pmu_ops->find_arch_event (pmc_to_pmu (pmc), event_select, unit_mask);if (config !=PERF_COUNT_HW_MAX )
@@ -265,7 +265,7 @@ void reprogram_fixed_counter(struct kvm_pmc *pmc, u8 ctrl, int idx) pmc->current_config = (u64 )ctrl;pmc_reprogram_counter (pmc,PERF_TYPE_HARDWARE , - kvm_x86_ops->pmu_ops->find_fixed_event (idx), + kvm_x86_ops.pmu_ops->find_fixed_event (idx), !(en_field &0x2 ),/* exclude user */ !(en_field &0x1 ),/* exclude kernel */ pmi, false, false);
@@ -274,7 +274,7 @@ EXPORT_SYMBOL_GPL(reprogram_fixed_counter);void reprogram_counter (struct kvm_pmu *pmu,int pmc_idx) { -struct kvm_pmc *pmc = kvm_x86_ops->pmu_ops->pmc_idx_to_pmc (pmu, pmc_idx); +struct kvm_pmc *pmc = kvm_x86_ops.pmu_ops->pmc_idx_to_pmc (pmu, pmc_idx);if (!pmc)return ;
@@ -296,7 +296,7 @@ void kvm_pmu_handle_event(struct kvm_vcpu *vcpu)int bit;for_each_set_bit (bit, pmu->reprogram_pmi,X86_PMC_IDX_MAX ) { -struct kvm_pmc *pmc = kvm_x86_ops->pmu_ops->pmc_idx_to_pmc (pmu, bit); +struct kvm_pmc *pmc = kvm_x86_ops.pmu_ops->pmc_idx_to_pmc (pmu, bit);if (unlikely (!pmc || !pmc->perf_event)) {clear_bit (bit, pmu->reprogram_pmi);
@@ -318,7 +318,7 @@ void kvm_pmu_handle_event(struct kvm_vcpu *vcpu)/* check if idx is a valid index to access PMU */ int kvm_pmu_is_valid_rdpmc_ecx (struct kvm_vcpu *vcpu,unsigned int idx) { -return kvm_x86_ops->pmu_ops->is_valid_rdpmc_ecx (vcpu, idx); +return kvm_x86_ops.pmu_ops->is_valid_rdpmc_ecx (vcpu, idx); }bool is_vmware_backdoor_pmc (u32 pmc_idx)
@@ -368,7 +368,7 @@ int kvm_pmu_rdpmc(struct kvm_vcpu *vcpu, unsigned idx, u64 *data)if (is_vmware_backdoor_pmc (idx))return kvm_pmu_rdpmc_vmware (vcpu, idx, data); - pmc = kvm_x86_ops->pmu_ops->rdpmc_ecx_to_pmc (vcpu, idx, &mask); + pmc = kvm_x86_ops.pmu_ops->rdpmc_ecx_to_pmc (vcpu, idx, &mask);if (!pmc)return 1 ;
@@ -384,14 +384,14 @@ void kvm_pmu_deliver_pmi(struct kvm_vcpu *vcpu)bool kvm_pmu_is_valid_msr (struct kvm_vcpu *vcpu,u32 msr) { -return kvm_x86_ops->pmu_ops->msr_idx_to_pmc (vcpu, msr) || - kvm_x86_ops->pmu_ops->is_valid_msr (vcpu, msr); +return kvm_x86_ops.pmu_ops->msr_idx_to_pmc (vcpu, msr) || + kvm_x86_ops.pmu_ops->is_valid_msr (vcpu, msr); }static void kvm_pmu_mark_pmc_in_use (struct kvm_vcpu *vcpu,u32 msr) {struct kvm_pmu *pmu =vcpu_to_pmu (vcpu); -struct kvm_pmc *pmc = kvm_x86_ops->pmu_ops->msr_idx_to_pmc (vcpu, msr); +struct kvm_pmc *pmc = kvm_x86_ops.pmu_ops->msr_idx_to_pmc (vcpu, msr);if (pmc)__set_bit (pmc->idx, pmu->pmc_in_use);
@@ -399,13 +399,13 @@ static void kvm_pmu_mark_pmc_in_use(struct kvm_vcpu *vcpu, u32 msr)int kvm_pmu_get_msr (struct kvm_vcpu *vcpu,u32 msr,u64 *data) { -return kvm_x86_ops->pmu_ops->get_msr (vcpu, msr, data); +return kvm_x86_ops.pmu_ops->get_msr (vcpu, msr, data); }int kvm_pmu_set_msr (struct kvm_vcpu *vcpu,struct msr_data *msr_info) {kvm_pmu_mark_pmc_in_use (vcpu, msr_info->index); -return kvm_x86_ops->pmu_ops->set_msr (vcpu, msr_info); +return kvm_x86_ops.pmu_ops->set_msr (vcpu, msr_info); }/* refresh PMU settings. This function generally is called when underlying
@@ -414,7 +414,7 @@ int kvm_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)*/ void kvm_pmu_refresh (struct kvm_vcpu *vcpu) { - kvm_x86_ops->pmu_ops->refresh (vcpu); + kvm_x86_ops.pmu_ops->refresh (vcpu); }void kvm_pmu_reset (struct kvm_vcpu *vcpu)
@@ -422,7 +422,7 @@ void kvm_pmu_reset(struct kvm_vcpu *vcpu)struct kvm_pmu *pmu =vcpu_to_pmu (vcpu);irq_work_sync (&pmu->irq_work); - kvm_x86_ops->pmu_ops->reset (vcpu); + kvm_x86_ops.pmu_ops->reset (vcpu); }void kvm_pmu_init (struct kvm_vcpu *vcpu)
@@ -430,7 +430,7 @@ void kvm_pmu_init(struct kvm_vcpu *vcpu)struct kvm_pmu *pmu =vcpu_to_pmu (vcpu);memset (pmu,0 ,sizeof (*pmu)); - kvm_x86_ops->pmu_ops->init (vcpu); + kvm_x86_ops.pmu_ops->init (vcpu);init_irq_work (&pmu->irq_work, kvm_pmi_trigger_fn); pmu->event_count =0 ; pmu->need_cleanup = false;
@@ -462,7 +462,7 @@ void kvm_pmu_cleanup(struct kvm_vcpu *vcpu) pmu->pmc_in_use, X86_PMC_IDX_MAX);for_each_set_bit (i, bitmask,X86_PMC_IDX_MAX ) { - pmc = kvm_x86_ops->pmu_ops->pmc_idx_to_pmc (pmu, i); + pmc = kvm_x86_ops.pmu_ops->pmc_idx_to_pmc (pmu, i);if (pmc && pmc->perf_event && !pmc_speculative_in_use (pmc))pmc_stop_counter (pmc);
arch/x86/kvm/pmu.h +1 -1
@@ -88,7 +88,7 @@ static inline bool pmc_is_fixed(struct kvm_pmc *pmc)static inline bool pmc_is_enabled (struct kvm_pmc *pmc) { -return kvm_x86_ops->pmu_ops->pmc_is_enabled (pmc); +return kvm_x86_ops.pmu_ops->pmc_is_enabled (pmc); } static inline bool kvm_valid_perf_global_ctrl(struct kvm_pmu *pmu,
arch/x86/kvm/svm.c +1 -1
@@ -7351,7 +7351,7 @@ static bool svm_apic_init_signal_blocked(struct kvm_vcpu *vcpu)* TODO: Last condition latch INIT signals on vCPU when * vCPU is in guest-mode and vmcb12 defines intercept on INIT. * To properly emulate the INIT intercept, SVM should implement -* kvm_x86_ops->check_nested_events() and call nested_svm_vmexit() +* kvm_x86_ops.check_nested_events() and call nested_svm_vmexit() * there if an INIT signal is pending. */ return !gif_set(svm) ||
arch/x86/kvm/trace.h +2 -2
@@ -240,7 +240,7 @@ TRACE_EVENT(kvm_exit, __entry->guest_rip =kvm_rip_read (vcpu); __entry->isa = isa; __entry->vcpu_id = vcpu->vcpu_id; - kvm_x86_ops->get_exit_info (vcpu, &__entry->info1, + kvm_x86_ops.get_exit_info (vcpu, &__entry->info1, &__entry->info2); ),
@@ -744,7 +744,7 @@ TRACE_EVENT(kvm_emulate_insn, ),TP_fast_assign ( - __entry->csbase = kvm_x86_ops->get_segment_base(vcpu, VCPU_SREG_CS); + __entry->csbase = kvm_x86_ops.get_segment_base(vcpu, VCPU_SREG_CS); __entry->len = vcpu->arch.emulate_ctxt.fetch.ptr - vcpu->arch.emulate_ctxt.fetch.data; __entry->rip = vcpu->arch.emulate_ctxt._eip - __entry->len;
arch/x86/kvm/vmx/nested.c +1 -1
@@ -4460,7 +4460,7 @@ void nested_vmx_pmu_entry_exit_ctls_update(struct kvm_vcpu *vcpu)return ; vmx =to_vmx (vcpu); -if (kvm_x86_ops->pmu_ops->is_valid_msr (vcpu,MSR_CORE_PERF_GLOBAL_CTRL )) { +if (kvm_x86_ops.pmu_ops->is_valid_msr (vcpu,MSR_CORE_PERF_GLOBAL_CTRL )) { vmx->nested.msrs.entry_ctls_high |VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL ; vmx->nested.msrs.exit_ctls_high |diff --git a/arch/x86/kvm/vmx/pmu_intel.c b/arch/x86/kvm/vmx/pmu_intel.c
index fd21cdb10b79..c6bcc4c61e97 100644
arch/x86/kvm/vmx/pmu_intel.c +1 -1
@@ -329,7 +329,7 @@ static void intel_pmu_refresh(struct kvm_vcpu *vcpu) pmu->global_ovf_ctrl_mask = pmu->global_ctrl_mask & ~(MSR_CORE_PERF_GLOBAL_OVF_CTRL_OVF_BUF |MSR_CORE_PERF_GLOBAL_OVF_CTRL_COND_CHGD ); -if (kvm_x86_ops->pt_supported ()) +if (kvm_x86_ops.pt_supported ()) pmu->global_ovf_ctrl_mask & ~MSR_CORE_PERF_GLOBAL_OVF_CTRL_TRACE_TOPA_PMI ;
arch/x86/kvm/vmx/vmx.c +2 -2
@@ -2978,7 +2978,7 @@ void vmx_set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3) eptp =construct_eptp (vcpu, cr3);vmcs_write64 (EPT_POINTER , eptp); -if (kvm_x86_ops->tlb_remote_flush) { +if (kvm_x86_ops.tlb_remote_flush) {spin_lock (&to_kvm_vmx (kvm)->ept_pointer_lock);to_vmx (vcpu)->ept_pointer = eptp;to_kvm_vmx (kvm)->ept_pointers_match
@@ -7381,7 +7381,7 @@ static void pi_post_block(struct kvm_vcpu *vcpu)static void vmx_post_block (struct kvm_vcpu *vcpu) { -if (kvm_x86_ops->set_hv_timer) +if (kvm_x86_ops.set_hv_timer)kvm_lapic_switch_to_hv_timer (vcpu);pi_post_block (vcpu);
arch/x86/kvm/x86.c +185 -185
1,271 lines not on this page · raw message
arch/x86/kvm/x86.h +2 -2
@@ -96,7 +96,7 @@ static inline bool is_64_bit_mode(struct kvm_vcpu *vcpu)if (!is_long_mode (vcpu))return false; - kvm_x86_ops->get_cs_db_l_bits (vcpu, &cs_db, &cs_l); + kvm_x86_ops.get_cs_db_l_bits (vcpu, &cs_db, &cs_l);return cs_l; }
@@ -247,7 +247,7 @@ static inline bool kvm_check_has_quirk(struct kvm *kvm, u64 quirk)static inline bool kvm_vcpu_latch_init (struct kvm_vcpu *vcpu) { -return is_smm (vcpu) || kvm_x86_ops->apic_init_signal_blocked (vcpu); +return is_smm (vcpu) || kvm_x86_ops.apic_init_signal_blocked (vcpu); }void kvm_set_pending_timer (struct kvm_vcpu *vcpu);
Signature · 1 line
2.24.1
PATCH v2 7/9 KVM: x86: Drop __exit from kvm_x86_ops' hardware_unsetup()
In reply to Sean ChristophersonRemove the __exit annotation from VMX/SVM's hardware_unsetup(), the hook can be reached during kvm_init() by way of kvm_arch_hardware_unsetup() if failure occurs at various points during initialization.
Note, there is no known functional issue with the __exit annotation, the above is merely justification for its removal. The real motivation is to be able to annotate vmx_x86_ops and svm_x86_ops with __initdata, which makes objtool complain because objtool doesn't understand that the vendor specific __initdata is being copied by value to a non-__initdata instance.
--- arch/x86/include/asm/kvm_host.h | 2 +- arch/x86/kvm/svm.c | 2 +- arch/x86/kvm/vmx/vmx.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/x86/include/asm/kvm_host.h +1 -1
@@ -1044,7 +1044,7 @@ static inline u16 kvm_lapic_irq_dest_mode(bool dest_mode_logical)struct kvm_x86_ops {int (*hardware_enable)(void );void (*hardware_disable)(void ); -void (*hardware_unsetup)(void );/* __exit */ +void (*hardware_unsetup)(void );bool (*cpu_has_accelerated_tpr)(void );bool (*has_emulated_msr)(int index);void (*cpuid_update)(struct kvm_vcpu *vcpu);
arch/x86/kvm/svm.c +1 -1
@@ -1468,7 +1468,7 @@ static __init int svm_hardware_setup(void)return r; } -static __exit void svm_hardware_unsetup(void) +static void svm_hardware_unsetup (void ) {int cpu;
arch/x86/kvm/vmx/vmx.c +1 -1
@@ -7548,7 +7548,7 @@ static bool vmx_apic_init_signal_blocked(struct kvm_vcpu *vcpu)return to_vmx (vcpu)->nested.vmxon; } -static __exit void hardware_unsetup(void) +static void hardware_unsetup (void ) {if (nested)nested_vmx_hardware_unsetup ();
Signature · 1 line
2.24.1
PATCH v2 8/9 KVM: VMX: Annotate vmx_x86_ops as __initdata
In reply to Sean ChristophersonTag vmx_x86_ops with __initdata now the the struct is copied by value to a common x86 instance of kvm_x86_ops as part of kvm_init().
--- arch/x86/kvm/vmx/vmx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kvm/vmx/vmx.c +1 -1
@@ -7564,7 +7564,7 @@ static bool vmx_check_apicv_inhibit_reasons(ulong bit)return supported &BIT (bit); } -static struct kvm_x86_ops vmx_x86_ops__ro_after_init = { +static struct kvm_x86_ops vmx_x86_ops__initdata = { .hardware_unsetup = hardware_unsetup, .hardware_enable = hardware_enable,
Signature · 1 line
2.24.1
PATCH v2 9/9 KVM: SVM: Annotate svm_x86_ops as __initdata
In reply to Sean ChristophersonTag svm_x86_ops with __initdata now the the struct is copied by value to a common x86 instance of kvm_x86_ops as part of kvm_init().
--- arch/x86/kvm/svm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kvm/svm.c +1 -1
@@ -7374,7 +7374,7 @@ static void svm_pre_update_apicv_exec_ctrl(struct kvm *kvm, bool activate)avic_update_access_page (kvm, activate); } -static struct kvm_x86_ops svm_x86_ops__ro_after_init = { +static struct kvm_x86_ops svm_x86_ops__initdata = { .hardware_unsetup = svm_hardware_unsetup, .hardware_enable = svm_hardware_enable, .hardware_disable = svm_hardware_disable,
Signature · 1 line
2.24.1