Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp3296041pxj; Tue, 1 Jun 2021 01:51:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwYyp+JdrRVfU+jDWVHbKd7FwVps8jh5EDcfWFcAPHD4IJwrST4QijgGeNRsq6E8+FH+SQg X-Received: by 2002:a02:91c1:: with SMTP id s1mr24295944jag.61.1622537467738; Tue, 01 Jun 2021 01:51:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622537467; cv=none; d=google.com; s=arc-20160816; b=e0IZj9HTT+ctDM8zKVXhB/rkWff0Qgr/7Y+dCXvR/frPVVEBFTAWyIqL3Ru3af6/+Q B1P/S92Nl6TRgkDJF/T5exdtczVjlUK26mN/PDypOMCPnEa7wiWzAByOzTHDLbk7jIk+ M+OY47GONJjNVJYRQVUDNJGt+UO1Yr0QGsl6I8sk1m2DhA11XPCVCPRaH0hDKZ2hDz8/ Tw32gYKUtNLSePNML5LY+rQjDl/r1efI4a3wBYM8xKrjMvRR1PTdK+crxe1lMYpnIXbh KFmLrFL2RIIFxxHn4Z0tdz/MB9b0pf3FXADZ9lqYZFuXOxoOCl3DgA1QLzpqCi1gScdp kqiA== 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=DFiRLgVjuN2d53rTXcBGqCMOEbAh9te5qz6OkvbUywQ=; b=pMTkPfv9rvNspVKE36w6PwBmpRRVzU7I4ZAvyY690qsBhcPh/lMtywRTGljPYp04ZA dNtydJk6Tw/iOGrwsfG4d4+pYlrDbz381TT2OHTP1nYg7BOSx+3zK6sc0fSBRmW+wJVa I31+Ob6CS/tQWfjzRkgDeFpQgpBsT8cvesXZLtghlwR9eFjX+NWWL+0N13WTKiNYyGQZ Nd/hzcG/4cNlThGlGVN+lJysUrTAx9ogs9b/pNXsGiIJK8IDLpVAlWK/5IzeQDMTekPb idd5sqXZ9N7TtXSngLOV7aFP8A/8l39slTurC/JXhbjBzkX/kqJMm3ehigR4L/4zc+gf wPTg== 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 b1si16438333ioh.94.2021.06.01.01.50.55; Tue, 01 Jun 2021 01:51:07 -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 S233779AbhFAIvS (ORCPT + 99 others); Tue, 1 Jun 2021 04:51:18 -0400 Received: from mga07.intel.com ([134.134.136.100]:45213 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233808AbhFAIur (ORCPT ); Tue, 1 Jun 2021 04:50:47 -0400 IronPort-SDR: JnW+IM80NHSYz4bwzIUuky+mrke9svHpaIT/N6XfeCLb+nqT9+fLPDTDRPTT6aEw2U2ZWECdmA 25YYAnjrVYcg== X-IronPort-AV: E=McAfee;i="6200,9189,10001"; a="267381474" X-IronPort-AV: E=Sophos;i="5.83,239,1616482800"; d="scan'208";a="267381474" 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:36 -0700 IronPort-SDR: 3+wwGZUYS9nCMhfMTiSsaiUlxW+DwLjhmFE/Wi97D/GXrBpq3RyO1SteaZUshAaqI/FXU3XUPI w4oB3bcw5upg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,239,1616482800"; d="scan'208";a="437967849" 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:33 -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 13/15] kvm/vmx/nested: Support Tertiary VM-Exec control in vmcs02 Date: Tue, 1 Jun 2021 16:47:52 +0800 Message-Id: <1622537274-146420-14-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 Signed-off-by: Robert Hoo --- arch/x86/kvm/vmx/nested.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c index b04184b..f5ec215 100644 --- a/arch/x86/kvm/vmx/nested.c +++ b/arch/x86/kvm/vmx/nested.c @@ -2222,6 +2222,7 @@ static void prepare_vmcs02_early_rare(struct vcpu_vmx *vmx, static void prepare_vmcs02_early(struct vcpu_vmx *vmx, struct vmcs12 *vmcs12) { u32 exec_control; + u64 vmcs02_ter_exec_ctrl; u64 guest_efer = nested_vmx_calc_efer(vmx, vmcs12); if (vmx->nested.dirty_vmcs12 || vmx->nested.hv_evmcs) @@ -2344,6 +2345,18 @@ static void prepare_vmcs02_early(struct vcpu_vmx *vmx, struct vmcs12 *vmcs12) vm_entry_controls_set(vmx, exec_control); /* + * Tertiary EXEC CONTROLS + */ + if (cpu_has_tertiary_exec_ctrls()) { + vmcs02_ter_exec_ctrl = vmx->tertiary_exec_control; + if (nested_cpu_has(vmcs12, + CPU_BASED_ACTIVATE_TERTIARY_CONTROLS)) + vmcs02_ter_exec_ctrl |= vmcs12->tertiary_vm_exec_control; + + tertiary_exec_controls_set(vmx, vmcs02_ter_exec_ctrl); + } + + /* * EXIT CONTROLS * * L2->L1 exit controls are emulated - the hardware exit is to L0 so -- 1.8.3.1