From patchwork Mon Feb 27 21:05:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takahiro Itazuri X-Patchwork-Id: 62143 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2651419wrd; Mon, 27 Feb 2023 13:17:38 -0800 (PST) X-Google-Smtp-Source: AK7set/60KdX7v5jhe6CwDqiZELUVFaxYTvFqWd+0l0pI/GYjx2oy/yJ4XZH8yraQqsXZ8ZxOmSN X-Received: by 2002:a17:903:120d:b0:19c:be49:48e1 with SMTP id l13-20020a170903120d00b0019cbe4948e1mr480245plh.7.1677532658519; Mon, 27 Feb 2023 13:17:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677532658; cv=none; d=google.com; s=arc-20160816; b=yAC3G9bjJiMQcO7pXgJWs8NSG7fmaBe3wPVXWetrvfTy1xS6mbIPbVfKJ7HrqymaBR Rovo08RIcrRdxGpqdhMeU9MzLEmuV9W1FUsQNzhF6MTCtMZVk2Q7mHFGcxnTCpJNBcqI NuZoViuulebVU768viBvql5ITk52qQIC8j12S7Ie054mhuukS6uea3sue2Y6Xt8C6OlU jkS+WUJ6NtXcsaKm7mA0AWCvOYmkz+F+lHRUHYcFCjE3NPVOBje1Kba5WUJ35JsNNHZo ssH30PCThPH/arPuQKK6GU8DlIxy8IMMHc5ZOqYWFFAPdy7M5T0g/TkrEyoctpKwG8p2 0GGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=+X2600KfN0m5ZqG1NqIyA9OmLfKGo7rr2urm8ZQTI2s=; b=lpSFE3CrfpVEZQMdsiMHcyM8ALD9PRTrnyF50Xzj/j7BJMvpKgBxP05Vy4BqmvUlxs agHgeJoIfcQhmPstnEqmuiZPGvdJbGcg+au7FeTkp4auD3cdZ0cFgmYyymwWnSAMUPp7 vSVk9KZOAm8Z0S2dTbZGtlTXxw792SbmU7K9ribxQ17lPMkYUsyvVkflHCLx22n6wOYy UkgmePDcGNDoluqODnXWTWNeuWcVHnst44Cu4KnSiyFgxe5MkBLyMc2lc7UAk4Ynsbv5 z/fkxeJEt+pDz3Fzd3s+6+W4Hn0sxjxjtpLtKsprKQaMmXBY3+AISnXasP8u1EL8FWZX U5cg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amazon.com header.s=amazon201209 header.b=ZuRM4s12; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amazon.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id jh20-20020a170903329400b0019cd5d744e4si7877521plb.156.2023.02.27.13.17.25; Mon, 27 Feb 2023 13:17:38 -0800 (PST) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@amazon.com header.s=amazon201209 header.b=ZuRM4s12; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amazon.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229911AbjB0VPK (ORCPT + 99 others); Mon, 27 Feb 2023 16:15:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51674 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229746AbjB0VPG (ORCPT ); Mon, 27 Feb 2023 16:15:06 -0500 Received: from smtp-fw-80006.amazon.com (smtp-fw-80006.amazon.com [99.78.197.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 02F4E2684A; Mon, 27 Feb 2023 13:14:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1677532498; x=1709068498; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=+X2600KfN0m5ZqG1NqIyA9OmLfKGo7rr2urm8ZQTI2s=; b=ZuRM4s124eYnB/MW31AvVoA4bI0ws8XHnrfZzzo9Z79I/bvFLkpJtFMh iiyY982Vq6I7WIIE8wqUEYpSPoiyRApQ7KZGLg3CRGTa+UJIGVIlrPU2e oB3Gu3AqT4hKUFb/OMqtmEQ8r8I+1Q1OrOv1m2xTFdgzeUUCVMQPdd1HR 4=; X-IronPort-AV: E=Sophos;i="5.98,220,1673913600"; d="scan'208";a="187221001" Received: from pdx4-co-svc-p1-lb2-vlan2.amazon.com (HELO email-inbound-relay-pdx-2c-m6i4x-fa5fe5fb.us-west-2.amazon.com) ([10.25.36.210]) by smtp-border-fw-80006.pdx80.corp.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Feb 2023 21:05:58 +0000 Received: from EX13MTAUWB002.ant.amazon.com (pdx1-ws-svc-p6-lb9-vlan3.pdx.amazon.com [10.236.137.198]) by email-inbound-relay-pdx-2c-m6i4x-fa5fe5fb.us-west-2.amazon.com (Postfix) with ESMTPS id E542040DFE; Mon, 27 Feb 2023 21:05:56 +0000 (UTC) Received: from EX19D002ANA003.ant.amazon.com (10.37.240.141) by EX13MTAUWB002.ant.amazon.com (10.43.161.202) with Microsoft SMTP Server (TLS) id 15.0.1497.45; Mon, 27 Feb 2023 21:05:56 +0000 Received: from b0f1d8753182.ant.amazon.com (10.95.130.142) by EX19D002ANA003.ant.amazon.com (10.37.240.141) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.24; Mon, 27 Feb 2023 21:05:51 +0000 From: Takahiro Itazuri To: , CC: Sean Christopherson , Paolo Bonzini , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , , "Takahiro Itazuri" , Takahiro Itazuri Subject: [PATCH 2/2] KVM: x86: Propagate AMD-specific IBRS related bits Date: Mon, 27 Feb 2023 21:05:26 +0000 Message-ID: <20230227210526.83182-3-itazur@amazon.com> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20230227210526.83182-1-itazur@amazon.com> References: <20230227210526.83182-1-itazur@amazon.com> MIME-Version: 1.0 X-Originating-IP: [10.95.130.142] X-ClientProxiedBy: EX19D031UWC001.ant.amazon.com (10.13.139.241) To EX19D002ANA003.ant.amazon.com (10.37.240.141) X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS, USER_IN_DEF_SPF_WL 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759020484640900147?= X-GMAIL-MSGID: =?utf-8?q?1759020484640900147?= Add AMD-specific IBRS related bits to be propagated to guests. Signed-off-by: Takahiro Itazuri --- arch/x86/kvm/cpuid.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c index 596061c1610e..829ca79076df 100644 --- a/arch/x86/kvm/cpuid.c +++ b/arch/x86/kvm/cpuid.c @@ -704,8 +704,9 @@ void kvm_set_cpu_caps(void) kvm_cpu_cap_mask(CPUID_8000_0008_EBX, F(CLZERO) | F(XSAVEERPTR) | F(WBNOINVD) | F(AMD_IBPB) | F(AMD_IBRS) | F(AMD_SSBD) | F(VIRT_SSBD) | - F(AMD_SSB_NO) | F(AMD_STIBP) | F(AMD_STIBP_ALWAYS_ON) | - __feature_bit(KVM_X86_FEATURE_AMD_PSFD) + F(AMD_SSB_NO) | F(AMD_STIBP) | F(X86_FEATURE_AMD_IBRS_ALWAYS_ON) | + F(AMD_STIBP_ALWAYS_ON) | F(X86_FEATURE_AMD_IBRS_PREFERRED) | + F(X86_FEATURE_AMD_IBRS_SAME_MODE) | __feature_bit(KVM_X86_FEATURE_AMD_PSFD) ); /*