From patchwork Wed Jul 3 13:41:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arthur Chunqi Li X-Patchwork-Id: 2816941 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id BCE5A9F3EB for ; Wed, 3 Jul 2013 13:41:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5DBFB2010A for ; Wed, 3 Jul 2013 13:41:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3641D200D9 for ; Wed, 3 Jul 2013 13:41:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756090Ab3GCNlY (ORCPT ); Wed, 3 Jul 2013 09:41:24 -0400 Received: from mail-pd0-f178.google.com ([209.85.192.178]:63275 "EHLO mail-pd0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755922Ab3GCNlX (ORCPT ); Wed, 3 Jul 2013 09:41:23 -0400 Received: by mail-pd0-f178.google.com with SMTP id w11so111325pde.9 for ; Wed, 03 Jul 2013 06:41:22 -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:x-mailer; bh=5R7ZEGA3mB+mOzGoDOBRdcOImP7A/kLsraCJpAHpyqw=; b=ZLyGeibEYOyTUQkGdTzQNR8TgIES3KvGa+NxomjaNG+wSd4kmBKwCr3LRmMbFiqAW4 Do4goRZUebjzJZ/z2PrQC9V3XhY9+plsaMAvUH0QEyMhdSfSTrZBYRgRkXm02xyMUgv3 uDNZreqVGW/I0y+yDZn1Pcwm5X6EZ9ITzaLJm5dOADXE2FsH7FdmACMtu6IRX1xJwu/g d0Ozqs+wok2pUmuUUyij322e+EgYwLHFykz+FntsESppjda4V5h5edmTmyl8ydKzs2Dw AP7dfspbVCURi2i96QAfYoE4YaEBOsVFsbQkcWcyTkCIgv90QSc9eDbeWWyLAfMJZNam OSIA== X-Received: by 10.66.190.3 with SMTP id gm3mr2589803pac.72.1372858882729; Wed, 03 Jul 2013 06:41:22 -0700 (PDT) Received: from Blade1-02.Blade1-02 ([162.105.146.101]) by mx.google.com with ESMTPSA id re16sm33877222pac.16.2013.07.03.06.41.19 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 03 Jul 2013 06:41:21 -0700 (PDT) From: Arthur Chunqi Li To: kvm@vger.kernel.org Cc: gleb@redhat.com, pbonzini@redhat.com, jan.kiszka@web.de, Arthur Chunqi Li Subject: [PATCH] KVM : Fix read/write to IA32_FEATURE_CONTROL MSR in nested virt Date: Wed, 3 Jul 2013 21:41:07 +0800 Message-Id: <1372858868-24755-1-git-send-email-yzt356@gmail.com> X-Mailer: git-send-email 1.7.9.5 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 Fix read/write to IA32_FEATURE_CONTROL MSR in nested environment. Simply return 0x5 when read and generate #GP(0) when write. Delete handling codes in vmx_set_vmx_msr() and generate #GP(0) in handle_wrmsr(). Signed-off-by: Arthur Chunqi Li --- arch/x86/kvm/vmx.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 260a919..e125f94 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -2277,7 +2277,7 @@ static int vmx_get_vmx_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 *pdata) switch (msr_index) { case MSR_IA32_FEATURE_CONTROL: - *pdata = 0; + *pdata = 0x5; break; case MSR_IA32_VMX_BASIC: /* @@ -2356,9 +2356,6 @@ static int vmx_set_vmx_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 data) if (!nested_vmx_allowed(vcpu)) return 0; - if (msr_index == MSR_IA32_FEATURE_CONTROL) - /* TODO: the right thing. */ - return 1; /* * No need to treat VMX capability MSRs specially: If we don't handle * them, handle_wrmsr will #GP(0), which is correct (they are readonly)