From patchwork Fri Aug 11 09:58:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Borislav Petkov X-Patchwork-Id: 134395 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp979984vqi; Fri, 11 Aug 2023 03:12:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHdan6+i1xW62yB7AhT/QMPnYj2xLDxyy4A/GY8EbeDMjhZE7Sfkn8Py6qAEM89QV5hifMS X-Received: by 2002:aa7:c656:0:b0:523:4b9d:a804 with SMTP id z22-20020aa7c656000000b005234b9da804mr1359793edr.37.1691748738692; Fri, 11 Aug 2023 03:12:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691748738; cv=none; d=google.com; s=arc-20160816; b=KPIQNeYm5b9msfPNcTGg6QOCiM+ghaBJEQym/nhplMXJwPVEZ2KX0L6SSdjKfbilzq vJMgd2OAPFXXPZvLNldDaDnkqYKiC6kKPMaQlXb9Uxd/KsGCFctwJtKD9uN3cNeJOzcs skr/q0nkgE6jqV6Vd/SN5drre7X0cqb1rWLcL7+QeBJPqbMTClHALvkrNDa31QPiISi7 lYq6BfpOZIIgHw6WE9T6cTh59Gt9j+dD4L2CgTCXD5afqETfcT6MmcXkO4ypq2IM9N+R 2Mn7oIHcytwb1RoASr2J0LFd2dm33fOvHbQk46W+c6AJmoegKPaGyGrfON1B053ZikfV Te3w== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=Q3Kk/bQQ2Nqai/td3MBq5UH9s37cHgV2ch33f1jKeag=; fh=Y2RMNzuk89H92G6QMvue7cHjIkKbDKzm4Db8EAAZYoE=; b=IZ5eH8XQfYem/9utpRsuuMqxzlX2RavZMnPrw093JuCfQqKyeO8ChDaOvdiLxyG9tD wUT31hczk9Blk8f381vBEUOM9TECCGrKGx/ILJ5dvYyTovP5CCHUyfXXqAtrvNY3b5bq sNHpO2Zrh7JwVBtFmyiSdGhDwHLWudl6kxtO8FUDnKXkN/YV8+S/m8bcoyp9Jh9UEFON XueJ6pQagNZRITPsdyEfmz2uk0J6ROpDIpBq//k2wRNDxhZEkjEaVom/VnnWuc2dzPYw AG72Se2tNImiOfa0UoaPCyb3RF82l1GZL775x3wHPi0LB1oD06F+O6F2TuIIeEZoAFs7 88iA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@alien8.de header.s=alien8 header.b=egQ0fIEI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bm25-20020a0564020b1900b00523226c590asi2963987edb.337.2023.08.11.03.11.55; Fri, 11 Aug 2023 03:12:18 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@alien8.de header.s=alien8 header.b=egQ0fIEI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alien8.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235310AbjHKJ7K (ORCPT + 99 others); Fri, 11 Aug 2023 05:59:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235549AbjHKJ6x (ORCPT ); Fri, 11 Aug 2023 05:58:53 -0400 Received: from mail.alien8.de (mail.alien8.de [65.109.113.108]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DA7EC3594 for ; Fri, 11 Aug 2023 02:58:45 -0700 (PDT) Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.alien8.de (SuperMail on ZX Spectrum 128k) with ESMTP id 61A4040E01A2; Fri, 11 Aug 2023 09:58:44 +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 YNJCMIl7mimu; Fri, 11 Aug 2023 09:58:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alien8.de; s=alien8; t=1691747921; bh=pTJZp8CvSa7EAMihFPW4TbWTb6SjgsxGRtf+EHHuJD0=; h=From:To:Cc:Subject:Date:From; b=egQ0fIEIItFsEj0PFPkQlTogGMmspnGg/88gZDeB8PyX3zxNGQckeRbMC/jpHrUpa MR40rhHI7+BTy0UylRfSoayMnP8hbeUISD45SBcU2Q1mszh3bkqiV6sbG576GlBKch bMS1q8pVKjLro6M8K+1A0OPU/ep+WskUvQK4U0k57dbIZuP3L4hkf4/VMRXEEpqQKk KwFqsFgYyuDpgyVE21DFfJtEcroWna4eB1MBd9aiMwBp9vC7csXaVxZQGDpxHfoZ4m DNcUmetnlKhuE7kybNLU/aXDC8pTg+YgC8O27kvypdsDjNuIsLlkTDBQR+zAfFapDJ BBT58TOFuU5iJ/yg9l3aZq79byXEI5aUOgVQq0RSOmHBpWClW/XNzkToCrAZsHE4E5 0A96MQxoPndF1dazq8dtsq13U2aVOzRMJDp1FgyyrJMjk4XYapIGCTi4lpaEFdieNO ONV10Gt5z4Cf9fDrw3AGk1wMgFy1on7k8ULZLZOezEz0q54b42cos4WNPFtE2bamAQ 2T1HdffbBD5Gk3sraQ2LH3E2lp4BpYtL2D6GVNwOal40y6KmWCsQHeQGfu1EiN22tW R44euJ76kHjCK4eIX48MDn3B62TpFVjHDJA+YT9UtzLCwUUM5C5cTEjMrgM4w/1qIV ZihmZiNSkVxcRV5LgV7F98og= Received: from zn.tnic (pd9530d32.dip0.t-ipconnect.de [217.83.13.50]) (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 53F9F40E01A1; Fri, 11 Aug 2023 09:58:39 +0000 (UTC) From: Borislav Petkov To: X86 ML Cc: LKML Subject: [PATCH] driver core: cpu: Fix the fallback cpu_show_gds() name Date: Fri, 11 Aug 2023 11:58:31 +0200 Message-ID: <20230811095831.27513-1-bp@alien8.de> X-Mailer: git-send-email 2.42.0.rc0.25.ga82fb66fed25 MIME-Version: 1.0 X-Spam: Yes 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,URIBL_BLOCKED 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-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773927125306019868 X-GMAIL-MSGID: 1773927125306019868 From: "Borislav Petkov (AMD)" In 6524c798b727 ("driver core: cpu: Make cpu_show_not_affected() static") I fat-fingered the name of cpu_show_gds(). Usually, I'd rebase but since those are extraordinary embargoed times, the commit above was already pulled into another tree so no no. Therefore, fix it ontop. Fixes: 6524c798b727 ("driver core: cpu: Make cpu_show_not_affected() static") Signed-off-by: Borislav Petkov (AMD) --- drivers/base/cpu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c index d7300d885822..fe6690ecf563 100644 --- a/drivers/base/cpu.c +++ b/drivers/base/cpu.c @@ -532,7 +532,7 @@ CPU_SHOW_VULN_FALLBACK(srbds); CPU_SHOW_VULN_FALLBACK(mmio_stale_data); CPU_SHOW_VULN_FALLBACK(retbleed); CPU_SHOW_VULN_FALLBACK(spec_rstack_overflow); -CPU_SHOW_VULN_FALLBACK(gather_data_sampling); +CPU_SHOW_VULN_FALLBACK(gds); static DEVICE_ATTR(meltdown, 0444, cpu_show_meltdown, NULL); static DEVICE_ATTR(spectre_v1, 0444, cpu_show_spectre_v1, NULL); @@ -546,7 +546,7 @@ static DEVICE_ATTR(srbds, 0444, cpu_show_srbds, NULL); static DEVICE_ATTR(mmio_stale_data, 0444, cpu_show_mmio_stale_data, NULL); static DEVICE_ATTR(retbleed, 0444, cpu_show_retbleed, NULL); static DEVICE_ATTR(spec_rstack_overflow, 0444, cpu_show_spec_rstack_overflow, NULL); -static DEVICE_ATTR(gather_data_sampling, 0444, cpu_show_gather_data_sampling, NULL); +static DEVICE_ATTR(gather_data_sampling, 0444, cpu_show_gds, NULL); static struct attribute *cpu_root_vulnerabilities_attrs[] = { &dev_attr_meltdown.attr,