From patchwork Sun Jul 25 02:24:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Hoo X-Patchwork-Id: 12397893 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC459C4338F for ; Sun, 25 Jul 2021 02:24:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7B44B60E92 for ; Sun, 25 Jul 2021 02:24:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229853AbhGYBnt (ORCPT ); Sat, 24 Jul 2021 21:43:49 -0400 Received: from mga02.intel.com ([134.134.136.20]:14481 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229665AbhGYBns (ORCPT ); Sat, 24 Jul 2021 21:43:48 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10055"; a="199262128" X-IronPort-AV: E=Sophos;i="5.84,266,1620716400"; d="scan'208";a="199262128" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Jul 2021 19:24:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.84,266,1620716400"; d="scan'208";a="416721353" Received: from sqa-gate.sh.intel.com (HELO robert-ivt.tsp.org) ([10.239.48.212]) by orsmga003.jf.intel.com with ESMTP; 24 Jul 2021 19:24:18 -0700 From: Robert Hoo To: kvm@vger.kernel.org, bsd@redhat.com Cc: Robert Hoo Subject: [kvm-unit-tests PATCH] x86: vmx_tests: pml: Skip PML test if it's not enabled in underlying Date: Sun, 25 Jul 2021 10:24:14 +0800 Message-Id: <1627179854-1878-1-git-send-email-robert.hu@linux.intel.com> X-Mailer: git-send-email 1.8.3.1 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org PML in VM depends on "enable PML" in VM-execution control, check this before vmwrite to PMLADDR, because this field doesn't exist if PML is disabled in VM-execution control. Signed-off-by: Robert Hoo --- x86/vmx_tests.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/x86/vmx_tests.c b/x86/vmx_tests.c index 4f712eb..8663112 100644 --- a/x86/vmx_tests.c +++ b/x86/vmx_tests.c @@ -1502,13 +1502,16 @@ static int pml_init(struct vmcs *vmcs) return VMX_TEST_EXIT; } + ctrl_cpu = vmcs_read(CPU_EXEC_CTRL1) & CPU_PML; + if (!ctrl_cpu) { + printf("\tPML is not enabled\n"); + return VMX_TEST_EXIT; + } + pml_log = alloc_page(); vmcs_write(PMLADDR, (u64)pml_log); vmcs_write(GUEST_PML_INDEX, PML_INDEX - 1); - ctrl_cpu = vmcs_read(CPU_EXEC_CTRL1) | CPU_PML; - vmcs_write(CPU_EXEC_CTRL1, ctrl_cpu); - return VMX_TEST_START; }