Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8;
Message-ID: <bae4d27d-5882-468d-a5bd-80b34c10dd80@suse.com>
Date:   Mon, 20 Nov 2023 14:53:54 +0200
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH 07/13] x86/CPU/AMD: Move Zenbleed check to the Zen2 init
 function
Content-Language: en-US
To:     Borislav Petkov <bp@alien8.de>, X86 ML <x86@kernel.org>
Cc:     LKML <linux-kernel@vger.kernel.org>
References: <20231120104152.13740-1-bp@alien8.de>
 <20231120104152.13740-8-bp@alien8.de>
From:   Nikolay Borisov <nik.borisov@suse.com>
In-Reply-To: <20231120104152.13740-8-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?OE45S2F6RE1mbTVIRjhMZTFObmJGMjFFaU03dGRxUG9ITE1KNkhleGZyR3cv?=
 =?utf-8?B?eW5hSzJIRnU5L1VxRis0QWc0NE1GcWRtK3dQODVTYUZQYkJleDhXOGdYdzlB?=
 =?utf-8?B?RGZ3ZHRYTzd0M1VhQS9tSk9ibldrajZ6ektEUnJwUE0zMlJPelo4R00yL0tE?=
 =?utf-8?B?MnUwY0d4TDJHcmlMYkMxUlJlOFp1VVplZGFJQ3dIVGJQYWc1TU9nT0l2UG8z?=
 =?utf-8?B?QTFJQ1pVSUhGelRwRXcyZ1pBUjhodWJ1VXducTM5bFEvQis3RFJJSDZEb3B4?=
 =?utf-8?B?MU41cXcxZkE0L0RVNCtKSG51TThZUkNoTTVGRzQrQkFnSTA4Mlo4RmtYVGEz?=
 =?utf-8?B?ZFBpWmR3aWVVdW9wNWZBZFRWaDZ0dVpnbUp4Q1cyTzZsVXh2dUVWU25yeEY5?=
 =?utf-8?B?VjZJTFNHdTRVeGY2bm0vZExHdGFNSjBlYWE3U201UnNkTldlMVRKdE5TOVRQ?=
 =?utf-8?B?c0lSanV3YkJkT2M2VnB5YTlsSFBnbzlxT2hBNUFLYm9mVlpVU0RZaWdadUtn?=
 =?utf-8?B?TkdpVkRBZXpUbjZnUmJUMjR4WEZ6M0tnK2xZdW1xR3Y4RjlrQWxTMHFlajJ4?=
 =?utf-8?B?T1VWYVpCWWFTTS9MQUpIaDZlZDh3YURicGN0RGc1cWhMVUY5M3JVYStiRlFV?=
 =?utf-8?B?dlBzVmROQmJPOHdETkUzZE54Njl3Q2lSVDB2MmZPV2NUVVY5UGFGd1RqQmlx?=
 =?utf-8?B?dnp5YzZtL3JmbnJ1RXA0aEFtcjNtLzFwNU9LVUlTdHZPOEpjVzI2VWFieFUw?=
 =?utf-8?B?cm5US2pqdE9HR1R3THJvMDJYaGZoTnplMThGUk93bjV2N3FzTkFjOWFCYkJr?=
 =?utf-8?B?ZUx0YlVrMW53VUdvc29JdzdpeXlVU3BycVozRzB3SmJxdGpwYUpGQ0ptYStm?=
 =?utf-8?B?TytoeFdscStmS2hsbVE0bDlyOXhiVFhNTlI0S3FHb3l4elR0RkRXOTJlR0V5?=
 =?utf-8?B?WkFNOHVVRTg1K0twR1ZLa1A0L1g4dW5uWVVWMityUUlxR0xaTzdZbWpsNG8x?=
 =?utf-8?B?bHNxdHRDaHhOeFA4dDQ3RWh4eXpMUENoa3FVTEFRRlhNMStKaUsrSEpGUW5t?=
 =?utf-8?B?WStQekpkMnVkRStsTHdUdWw2QlRFODdUL1JUZXpBN0w3TDhNQWtxckVDeUp1?=
 =?utf-8?B?Nk1QOEZuM3Z4dkJSd0owS05KeWxBeC85clV3SXRia05FRGNoaTcrNjRPRDQ3?=
 =?utf-8?B?R3hYU0JlYTNGK0Y2SVYrMW1yeHR4MXM1M2lla2hUSHZ5ZkhMT3FVMU1SNUcy?=
 =?utf-8?B?NzREM0F0S2NvcWZFd3pDZ0dqcWk5UXBKYXJQMUNlQnB3T1IyTElxVTJOUVVv?=
 =?utf-8?B?WU1xTDRZMTR0MFdDWnQwZDUrOGJCL1FPOVliQnFsVFMraEhvaXdBdm1STTZv?=
 =?utf-8?B?RGRweU1nY2krMkJKNHArU3pHK2xWYkxST2V0eVhSNWVaaUFiM0pHeGUxRlZa?=
 =?utf-8?B?TWJmWFkrdG9ZSEZkWm1ETFFIN1lLQTlibm0yRHVHNldQZ3p2VFdUWFY5bmVB?=
 =?utf-8?B?Mzg3WHEwYytIc2V4OFlkU3IyN3JyMEkzemtNeUQ3UG03SVY1U01HbWswb0o0?=
 =?utf-8?B?QjZMOWlRZUsyeTRPLzhRS3NQenE0cjJIV2RpV01OQlRQOFZWeEhWTUZFUWtR?=
 =?utf-8?B?NUx0MUtJelhLdmFzbUZ5WDBqQjlUYnVsc1pULytNeUMyYWNxcWR5UVBSOGwx?=
 =?utf-8?B?a1k3ZnF0ejh6THd2WlozOW9md0s5aGp4NWpMNkt0L0tyUzZiRm9YUE5CQ040?=
 =?utf-8?B?cEhleURLaXBBZG1kNUNsVUtDNkdKcElBL1dzTzZyVHlNRkNOeEtadVlwYXh5?=
 =?utf-8?B?OXFIMWtlS3F3QzFCak0xa0w3QVExeWhBSG9GN3BiUThkOEZMeW5lWEpyOXha?=
 =?utf-8?B?cmRJRU1pMzhBeEJDeHZzaGo5V0ZWS2xTZVZTTUo5bVFHcGxOZmNOT0hWcU1X?=
 =?utf-8?B?UFFaODg1aXhDTEpWb0Voanlkb3NtREdsaFVCWUFEbmxUTjJSMnQweU4yMlNa?=
 =?utf-8?B?OXBnZXREWEU2ek5wTWZKMXZkQ3laUW1kazZoNGxZZjVDMjJtVTUwanFSWDJo?=
 =?utf-8?B?YytJZlNJR0JxSmd4R3FKMEtZd0lpOUJTZnRWNU9yUkltaUZiT3pKam5VK0pw?=
 =?utf-8?B?NmVIVmVHQ3kvL2tzSEg3clJJZm1UemlpM0E4MkoyRFl1UGcybC9OTFRyVnR0?=
 =?utf-8?Q?qfnDWaGQ/MnLzCEwKMekNRKAOuRyIUNOW32jt0ZZmp3E?=
X-OriginatorOrg: suse.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c09740d5-d51a-4f84-34ed-08dbe9c7c200
X-MS-Exchange-CrossTenant-AuthSource: PA4PR04MB7790.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2023 12:53:56.7656
 (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: jZpxdqNV/6AArIzhdMj0pTcmche9rSfdCxQUoUsmxCppGZteQNtv6aPtuBwGVrBQLMe0DJvw7h5xeIl6oiQRWQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7912
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable
	autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Mon, 20 Nov 2023 04:54:23 -0800 (PST)


On 20.11.23 г. 12:41 ч., Borislav Petkov wrote:
> From: "Borislav Petkov (AMD)" <bp@alien8.de>
> 
> Prefix it properly so that it is clear which generation it is dealing
> with.
> 
> No functional changes.
> 
> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
> ---
>   arch/x86/kernel/cpu/amd.c | 70 +++++++++++++++++----------------------
>   1 file changed, 30 insertions(+), 40 deletions(-)
> 
> diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
> index 8d90f5f6b0d9..7cbb108afaf4 100644
> --- a/arch/x86/kernel/cpu/amd.c
> +++ b/arch/x86/kernel/cpu/amd.c
> @@ -70,12 +70,6 @@ static const int amd_erratum_383[] =
>   static const int amd_erratum_1054[] =
>   	AMD_LEGACY_ERRATUM(AMD_MODEL_RANGE(0x17, 0, 0, 0x2f, 0xf));
>   
> -static const int amd_zenbleed[] =
> -	AMD_LEGACY_ERRATUM(AMD_MODEL_RANGE(0x17, 0x30, 0x0, 0x4f, 0xf),
> -			   AMD_MODEL_RANGE(0x17, 0x60, 0x0, 0x7f, 0xf),
> -			   AMD_MODEL_RANGE(0x17, 0x90, 0x0, 0x91, 0xf),
> -			   AMD_MODEL_RANGE(0x17, 0xa0, 0x0, 0xaf, 0xf));
> -
>   static const int amd_div0[] =
>   	AMD_LEGACY_ERRATUM(AMD_MODEL_RANGE(0x17, 0x00, 0x0, 0x2f, 0xf),
>   			   AMD_MODEL_RANGE(0x17, 0x50, 0x0, 0x5f, 0xf));
> @@ -1039,33 +1033,6 @@ static void init_amd_zen(struct cpuinfo_x86 *c)
>   
>   }
>   
> -static void init_amd_zen2(struct cpuinfo_x86 *c)
> -{
> -	init_amd_zen_common();
> -	init_spectral_chicken(c);
> -	fix_erratum_1386(c);
> -}
> -
> -static void init_amd_zen3(struct cpuinfo_x86 *c)
> -{
> -	init_amd_zen_common();
> -
> -	if (!cpu_has(c, X86_FEATURE_HYPERVISOR)) {
> -		/*
> -		 * Zen3 (Fam19 model < 0x10) parts are not susceptible to
> -		 * Branch Type Confusion, but predate the allocation of the
> -		 * BTC_NO bit.
> -		 */
> -		if (!cpu_has(c, X86_FEATURE_BTC_NO))
> -			set_cpu_cap(c, X86_FEATURE_BTC_NO);
> -	}
> -}
> -
> -static void init_amd_zen4(struct cpuinfo_x86 *c)
> -{
> -	init_amd_zen_common();
> -}

nit:  If you initially introduced the zen-specific functions right after 
zenbleed_check you would have avoided the function move in this patch 
which would have reduced the overall diff.

<snip>