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;
Message-ID: <1588ed00-be11-ff9d-e4c2-12db78cca06f@suse.com>
Date:   Mon, 14 Aug 2023 09:39:11 +0300
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.13.0
Subject: Re: [PATCH] x86/srso: Disable the mitigation on unaffected
 configurations
Content-Language: en-US
To:     Borislav Petkov <bp@alien8.de>, X86 ML <x86@kernel.org>
Cc:     Josh Poimboeuf <jpoimboe@redhat.com>,
        LKML <linux-kernel@vger.kernel.org>
References: <20230813104517.3346-1-bp@alien8.de>
From:   Nikolay Borisov <nik.borisov@suse.com>
In-Reply-To: <20230813104517.3346-1-bp@alien8.de>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?aGhkcVdWdzBsSUZPS2FWNTNKY3lHNENmWnlBN2xRT01MaGRlOEd5YkVmd3hJ?=
 =?utf-8?B?TU5GbnZVUnowR25iY3h6WldVTVhjWjJCSWk5WjUwV2FWT3RSaXN0emFvQVRp?=
 =?utf-8?B?Q09tT3ZuaXJtL3plbjY2cFlBcm5GY0J3Mk42TGYyejB1NjY3WDA4U0lXeThV?=
 =?utf-8?B?Nk5wYXFEUkhIRm5tamRrRVN2SG0zS2d3MW5oTFlOaC9UNWQ3U052ZGRTNEJx?=
 =?utf-8?B?T3RPK1hMN1FOV3FPd2ZFRTRpdzFKSWg5UnJsMlBzZ2x4SUhlWk8rYkppR1Bj?=
 =?utf-8?B?V3p5Qi9JbWxQbWQwOXJnRTk1VkwxM1B2QjdUQ3d0OVZUQVZUUGZPOVBTK1VZ?=
 =?utf-8?B?bGMvYkdTcmQ5TXlDeXowbXpGM2lMTlU2R1pSOHRYbnZNREF2UVI0a1dVN0da?=
 =?utf-8?B?NFp3SXNsTWlkSTRpN1pxQktmZmJ1OURwc3VmK21BUitndGk5NUVaTW1mWkVU?=
 =?utf-8?B?Qk8rZGU4M0VBVlBlTGN2UUh4a1g1ak9ESWNBNHZHTGh5c2tsOHVmQUo4OUNx?=
 =?utf-8?B?ai9zTnVuTTBmUS8zM2lCbTRsQ0lVQXRjTFcwVnk1c0lvMDlsNlJNVVNPMEtB?=
 =?utf-8?B?K3hQZCtFblcyWjlBN1Baam9EcGJkeXBGeHcwbjc3WjVzanQxT3djM082eVhy?=
 =?utf-8?B?RTZnd1l0Z2xEYTg5dVFoVVlqM3c1YVM1T2FLMkVxOWdlaDRYWE9FOHJXNmlw?=
 =?utf-8?B?WHdKVnh3QUs2ZFpVUnJRd1ZDdlcxcG5jOE5RZXBvOCt6MVp1NnJOZi8xeFBj?=
 =?utf-8?B?aFlmR2JMTHROUGo5YUpWV2Q5MTJCL1NXMjNnNDFXR09VNWdzYXRJbnJTSWVt?=
 =?utf-8?B?RGY4Ym90UlowNEpVWm8rS0cxKzFWR2p1dFdOWlBjaThRSW1vZUNkbldxV2Ix?=
 =?utf-8?B?dFlaSU5RbjlINWZ6N2orbmw4WjkvK1BsV28xSjVwVWRGWUlyY01MTkFhMDYv?=
 =?utf-8?B?MFU0WHJtTlNWNWx2NG5qYXk5eTZVaWhJK3NNWDlNRndQTHJDZ2NSUklIdmIr?=
 =?utf-8?B?OVVsYTRxbi9HVldYcXh6cnJ5SVBxR01lbEpDN2VKbGJUY3BBK21lV2RGV055?=
 =?utf-8?B?SHhjbEdyUld0Y25mbVNJdkk5YmRab1ZxeGduRGZKWFFwQzNWN2xMUDM3eFhS?=
 =?utf-8?B?aFQ0Y3RQcnhudXVRclVXdXRmaGttN1FRNWNnMnFiSHp6Ujh4NS9xS2Mza21J?=
 =?utf-8?B?WW5QWFFSYzVsQU1zNkRLNmhHQmZGQUxSaUlHY01TMzZqMEhFYnd1Y0VqMXRx?=
 =?utf-8?B?V0xXb3NsYlhPd3JrTkhVL1YyRURVVDFLMWdMNi81c2c3R05lYWs0RmEwWnMv?=
 =?utf-8?B?L2NmRmp6dGZMMXZ5Sk5USFJQSDlWQ2RQbUtKZjI5ZmgvUTVydlFOL0NXZ3Uv?=
 =?utf-8?B?VWZtSzBCR2F3am1aQkxWeXpQdmE0U3Z0SDI2MXc4cWJEZUZUTWpibUFVdm50?=
 =?utf-8?B?RnorekJCT0tTSjUrZzM1TVliQlg2M1R5WEVXN0lVSDRLMmpqWFBsNWxIc2tE?=
 =?utf-8?B?Z0wvZ0pHS0MrN2dJRXlNQkhvZjJFRVZjMWJPWDZNZFFmaklXWDhqNXpSbkFW?=
 =?utf-8?B?NUthdmZESlhLQWV3SnRHZ2ZQOHlLaHFybEhSNllYRURpdTdVWWNvS0x1R2cw?=
 =?utf-8?B?RFMzNVp5L3VPd2JRVXFxbEplSC8zV04zK2YwU2VWOExWYWx0TTZXS2VNNm11?=
 =?utf-8?B?MjlMUHE4Qjl6eWpmMlRPbnJUWFZmeW96UExqakE5M1pyNTZ1cjVYdVQwTUQ5?=
 =?utf-8?B?VkZvUXpUSmxqc0RDMDQzNFBYMk4ydmdXZGNETGVHNVRXNE55Zzdzd0EzdjFJ?=
 =?utf-8?B?QlhkcjBpMit0T2dPK2RJSHk2THh6N2lCS2svQjlsaHVZTUxZb29TWjR1OXN2?=
 =?utf-8?B?cEUvYXBoL3o4cG4xbXNsdkJmdDdId0x4VWFiaFBzVGg0Sk5sb3JzTEViVTJI?=
 =?utf-8?B?TU5oMGlvMklMVXhTa1IyRFMrTUZ3T09yUHczei9ya2JvNnV0eUhBOUdhcjFF?=
 =?utf-8?B?RU13WXZDc2ZqVnVXRDREMFlURnlwenIrUHk2MVE3U3EwVEdHRnBYWXBHWkpS?=
 =?utf-8?B?T3pxdmYvMmNIdUQ4bmZlcG5heG4wNXA5THdscjFpZXcyZnJLNE50QXhFK25m?=
 =?utf-8?Q?omQZ4YpqkPXSg9kBuzJVNZPj4?=
X-OriginatorOrg: suse.com
X-MS-Exchange-CrossTenant-Network-Message-Id: a33c3a69-efca-4fef-a7e1-08db9c912cb5
X-MS-Exchange-CrossTenant-AuthSource: PA4PR04MB7790.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Aug 2023 06:39:13.9188
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 0Goi72gu8lEZLqihBFlthUZgSbn3XE3O9+9wTn1A38p9lGwqwMjxBhoAxkuiChfXjXW7xiLAt8o3z3lrqGgPEA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB7489
X-Spam-Status: No, score=-6.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,
        RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS
        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 13.08.23 г. 13:45 ч., Borislav Petkov wrote:
> From: "Borislav Petkov (AMD)" <bp@alien8.de>
> 
> Skip the srso cmd line parsing which is not needed on Zen1/2 with SMT
> disabled and with the proper microcode applied (latter should be the
> case anyway) as those are not affected.
> 
> Fixes: 5a15d8348881 ("x86/srso: Tie SBPB bit setting to microcode patch detection")
> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
> ---
>   arch/x86/kernel/cpu/bugs.c | 7 ++++++-
>   1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
> index d02f73c5339d..8959a1b9fb80 100644
> --- a/arch/x86/kernel/cpu/bugs.c
> +++ b/arch/x86/kernel/cpu/bugs.c
> @@ -2418,8 +2418,10 @@ static void __init srso_select_mitigation(void)
>   		 * IBPB microcode has been applied.
>   		 */
>   		if ((boot_cpu_data.x86 < 0x19) &&
> -		    (!cpu_smt_possible() || (cpu_smt_control == CPU_SMT_DISABLED)))
> +		    (!cpu_smt_possible() || (cpu_smt_control == CPU_SMT_DISABLED))) {
>   			setup_force_cpu_cap(X86_FEATURE_SRSO_NO);
> +			goto pred_cmd;

Actually can't you simply return, given that zen1/2 never have the SBPB 
flag set? Only zen3/4 with the updated microcode?


> +		}
>   	}
>   
>   	if (retbleed_mitigation == RETBLEED_MITIGATION_IBPB) {
> @@ -2696,6 +2698,9 @@ static ssize_t retbleed_show_state(char *buf)
>   
>   static ssize_t srso_show_state(char *buf)
>   {
> +	if (boot_cpu_has(X86_FEATURE_SRSO_NO))
> +		return sysfs_emit(buf, "Not affected\n");
> +
>   	return sysfs_emit(buf, "%s%s\n",
>   			  srso_strings[srso_mitigation],
>   			  (cpu_has_ibpb_brtype_microcode() ? "" : ", no microcode"));