Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Sun, 15 Jan 2023 22:20:23 +0800
From:   Chao Gao <chao.gao@intel.com>
To:     Zhang Chen <chen.zhang@intel.com>
CC:     <x86@kernel.org>, <linux-kernel@vger.kernel.org>,
        <kvm@vger.kernel.org>,
        Pawan Gupta <pawan.kumar.gupta@linux.intel.com>,
        Paolo Bonzini <pbonzini@redhat.com>,
        Sean Christopherson <seanjc@google.com>,
        "H. Peter Anvin" <hpa@zytor.com>,
        Dave Hansen <dave.hansen@linux.intel.com>,
        "Borislav Petkov" <bp@alien8.de>, Ingo Molnar <mingo@redhat.com>,
        Thomas Gleixner <tglx@linutronix.de>
Subject: Re: [RFC PATCH 8/9] x86/kvm/vmx: Initialize SPEC_CTRL MASK for RRSBA
Message-ID: <Y8QLp33AgbDjMMh7@gao-cwp>
References: <20221210160046.2608762-1-chen.zhang@intel.com>
 <20221210160046.2608762-9-chen.zhang@intel.com>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20221210160046.2608762-9-chen.zhang@intel.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?CFmhUzn5Xu+95NCspZWtgB9hgBfpi+lO3CkK8zYbma9Vb8eVOLJDW7XoNgmL?=
 =?us-ascii?Q?+/7LzU72kGtQCUee20w4VR3HuHwImfp5HdPiJgfWCb2z89eQS+6qsJ2Xy1b8?=
 =?us-ascii?Q?IjEBAz6xuNwQPnUEhleSdN2c8PaH7TdZy3oI+HVEOvy64Tthfg7M22Vrt1on?=
 =?us-ascii?Q?HCmPMi95KWZcrDIVMwnjCjOSFPcNRZO61cXiLmFKmVDR7nWgMSDtIerdetqd?=
 =?us-ascii?Q?WL08LTnoMuD2WbPsjjI1vTWvVq9Q0qsfsZ3nQpPY7V1mT7zFqj0/M0dQLpY7?=
 =?us-ascii?Q?uW4WYoGHAiQy4QED+HGj50ISPnmCPsiW9sz+/yscTZZ5wvDeoJ2t1LHr4eyT?=
 =?us-ascii?Q?PJl/A6x/1XqZ9i3GqXS9eUdS4vTco4v75WHZOItU+0jvEUvm3xLFNNUmdL11?=
 =?us-ascii?Q?RSk+mICXAxEIimgr34p9eC7Kv0v79OLG4+mwKWN6ik6RFrQevq/CFRQC9Cl1?=
 =?us-ascii?Q?thK/XrXvFPBgX1qeLVMTxlGcFu1oNfVYGvQLIltP6bLmVcDDEdpgDah29ga5?=
 =?us-ascii?Q?mr2wxamrSWzfyONrvg2aGtUOgE07mrGwTf1UGfcYhJSos3KQE1+IxppW9Rhk?=
 =?us-ascii?Q?AWiYRxr2PpLT0eijN2NaZWASlFCHPYM6DWQJPfkzXH+dKLvwjO+z2v/ojXsj?=
 =?us-ascii?Q?qEs2fvCqytVuBUcmuh5rs+yXPq9dlDasPWTwe+0s0CPDBDgWzHgMf56Q77ux?=
 =?us-ascii?Q?8EzP/8FjiWv202oHO7Vks9IlkoaR09k1c8gZih+z+P1iIxKfNjQ+AFlqp6wS?=
 =?us-ascii?Q?9eY2dKPDdXqCAHq1J48nLnSJ0VJjGNEeSm8H0t8ckZ54tPL0dBA8HngR4xpW?=
 =?us-ascii?Q?8NAQiySeYbqs53bCwsnoY06DKukEmOxmUGvmJ+I4Ldn0822jOOGYyFFLHuXX?=
 =?us-ascii?Q?cgXUW1ZY8HLlUjlF+sIrSf+/AIPg56udsToGZEkkm8duxPaUVQIfKAnUHw3B?=
 =?us-ascii?Q?mmNiw1UZIc4L/iiZsyvuIvCLh+J63Bnw+VaatD23cFucmkhoWs5W4oLdRr7D?=
 =?us-ascii?Q?+ZKb38LSyNvsjSicNw4HYbzPg8S7ypkKInbpHgmYHjuZMI0T/RmSljCm+Mr4?=
 =?us-ascii?Q?txTfcE5bes56pMxfH/sqMiEDtf0rlcdIjmjQGRGvYJIRAO5c7Gk5NkVGtf16?=
 =?us-ascii?Q?/MsiUbaI6BNpnMaprH7Aan3YXnrf+aEhJBsv/gMMF0Eta5TL0hcc98RjmNNr?=
 =?us-ascii?Q?IzRJCLjJ+cPdlTKXUzixfdJhFPnyJ48a4WCKlKLfT6dvOhobJ24uqi864f77?=
 =?us-ascii?Q?qrcaUTP4VL6wJ5EsAxi7wJPHqH2jHlQ2CoxgUE5zpZcQ29xRyaLnUO7Vs0j+?=
 =?us-ascii?Q?5LoXAh0Fi8RHFPHK3jOwaHJvkZd+VmT1u6e6Az/T+G/EWcPwvEpPN0JhOkoS?=
 =?us-ascii?Q?PEGpdLkV+w/hL1glahQvUwOfsrkeQ2e068am65eZkxS3EtS5fyGF2oLJbF8q?=
 =?us-ascii?Q?HfGiSOKjHX1hYsil2V4JahwmaqSK6eQJKzbVfhdXYkzxHnXkWIewY+S1mUA/?=
 =?us-ascii?Q?iP+NKuXcvCpNjESWqY8+AUvYz5oJxNfXPPJe6IjbZo6B8+LmiInMdwR3XXhU?=
 =?us-ascii?Q?LIPonMyidDjRMWLsHvEnhao5ZPr9X2WyY5y6jUJd?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 9d985ac1-561f-4387-658e-08daf7039e29
X-MS-Exchange-CrossTenant-AuthSource: PH8PR11MB6780.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jan 2023 14:20:13.9477
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: JllFhNlorvyX06ijUgNPy0pC2gLKH7BK80YBQWkdp31YvCIEU9TM5t/adPVzzSG8QDh8gTWERqmVzfMpstdwvg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB4548
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,
        RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Sun, Dec 11, 2022 at 12:00:45AM +0800, Zhang Chen wrote:
>VMMs can address mitigations issues in migration pool by applying
>the needed controls whenever the guest is operating on a newer
>processor. If a guest is using retpoline to mitigate intra-mode BTI
>in CPL0, the VMM can set RRSBA_DIS_S when the guest runs on hardware
>which enumerates RRSBA.
>
>Signed-off-by: Zhang Chen <chen.zhang@intel.com>
>---
> arch/x86/kvm/vmx/vmx.c | 57 +++++++++++++++++++++++++++++++++++++++++-
> 1 file changed, 56 insertions(+), 1 deletion(-)
>
>diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
>index 6ed6b743be0e..fb0f3b1639b9 100644
>--- a/arch/x86/kvm/vmx/vmx.c
>+++ b/arch/x86/kvm/vmx/vmx.c
>@@ -2007,6 +2007,20 @@ static int vmx_get_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
> 			return 1;
> 		msr_info->data = vmx->msr_virtual_enumeration;
> 		break;
>+	case MSR_VIRTUAL_MITIGATION_ENUM:
>+		if (!msr_info->host_initiated &&
>+		    !(vmx->msr_virtual_enumeration &
>+		    VIRT_ENUM_MITIGATION_CTRL_SUPPORT))
>+			return 1;
>+		msr_info->data = vmx->msr_virtual_mitigation_enum;
>+		break;
>+	case MSR_VIRTUAL_MITIGATION_CTRL:
>+		if (!msr_info->host_initiated &&
>+		    !(vmx->msr_virtual_enumeration &
>+		    VIRT_ENUM_MITIGATION_CTRL_SUPPORT))
>+			return 1;
>+		msr_info->data = vmx->msr_virtual_mitigation_ctrl;
>+		break;
> 	default:
> 	find_uret_msr:
> 		msr = vmx_find_uret_msr(vmx, msr_info->index);
>@@ -2056,7 +2070,7 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
> 	struct vmx_uret_msr *msr;
> 	int ret = 0;
> 	u32 msr_index = msr_info->index;
>-	u64 data = msr_info->data;
>+	u64 data = msr_info->data, arch_msr;
> 	u32 index;
> 
> 	switch (msr_index) {
>@@ -2390,6 +2404,46 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
> 		vmx->msr_virtual_enumeration = data &
> 						VIRT_ENUM_MITIGATION_CTRL_SUPPORT;
> 		break;
>+	case MSR_VIRTUAL_MITIGATION_ENUM:
>+		if (msr_info->host_initiated &&
>+		    !(vmx->msr_virtual_enumeration &
>+		    VIRT_ENUM_MITIGATION_CTRL_SUPPORT))
>+			return 1;
>+		if (data & ~MITI_ENUM_SUPPORTED)
>+			return 1;
>+		vmx->msr_virtual_mitigation_enum = data;
>+		break;
>+	case MSR_VIRTUAL_MITIGATION_CTRL:
>+		if (!msr_info->host_initiated &&
>+		    !(vmx->msr_virtual_enumeration &
>+		    VIRT_ENUM_MITIGATION_CTRL_SUPPORT))
>+			return 1;
>+		if (data & ~MITI_CTRL_USED)
>+			return 1;
>+


>+		if (boot_cpu_has(X86_FEATURE_ARCH_CAPABILITIES))
>+			rdmsrl(MSR_IA32_ARCH_CAPABILITIES, arch_msr);
>+
>+		if (data & MITI_CTRL_RETPOLINE_S_USED &&
>+		    boot_cpu_has(X86_FEATURE_RRSBA_CTRL) &&
>+		    arch_msr & ARCH_CAP_RRSBA)
>+			vmx->spec_ctrl_mask |= SPEC_CTRL_RRSBA_DIS_S;
>+		else
>+			vmx->spec_ctrl_mask &= ~SPEC_CTRL_RRSBA_DIS_S;

IIUC, only above chunk belongs to this patch. Other changes should be moved
to patch 7, which deals with MSRs emulation.