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: <86921fe7-6a6b-2731-b09e-a6e03f38a6b9@amd.com>
Date:   Fri, 5 Aug 2022 12:04:34 -0500
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.11.0
Content-Language: en-US
To:     Borislav Petkov <bp@alien8.de>
Cc:     x86@kernel.org, peterz@infradead.org, bpf@vger.kernel.org,
        jpoimboe@redhat.com, andrew.cooper3@citrix.com,
        linux-kernel@vger.kernel.org, thomas.lendacky@amd.com
References: <20220804192201.439596-1-kim.phillips@amd.com>
 <Yu0sT6vCofyWiAMI@zn.tnic>
From:   Kim Phillips <kim.phillips@amd.com>
Subject: Re: [PATCH] x86/bugs: Enable STIBP for IBPB mitigated RetBleed
In-Reply-To: <Yu0sT6vCofyWiAMI@zn.tnic>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?aXJOaFNwRFc5VHVLMkptU2hoSFZ5NHlrdUx6SkJRNlF3NDcxMytYbnp6WkE4?=
 =?utf-8?B?b3pkMFdtWE50RmNabHBGZEJ4cVk5VWVJc1VVVW42T1ZEYlZkVnhZYnZ3OW9k?=
 =?utf-8?B?N3ZFcDM0OWpuM0haSng5VjRnSG5IWDFXMzFKY084a2FJSzJKL09OMlpoSzlZ?=
 =?utf-8?B?VHp2Z0t0Zi9ITER0ejZvZ0VGSCtoMzVKQlN0Q0k1dmtkSlhWZGRaWXUwTEth?=
 =?utf-8?B?ZCsxWlcycVFkY041dUwyVi9SVU4xQ2UwaGNWOG5qOGg2cFlFanVPamtjZmNi?=
 =?utf-8?B?N3BJSlUwWFMwU3B6ZktrVUVUbmprYXBISE80VmJpVXpZTTZyby9JenF1U3Fi?=
 =?utf-8?B?UHJhLzhOa3E4NFJlQ3NMeWdxSzA2dllrVFJKVkVMK1JYd0pEZ0N1azVNVEpw?=
 =?utf-8?B?bEQzTzUyc0xnMk5mUXNVZFdCMEN2RzJKRkRkdWJXMWtKYXZzWUpNcW1SOHd2?=
 =?utf-8?B?Mkg0SzE3QmNhUHBQWVJCelhqeHdNQmJON3UwMEc2bldaTHVMTytGaHBQMlJT?=
 =?utf-8?B?dGJpdXczeStoR2lhQS9reUQyRFFHam80Vm1XOGlncUIwb0huQU5YRld0SGZR?=
 =?utf-8?B?MUp6a3F1NG8vRzBuU1NpNUdyQmI5eXdTdnRMMjhJK21ySzlXUWtjUTFEcUhZ?=
 =?utf-8?B?azJuVTM4L1g2UTY3YjBERlFkYk5MUVE0WEpud2hMQm1oQURlMTVpelNJMnpV?=
 =?utf-8?B?cUJTdDR6SllMdHMrcnJpc1E3bnRnd3gwV2E0RitZVkNQZm1TQWlhWndDdzRv?=
 =?utf-8?B?dmszQk90cGh5TGNjdlE2clJDNFh6MkFTQktGMVlkSlFNdUxwemFldGlCY01J?=
 =?utf-8?B?N1ZqRVF0THlXWnBUMmsvYks1Zi9wWTEyVGE5UENwS3gxZXkzQjluR2g2N2J5?=
 =?utf-8?B?Rk1IdUQvMlNzU2RLQXhzOE5MbDBRazNkdWtiRDJNRVVzNDJ4R0xQa3lIUG9n?=
 =?utf-8?B?ejVFYllZc3MrL3NZUXRJSmUrMHBNRituNHdkNlAwMnMreFZ1V2tnQTNYeWQx?=
 =?utf-8?B?VUxLUUo5RWVqeHdIeDFyTWRQQ0hWVjBpc0ZwRHZUYkVEbFpZYnBlaFNDUkp2?=
 =?utf-8?B?Unhla1ZSWEZ2YjFtSGJ5T1RiL2pkYm1hMzd1bHg4a3NGUHd6SUhDTTdyallW?=
 =?utf-8?B?WDlRQVNqa1ZDWjJ2YmdFNU9HZlU1UTBuWnJJekdlOFpSaU9mV3JUelBtMUZ6?=
 =?utf-8?B?ZWhWZzFMVW9tUEhkbGsycnJKekpJa1l5ZldsaXorTjRJS2d4VlRaUmt6M3p4?=
 =?utf-8?B?RE9EZUl1ejhTTDl5ZnpQeEFneklvN3l6Vm5nZWlhdXFVZ05WSWpBL1JTd3E2?=
 =?utf-8?B?MlZhMzR0NnZqR3FWS3g0Uk5ieHIzU2FDRTRwRFoxVFIrUmMreDFUR2IyQUNr?=
 =?utf-8?B?a1RyOXZ1SUVXQ0g5RGcySm1wWGlTc3RneGVyWHVGeVVhNjVnRjFkMzF4WWwx?=
 =?utf-8?B?c3kxQVByVnpmYndwVGN0cjBHUlo1L3Z4M2dDODEvQldlNGs3YnNlL3A2Z0Nm?=
 =?utf-8?B?UDlvempRMktsK2xJT0o0QVI2Y2hrdU52SmJHZzQvMCs5dHFhenBZWW1qUlhT?=
 =?utf-8?B?RWJ2MGZNQWJuazRQNDZuRHdld3dmZEhnYjlrbm8yQ0F6dkJlQVMxdWJSTFFY?=
 =?utf-8?B?K1laSVZqRkFLTVppMzJBVDMwdjRlK3E2cDZNZmxuSzdiSEJiQ1BlL1lUV2FU?=
 =?utf-8?B?SGtTRXhmVXhTSSs3bkUvUXErYzhhVHZ5UHFhMCs4ekRaaGFPTWltQnROeUdG?=
 =?utf-8?B?Q2NxdTJjckVjUUMzQnZ3K3VjUHlJajNvVzlCRHVvSDExOU1yT3dBaE45K0RE?=
 =?utf-8?B?emVuaHV5RlIzWTgyZVFIV0pGOGZoQ09haElGMUM2b0FKV2dCMTJHMVpONkY3?=
 =?utf-8?B?Slo5WTNLblIxLzZKL1dsWHV4WmdZQlFqRWxtMkNJaGJjTFBSZnBrNWZ6aGc4?=
 =?utf-8?B?bmUvZmdjOW5mbUVudFAwdnVEYnZKQlJnd0NKVU9vTFdGYVhNRnR0UENWRjhZ?=
 =?utf-8?B?K1RJaEYvUEJvK3cyV3Vtb0RPb2U3S0JtYjZyS05WbElHSXJObURJcnRUcUEz?=
 =?utf-8?B?WElWTVZMZnJ0TXB4WFY3Y0JpZDkzTnFEamkzZzI4L2dWYXZ4MGZjblRNVno0?=
 =?utf-8?Q?967Bk9nX1SbmnfVvCIuAE6kyU?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c4eab476-aec6-4edf-2152-08da770493b3
X-MS-Exchange-CrossTenant-AuthSource: MN0PR12MB6272.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Aug 2022 17:04:36.9161
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: sTvUiOChFTUO6i8NEnZeF2GgNTSIE73uIjbSeJ21TrCpkwMtjYieExCCiNhmhuTFfE0k9kziwZnu2NV9xRt0KQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR12MB5394
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        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 8/5/22 9:42 AM, Borislav Petkov wrote:
> On Thu, Aug 04, 2022 at 02:22:01PM -0500, Kim Phillips wrote:
>> For retbleed=ibpb, force STIBP on machines that have it,
> 
> Because?

See "6.1.2 IBPB On Privileged Mode Entry / SMT Safety":

https://www.amd.com/system/files/documents/technical-guidance-for-mitigating-branch-type-confusion_v7_20220712.pdf

Did you want me to re-quote the whitepaper, or reference it,
or paraphrase it, or...?

>> and report its SMT vulnerability status accordingly.
>>
>> Fixes: 3ebc17006888 ("x86/bugs: Add retbleed=ibpb")
>> Signed-off-by: Kim Phillips <kim.phillips@amd.com>
>> ---
>>   Documentation/admin-guide/kernel-parameters.txt |  4 +++-
>>   arch/x86/kernel/cpu/bugs.c                      | 10 ++++++----
>>   2 files changed, 9 insertions(+), 5 deletions(-)
>>
>> diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
>> index 597ac77b541c..127fa4328360 100644
>> --- a/Documentation/admin-guide/kernel-parameters.txt
>> +++ b/Documentation/admin-guide/kernel-parameters.txt
>> @@ -5212,10 +5212,12 @@
>>   			ibpb	     - mitigate short speculation windows on
>>   				       basic block boundaries too. Safe, highest
>>   				       perf impact.
> 
> You should put some blurb here about STIBP and why it is being enabled,
> where present.

unret didn't have it, was just copying unret's entry, but,
ok, will do for both now.

How about:

"{unret,ibpb} alone does not stop sibling threads influencing the predictions of
other sibling threads.  For that reason, we use STIBP on processors that support
it, and mitigate SMT on processors that don't."

>> @@ -2346,10 +2347,11 @@ static ssize_t srbds_show_state(char *buf)
>>   
>>   static ssize_t retbleed_show_state(char *buf)
>>   {
>> -	if (retbleed_mitigation == RETBLEED_MITIGATION_UNRET) {
>> +	if (retbleed_mitigation == RETBLEED_MITIGATION_UNRET ||
>> +	    retbleed_mitigation == RETBLEED_MITIGATION_IBPB) {
>>   	    if (boot_cpu_data.x86_vendor != X86_VENDOR_AMD &&
>>   		boot_cpu_data.x86_vendor != X86_VENDOR_HYGON)
>> -		    return sprintf(buf, "Vulnerable: untrained return thunk on non-Zen uarch\n");
>> +		    return sprintf(buf, "Vulnerable: untrained return thunk / IBPB on non-AMD based uarch\n");
> 
> Well, you can't lump those together.
>  > You can't especially say "Vulnerable" and "IBPB" in one line.
> 
> To quote from the BTC paper:
> 
> "Software may choose to perform an IBPB command on entry into privileged
> code in order to avoid any previous branch prediction information from
> subsequently being used. This effectively mitigates all forms of BTC for
> scenarios like user-to-supervisor or VM-to-hypervisor attacks."
> 
> Especially if we disable SMT only on !STIBP parts:
> 
>          if (mitigate_smt && !boot_cpu_has(X86_FEATURE_STIBP) &&
>              (retbleed_nosmt || cpu_mitigations_auto_nosmt()))
>                  cpu_smt_disable(false);
> 
> If there are AMD parts which have IBPB but DO NOT have STIBP, then you
> can say "Vulnerable... IBPB" but then you need to check for !STIBP and
> issue that on a separate line.
> 
> I'd say...

Those messages only get printed on non-AMD hardware?

Kim