From patchwork Wed Mar 4 06:31:56 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wincy Van X-Patchwork-Id: 5930281 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 67270BF440 for ; Wed, 4 Mar 2015 06:33:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 906A9203B7 for ; Wed, 4 Mar 2015 06:33:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AA67C2034A for ; Wed, 4 Mar 2015 06:33:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934148AbbCDGde (ORCPT ); Wed, 4 Mar 2015 01:33:34 -0500 Received: from smtpbg64.qq.com ([103.7.28.238]:11138 "EHLO smtpbg64.qq.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933763AbbCDGdc (ORCPT ); Wed, 4 Mar 2015 01:33:32 -0500 X-QQ-mid: esmtp26t1425450766t477t25914 Received: from localhost (unknown [114.255.44.132]) by esmtp4.qq.com (ESMTP) with id ; Wed, 04 Mar 2015 14:32:44 +0800 (CST) X-QQ-SSF: 01000000000000F0FUF02F00002000Z X-QQ-FEAT: lKg1JVH8Fzg/DxqTx3SRNMm7dwgk5a3I7tT2NyeDXOFKQyCrBSxFMLV8WDb4E fK7rBWfK06ZIZ/D9kohd4a/D5sDQh/6VxXmuYDQg2OSbentYjIBVS/NkxVuGPl/SU19fnoZ umA/73ohP8vb4fHr5zNVQNCLZcGUeSNaTlRibHbwA5PEFoHYE7YJZNNv9rIaR1lamARLaCb dhCU7KxUbuTcdhI4SCJuvixxflS3NveM= X-QQ-GoodBg: 0 X-QQ-CSender: fanwenyi0529@vip.qq.com From: Wincy Van To: bsd@redhat.com, mtosatti@redhat.com, pbonzini@redhat.com, gleb@kernel.org, yang.z.zhang@intel.com, fanwenyi0529@gmail.com Cc: wanpeng.li@linux.intel.com, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, jan.kiszka@web.de, yong.y.wang@linux.intel.com Subject: [PATCH v2] KVM: vmx: Set msr bitmap correctly if vcpu is in guest mode Date: Wed, 4 Mar 2015 14:31:56 +0800 Message-Id: <1425450716-2216-1-git-send-email-fanwenyi0529@gmail.com> X-Mailer: git-send-email 1.7.1 X-QQ-SENDSIZE: 520 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM,RCVD_IN_DNSWL_HI,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In commit 3af18d9c5fe9 ("KVM: nVMX: Prepare for using hardware MSR bitmap"), we are setting MSR_BITMAP in prepare_vmcs02 if we should use hardware. This is not enough since the field will be modified by following vmx_set_efer. Fix this by setting vmx_msr_bitmap_nested in vmx_set_msr_bitmap if vcpu is in guest mode. Signed-off-by: Wincy Van --- arch/x86/kvm/vmx.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index f7b20b4..10a481b 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -2168,7 +2168,10 @@ static void vmx_set_msr_bitmap(struct kvm_vcpu *vcpu) { unsigned long *msr_bitmap; - if (irqchip_in_kernel(vcpu->kvm) && apic_x2apic_mode(vcpu->arch.apic)) { + if (is_guest_mode(vcpu)) + msr_bitmap = vmx_msr_bitmap_nested; + else if (irqchip_in_kernel(vcpu->kvm) && + apic_x2apic_mode(vcpu->arch.apic)) { if (is_long_mode(vcpu)) msr_bitmap = vmx_msr_bitmap_longmode_x2apic; else @@ -9218,9 +9221,9 @@ static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12) } if (cpu_has_vmx_msr_bitmap() && - exec_control & CPU_BASED_USE_MSR_BITMAPS && - nested_vmx_merge_msr_bitmap(vcpu, vmcs12)) { - vmcs_write64(MSR_BITMAP, __pa(vmx_msr_bitmap_nested)); + exec_control & CPU_BASED_USE_MSR_BITMAPS) { + nested_vmx_merge_msr_bitmap(vcpu, vmcs12); + /* MSR_BITMAP will be set by following vmx_set_efer. */ } else exec_control &= ~CPU_BASED_USE_MSR_BITMAPS;