From patchwork Fri Jun 15 21:39:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krish Sadhukhan X-Patchwork-Id: 10467743 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 93AA9601C2 for ; Fri, 15 Jun 2018 22:02:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8242928EA4 for ; Fri, 15 Jun 2018 22:02:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 76D0C28EA6; Fri, 15 Jun 2018 22:02:01 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY 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 F139628EA4 for ; Fri, 15 Jun 2018 22:02:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756730AbeFOWB6 (ORCPT ); Fri, 15 Jun 2018 18:01:58 -0400 Received: from userp2130.oracle.com ([156.151.31.86]:36148 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756665AbeFOWB5 (ORCPT ); Fri, 15 Jun 2018 18:01:57 -0400 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w5FLx53Q171978; Fri, 15 Jun 2018 22:01:38 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2017-10-26; bh=rU178/uQ0FKVXGOulQyLxritw9aKUJcsrbss4K/frv8=; b=LPXctRapVFURbJ8J8QL5qVBR8aGpn4CKYQFCGwKMPLHzk2yLa2GKTyA90KMiCyvfpXv2 04rIxSvs4zm3rNvFtdTpNsOeQYu11P4XWRMWGc0vbN3HMBy81hU8Ouzhco63lwEiB4FJ tHuEI1tVCtgoX7mUz8ntv2qJKohDOkoOTlxDvdfYudJS10v8oKaM0aYicKjUuhdFb6PN VVlRRAd5SoXVfUAlFnAcIPiE392S1e2IJR+mUILmstSrY/SEawTi9ywPKKrg+A09WIs1 CdT+wogV01e5C9Xecsr/LkmDIycB6WNPg675sRD43wL+ySbfUekYTHH/SRHtpWJyGfXl xg== Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by userp2130.oracle.com with ESMTP id 2jk0xrjgpr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 15 Jun 2018 22:01:38 +0000 Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by userv0022.oracle.com (8.14.4/8.14.4) with ESMTP id w5FM1cw0019449 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 15 Jun 2018 22:01:38 GMT Received: from abhmp0008.oracle.com (abhmp0008.oracle.com [141.146.116.14]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id w5FM1bEp001621; Fri, 15 Jun 2018 22:01:38 GMT Received: from ban25x6uut29.us.oracle.com (/10.153.73.29) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 15 Jun 2018 15:01:37 -0700 From: Krish Sadhukhan To: kvm@vger.kernel.org Cc: pbonzini@redhat.com, rkrcmar@redhat.com, jmattson@google.com Subject: [kvm-unit-test 1/2] nVMX x86: APIC virtual controls must be unset if "Use TPR shadow" is unset Date: Fri, 15 Jun 2018 17:39:07 -0400 Message-Id: <20180615213908.1698-2-krish.sadhukhan@oracle.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20180615213908.1698-1-krish.sadhukhan@oracle.com> References: <20180615213908.1698-1-krish.sadhukhan@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8925 signatures=668702 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=1 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=885 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1805220000 definitions=main-1806150234 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP According to section "Checks on VMX Controls" in Intel SDM vol 3C, the following check needs to be enforced on vmentry of L2 guests: If the "use TPR shadow" VM-execution control is 0, the following VM-execution controls must also be 0: "virtualize x2APIC mode", "APIC-register virtualization" and "virtual-interrupt delivery". This unit-test validates the above vmentry check. Signed-off-by: Krish Sadhukhan Reviewed-by: Karl Heubaum --- x86/vmx_tests.c | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 106 insertions(+), 2 deletions(-) diff --git a/x86/vmx_tests.c b/x86/vmx_tests.c index 38f10f4..64be48f 100644 --- a/x86/vmx_tests.c +++ b/x86/vmx_tests.c @@ -3580,6 +3580,111 @@ static void test_apic_access_addr(void) "virtualize APIC-accesses", true, false); } +/* + * If the "use TPR shadow" VM-execution control is 0, the following + * VM-execution controls must also be 0: + * - virtualize x2APIC mode + * - APIC-register virtualization + * - virtual-interrupt delivery + */ +static void test_apic_virtual_ctls(void) +{ + u32 saved_primary = vmcs_read(CPU_EXEC_CTRL0); + u32 saved_secondary = vmcs_read(CPU_EXEC_CTRL1); + u32 primary = saved_primary; + u32 secondary = saved_secondary; + bool cpu_has_virt_x2apic = 0; + bool cpu_has_apic_reg_virt = 0; + bool cpu_has_vintd = 0; + + if (!((ctrl_cpu_rev[0].clr & (CPU_SECONDARY | CPU_TPR_SHADOW)) == + (CPU_SECONDARY | CPU_TPR_SHADOW))) + return; + + if ((ctrl_cpu_rev[1].clr & CPU_VIRT_X2APIC) == CPU_VIRT_X2APIC) + cpu_has_virt_x2apic = 1; + if ((ctrl_cpu_rev[1].clr & CPU_APIC_REG_VIRT) == CPU_APIC_REG_VIRT) + cpu_has_apic_reg_virt = 1; + if ((ctrl_cpu_rev[1].clr & CPU_VINTD) == CPU_VINTD) + cpu_has_vintd = 1; + + primary |= CPU_SECONDARY; + vmcs_write(CPU_EXEC_CTRL0, primary & ~CPU_TPR_SHADOW); + + if (cpu_has_virt_x2apic) { + secondary &= ~(CPU_APIC_REG_VIRT | CPU_VINTD); + vmcs_write(CPU_EXEC_CTRL1, secondary | CPU_VIRT_X2APIC); + report_prefix_pushf("Use TPR shadow disabled; virtualize x2APIC mode enabled"); + test_vmx_controls(false, false); + report_prefix_pop(); + + if (cpu_has_apic_reg_virt) { + vmcs_write(CPU_EXEC_CTRL1, secondary | + CPU_APIC_REG_VIRT); + report_prefix_pushf("Use TPR shadow disabled; virtualize x2APIC mode enabled; APIC-register virtualization enabled"); + test_vmx_controls(false, false); + report_prefix_pop(); + } + + if (cpu_has_vintd) { + secondary &= ~CPU_APIC_REG_VIRT; + vmcs_write(CPU_EXEC_CTRL1, secondary | CPU_VINTD); + report_prefix_pushf("Use TPR shadow disabled; virtualize x2APIC mode enabled; virtual-interrupt delivery enabled"); + test_vmx_controls(false, false); + report_prefix_pop(); + } + } + + if (cpu_has_apic_reg_virt) { + secondary &= ~(~CPU_VIRT_X2APIC | CPU_VINTD); + vmcs_write(CPU_EXEC_CTRL1, secondary | CPU_APIC_REG_VIRT); + report_prefix_pushf("Use TPR shadow disabled; APIC-register virtualization enabled"); + test_vmx_controls(false, false); + report_prefix_pop(); + + if (cpu_has_vintd) { + secondary &= ~CPU_VIRT_X2APIC; + vmcs_write(CPU_EXEC_CTRL1, secondary | CPU_VINTD); + report_prefix_pushf("Use TPR shadow disabled; APIC-register virtualization enabled; virtual-interrupt delivery enabled"); + test_vmx_controls(false, false); + report_prefix_pop(); + } + } + + if (cpu_has_vintd) { + secondary &= ~(~CPU_VIRT_X2APIC | CPU_APIC_REG_VIRT); + vmcs_write(CPU_EXEC_CTRL1, secondary | CPU_VINTD); + report_prefix_pushf("Use TPR shadow disabled; virtual-interrupt delivery enabled"); + test_vmx_controls(false, false); + report_prefix_pop(); + } + + if (cpu_has_virt_x2apic && cpu_has_apic_reg_virt && + cpu_has_vintd) { + + vmcs_write(CPU_EXEC_CTRL1, secondary | (CPU_VIRT_X2APIC | + CPU_APIC_REG_VIRT | CPU_VINTD)); + report_prefix_pushf("Use TPR shadow disabled; virtualize x2APIC mode enabled; APIC-register virtualization enabled; virtual-interrupt delivery enabled"); + test_vmx_controls(false, false); + report_prefix_pop(); + + vmcs_write(CPU_EXEC_CTRL0, primary | CPU_TPR_SHADOW); + report_prefix_pushf("Use TPR shadow enabled; virtualize x2APIC mode enabled; APIC-register virtualization enabled; virtual-interrupt delivery enabled"); + test_vmx_controls(true, false); + report_prefix_pop(); + } + + vmcs_write(CPU_EXEC_CTRL0, saved_primary); + vmcs_write(CPU_EXEC_CTRL1, saved_secondary); +} + +static void test_apic_ctls(void) +{ + test_apic_virt_addr(); + test_apic_access_addr(); + test_apic_virtual_ctls(); +} + static void set_vtpr(unsigned vtpr) { *(u32 *)phys_to_virt(vmcs_read(APIC_VIRT_ADDR) + APIC_TASKPRI) = vtpr; @@ -3846,8 +3951,7 @@ static void vmx_controls_test(void) test_cr3_targets(); test_io_bitmaps(); test_msr_bitmap(); - test_apic_virt_addr(); - test_apic_access_addr(); + test_apic_ctls(); test_tpr_threshold(); test_nmi_ctrls(); }