Message-ID: <2a3cfe80-9403-9289-cf14-b88b31000c0a@intel.com>
Date:   Wed, 15 Mar 2023 07:15:18 -0700
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Firefox/91.0 Thunderbird/91.11.0
Subject: Re: [PATCH] x86/split_lock: Enumerate architectural split lock
 disable bit
Content-Language: en-US
To:     Thomas Gleixner <tglx@linutronix.de>,
        Dave Hansen <dave.hansen@linux.intel.com>,
        Ingo Molnar <mingo@redhat.com>,
        "Borislav Petkov" <bp@alien8.de>,
        Andy Lutomirski <luto@kernel.org>,
        Tony Luck <tony.luck@intel.com>,
        Andi Kleen <andi@firstfloor.org>,
        Ravi V Shankar <ravi.v.shankar@intel.com>,
        x86 <x86@kernel.org>
CC:     linux-kernel <linux-kernel@vger.kernel.org>
References: <20230302011946.211696-1-fenghua.yu@intel.com>
From:   Fenghua Yu <fenghua.yu@intel.com>
In-Reply-To: <20230302011946.211696-1-fenghua.yu@intel.com>
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?ejlXMzhLRHRHbE5lVEFOZTljVkw2ai82RFlYaDlHc0ZEdFJqVlBzVGpDOEE4?=
 =?utf-8?B?QlBYbG5LZk85aXFrenlnemVkTUVkditrb2RGMC95dmxYbWZLVGpRTHBaVldn?=
 =?utf-8?B?ZjNyaFMzeXo4c1hOb0c1a2V0MzBITE0ySTRwKzljZkovZGNyakFhaklYVGJu?=
 =?utf-8?B?QUd4MlJ6Tm5GSjdxY0NzTGNJcG5QaXVZWWdyTUx1WkhKOCt0djBNcURlbmNr?=
 =?utf-8?B?TXk5REFTK0JkUlJvOW0yVWFHNjBuY0RoOXhSdlhTL1lZUzVlN0s4bzR2SFF2?=
 =?utf-8?B?R2dNeGpiWkNaMWdYMHpoU3J0L3NjdHpQM1BMMmVrTit3dC9YUG1KY2YvQjlB?=
 =?utf-8?B?TG4wZ096V3lENGZ3RDJZNWpxNlJuenM5RnVHMkdIOG9Za3NZYnNIczcvYU9Y?=
 =?utf-8?B?NWFoMU9kZy9BcU9ZN0hNY2M5a2NBMk1RTko0RUw2K2d3ay9EZm0wajA1T1pM?=
 =?utf-8?B?VVpSemZVSzc2OWN2QUZ4TUZUVURBSXdBeDZLdXVQV1NnTUFkM1FNYmlEUjZt?=
 =?utf-8?B?T2xpMTVTcGltOXU0SG15WnBVQXI1WGo0YkdjbktrUVY1S3UxWk9TZG92eWNy?=
 =?utf-8?B?N3pEYURFaDNraFk4MzEvS0M0citvLzU0V0U4NFB4NVFXeXNvajlJc3B3MUcy?=
 =?utf-8?B?eWVsa05GWThTMFk2M3VNenlWbnlDRjhvZXVRQzVsQXp2WFBqR0RLZkY3Tkdn?=
 =?utf-8?B?enhreVU3WEEwZ3YrWjl6NlJxK09GS3ZvVnRwSWtBalhIRjY2Zlo3U3dIUGtX?=
 =?utf-8?B?RG1yYlFGYWQyTkRrY0xDcTB3RjhleXAzK0lPcm5DM0ZDOGI4b0g2dkFaNEhC?=
 =?utf-8?B?bWVmbE5lYUptMHJySjVjWDVzZ1I5bGdvZXIwbWI2NVQ3bHcxcDhWcERWZHV5?=
 =?utf-8?B?bjlKSEFOakd4VzZxSGRyRVlLTXFYa3QvZTZSckR0eEpLWTRObmxVSGRXZ0Mr?=
 =?utf-8?B?VjRONGl4VHhPemJPdGVaZnlFVzFwekxJNEVPSnVKYzFybUV2ZUJvRWJIRVZr?=
 =?utf-8?B?Q2pOU2pCMHFJK25La3EzV3VGeURXQXpnOGlyT0pMTGZjZ0l0SnlodlpFOWF2?=
 =?utf-8?B?LzlWOTZBZHR4Q1cyWERGMUVUbDgrVG5qUXNvZ1RvMWVBa0ZtTi9oSDhnaVdu?=
 =?utf-8?B?MVo2OXh3RndkWG1xZ0RvbUFTWUlkSTBndFNhVHorOGRuaS95Z3Qwa3JsRlU5?=
 =?utf-8?B?S0FJQmc4TnZqbVFtTnFqcVNFekRMcUR4SGhkaEVBVUFRSTAvdHlBMjhXMHFm?=
 =?utf-8?B?cC9lVHJ4cXBVZWhVdTdCY0hEdW1zbFJ1T0RWNW5RUFNjN2dmZFJDOTUwUkNF?=
 =?utf-8?B?dmwzZEJVZjhnbS9EeWk1cWFxcmVWeFc5VU02dWs5dlNnNzVOUExVZ0xWTnF2?=
 =?utf-8?B?N1F6M1FMTXE5emtZUWo3YUtqdCtrNzI0WEZyL3h1Mzhva1E5NkFzb2JDNWZC?=
 =?utf-8?B?TW15M3JxU01xdTVGSEZ4ZXRndlBIcDZGVm4vZ082emltZElBOGdySkhWTEdX?=
 =?utf-8?B?Tkt3K21DT1JjK0dnOFY3YTJVN0lRMjlvRDh1TC82SVRsWVZqbXYrcWVHeUZ6?=
 =?utf-8?B?bzNVY01YRUJVeHpudW01T09yc1BTa1VtRDF3bkQ3Z1o2VE5QdlRKYVl3QTdH?=
 =?utf-8?B?dXUxS2JISUc1ck8xOHVMWHZWbW9oZHdVOHFNRE5hQXVXeGxxaWJIZWtrNjdo?=
 =?utf-8?B?ZnI0V1lKbStRSzFxV2tleW41cU5XbVR3UDdhTGpHRUhndlpoMGRsQitINXc0?=
 =?utf-8?B?THg0QmxTOWhDR0F5cVNsbDVCOFdNcEdEZGpjYllTYXRGbWVTVndnc01jT1Ux?=
 =?utf-8?B?QVNDTnF3ZVlNcjZvRTYzeHdCdmlhQVZuSXJDcWZiSjFIbnY4WGEwcjFtOU01?=
 =?utf-8?B?TG9kVFkzbVJyOXVpWXBNL3hjUWcvSzBZdjdQaUwzSk1IaGhnK21vWXp0bmhW?=
 =?utf-8?B?WXJhZDBOaUtxUEdoRGNlNzkwdkt5dVN2L1lOaVo0L2xTcTMrWFMvaFpjeE51?=
 =?utf-8?B?T2REV1FrRE0xS3RiQ2d6ajJtODJOT1FqcFRkeEh0TEhlUGxwcWJxMGhTVkFJ?=
 =?utf-8?B?eTgrTzJYbzErRXY5d3hKdHhFazcrZ2tZUVViZElCeldqZzdCWHBkWVdNWW93?=
 =?utf-8?Q?ajeDVpRb4ETjBU9weM1vivSlt?=
X-MS-Exchange-CrossTenant-Network-Message-Id: f6a6a9a8-fe12-41db-7241-08db255fa7d3
X-MS-Exchange-CrossTenant-AuthSource: IA1PR11MB6097.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Mar 2023 14:14:57.3954
 (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: XVmUPOO2RpRIU2wh+pLxy5Gq5VmjCQqULA5Ux8v9CIl435Sxro3+RLsrW4nufc8iaMEAU0a7dWWR3VZ6H8vu2g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR11MB5517
X-OriginatorOrg: intel.com
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi, Dear X86 Maintainers,

On 3/1/23 17:19, Fenghua Yu wrote:
> The December 2022 edition of the Intel Instruction Set Extensions manual
> defined that the split lock disable bit in the IA32_CORE_CAPABILITIES MSR
> is (and retrospectively always has been) architectural.
> 
> Remove all the model specific checks except for Ice Lake variants which are
> still needed because these CPU models do not enumerate presence of the
> IA32_CORE_CAPABILITIES MSR.
> 
> Link: https://lore.kernel.org/lkml/20220701131958.687066-1-fenghua.yu@intel.com/t/#mada243bee0915532a6adef6a9e32d244d1a9aef4
> Originally-by: Dave Hansen <dave.hansen@linux.intel.com>
> Signed-off-by: Fenghua Yu <fenghua.yu@intel.com>
> Reviewed-by: Tony Luck <tony.luck@intel.com>
> ---
>   arch/x86/kernel/cpu/intel.c | 59 ++++++++++++++-----------------------
>   1 file changed, 22 insertions(+), 37 deletions(-)
> 
> diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
> index 2d7ea5480ec3..d27f8973b58f 100644
> --- a/arch/x86/kernel/cpu/intel.c
> +++ b/arch/x86/kernel/cpu/intel.c
> @@ -1266,31 +1266,13 @@ void handle_bus_lock(struct pt_regs *regs)
>   }
>   
>   /*
> - * Bits in the IA32_CORE_CAPABILITIES are not architectural, so they should
> - * only be trusted if it is confirmed that a CPU model implements a
> - * specific feature at a particular bit position.
> - *
> - * The possible driver data field values:
> - *
> - * - 0: CPU models that are known to have the per-core split-lock detection
> - *	feature even though they do not enumerate IA32_CORE_CAPABILITIES.
> - *
> - * - 1: CPU models which may enumerate IA32_CORE_CAPABILITIES and if so use
> - *      bit 5 to enumerate the per-core split-lock detection feature.
> + * CPU models that are known to have the per-core split-lock detection
> + * feature even though they do not enumerate IA32_CORE_CAPABILITIES.
>    */
>   static const struct x86_cpu_id split_lock_cpu_ids[] __initconst = {
> -	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_X,		0),
> -	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L,		0),
> -	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_D,		0),
> -	X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT,	1),
> -	X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_D,	1),
> -	X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_L,	1),
> -	X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE_L,		1),
> -	X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE,		1),
> -	X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X,	1),
> -	X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE,		1),
> -	X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_L,		1),
> -	X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE,		1),
> +	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_X,	0),
> +	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L,	0),
> +	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_D,	0),
>   	{}
>   };
>   
> @@ -1302,24 +1284,27 @@ static void __init split_lock_setup(struct cpuinfo_x86 *c)
>   	if (boot_cpu_has(X86_FEATURE_HYPERVISOR))
>   		return;
>   
> +	/* Check for CPUs that have support but do not enumerate it: */
>   	m = x86_match_cpu(split_lock_cpu_ids);
> -	if (!m)
> -		return;
> +	if (m)
> +		goto supported;
>   
> -	switch (m->driver_data) {
> -	case 0:
> -		break;
> -	case 1:
> -		if (!cpu_has(c, X86_FEATURE_CORE_CAPABILITIES))
> -			return;
> -		rdmsrl(MSR_IA32_CORE_CAPS, ia32_core_caps);
> -		if (!(ia32_core_caps & MSR_IA32_CORE_CAPS_SPLIT_LOCK_DETECT))
> -			return;
> -		break;
> -	default:
> +	if (!cpu_has(c, X86_FEATURE_CORE_CAPABILITIES))
>   		return;
> -	}
>   
> +	/*
> +	 * Not all bits in MSR_IA32_CORE_CAPS are architectural, but
> +	 * MSR_IA32_CORE_CAPS_SPLIT_LOCK_DETECT is.  All CPUs that set
> +	 * it have split lock detection.
> +	 */
> +	rdmsrl(MSR_IA32_CORE_CAPS, ia32_core_caps);
> +	if (ia32_core_caps & MSR_IA32_CORE_CAPS_SPLIT_LOCK_DETECT)
> +		goto supported;
> +
> +	/* CPU is not in the model list and does not have the MSR bit: */
> +	return;
> +
> +supported:
>   	cpu_model_supports_sld = true;
>   	__split_lock_setup();
>   }

Any comment on this patch?

If this patch is in upstream, we won't continuously send model specific 
enumeration patches for future processors.

Thanks.

-Fenghua