Message ID | 20231019181158.1982205-2-leitao@debian.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2010:b0:403:3b70:6f57 with SMTP id fe16csp567624vqb; Thu, 19 Oct 2023 11:12:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFw9p+e+W3dmOkKHZh9SXqOMKPbMLsB4qlgfub6BbeiI7kHRCmefQQDMCCi0AfUfz/Taecf X-Received: by 2002:a05:6a21:788a:b0:164:e94b:d3ae with SMTP id bf10-20020a056a21788a00b00164e94bd3aemr3185423pzc.54.1697739150625; Thu, 19 Oct 2023 11:12:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697739150; cv=none; d=google.com; s=arc-20160816; b=iLih7P4BXyeN3r2m/bIbU9QKmjB1Hc4IdxK1fbTHshRQ6VQ/qEpB6D4IYd88E7GR6N WX1eo32gz7wDxfqeWqL2PjnKUr3Lq5rDPZLqd/w0Vm7xsLmypvQhMx4tffTEAwW0C6Ts YfRFUWvAT2SgXbK1wRuSfHqYIXNnG97Ag5NKhQ9kQsF1en+0JyjoFTbTWEDuDKIjABW7 UU79vA9KtIONdw7LgPQGLRqfTPPREOXl22Jv6SyXA9P23fGcLB0I3voATIbG20NignUk q1DBIyHdf9kU/t4BhkCpI1cifRgqY5lhmBk2iidz2idIQteSKJeMZjtp4MYRF39rq3gT Dciw== 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; bh=irECxvruaE2IjUyg8ZiPj7VTaWFMYsTQ4MA7HTrIquI=; fh=T/Na3StdsDt/Vl3W5ovSX6FCLua67DwAek6VvvDgcow=; b=wYZF0CkEvmz1OoYcdBFJ5uvvg6fVhuX4arpykvJ72OfhU+f243zlP+SScrKL9Kc3d6 6WKGOnIDUbzA+rDSjFxhwzXydIGA50FBSoFEiZdk02F7rmFFwVOmkqBC+Qyg34SK6L2Q h6cu5u9ayzR1PCmFqZjgE26kEMDYnAxroB3du+G4/kNguhe9gqpp68QYNjDVziYcuYD8 R7foNJJBY1eQaYRty5t3wTgbUOVH0Dj77QzBKYH5dKRNIY+ltG1eB/n4vYUw2KGtPC82 NT6OXqz3Ogm1trbklQfAcae1jJxEz+qqtk/1YBrQQEa4I4TvTMXTLyFeAI///fOFeVza N6lw== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id bz3-20020a056a02060300b00585a5e3039esi147120pgb.113.2023.10.19.11.12.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Oct 2023 11:12:30 -0700 (PDT) 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; 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 Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id DD1DF827006C; Thu, 19 Oct 2023 11:12:29 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233324AbjJSSMZ (ORCPT <rfc822;a1648639935@gmail.com> + 26 others); Thu, 19 Oct 2023 14:12:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40896 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235475AbjJSSMY (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Thu, 19 Oct 2023 14:12:24 -0400 Received: from mail-lj1-f178.google.com (mail-lj1-f178.google.com [209.85.208.178]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D1AA8121 for <linux-kernel@vger.kernel.org>; Thu, 19 Oct 2023 11:12:21 -0700 (PDT) Received: by mail-lj1-f178.google.com with SMTP id 38308e7fff4ca-2bb9a063f26so112740831fa.2 for <linux-kernel@vger.kernel.org>; Thu, 19 Oct 2023 11:12:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697739140; x=1698343940; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=irECxvruaE2IjUyg8ZiPj7VTaWFMYsTQ4MA7HTrIquI=; b=R9HDS6jaSLgCZbMbUh57zJSwJMqHY5AxVLHEwoRObE4F4PeR7DaSEGUngo2KqTwACT JPYQi9eqKn2/KXTg3Onf+g3eUZE53Ymjeit8wc2mwy4yAoJSgz6J/KOV+uliTIcly6Yd nYNC4gb8jOPYIdaiqzSGvyGDV1YRqkFQ67eHZ4Ds8plEBB7nXbeuO1e2ltHUrtecOIaH 3Rgu7QuU7fKsdclc5EEBxm7UHQ3HVQ2cWM5FGxulKqfHntjwsceTFyBuvpjcHIywwli7 ZWdvFxJDZLXVjJ9d3jILW+vXasWRYlOq3tZLaymxVo2WKg2ONCDch61M4j4EtTh7H94a jlVg== X-Gm-Message-State: AOJu0YwKUjtM1r3kNiVMCSdxuWBcjLXP65MrjJbnkp1q4L9zxHbNGlXC p83xbFJqtwcymiE7GyDc92Q= X-Received: by 2002:ac2:599d:0:b0:507:a671:3231 with SMTP id w29-20020ac2599d000000b00507a6713231mr2048308lfn.52.1697739139709; Thu, 19 Oct 2023 11:12:19 -0700 (PDT) Received: from localhost (fwdproxy-cln-007.fbsv.net. [2a03:2880:31ff:7::face:b00c]) by smtp.gmail.com with ESMTPSA id b22-20020a170906709600b009c3828fec06sm3875301ejk.81.2023.10.19.11.12.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Oct 2023 11:12:19 -0700 (PDT) From: Breno Leitao <leitao@debian.org> To: jpoimboe@kernel.org, mingo@redhat.com, tglx@linutronix.de, bp@alien8.de, Dave Hansen <dave.hansen@linux.intel.com>, x86@kernel.org, "H. Peter Anvin" <hpa@zytor.com>, Peter Zijlstra <peterz@infradead.org>, Pawan Gupta <pawan.kumar.gupta@linux.intel.com> Cc: leit@meta.com, linux-kernel@vger.kernel.org (open list:X86 ARCHITECTURE (32-BIT AND 64-BIT)) Subject: [PATCH v5 01/12] x86/bugs: Rename GDS_FORCE_MITIGATION to MITIGATION_GDS_FORCE Date: Thu, 19 Oct 2023 11:11:47 -0700 Message-Id: <20231019181158.1982205-2-leitao@debian.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231019181158.1982205-1-leitao@debian.org> References: <20231019181158.1982205-1-leitao@debian.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.4 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS 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: <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 (snail.vger.email [0.0.0.0]); Thu, 19 Oct 2023 11:12:29 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780208527321094328 X-GMAIL-MSGID: 1780208527321094328 |
Series |
[v5,01/12] x86/bugs: Rename GDS_FORCE_MITIGATION to MITIGATION_GDS_FORCE
|
|
Commit Message
Breno Leitao
Oct. 19, 2023, 6:11 p.m. UTC
CPU mitigations config entries are inconsistent, and names are hard to
related[1]. There are concrete benefits for both users and developers of
having all the mitigation config options living in the same config
namespace.
The mitigation options should have consistency and start with
MITIGATION.
Rename the Kconfig entry from GDS_FORCE_MITIGATION to
MITIGATION_GDS_FORCE.
[1] Link: https://lore.kernel.org/lkml/20231011044252.42bplzjsam3qsasz@treble/
Suggested-by: Josh Poimboeuf <jpoimboe@kernel.org>
Signed-off-by: Breno Leitao <leitao@debian.org>
---
arch/x86/Kconfig | 2 +-
arch/x86/kernel/cpu/bugs.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index d4a73d12780a..d0a9f5a5c8a4 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2566,7 +2566,7 @@ config SLS against straight line speculation. The kernel image might be slightly larger. -config GDS_FORCE_MITIGATION +config MITIGATION_GDS_FORCE bool "Force GDS Mitigation" depends on CPU_SUP_INTEL default n diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index bb0ab8466b91..3c7e27b58f0e 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -671,7 +671,7 @@ enum gds_mitigations { GDS_MITIGATION_HYPERVISOR, }; -#if IS_ENABLED(CONFIG_GDS_FORCE_MITIGATION) +#if IS_ENABLED(CONFIG_MITIGATION_GDS_FORCE) static enum gds_mitigations gds_mitigation __ro_after_init = GDS_MITIGATION_FORCE; #else static enum gds_mitigations gds_mitigation __ro_after_init = GDS_MITIGATION_FULL;