From patchwork Mon Sep 9 15:55:49 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: 2862281 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 2B56E9F499 for ; Mon, 9 Sep 2013 15:56:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0C04B202F6 for ; Mon, 9 Sep 2013 15:56:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D64B7202CF for ; Mon, 9 Sep 2013 15:56:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754183Ab3IIPz6 (ORCPT ); Mon, 9 Sep 2013 11:55:58 -0400 Received: from mail-pd0-f171.google.com ([209.85.192.171]:55711 "EHLO mail-pd0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753547Ab3IIPz4 (ORCPT ); Mon, 9 Sep 2013 11:55:56 -0400 Received: by mail-pd0-f171.google.com with SMTP id g10so6347477pdj.30 for ; Mon, 09 Sep 2013 08:55:56 -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; bh=gEzIlYfgRAy+r7nSrpZOVWk4dHQOtKutM0ZJeJ62tOc=; b=vNrGIe+FFkCgOBwJoth5mfTOCmzLL9eyCCxJmh2bcQA5Wr0HYCPSG4L3odJu+fBZy5 0XOvYQt6YceB74dd5oopyk2OLsEuNPd506TmakVAnMJgYg1o5vufGrSnmwGw3oAdvTOy XNOpmtnfvMxRDib/Pp2Z0ANRoyPBbG2z5bb01dEhd3h0lap0tduxwwchdE4l812MRfJG Lxg9vvbNxZpPJRV0KK92EJipBHRwdsfj/Cg0GQJcxjfVr1mEyi6e2RVYB07S9U+ZvwZr gH7kcEHezm/SEEK9BkH7W5i++j8n8vpEQc1LdZuZd0ByiL2hUvXeUu/Rc7laOINbl6FL JFNQ== X-Received: by 10.66.231.42 with SMTP id td10mr4022810pac.144.1378742156220; Mon, 09 Sep 2013 08:55:56 -0700 (PDT) Received: from Blade1-01.Blade1-01 ([162.105.146.101]) by mx.google.com with ESMTPSA id gh9sm17009876pbc.40.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 09 Sep 2013 08:55:55 -0700 (PDT) From: Arthur Chunqi Li To: kvm@vger.kernel.org Cc: jan.kiszka@web.de, gleb@redhat.com, pbonzini@redhat.com, Arthur Chunqi Li Subject: [PATCH] kvm-unit-tests: VMX: Fix some nested EPT related bugs Date: Mon, 9 Sep 2013 23:55:49 +0800 Message-Id: <1378742149-30822-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=-7.7 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 This patch fix 3 bugs in VMX framework and EPT framework 1. Fix bug of setting default value of CPU_SECONDARY 2. Fix bug of reading MSR_IA32_VMX_PROCBASED_CTLS2 and MSR_IA32_VMX_EPT_VPID_CAP 3. For EPT violation and misconfiguration reduced vmexit, vmcs field "VM-exit instruction length" is not used and will return unexpected value when read. Signed-off-by: Arthur Chunqi Li --- x86/vmx.c | 13 ++++++++++--- x86/vmx_tests.c | 2 -- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/x86/vmx.c b/x86/vmx.c index 87d1d55..9db4ef4 100644 --- a/x86/vmx.c +++ b/x86/vmx.c @@ -304,7 +304,8 @@ static void init_vmcs_ctrl(void) /* Disable VMEXIT of IO instruction */ vmcs_write(CPU_EXEC_CTRL0, ctrl_cpu[0]); if (ctrl_cpu_rev[0].set & CPU_SECONDARY) { - ctrl_cpu[1] |= ctrl_cpu_rev[1].set & ctrl_cpu_rev[1].clr; + ctrl_cpu[1] = (ctrl_cpu[1] | ctrl_cpu_rev[1].set) & + ctrl_cpu_rev[1].clr; vmcs_write(CPU_EXEC_CTRL1, ctrl_cpu[1]); } vmcs_write(CR3_TARGET_COUNT, 0); @@ -489,8 +490,14 @@ static void init_vmx(void) : MSR_IA32_VMX_ENTRY_CTLS); ctrl_cpu_rev[0].val = rdmsr(basic.ctrl ? MSR_IA32_VMX_TRUE_PROC : MSR_IA32_VMX_PROCBASED_CTLS); - ctrl_cpu_rev[1].val = rdmsr(MSR_IA32_VMX_PROCBASED_CTLS2); - ept_vpid.val = rdmsr(MSR_IA32_VMX_EPT_VPID_CAP); + if ((ctrl_cpu_rev[0].clr & CPU_SECONDARY) != 0) + ctrl_cpu_rev[1].val = rdmsr(MSR_IA32_VMX_PROCBASED_CTLS2); + else + ctrl_cpu_rev[1].val = 0; + if ((ctrl_cpu_rev[1].clr & (CPU_EPT | CPU_VPID)) != 0) + ept_vpid.val = rdmsr(MSR_IA32_VMX_EPT_VPID_CAP); + else + ept_vpid.val = 0; write_cr0((read_cr0() & fix_cr0_clr) | fix_cr0_set); write_cr4((read_cr4() & fix_cr4_clr) | fix_cr4_set | X86_CR4_VMXE); diff --git a/x86/vmx_tests.c b/x86/vmx_tests.c index 6d972c0..e891a9f 100644 --- a/x86/vmx_tests.c +++ b/x86/vmx_tests.c @@ -1075,7 +1075,6 @@ static int ept_exit_handler() print_vmexit_info(); return VMX_TEST_VMEXIT; } - vmcs_write(GUEST_RIP, guest_rip + insn_len); return VMX_TEST_RESUME; case VMX_EPT_VIOLATION: switch(get_stage()) { @@ -1100,7 +1099,6 @@ static int ept_exit_handler() print_vmexit_info(); return VMX_TEST_VMEXIT; } - vmcs_write(GUEST_RIP, guest_rip + insn_len); return VMX_TEST_RESUME; default: printf("Unknown exit reason, %d\n", reason);