From patchwork Tue Jan 15 18:05:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krish Sadhukhan X-Patchwork-Id: 10764957 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4A8716C5 for ; Tue, 15 Jan 2019 18:30:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3D37B2D699 for ; Tue, 15 Jan 2019 18:30:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 31AA12D6AC; Tue, 15 Jan 2019 18:30:25 +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 D23FC2D6B5 for ; Tue, 15 Jan 2019 18:30:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731397AbfAOSaY (ORCPT ); Tue, 15 Jan 2019 13:30:24 -0500 Received: from userp2130.oracle.com ([156.151.31.86]:33586 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728726AbfAOSaX (ORCPT ); Tue, 15 Jan 2019 13:30:23 -0500 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 x0FISIBJ124755; Tue, 15 Jan 2019 18:30:20 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-2018-07-02; bh=lfNmNM03vbh7DGGwpHPZGA4R7kLJzI6mqOVzVyFLqps=; b=jUVbTZNZhPziBpJ47Q9ThDR1MrdZD+k3qCR9b2+N2+iQ/F/mWiLfWu2NWiGz4FrEZNKy T1gu7sHO+xi26kHNKTpZ9UhF8MMDvCBycW5duMELoCXyumJIZc1RFn0hoijX5tORSiZp tuG5mpHwhUlMhawXpTTYPid5oY1Vdwzba2+/34BBrC9HKDEJKoq6MobpGvNc1Ml3MXbY xGtzYBkMWlaLiLeX6e6m9cNq+Grvq08IMPt9ukJkzLnUYbobFAH8uOEegl12amrwZ9EO NAtDS/50dngk3mFRxfrZoim5JboDQFbJ7ict6YnrrdZuMbwRGqMlmtek3THPtIrnY+fS Ig== Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by userp2130.oracle.com with ESMTP id 2pybkcdjr7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 15 Jan 2019 18:30:19 +0000 Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id x0FIUJCw025766 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 15 Jan 2019 18:30:19 GMT Received: from abhmp0003.oracle.com (abhmp0003.oracle.com [141.146.116.9]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id x0FIUJKx027775; Tue, 15 Jan 2019 18:30:19 GMT Received: from ban25x6uut29.us.oracle.com (/10.153.73.29) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 15 Jan 2019 10:30:19 -0800 From: Krish Sadhukhan To: kvm@vger.kernel.org Cc: pbonzini@redhat.com, rkrcmar@redhat.com, jmattson@google.com Subject: [kvm-unit-test nVMX 1/2]: vmlaunch_succeeds() needs to check failure of VM-entry MSR-load Date: Tue, 15 Jan 2019 13:05:32 -0500 Message-Id: <20190115180533.19397-2-krish.sadhukhan@oracle.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190115180533.19397-1-krish.sadhukhan@oracle.com> References: <20190115180533.19397-1-krish.sadhukhan@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9137 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=1 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=932 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1901150149 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP .. as that is one of the valid reasons for vmentry failure. Signed-off-by: Krish Sadhukhan Reviewed-by: Mihai Carabas Reviewed-by: Jim Mattson --- x86/vmx_tests.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/x86/vmx_tests.c b/x86/vmx_tests.c index ee0c9ff..02cd868 100644 --- a/x86/vmx_tests.c +++ b/x86/vmx_tests.c @@ -3262,6 +3262,8 @@ static void invvpid_test_v2(void) */ static bool vmlaunch_succeeds(void) { + u32 exit_reason; + /* * Indirectly set VMX_INST_ERR to 12 ("VMREAD/VMWRITE from/to * unsupported VMCS component"). The caller can then check @@ -3277,8 +3279,9 @@ static bool vmlaunch_succeeds(void) : success); return false; success: - TEST_ASSERT(vmcs_read(EXI_REASON) == - (VMX_FAIL_STATE | VMX_ENTRY_FAILURE)); + exit_reason = vmcs_read(EXI_REASON); + TEST_ASSERT(exit_reason == (VMX_FAIL_STATE | VMX_ENTRY_FAILURE) || + exit_reason == (VMX_FAIL_MSR | VMX_ENTRY_FAILURE)); return true; }