From patchwork Fri Sep 23 11:17:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Wanpeng Li X-Patchwork-Id: 9347903 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D2E2A601C2 for ; Fri, 23 Sep 2016 11:17:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C19592A7BC for ; Fri, 23 Sep 2016 11:17:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B48522AADE; Fri, 23 Sep 2016 11:17:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0F1C12A7BC for ; Fri, 23 Sep 2016 11:17:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759305AbcIWLRZ (ORCPT ); Fri, 23 Sep 2016 07:17:25 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:36488 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759275AbcIWLRV (ORCPT ); Fri, 23 Sep 2016 07:17:21 -0400 Received: by mail-pf0-f196.google.com with SMTP id n24so5146677pfb.3; Fri, 23 Sep 2016 04:17:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=2Bk2N8RfztRn0bnuejn6Os6KjvDK+Ind5R2hXVly10c=; b=biFiuuXmaUW3ILXuW5HikJRw+jDbkPghRfpI9XYFeplBCGMnSxWdvtL0Pp1OfbyvDC TTsywpMOEvjZUog+/Wh3FRRg/Zi5s491dQdn6ZNfnWSe4KU6wBKSCRoNB3K+vQVrhQ2Q QHdecBzyBHG/3jyXoCoBt244H15qCE+/UXcP/Nbx/yts4kJ2e8BRNFuLrwqQWTmd6Wze 8iQxH9V1QfS9w1csYIaAiR3OcYsmi6NptAjqHCV1yswT7XUMuago/sHHcvTBNqO8qzB4 +1BSeREdCno6819w0s/ouMpqDPbPf8AiDBD03/vJjB9h4dfPiKiatVa5sM+zTo9o6HpF Aejw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=2Bk2N8RfztRn0bnuejn6Os6KjvDK+Ind5R2hXVly10c=; b=AvwYceIwmeuv8wTZU3aXw2synCz0aj0cKDthqzmYsSu0i5cYPEVWIJxVmAtSTqDItk yquLHHqL7dXFtezNsnghPRk9Nbsg0zsuYoT01873Pr/Sx4kdvsarWY2FrS4v+BPPsLK8 o98BMj382A8ZOdiRI/co+CyoPGwxsLFPS+Uy6qdWf4CcUizlalIvnsXTboR13r+SAED4 1dqIiIVaUZ758K/ZaRwBbn6bBGkmESwhdIAJZNbNtKI0uF+1O5EFBtmqdUukV1Jo4dmv P7M5fxYBxTN2lOv3W61Fs0YYeb3adNqhaUItrMeztkrFTGbLi0Ma6p/F1/jgHfe8HQ4q pVuw== X-Gm-Message-State: AE9vXwOUmmvOwlPZZOgxU2op60HNWp0PjGOnCgHNckGDs5KhOmarcgaoAjycf8rHwABwJg== X-Received: by 10.98.76.134 with SMTP id e6mr11685977pfj.23.1474629440690; Fri, 23 Sep 2016 04:17:20 -0700 (PDT) Received: from kernel.kingsoft.cn ([114.255.44.132]) by smtp.gmail.com with ESMTPSA id f7sm10798516pfk.79.2016.09.23.04.17.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 23 Sep 2016 04:17:19 -0700 (PDT) From: Wanpeng Li X-Google-Original-From: Wanpeng Li To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Wanpeng Li , Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= Subject: [PATCH] KVM: VMX: Better name x2apic msr bitmaps Date: Fri, 23 Sep 2016 19:17:16 +0800 Message-Id: <1474629436-3576-1-git-send-email-wanpeng.li@hotmail.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Renames x2apic_apicv_inactive msr_bitmaps to x2apic and original x2apic bitmaps to x2apic_apicv. Cc: Paolo Bonzini Cc: Radim Krčmář Signed-off-by: Wanpeng Li --- arch/x86/kvm/vmx.c | 72 +++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index c6c22ff..2202319 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -925,10 +925,10 @@ static unsigned long *vmx_io_bitmap_a; static unsigned long *vmx_io_bitmap_b; static unsigned long *vmx_msr_bitmap_legacy; static unsigned long *vmx_msr_bitmap_longmode; +static unsigned long *vmx_msr_bitmap_legacy_x2apic_apicv; +static unsigned long *vmx_msr_bitmap_longmode_x2apic_apicv; static unsigned long *vmx_msr_bitmap_legacy_x2apic; static unsigned long *vmx_msr_bitmap_longmode_x2apic; -static unsigned long *vmx_msr_bitmap_legacy_x2apic_apicv_inactive; -static unsigned long *vmx_msr_bitmap_longmode_x2apic_apicv_inactive; static unsigned long *vmx_vmread_bitmap; static unsigned long *vmx_vmwrite_bitmap; @@ -2528,14 +2528,14 @@ static void vmx_set_msr_bitmap(struct kvm_vcpu *vcpu) SECONDARY_EXEC_VIRTUALIZE_X2APIC_MODE)) { if (enable_apicv && kvm_vcpu_apicv_active(vcpu)) { if (is_long_mode(vcpu)) - msr_bitmap = vmx_msr_bitmap_longmode_x2apic; + msr_bitmap = vmx_msr_bitmap_longmode_x2apic_apicv; else - msr_bitmap = vmx_msr_bitmap_legacy_x2apic; + msr_bitmap = vmx_msr_bitmap_legacy_x2apic_apicv; } else { if (is_long_mode(vcpu)) - msr_bitmap = vmx_msr_bitmap_longmode_x2apic_apicv_inactive; + msr_bitmap = vmx_msr_bitmap_longmode_x2apic; else - msr_bitmap = vmx_msr_bitmap_legacy_x2apic_apicv_inactive; + msr_bitmap = vmx_msr_bitmap_legacy_x2apic; } } else { if (is_long_mode(vcpu)) @@ -4694,14 +4694,14 @@ static void vmx_disable_intercept_for_msr(u32 msr, bool longmode_only) static void vmx_enable_intercept_msr_read_x2apic(u32 msr, bool apicv_active) { if (apicv_active) { - __vmx_enable_intercept_for_msr(vmx_msr_bitmap_legacy_x2apic, + __vmx_enable_intercept_for_msr(vmx_msr_bitmap_legacy_x2apic_apicv, msr, MSR_TYPE_R); - __vmx_enable_intercept_for_msr(vmx_msr_bitmap_longmode_x2apic, + __vmx_enable_intercept_for_msr(vmx_msr_bitmap_longmode_x2apic_apicv, msr, MSR_TYPE_R); } else { - __vmx_enable_intercept_for_msr(vmx_msr_bitmap_legacy_x2apic_apicv_inactive, + __vmx_enable_intercept_for_msr(vmx_msr_bitmap_legacy_x2apic, msr, MSR_TYPE_R); - __vmx_enable_intercept_for_msr(vmx_msr_bitmap_longmode_x2apic_apicv_inactive, + __vmx_enable_intercept_for_msr(vmx_msr_bitmap_longmode_x2apic, msr, MSR_TYPE_R); } } @@ -4709,14 +4709,14 @@ static void vmx_enable_intercept_msr_read_x2apic(u32 msr, bool apicv_active) static void vmx_disable_intercept_msr_read_x2apic(u32 msr, bool apicv_active) { if (apicv_active) { - __vmx_disable_intercept_for_msr(vmx_msr_bitmap_legacy_x2apic, + __vmx_disable_intercept_for_msr(vmx_msr_bitmap_legacy_x2apic_apicv, msr, MSR_TYPE_R); - __vmx_disable_intercept_for_msr(vmx_msr_bitmap_longmode_x2apic, + __vmx_disable_intercept_for_msr(vmx_msr_bitmap_longmode_x2apic_apicv, msr, MSR_TYPE_R); } else { - __vmx_disable_intercept_for_msr(vmx_msr_bitmap_legacy_x2apic_apicv_inactive, + __vmx_disable_intercept_for_msr(vmx_msr_bitmap_legacy_x2apic, msr, MSR_TYPE_R); - __vmx_disable_intercept_for_msr(vmx_msr_bitmap_longmode_x2apic_apicv_inactive, + __vmx_disable_intercept_for_msr(vmx_msr_bitmap_longmode_x2apic, msr, MSR_TYPE_R); } } @@ -4724,14 +4724,14 @@ static void vmx_disable_intercept_msr_read_x2apic(u32 msr, bool apicv_active) static void vmx_disable_intercept_msr_write_x2apic(u32 msr, bool apicv_active) { if (apicv_active) { - __vmx_disable_intercept_for_msr(vmx_msr_bitmap_legacy_x2apic, + __vmx_disable_intercept_for_msr(vmx_msr_bitmap_legacy_x2apic_apicv, msr, MSR_TYPE_W); - __vmx_disable_intercept_for_msr(vmx_msr_bitmap_longmode_x2apic, + __vmx_disable_intercept_for_msr(vmx_msr_bitmap_longmode_x2apic_apicv, msr, MSR_TYPE_W); } else { - __vmx_disable_intercept_for_msr(vmx_msr_bitmap_legacy_x2apic_apicv_inactive, + __vmx_disable_intercept_for_msr(vmx_msr_bitmap_legacy_x2apic, msr, MSR_TYPE_W); - __vmx_disable_intercept_for_msr(vmx_msr_bitmap_longmode_x2apic_apicv_inactive, + __vmx_disable_intercept_for_msr(vmx_msr_bitmap_longmode_x2apic, msr, MSR_TYPE_W); } } @@ -6390,28 +6390,28 @@ static __init int hardware_setup(void) if (!vmx_msr_bitmap_legacy) goto out1; - vmx_msr_bitmap_legacy_x2apic = + vmx_msr_bitmap_legacy_x2apic_apicv = (unsigned long *)__get_free_page(GFP_KERNEL); - if (!vmx_msr_bitmap_legacy_x2apic) + if (!vmx_msr_bitmap_legacy_x2apic_apicv) goto out2; - vmx_msr_bitmap_legacy_x2apic_apicv_inactive = + vmx_msr_bitmap_legacy_x2apic = (unsigned long *)__get_free_page(GFP_KERNEL); - if (!vmx_msr_bitmap_legacy_x2apic_apicv_inactive) + if (!vmx_msr_bitmap_legacy_x2apic) goto out3; vmx_msr_bitmap_longmode = (unsigned long *)__get_free_page(GFP_KERNEL); if (!vmx_msr_bitmap_longmode) goto out4; - vmx_msr_bitmap_longmode_x2apic = + vmx_msr_bitmap_longmode_x2apic_apicv = (unsigned long *)__get_free_page(GFP_KERNEL); - if (!vmx_msr_bitmap_longmode_x2apic) + if (!vmx_msr_bitmap_longmode_x2apic_apicv) goto out5; - vmx_msr_bitmap_longmode_x2apic_apicv_inactive = + vmx_msr_bitmap_longmode_x2apic = (unsigned long *)__get_free_page(GFP_KERNEL); - if (!vmx_msr_bitmap_longmode_x2apic_apicv_inactive) + if (!vmx_msr_bitmap_longmode_x2apic) goto out6; vmx_vmread_bitmap = (unsigned long *)__get_free_page(GFP_KERNEL); @@ -6502,13 +6502,13 @@ static __init int hardware_setup(void) vmx_disable_intercept_for_msr(MSR_IA32_SYSENTER_EIP, false); vmx_disable_intercept_for_msr(MSR_IA32_BNDCFGS, true); - memcpy(vmx_msr_bitmap_legacy_x2apic, + memcpy(vmx_msr_bitmap_legacy_x2apic_apicv, vmx_msr_bitmap_legacy, PAGE_SIZE); - memcpy(vmx_msr_bitmap_longmode_x2apic, + memcpy(vmx_msr_bitmap_longmode_x2apic_apicv, vmx_msr_bitmap_longmode, PAGE_SIZE); - memcpy(vmx_msr_bitmap_legacy_x2apic_apicv_inactive, + memcpy(vmx_msr_bitmap_legacy_x2apic, vmx_msr_bitmap_legacy, PAGE_SIZE); - memcpy(vmx_msr_bitmap_longmode_x2apic_apicv_inactive, + memcpy(vmx_msr_bitmap_longmode_x2apic, vmx_msr_bitmap_longmode, PAGE_SIZE); set_bit(0, vmx_vpid_bitmap); /* 0 is reserved for host */ @@ -6586,15 +6586,15 @@ out9: out8: free_page((unsigned long)vmx_vmread_bitmap); out7: - free_page((unsigned long)vmx_msr_bitmap_longmode_x2apic_apicv_inactive); -out6: free_page((unsigned long)vmx_msr_bitmap_longmode_x2apic); +out6: + free_page((unsigned long)vmx_msr_bitmap_longmode_x2apic_apicv); out5: free_page((unsigned long)vmx_msr_bitmap_longmode); out4: - free_page((unsigned long)vmx_msr_bitmap_legacy_x2apic_apicv_inactive); -out3: free_page((unsigned long)vmx_msr_bitmap_legacy_x2apic); +out3: + free_page((unsigned long)vmx_msr_bitmap_legacy_x2apic_apicv); out2: free_page((unsigned long)vmx_msr_bitmap_legacy); out1: @@ -6607,10 +6607,10 @@ out: static __exit void hardware_unsetup(void) { + free_page((unsigned long)vmx_msr_bitmap_legacy_x2apic_apicv); free_page((unsigned long)vmx_msr_bitmap_legacy_x2apic); - free_page((unsigned long)vmx_msr_bitmap_legacy_x2apic_apicv_inactive); + free_page((unsigned long)vmx_msr_bitmap_longmode_x2apic_apicv); free_page((unsigned long)vmx_msr_bitmap_longmode_x2apic); - free_page((unsigned long)vmx_msr_bitmap_longmode_x2apic_apicv_inactive); free_page((unsigned long)vmx_msr_bitmap_legacy); free_page((unsigned long)vmx_msr_bitmap_longmode); free_page((unsigned long)vmx_io_bitmap_b);