From patchwork Mon Nov 20 10:41:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Borislav Petkov X-Patchwork-Id: 167041 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9910:0:b0:403:3b70:6f57 with SMTP id i16csp2109961vqn; Mon, 20 Nov 2023 02:44:07 -0800 (PST) X-Google-Smtp-Source: AGHT+IHG9pO/Duw8lsNc7QzJtaHlPffOC1kAb2lSh9n+etCRbF0LXLPThsbO5Xm0PpGfsbhkOdT2 X-Received: by 2002:a17:902:7793:b0:1cc:5378:6a56 with SMTP id o19-20020a170902779300b001cc53786a56mr4837685pll.48.1700477047177; Mon, 20 Nov 2023 02:44:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700477047; cv=none; d=google.com; s=arc-20160816; b=UqdFSpQH0JRK8U3Mdx8lggFlEXWMD57EK8TVU2yKGVkfwPWXRxKSPlgACPzLrl8ndN EfRF+Cga8VCLGt8cY+Rih8yG/R4u9BM68DZqYFFdxwiM0lyn/eSM9WPyI942Uf5zosUr 6eci7R7KdE6iJtqQia7b9q+PfMX2/feTEY0TnAWfMM11lO5rK7BMtA74JgviYUJZPAFh e6dtvDPRKAL+rxvsbJR8767+x+Op/VY7zxeqKnyAFZ78bluptD3KpU4FPRk519li86Bo tvanjWh8Gsn/a/7KGtwqJj53IcOG1SOe6J13P0kooKAEoFhWDYhbHJ98jffmMDFon5zg Yu6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=LyFsSHLJuWIth4fnzmUnEOdKoK1Kc4wkYZUjUwGrTjo=; fh=yRofEPOsMYSFYi/7/f3tXB782BWAy0107oR1j5aafGk=; b=xx9bPGzen7D7GpCZETWmyY8OePzHX8rWMm/6tNy45Wt0XyVLFukbZ/ZJwrU8pZAVfR jcDWfU1D5UoFhiB4/EOg54uJXMrEMkMaIs+oAOrQx/TjeKxvW/jp3LhDk7SMPKhEn0yK xhdWEihxllRhOtQI/T2kj8RtmXRq4sYvqym65JwFPYGnagRAun355Y8TGNfKRTwhQ7QO SJpyh5f4MPxxVhd1rbkHJdb1QLJST5vc4Z+c7tDR4UEcrytbHlzsRfEKKIof4WAVT/Sz wz9IwVrtTG10rkNWuza+mXhyTCQSstLufR053KcOwvN1QsuvZDiubONQ3Ud3GCSDKgnu 6iqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@alien8.de header.s=alien8 header.b=dlDFrVYY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alien8.de Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id d1-20020a170903230100b001ce5b8cfe7dsi8399739plh.230.2023.11.20.02.44.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 02:44:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@alien8.de header.s=alien8 header.b=dlDFrVYY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alien8.de Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id EC92680CF546; Mon, 20 Nov 2023 02:42:36 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233166AbjKTKmR (ORCPT + 27 others); Mon, 20 Nov 2023 05:42:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53082 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232566AbjKTKmO (ORCPT ); Mon, 20 Nov 2023 05:42:14 -0500 Received: from mail.alien8.de (mail.alien8.de [IPv6:2a01:4f9:3051:3f93::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 44246CA for ; Mon, 20 Nov 2023 02:42:10 -0800 (PST) Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.alien8.de (SuperMail on ZX Spectrum 128k) with ESMTP id 7382040E0199; Mon, 20 Nov 2023 10:42:08 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at mail.alien8.de Authentication-Results: mail.alien8.de (amavisd-new); dkim=fail (4096-bit key) reason="fail (body has been altered)" header.d=alien8.de Received: from mail.alien8.de ([127.0.0.1]) by localhost (mail.alien8.de [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id RkOOUOSPk8KA; Mon, 20 Nov 2023 10:42:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alien8.de; s=alien8; t=1700476925; bh=HxttFcqjU7pq71AIEFYdAjIvuj4XO+qvt4ZK4/zq++U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dlDFrVYYBJfJEwXM4O5nSh0jip04X+D96XbQtfFOgJDd1beZfTwZc5+OLZyQoKPyX zGGf2olJrYxTT4eSaTC97VxMFE6YYFvgD0bg6msN+hV/AYBjGmOA90vJ1dBEBfaSnG gIvElgm8CT75xSMeF/9/X+w14DHAbwRhseZkKjYuj+rZNz5cbTLkyvevhOOeFXmx6f WB8v5c+By/pcyE6HwwZBhoHDeI+mnbvzlCGu/PKiPH+pSe/xyTXGkLb71TzA/nIc1S +9FXpaHXOzrrT1LtY8dqBBt9eUU0MmX2vItpsOSBTeP4ZokLqb01PMyIQLSzqAuvNe xQfsPQacrBlKvEdteSyRCJuU/D/LrglJUpI9N2HX7WrS4dHnELMVGQA/VTBhkDhpKN HeXCIItYhtHoM5A7LnARnZ533EvPHfBi3lldQJqNWsrYyJgDrlHnm3yAGk51nAh+Sl bB+UaKJHODEePzhYmNY+RPYRE827Pst7+w4RKen8O7hRrzIHavAWhMgRAaIrF5xdPy u+BUJaKBj7WleaRDDp1aXloKvvY/EEHovQXzNPzy8hgoCL6ijKde0936gqKr2BoiL6 yrD74wcbg0rU7lLd9ygCJWKMX++jbYOSTLwMYp3A2dFefWhf3ZESuydWYJFB3wCuG1 BuiRogp2cqZOIlEnWiIIxnGQ= Received: from zn.tnic (pd95304da.dip0.t-ipconnect.de [217.83.4.218]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature ECDSA (P-256) server-digest SHA256) (No client certificate requested) by mail.alien8.de (SuperMail on ZX Spectrum 128k) with ESMTPSA id 91C1A40E0031; Mon, 20 Nov 2023 10:42:03 +0000 (UTC) From: Borislav Petkov To: X86 ML Cc: LKML Subject: [PATCH 01/13] x86/CPU/AMD: Add ZenX generations flags Date: Mon, 20 Nov 2023 11:41:40 +0100 Message-ID: <20231120104152.13740-2-bp@alien8.de> X-Mailer: git-send-email 2.42.0.rc0.25.ga82fb66fed25 In-Reply-To: <20231120104152.13740-1-bp@alien8.de> References: <20231120104152.13740-1-bp@alien8.de> MIME-Version: 1.0 X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=no 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: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 20 Nov 2023 02:42:37 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783079419903797655 X-GMAIL-MSGID: 1783079419903797655 From: "Borislav Petkov (AMD)" Add X86_FEATURE flags for each Zen generation. They should be used from now on instead of checking f/m/s. Signed-off-by: Borislav Petkov (AMD) --- arch/x86/include/asm/cpufeatures.h | 6 ++- arch/x86/kernel/cpu/amd.c | 70 +++++++++++++++++++++++++++++- 2 files changed, 72 insertions(+), 4 deletions(-) diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h index 4af140cf5719..6f6cf49e9891 100644 --- a/arch/x86/include/asm/cpufeatures.h +++ b/arch/x86/include/asm/cpufeatures.h @@ -218,7 +218,7 @@ #define X86_FEATURE_IBRS ( 7*32+25) /* Indirect Branch Restricted Speculation */ #define X86_FEATURE_IBPB ( 7*32+26) /* Indirect Branch Prediction Barrier */ #define X86_FEATURE_STIBP ( 7*32+27) /* Single Thread Indirect Branch Predictors */ -#define X86_FEATURE_ZEN (7*32+28) /* "" CPU based on Zen microarchitecture */ +#define X86_FEATURE_ZEN ( 7*32+28) /* "" CPU based on Zen microarchitecture */ #define X86_FEATURE_L1TF_PTEINV ( 7*32+29) /* "" L1TF workaround PTE inversion */ #define X86_FEATURE_IBRS_ENHANCED ( 7*32+30) /* Enhanced IBRS */ #define X86_FEATURE_MSR_IA32_FEAT_CTL ( 7*32+31) /* "" MSR IA32_FEAT_CTL configured */ @@ -308,10 +308,12 @@ #define X86_FEATURE_SMBA (11*32+21) /* "" Slow Memory Bandwidth Allocation */ #define X86_FEATURE_BMEC (11*32+22) /* "" Bandwidth Monitoring Event Configuration */ #define X86_FEATURE_USER_SHSTK (11*32+23) /* Shadow stack support for user mode applications */ - #define X86_FEATURE_SRSO (11*32+24) /* "" AMD BTB untrain RETs */ #define X86_FEATURE_SRSO_ALIAS (11*32+25) /* "" AMD BTB untrain RETs through aliasing */ #define X86_FEATURE_IBPB_ON_VMEXIT (11*32+26) /* "" Issue an IBPB only on VMEXIT */ +#define X86_FEATURE_ZEN2 (11*32+27) /* "" CPU based on Zen2 microarchitecture */ +#define X86_FEATURE_ZEN3 (11*32+28) /* "" CPU based on Zen3 microarchitecture */ +#define X86_FEATURE_ZEN4 (11*32+29) /* "" CPU based on Zen4 microarchitecture */ /* Intel-defined CPU features, CPUID level 0x00000007:1 (EAX), word 12 */ #define X86_FEATURE_AVX_VNNI (12*32+ 4) /* AVX VNNI instructions */ diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index a7eab05e5f29..fa6ba63ca7e2 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -616,6 +616,49 @@ static void bsp_init_amd(struct cpuinfo_x86 *c) } resctrl_cpu_detect(c); + + /* Figure out Zen generations: */ + switch (c->x86) { + case 0x17: { + switch (c->x86_model) { + case 0x00 ... 0x2f: + case 0x50 ... 0x5f: + setup_force_cpu_cap(X86_FEATURE_ZEN); + break; + case 0x30 ... 0x4f: + case 0x60 ... 0x7f: + case 0x90 ... 0x91: + case 0xa0 ... 0xaf: + setup_force_cpu_cap(X86_FEATURE_ZEN2); + break; + default: + goto warn; + } + break; + } + case 0x19: { + switch (c->x86_model) { + case 0x00 ... 0x0f: + case 0x20 ... 0x5f: + setup_force_cpu_cap(X86_FEATURE_ZEN3); + break; + case 0x10 ... 0x1f: + case 0x60 ... 0xaf: + setup_force_cpu_cap(X86_FEATURE_ZEN4); + break; + default: + goto warn; + } + break; + } + default: + break; + } + + return; + +warn: + WARN_ONCE(1, "Family 0x%x, model: 0x%x??\n", c->x86, c->x86_model); } static void early_detect_mem_encrypt(struct cpuinfo_x86 *c) @@ -974,8 +1017,6 @@ void init_spectral_chicken(struct cpuinfo_x86 *c) static void init_amd_zn(struct cpuinfo_x86 *c) { - set_cpu_cap(c, X86_FEATURE_ZEN); - #ifdef CONFIG_NUMA node_reclaim_distance = 32; #endif @@ -997,6 +1038,22 @@ static void init_amd_zn(struct cpuinfo_x86 *c) } } +static void init_amd_zen(struct cpuinfo_x86 *c) +{ +} + +static void init_amd_zen2(struct cpuinfo_x86 *c) +{ +} + +static void init_amd_zen3(struct cpuinfo_x86 *c) +{ +} + +static void init_amd_zen4(struct cpuinfo_x86 *c) +{ +} + static bool cpu_has_zenbleed_microcode(void) { u32 good_rev = 0; @@ -1077,6 +1134,15 @@ static void init_amd(struct cpuinfo_x86 *c) case 0x19: init_amd_zn(c); break; } + if (boot_cpu_has(X86_FEATURE_ZEN)) + init_amd_zen(c); + else if (boot_cpu_has(X86_FEATURE_ZEN2)) + init_amd_zen2(c); + else if (boot_cpu_has(X86_FEATURE_ZEN3)) + init_amd_zen3(c); + else if (boot_cpu_has(X86_FEATURE_ZEN4)) + init_amd_zen4(c); + /* * Enable workaround for FXSAVE leak on CPUs * without a XSaveErPtr feature