Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp3295381pxj; Tue, 1 Jun 2021 01:49:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyUmQVNxURqQwSu+kVRCkdETvPUEaNWvszCvXWv369XiYdaPfl1pXF0dA3gQzcnnGzu/3/y X-Received: by 2002:a92:c5d4:: with SMTP id s20mr7304418ilt.149.1622537397491; Tue, 01 Jun 2021 01:49:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622537397; cv=none; d=google.com; s=arc-20160816; b=IXbuc8sEXT2LOT7WwkM0JHKEX/e95RNJNDl/DoTZ9XUCWeDUesOkcm4yW861lQ2UXZ 5o+xXLyBEeNn/tUZ6BfIPbHq6K75iHzTR3tF0alYXRnt+WXYlKvXPAALe3uvs79SghTP ekJ/4htqTnAAIQrRbCGIa7pyRh8DOVdasFmn68Oihr+7zvLwf7pLWQ6eH5l4DKqNcbHA jD3u5arIEXH05Uw33iFPDY7+6YV2m2Fi8lZkKoLXMbk4tOZF9Ot6ShJ0rSmJf6gODl/H Iim5FuCOjl250KnHdjxW7Puh77MiFE5oxTRdf5oKrzjcQY2McxDP6sEnf+WtT3pqp7Rr PqBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:ironport-sdr:ironport-sdr; bh=R/mCyuybZZszTs06cMQolzSx5znxPjcEsXnwhxK558U=; b=arWV8Sesx9CZ+3cZdkI7tiZsreGR7gAGZ9QnhFsQyOEHnYS+GGOwjEhYShSfE3tti0 7Hito3LcOgpOW1voRuFao9C5cGD5h9V7ZRsIPFxKvW4MFbNoUBMWesprgdM8VFSmE+GC nX1qNqJ3wCiL8nMPgoMDISMHLBuKf27KwtHNZh5/FTwQBmc6uBx1FM3oVwAH1zRFCk/j KBeyVHsCW6r4oKWu9+f9FmWas+B0uTKkj0oDxkfvFaSnKKYegd83sFkdkYv9Y47bvfTs rtDN1NBM77RBj2aA4kqmiHKyxjgXYBVWR/xNByTMPHYT1O1CiR0TFl8BJB1JqVPlqaYd Aqxw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y7si3301669ilv.7.2021.06.01.01.49.44; Tue, 01 Jun 2021 01:49:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233562AbhFAIuT (ORCPT + 99 others); Tue, 1 Jun 2021 04:50:19 -0400 Received: from mga07.intel.com ([134.134.136.100]:45142 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233628AbhFAIuA (ORCPT ); Tue, 1 Jun 2021 04:50:00 -0400 IronPort-SDR: F3Iod4SisXO2+g+PoOhzcztIDIOyMlgjZz19OUZ14GXgk+Zf3IIPhhZ4tMn/srghnIMqE1uPud HdN5B5yNhP7A== X-IronPort-AV: E=McAfee;i="6200,9189,10001"; a="267381375" X-IronPort-AV: E=Sophos;i="5.83,239,1616482800"; d="scan'208";a="267381375" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Jun 2021 01:48:18 -0700 IronPort-SDR: eb4AjpMNOguevhBgoborz8xZ4/APOoo15DSixNyUBXcXZOmjAWWOLsb/Go5KNqGI065msxl7tH xBoMPPKZoWKQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,239,1616482800"; d="scan'208";a="437967799" Received: from sqa-gate.sh.intel.com (HELO robert-ivt.tsp.org) ([10.239.48.212]) by orsmga007.jf.intel.com with ESMTP; 01 Jun 2021 01:48:15 -0700 From: Robert Hoo To: pbonzini@redhat.com, seanjc@google.com, vkuznets@redhat.com, wanpengli@tencent.com, jmattson@google.com, joro@8bytes.org, kvm@vger.kernel.org Cc: x86@kernel.org, linux-kernel@vger.kernel.org, chang.seok.bae@intel.com, robert.hu@intel.com, robert.hu@linux.intel.com Subject: [PATCH 07/15] kvm/vmx: dump_vmcs() reports tertiary_exec_control field as well Date: Tue, 1 Jun 2021 16:47:46 +0800 Message-Id: <1622537274-146420-8-git-send-email-robert.hu@linux.intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1622537274-146420-1-git-send-email-robert.hu@linux.intel.com> References: <1622537274-146420-1-git-send-email-robert.hu@linux.intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Hu, Robert" Signed-off-by: Hu, Robert --- arch/x86/kvm/vmx/vmx.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index 56a56f5..afcf1e0 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -5808,6 +5808,7 @@ void dump_vmcs(struct kvm_vcpu *vcpu) struct vcpu_vmx *vmx = to_vmx(vcpu); u32 vmentry_ctl, vmexit_ctl; u32 cpu_based_exec_ctrl, pin_based_exec_ctrl, secondary_exec_control; + u64 tertiary_exec_control = 0; unsigned long cr4; int efer_slot; @@ -5825,6 +5826,9 @@ void dump_vmcs(struct kvm_vcpu *vcpu) if (cpu_has_secondary_exec_ctrls()) secondary_exec_control = vmcs_read32(SECONDARY_VM_EXEC_CONTROL); + if (cpu_has_tertiary_exec_ctrls()) + tertiary_exec_control = vmcs_read64(TERTIARY_VM_EXEC_CONTROL); + pr_err("*** Guest State ***\n"); pr_err("CR0: actual=0x%016lx, shadow=0x%016lx, gh_mask=%016lx\n", vmcs_readl(GUEST_CR0), vmcs_readl(CR0_READ_SHADOW), @@ -5921,8 +5925,9 @@ void dump_vmcs(struct kvm_vcpu *vcpu) vmx_dump_msrs("host autoload", &vmx->msr_autoload.host); pr_err("*** Control State ***\n"); - pr_err("PinBased=%08x CPUBased=%08x SecondaryExec=%08x\n", - pin_based_exec_ctrl, cpu_based_exec_ctrl, secondary_exec_control); + pr_err("PinBased=0x%08x CPUBased=0x%08x SecondaryExec=0x%08x TertiaryExec=0x%016llx\n", + pin_based_exec_ctrl, cpu_based_exec_ctrl, secondary_exec_control, + tertiary_exec_control); pr_err("EntryControls=%08x ExitControls=%08x\n", vmentry_ctl, vmexit_ctl); pr_err("ExceptionBitmap=%08x PFECmask=%08x PFECmatch=%08x\n", vmcs_read32(EXCEPTION_BITMAP), -- 1.8.3.1