From patchwork Wed Oct 4 15:47:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 148383 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:254a:b0:403:3b70:6f57 with SMTP id hf10csp225984vqb; Wed, 4 Oct 2023 08:47:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGvsWGEeQD2S+jKzhtATsnRrRY5IOifWr6sHUzRlW1hoeCXR2RFYh5EEhR1477REFjJ4WEp X-Received: by 2002:a54:4113:0:b0:3ab:88a0:78f8 with SMTP id l19-20020a544113000000b003ab88a078f8mr2687290oic.23.1696434467878; Wed, 04 Oct 2023 08:47:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696434467; cv=none; d=google.com; s=arc-20160816; b=Ode85nm18b1wpk5HNQu6p2mSIXR7ca0rym+n94+MnBJFml6pnHpT+pepeWgKnMfmJ2 qkAag8jG3iSoBVhx5DAFVo7A6DgC5dkkgGXOpWt9Ltdus36ZfzLDYM7/J2SjahX8WTNz Hu4G35d1315L0Ra43FBQPr7Y3EpPuh8+JAoRkGcULXHzGm6diheyrAGfumi39HaUEz/p F2fwez3d7uvYctW/Sl0aiiQH9jGRSDAMBZprPH427GYYiWhVlsfHOuQh2MHr2ooKChKc UqU2sQciH8nJVfKtrPAIkGDnTWkIYuJ4TNQn86DtJEYiQByeYpfayUuSh1YyTm0b968I 7hRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=NlgD9fJSxF6SBsZTOTtjt60oqZg662A2r4tQfCG2bII=; fh=9hbCrlT43iXm4uesi0nu9AJusJzEgkVU2SuAPew9Phs=; b=fGq+Qx/SXyEylpqnXwH3KhESzYo782Yb0Bn8SVTiLTV0J9ke7vFW5MITjySpuUVB9p 7bWv/svMsd4FuFZh+5Rn9OTTB2KlP/Oeu4+CiGb+izl1KyOmtdkUXeicWhqKmxUYOk2B YBfdyAb9wKv/gllNoIO6IMrdMKXMazrWJhhwyDj8btVOzuZop6cRMFc+7sRUV8vg2rnk 6f6eus8pbpepMbHSm3IwNunUI8M3iC3LGMq6JjZMVf4OL9VjxRecBeqvknq6PTp5qW7l wi2tBmmb/fcPh6cwxgcCkUcEOpOUQTGx8ywbdEKQfWw0mKhM1Tmk2svZhQLM43PEhC4e s8Jg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=Thm926Vw; dkim=neutral (no key) header.i=@linutronix.de header.b="1LIsLd/C"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id 10-20020a63124a000000b00577f7bc56absi3987547pgs.100.2023.10.04.08.47.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Oct 2023 08:47:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=Thm926Vw; dkim=neutral (no key) header.i=@linutronix.de header.b="1LIsLd/C"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 2AB51826EC90; Wed, 4 Oct 2023 08:47:39 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242893AbjJDPrV (ORCPT + 18 others); Wed, 4 Oct 2023 11:47:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55610 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233622AbjJDPrR (ORCPT ); Wed, 4 Oct 2023 11:47:17 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BA5B5D7; Wed, 4 Oct 2023 08:47:13 -0700 (PDT) Date: Wed, 04 Oct 2023 15:47:11 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1696434432; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NlgD9fJSxF6SBsZTOTtjt60oqZg662A2r4tQfCG2bII=; b=Thm926VwG6851nDDraah0ZZfxLCYJ10bl48vOxZmCL0zraY/Skbs6lMIAGOTCPc4ObwZzj k8hkJSPDyl7qlML8ocARDj8zT2rKaa2rw7WQ27S/QfZgH+/07Rl5IX9/Baqqrfp9CjHoY4 V1h4dZBbjnShDl0/Q6kzRetpAbHhaZ44r/jlVV3BxVosPPjnN1SOjeZ6VxIy+oHXYKDprU tVqG9KTn4wJJ8stthNB+fc6vuWgTfBpsOK4DF0aPtzAoTd1lUEcJaRUfL8A35wBb1/clHL FSzmPFMS5QsVmv1zHJJg2sTqW2skZ+FZ47PZ4EnzYIQZ2nsV3ZapbzZIhE7FmA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1696434432; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NlgD9fJSxF6SBsZTOTtjt60oqZg662A2r4tQfCG2bII=; b=1LIsLd/Cj1L+8pEfr0ldb3y+6gjjO5CuqKdUOdiadqq3rD7zMCFgJPWy/9iOkedGr1xKxC 6TZWrB6xeq3Gw/CA== From: "tip-bot2 for Waiman Long" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: sched/core] intel_idle: Add ibrs_off module parameter to force-disable IBRS Cc: Waiman Long , Ingo Molnar , "Rafael J. Wysocki" , Linus Torvalds , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230727184600.26768-5-longman@redhat.com> References: <20230727184600.26768-5-longman@redhat.com> MIME-Version: 1.0 Message-ID: <169643443175.3135.8419099625718092911.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email 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 (groat.vger.email [0.0.0.0]); Wed, 04 Oct 2023 08:47:39 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778840468449002705 X-GMAIL-MSGID: 1778840468449002705 The following commit has been merged into the sched/core branch of tip: Commit-ID: 238437d88cea4bfcbc0e7c5031e873dec15d3e93 Gitweb: https://git.kernel.org/tip/238437d88cea4bfcbc0e7c5031e873dec15d3e93 Author: Waiman Long AuthorDate: Thu, 27 Jul 2023 14:46:00 -04:00 Committer: Ingo Molnar CommitterDate: Wed, 04 Oct 2023 13:48:48 +02:00 intel_idle: Add ibrs_off module parameter to force-disable IBRS Commit bf5835bcdb96 ("intel_idle: Disable IBRS during long idle") disables IBRS when the cstate is 6 or lower. However, there are some use cases where a customer may want to use max_cstate=1 to lower latency. Such use cases will suffer from the performance degradation caused by the enabling of IBRS in the sibling idle thread. Add a "ibrs_off" module parameter to force disable IBRS and the CPUIDLE_FLAG_IRQ_ENABLE flag if set. In the case of a Skylake server with max_cstate=1, this new ibrs_off option will likely increase the IRQ response latency as IRQ will now be disabled. When running SPECjbb2015 with cstates set to C1 on a Skylake system. First test when the kernel is booted with: "intel_idle.ibrs_off": max-jOPS = 117828, critical-jOPS = 66047 Then retest when the kernel is booted without the "intel_idle.ibrs_off" added: max-jOPS = 116408, critical-jOPS = 58958 That means booting with "intel_idle.ibrs_off" improves performance by: max-jOPS: +1.2%, which could be considered noise range. critical-jOPS: +12%, which is definitely a solid improvement. The admin-guide/pm/intel_idle.rst file is updated to add a description about the new "ibrs_off" module parameter. Signed-off-by: Waiman Long Signed-off-by: Ingo Molnar Acked-by: Rafael J. Wysocki Cc: Linus Torvalds Link: https://lore.kernel.org/r/20230727184600.26768-5-longman@redhat.com --- Documentation/admin-guide/pm/intel_idle.rst | 17 ++++++++++++++++- drivers/idle/intel_idle.c | 11 ++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/Documentation/admin-guide/pm/intel_idle.rst b/Documentation/admin-guide/pm/intel_idle.rst index b799a43..39bd6ec 100644 --- a/Documentation/admin-guide/pm/intel_idle.rst +++ b/Documentation/admin-guide/pm/intel_idle.rst @@ -170,7 +170,7 @@ and ``idle=nomwait``. If any of them is present in the kernel command line, the ``MWAIT`` instruction is not allowed to be used, so the initialization of ``intel_idle`` will fail. -Apart from that there are four module parameters recognized by ``intel_idle`` +Apart from that there are five module parameters recognized by ``intel_idle`` itself that can be set via the kernel command line (they cannot be updated via sysfs, so that is the only way to change their values). @@ -216,6 +216,21 @@ are ignored). The idle states disabled this way can be enabled (on a per-CPU basis) from user space via ``sysfs``. +The ``ibrs_off`` module parameter is a boolean flag (defaults to +false). If set, it is used to control if IBRS (Indirect Branch Restricted +Speculation) should be turned off when the CPU enters an idle state. +This flag does not affect CPUs that use Enhanced IBRS which can remain +on with little performance impact. + +For some CPUs, IBRS will be selected as mitigation for Spectre v2 and Retbleed +security vulnerabilities by default. Leaving the IBRS mode on while idling may +have a performance impact on its sibling CPU. The IBRS mode will be turned off +by default when the CPU enters into a deep idle state, but not in some +shallower ones. Setting the ``ibrs_off`` module parameter will force the IBRS +mode to off when the CPU is in any one of the available idle states. This may +help performance of a sibling CPU at the expense of a slightly higher wakeup +latency for the idle CPU. + .. _intel-idle-core-and-package-idle-states: diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c index 86ac9a4..dcda0af 100644 --- a/drivers/idle/intel_idle.c +++ b/drivers/idle/intel_idle.c @@ -68,6 +68,7 @@ static int max_cstate = CPUIDLE_STATE_MAX - 1; static unsigned int disabled_states_mask __read_mostly; static unsigned int preferred_states_mask __read_mostly; static bool force_irq_on __read_mostly; +static bool ibrs_off __read_mostly; static struct cpuidle_device __percpu *intel_idle_cpuidle_devices; @@ -1852,11 +1853,13 @@ static void state_update_enter_method(struct cpuidle_state *state, int cstate) } if (cpu_feature_enabled(X86_FEATURE_KERNEL_IBRS) && - state->flags & CPUIDLE_FLAG_IBRS) { + ((state->flags & CPUIDLE_FLAG_IBRS) || ibrs_off)) { /* * IBRS mitigation requires that C-states are entered * with interrupts disabled. */ + if (ibrs_off && (state->flags & CPUIDLE_FLAG_IRQ_ENABLE)) + state->flags &= ~CPUIDLE_FLAG_IRQ_ENABLE; WARN_ON_ONCE(state->flags & CPUIDLE_FLAG_IRQ_ENABLE); state->enter = intel_idle_ibrs; return; @@ -2175,3 +2178,9 @@ MODULE_PARM_DESC(preferred_cstates, "Mask of preferred idle states"); * 'CPUIDLE_FLAG_INIT_XSTATE' and 'CPUIDLE_FLAG_IBRS' flags. */ module_param(force_irq_on, bool, 0444); +/* + * Force the disabling of IBRS when X86_FEATURE_KERNEL_IBRS is on and + * CPUIDLE_FLAG_IRQ_ENABLE isn't set. + */ +module_param(ibrs_off, bool, 0444); +MODULE_PARM_DESC(ibrs_off, "Disable IBRS when idle");