From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 07ADB2E041A for ; Fri, 21 Nov 2025 18:53:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763751224; cv=none; b=gkdoFeFTspSvcLrJxRq84k1y6VVYbldyPl9t/nZXospczpVYWR9SmkGeaIW5/Oxh+NHF/5irbwHntOcAiH4evouNiRez3DQYsF36xIXAYd3VnDS5ts8qH9ekOkWnb+JeUZmEyXnYsBwuiu113HKuZjL35ha0kMjx8KnR8fI8ji8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763751224; c=relaxed/simple; bh=GG+r1J86a8W8oiqwgavGUtd6Y3Yzj26Cpb/I9emdWGQ=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=JR2WVKQerpj/4oGG2/JHpj/+5RRFRzQaYxsknIi9EZmEiVga0+Z8fgu1wkZ0SDKB+mebI/BkLuHjVkNq9t/HuD5v1Jmq19iOjaoj26Ouddun9qKG1sWEYEHBq/LMoYGX51abtKGN9xXzrels/xtY7otkV9KoXKrqdNspvRZBkY0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=fq3yQJey; arc=none smtp.client-ip=209.85.218.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="fq3yQJey" Received: by mail-ej1-f41.google.com with SMTP id a640c23a62f3a-b72cbc24637so408214066b.0 for ; Fri, 21 Nov 2025 10:53:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1763751220; x=1764356020; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :from:references:cc:to:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=DF3TkciJrJV9PrxB3NEf/4Nx5IH0iprQ4Up4rxRZwLY=; b=fq3yQJeyOkktshXWBXWc0P2flsjm4Ia5ro+9Iz5EwgpWNPPkAbFIVscI2TE1x5g0It u4vi5hbx9IEJh/h6vN/8AUUWquCGIpCZ3/mYY+uoZuohzFJYv9EKMiFLfZh59SKXEyPP y7RWKmBhWFrB4zppeYhlEW3uHpMv6NY5FY+qlz+hKllCQxEP2Ti0ddXPjm7RMNrDrWXj /C+ppciIfZQ/xnUks20bg27EtOVaYxzMo4pGGrDMdl5bvcRMtXjUx0oZzTDNR1ILzBwF Dbzv8V0R0bC2l4Iup9ocXP2esD7q42mdC0DIBNKd/SRN/rKH283Jjb0i4i+66SfWeqHM n+dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763751220; x=1764356020; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :from:references:cc:to:subject:user-agent:mime-version:date :message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=DF3TkciJrJV9PrxB3NEf/4Nx5IH0iprQ4Up4rxRZwLY=; b=J9yvYs9e8U90kci0vaMZXKcERZt50Sj2j2JTVnni6e2vqNWs/H3e45CfTgRtSngYNl Oimv4PvB7Dfl4AVQbG0qWDECGsfyEkkjKNwCVySVzn+3gDpRzF7ak+sVJlcEHK9xkfGR B9il1FfJscFoRg7YFp2PnXKVCOlUkp59OPjF/Zqsg7SnevOBv1HHnCmcpu9nOPEh5UVy V9F0myKB2KizqwxNhz4SIS3zQBQpCU+YxDAvZ6v/uQDXy8r8G6i4xMnomsAKUJ31ydSg kjJFsTtxfZQoc8pFkbBKAYPAHEY44ttS+Qd/U6EIKL/gZwnSoQs06fIDD70x+IZUj4Nc hi9A== X-Forwarded-Encrypted: i=1; AJvYcCW4RRcO7Papqaa+LnLt2aRll0ZRpjXGH/4XgcUfo89JVrgF0xK1OePAlB4y5qPaxjEVx1Vpq7m0Hnf2+hs=@vger.kernel.org X-Gm-Message-State: AOJu0YzU1Qre7TwO5hGwxGAEPxLEvXX4TqvEOYfQg/nUKk4Zl73D11T9 SOw+3XnECFxIcME/pkWaWooAUBhh9MtGjnchLsNP6FYvpB9AUUl/Nh3W5kQWO9v2Vfo= X-Gm-Gg: ASbGnctVmbc5eL6YJPXsOeF0qb/v59zTcRRSkIDtyFI1Qk6F3qtE31BKfo7Q1j35JQU K5e/UlEKqwfR3u6f37zj5/a1Zioqx8lO2eD1vTym/qV7tyG6mwQu1MAWY5zzTEYmz4aeS0WWlKO 8md5ySc0MVnWXDaNLj3uv0IUBgScWBtuzCZIdBGuY2Ow8fo8+0hivOusjNzz/CXnBq++YfH6iYV gI3Wp70ZgiY2tyF1ZJceK3T1jL/m3EB0n0TBtXu5xNwOrKxwNWD2doxSgZx7tHQEWnWqkwqbTea U57dY0+RxNotgWoYb+rPkwkKc7tOavvJwLu+XKAnGEyfb0Tbhu7my6FoljNTw5Pa/tsGUIYQWXS YEM/MUyKSWqlX/+HNLub14jCU6uqaJcHm//hlaqEjwTuRaZd+YUDZ3CqyKOaMlIXUWupaqFjk4e FuAPcaa8Ry8BuaXKz7Odu5qqcEm+uVePhbmg/L X-Google-Smtp-Source: AGHT+IEToTYqjdJCl9TwhBBU2DRQPZ1NBUDX8z7CoOnavj5czclk77vuzB8mZ/s7ih7kaVF1L7gpyQ== X-Received: by 2002:a17:907:3f22:b0:b76:3548:b73b with SMTP id a640c23a62f3a-b767168f0b8mr358110366b.4.1763751220330; Fri, 21 Nov 2025 10:53:40 -0800 (PST) Received: from [192.168.0.20] (nborisov.ddns.nbis.net. [85.187.216.236]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b7654cdd60csm521074166b.3.2025.11.21.10.53.39 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 21 Nov 2025 10:53:39 -0800 (PST) Message-ID: <7d136f5b-437d-48ce-852d-cc793df4de15@suse.com> Date: Fri, 21 Nov 2025 20:53:38 +0200 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v4 09/11] x86/vmscape: Deploy BHB clearing mitigation To: Pawan Gupta Cc: x86@kernel.org, David Kaplan , "H. Peter Anvin" , Josh Poimboeuf , Sean Christopherson , Paolo Bonzini , Borislav Petkov , Dave Hansen , linux-kernel@vger.kernel.org, kvm@vger.kernel.org, Asit Mallick , Tao Zhang References: <20251119-vmscape-bhb-v4-0-1adad4e69ddc@linux.intel.com> <20251119-vmscape-bhb-v4-9-1adad4e69ddc@linux.intel.com> <5cdca004-5228-4f07-b9b8-901880f59bb7@suse.com> <20251121184148.hi6ye2trohwjm3oe@desk> From: Nikolay Borisov Content-Language: en-US Autocrypt: addr=nik.borisov@suse.com; keydata= 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 In-Reply-To: <20251121184148.hi6ye2trohwjm3oe@desk> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 11/21/25 20:41, Pawan Gupta wrote: > On Fri, Nov 21, 2025 at 04:23:56PM +0200, Nikolay Borisov wrote: >> >> >> On 11/20/25 08:19, Pawan Gupta wrote: >>> IBPB mitigation for VMSCAPE is an overkill on CPUs that are only affected >>> by the BHI variant of VMSCAPE. On such CPUs, eIBRS already provides >>> indirect branch isolation between guest and host userspace. However, branch >>> history from guest may also influence the indirect branches in host >>> userspace. >>> >>> To mitigate the BHI aspect, use clear_bhb_loop(). >>> >>> Signed-off-by: Pawan Gupta >>> --- >>> Documentation/admin-guide/hw-vuln/vmscape.rst | 4 ++++ >>> arch/x86/include/asm/nospec-branch.h | 2 ++ >>> arch/x86/kernel/cpu/bugs.c | 30 ++++++++++++++++++++------- >>> 3 files changed, 29 insertions(+), 7 deletions(-) >>> >>> diff --git a/Documentation/admin-guide/hw-vuln/vmscape.rst b/Documentation/admin-guide/hw-vuln/vmscape.rst >>> index d9b9a2b6c114c05a7325e5f3c9d42129339b870b..dc63a0bac03d43d1e295de0791dd6497d101f986 100644 >>> --- a/Documentation/admin-guide/hw-vuln/vmscape.rst >>> +++ b/Documentation/admin-guide/hw-vuln/vmscape.rst >>> @@ -86,6 +86,10 @@ The possible values in this file are: >>> run a potentially malicious guest and issues an IBPB before the first >>> exit to userspace after VM-exit. >>> + * 'Mitigation: Clear BHB before exit to userspace': >>> + >>> + As above, conditional BHB clearing mitigation is enabled. >>> + >>> * 'Mitigation: IBPB on VMEXIT': >>> IBPB is issued on every VM-exit. This occurs when other mitigations like >>> diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/nospec-branch.h >>> index 15a2fa8f2f48a066e102263513eff9537ac1d25f..1e8c26c37dbed4256b35101fb41c0e1eb6ef9272 100644 >>> --- a/arch/x86/include/asm/nospec-branch.h >>> +++ b/arch/x86/include/asm/nospec-branch.h >>> @@ -388,6 +388,8 @@ extern void write_ibpb(void); >>> #ifdef CONFIG_X86_64 >>> extern void clear_bhb_loop(void); >>> +#else >>> +static inline void clear_bhb_loop(void) {} >>> #endif >>> extern void (*x86_return_thunk)(void); >>> diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c >>> index cbb3341b9a19f835738eda7226323d88b7e41e52..d12c07ccf59479ecf590935607394492c988b2ff 100644 >>> --- a/arch/x86/kernel/cpu/bugs.c >>> +++ b/arch/x86/kernel/cpu/bugs.c >>> @@ -109,9 +109,8 @@ DEFINE_PER_CPU(u64, x86_spec_ctrl_current); >>> EXPORT_PER_CPU_SYMBOL_GPL(x86_spec_ctrl_current); >>> /* >>> - * Set when the CPU has run a potentially malicious guest. An IBPB will >>> - * be needed to before running userspace. That IBPB will flush the branch >>> - * predictor content. >>> + * Set when the CPU has run a potentially malicious guest. Indicates that a >>> + * branch predictor flush is needed before running userspace. >>> */ >>> DEFINE_PER_CPU(bool, x86_predictor_flush_exit_to_user); >>> EXPORT_PER_CPU_SYMBOL_GPL(x86_predictor_flush_exit_to_user); >>> @@ -3200,13 +3199,15 @@ enum vmscape_mitigations { >>> VMSCAPE_MITIGATION_AUTO, >>> VMSCAPE_MITIGATION_IBPB_EXIT_TO_USER, >>> VMSCAPE_MITIGATION_IBPB_ON_VMEXIT, >>> + VMSCAPE_MITIGATION_BHB_CLEAR_EXIT_TO_USER, >>> }; >>> static const char * const vmscape_strings[] = { >>> - [VMSCAPE_MITIGATION_NONE] = "Vulnerable", >>> + [VMSCAPE_MITIGATION_NONE] = "Vulnerable", >>> /* [VMSCAPE_MITIGATION_AUTO] */ >>> - [VMSCAPE_MITIGATION_IBPB_EXIT_TO_USER] = "Mitigation: IBPB before exit to userspace", >>> - [VMSCAPE_MITIGATION_IBPB_ON_VMEXIT] = "Mitigation: IBPB on VMEXIT", >>> + [VMSCAPE_MITIGATION_IBPB_EXIT_TO_USER] = "Mitigation: IBPB before exit to userspace", >>> + [VMSCAPE_MITIGATION_IBPB_ON_VMEXIT] = "Mitigation: IBPB on VMEXIT", >>> + [VMSCAPE_MITIGATION_BHB_CLEAR_EXIT_TO_USER] = "Mitigation: Clear BHB before exit to userspace", >>> }; >>> static enum vmscape_mitigations vmscape_mitigation __ro_after_init = >>> @@ -3253,8 +3254,19 @@ static void __init vmscape_select_mitigation(void) >>> vmscape_mitigation = VMSCAPE_MITIGATION_NONE; >>> break; >>> + case VMSCAPE_MITIGATION_BHB_CLEAR_EXIT_TO_USER: >>> + if (!boot_cpu_has(X86_FEATURE_BHI_CTRL)) >>> + vmscape_mitigation = VMSCAPE_MITIGATION_NONE; >>> + break; >> >> Am I missing something or this case can never execute because >> VMSCAPE_MITIGATION_BHB_CLEAR_EXIT_TO_USER is only ever set if mitigation is >> VMSCAPE_MITIGATION_AUTO in the below branch? Perhaps just remove it? This >> just shows how confusing the logic for choosing the mitigations has >> become.... > > The goal was not make any assumptions on what vmscape_parse_cmdline() can > and cannot set. If you feel strongly about it, I can remove this case. From where I'm standing bugs.c is already rather hairy even after multiple rounds of cleanups and brushups, if we can remove code - I'll be up for it. At the very least in the commit message you can explicitly mention that you handle every case on-principle, and you expect that some of it is dead code. Still, I think the best code is the one which doesn't exist and you won't have to worry about it.