From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1FE9AC54FCE for ; Mon, 23 Mar 2020 12:12:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EB5C1208FE for ; Mon, 23 Mar 2020 12:12:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="JwVoPvTx" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727451AbgCWMMz (ORCPT ); Mon, 23 Mar 2020 08:12:55 -0400 Received: from us-smtp-delivery-74.mimecast.com ([216.205.24.74]:27880 "EHLO us-smtp-delivery-74.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727422AbgCWMMz (ORCPT ); Mon, 23 Mar 2020 08:12:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584965573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=5qx8zhPCnTE2qfI2i3stQlj2dT0PZ4HXDVQ2fRtvOJ8=; b=JwVoPvTxqyu9A8bEcRMf+mDNzp8Y/9MlPf6hhHpPj7+5DAoe+sV7gQYekTKvs4Z3E4DDmL joQUTNrAcbWiEysfNVzMKoo74nonRRr5zq7Y14ON2wS0SwBuC1UB0AzgNInZ5txAGnlGVv eN0JfW7HCiTB9HCUjevZYSAEVsy1HmA= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-205-AqEXRlc_Oxq5wnJ8L2s3wg-1; Mon, 23 Mar 2020 08:12:52 -0400 X-MC-Unique: AqEXRlc_Oxq5wnJ8L2s3wg-1 Received: by mail-wr1-f71.google.com with SMTP id h14so1132533wrr.12 for ; Mon, 23 Mar 2020 05:12:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version; bh=5qx8zhPCnTE2qfI2i3stQlj2dT0PZ4HXDVQ2fRtvOJ8=; b=kHGLcB2rQPy6HjU2HpdflqcD6RFqZzOx76jvAOeIoQHVfSBKuriJIgblPBMUDxn3Ei FzjJ5K5ZYhBKBkNrv1VKnNXOKKaxKwrpwKY+CmYPWynhkXm+A2q7FC+F4epWOTXTIQe1 DooXsLkffpqWk3F0RTubI1ws9GXLfFBm6ZVDl1GbCcbKlj7JTOyEjSGwexFxgysGpyJP A85rWjKp3vMKuS1ZpqVar83xRRiqzzsMAFmDfP7c9BT2SSU7Rb3Kt9qfWyx+UM4/TvvK bOfEE9T/0hpg3xws9qhBM3FJLydxsIb+6Isx/kBeCiR0cb2i0qgK4FseBrTo+8TE2mc/ ngqw== X-Gm-Message-State: ANhLgQ039/YyMK9VDY2MfKo0RlDxAzJMg4zUZ1ONn509zO8JMkZLTwKk 03sv6JovhN0QgdskW08h8BKUq4bHlfLPj4qDTjlLUtapIpCifsYmu/7yiKrgmzR0I0DfGjRdFrh wUPz7nyBSZ8RvxFbl0Bsu0w== X-Received: by 2002:a1c:7dc8:: with SMTP id y191mr26149371wmc.167.1584965570414; Mon, 23 Mar 2020 05:12:50 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvxdntzGTAq5lGTsloo1YunEi0RacH3kYz7CeYUhon5iCYkq0bwrHPPjatnROv0Mk0H2zrWhQ== X-Received: by 2002:a1c:7dc8:: with SMTP id y191mr26149348wmc.167.1584965570127; Mon, 23 Mar 2020 05:12:50 -0700 (PDT) Received: from vitty.brq.redhat.com (g-server-2.ign.cz. [91.219.240.2]) by smtp.gmail.com with ESMTPSA id p16sm20678671wmi.40.2020.03.23.05.12.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Mar 2020 05:12:49 -0700 (PDT) From: Vitaly Kuznetsov To: Sean Christopherson , Paolo Bonzini Cc: Paul Mackerras , Christian Borntraeger , Janosch Frank , David Hildenbrand , Cornelia Huck , Sean Christopherson , Wanpeng Li , Jim Mattson , Joerg Roedel , Marc Zyngier , James Morse , Julien Thierry , Suzuki K Poulose , linux-mips@vger.kernel.org, kvm@vger.kernel.org, kvm-ppc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org Subject: Re: [PATCH v3 3/9] KVM: VMX: Move hardware_setup() definition below vmx_x86_ops In-Reply-To: <20200321202603.19355-4-sean.j.christopherson@intel.com> References: <20200321202603.19355-1-sean.j.christopherson@intel.com> <20200321202603.19355-4-sean.j.christopherson@intel.com> Date: Mon, 23 Mar 2020 13:12:47 +0100 Message-ID: <87imiv9sn4.fsf@vitty.brq.redhat.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org Sean Christopherson writes: > Move 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. > > Signed-off-by: Sean Christopherson > --- > arch/x86/kvm/vmx/vmx.c | 346 ++++++++++++++++++++--------------------- > 1 file changed, 173 insertions(+), 173 deletions(-) > > diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c > index ffcdcc86f5b7..82dab775d520 100644 > --- a/arch/x86/kvm/vmx/vmx.c > +++ b/arch/x86/kvm/vmx/vmx.c > @@ -7652,179 +7652,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, ept_lpage_level; > - > - 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_mpx()) > - supported_xcr0 &= ~(XFEATURE_MASK_BNDREGS | > - XFEATURE_MASK_BNDCSR); > - > - 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 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(); > - > - if (!enable_ept) > - ept_lpage_level = 0; > - else if (cpu_has_vmx_ept_1g_page()) > - ept_lpage_level = PT_PDPE_LEVEL; > - else if (cpu_has_vmx_ept_2m_page()) > - ept_lpage_level = PT_DIRECTORY_LEVEL; > - else > - ept_lpage_level = PT_PAGE_TABLE_LEVEL; > - kvm_configure_mmu(enable_ept, ept_lpage_level); > - > - /* > - * 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); > - > - r = nested_vmx_hardware_setup(kvm_vmx_exit_handlers); > - if (r) > - return r; > - } > - > - vmx_set_cpu_caps(); > - > - r = alloc_kvm_area(); > - if (r) > - nested_vmx_hardware_unsetup(); > - return r; > -} > - > static __exit void hardware_unsetup(void) > { > if (nested) > @@ -7978,6 +7805,179 @@ 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, ept_lpage_level; > + > + 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_mpx()) > + supported_xcr0 &= ~(XFEATURE_MASK_BNDREGS | > + XFEATURE_MASK_BNDCSR); > + > + 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 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(); > + > + if (!enable_ept) > + ept_lpage_level = 0; > + else if (cpu_has_vmx_ept_1g_page()) > + ept_lpage_level = PT_PDPE_LEVEL; > + else if (cpu_has_vmx_ept_2m_page()) > + ept_lpage_level = PT_DIRECTORY_LEVEL; > + else > + ept_lpage_level = PT_PAGE_TABLE_LEVEL; > + kvm_configure_mmu(enable_ept, ept_lpage_level); > + > + /* > + * 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); > + > + r = nested_vmx_hardware_setup(kvm_vmx_exit_handlers); > + if (r) > + return r; > + } > + > + vmx_set_cpu_caps(); > + > + 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, Reviewed-by: Vitaly Kuznetsov -- Vitaly