From: <gregkh@linuxfoundation•org>
To: greg@kroah•com, gregkh@linuxfoundation•org,
linuxppc-dev@ozlabs•org, mauricfo@linux•vnet.ibm.com,
mpe@ellerman•id.au, tglx@linutronix•de
Cc: <stable-commits@vger•kernel.org>
Subject: Patch "powerpc/rfi-flush: Move the logic to avoid a redo into the debugfs code" has been added to the 4.14-stable tree
Date: Sun, 27 May 2018 15:49:54 +0200 [thread overview]
Message-ID: <152742899472148@kroah.com> (raw)
In-Reply-To: <20180526042749.5324-5-mpe@ellerman.id.au>
This is a note to let you know that I've just added the patch titled
powerpc/rfi-flush: Move the logic to avoid a redo into the debugfs code
to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
powerpc-rfi-flush-move-the-logic-to-avoid-a-redo-into-the-debugfs-code.patch
and it can be found in the queue-4.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger•kernel.org> know about it.
>From foo@baz Sun May 27 15:47:18 CEST 2018
From: Michael Ellerman <mpe@ellerman•id.au>
Date: Sat, 26 May 2018 14:27:30 +1000
Subject: powerpc/rfi-flush: Move the logic to avoid a redo into the debugfs code
To: greg@kroah•com
Cc: stable@vger•kernel.org, tglx@linutronix•de, linuxppc-dev@ozlabs•org
Message-ID: <20180526042749.5324-5-mpe@ellerman•id.au>
From: Michael Ellerman <mpe@ellerman•id.au>
commit 1e2a9fc7496955faacbbed49461d611b704a7505 upstream.
rfi_flush_enable() includes a check to see if we're already
enabled (or disabled), and in that case does nothing.
But that means calling setup_rfi_flush() a 2nd time doesn't actually
work, which is a bit confusing.
Move that check into the debugfs code, where it really belongs.
Signed-off-by: Michael Ellerman <mpe@ellerman•id.au>
Signed-off-by: Mauricio Faria de Oliveira <mauricfo@linux•vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman•id.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation•org>
---
arch/powerpc/kernel/setup_64.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -822,9 +822,6 @@ static void do_nothing(void *unused)
void rfi_flush_enable(bool enable)
{
- if (rfi_flush == enable)
- return;
-
if (enable) {
do_rfi_flush_fixups(enabled_flush_types);
on_each_cpu(do_nothing, NULL, 1);
@@ -878,13 +875,19 @@ void __init setup_rfi_flush(enum l1d_flu
#ifdef CONFIG_DEBUG_FS
static int rfi_flush_set(void *data, u64 val)
{
+ bool enable;
+
if (val == 1)
- rfi_flush_enable(true);
+ enable = true;
else if (val == 0)
- rfi_flush_enable(false);
+ enable = false;
else
return -EINVAL;
+ /* Only do anything if we're changing state */
+ if (enable != rfi_flush)
+ rfi_flush_enable(enable);
+
return 0;
}
Patches currently in stable-queue which might be from mpe@ellerman•id.au are
queue-4.14/powerpc-64s-clear-pcr-on-boot.patch
queue-4.14/powerpc-rfi-flush-differentiate-enabled-and-patched-flush-types.patch
queue-4.14/powerpc-64s-fix-section-mismatch-warnings-from-setup_rfi_flush.patch
queue-4.14/powerpc-pseries-fix-clearing-of-security-feature-flags.patch
queue-4.14/powerpc-powernv-set-or-clear-security-feature-flags.patch
queue-4.14/powerpc-64s-move-cpu_show_meltdown.patch
queue-4.14/powerpc-rfi-flush-call-setup_rfi_flush-after-lpm-migration.patch
queue-4.14/powerpc-pseries-set-or-clear-security-feature-flags.patch
queue-4.14/powerpc-rfi-flush-make-it-possible-to-call-setup_rfi_flush-again.patch
queue-4.14/powerpc-move-default-security-feature-flags.patch
queue-4.14/powerpc-powernv-use-the-security-flags-in-pnv_setup_rfi_flush.patch
queue-4.14/powerpc-add-security-feature-flags-for-spectre-meltdown.patch
queue-4.14/powerpc-pseries-use-the-security-flags-in-pseries_setup_rfi_flush.patch
queue-4.14/powerpc-64s-enhance-the-information-in-cpu_show_meltdown.patch
queue-4.14/powerpc-64s-improve-rfi-l1-d-cache-flush-fallback.patch
queue-4.14/powerpc-rfi-flush-always-enable-fallback-flush-on-pseries.patch
queue-4.14/powerpc-rfi-flush-move-the-logic-to-avoid-a-redo-into-the-debugfs-code.patch
queue-4.14/powerpc-pseries-restore-default-security-feature-flags-on-setup.patch
queue-4.14/powerpc-pseries-add-new-h_get_cpu_characteristics-flags.patch
queue-4.14/powerpc-64s-add-support-for-a-store-forwarding-barrier-at-kernel-entry-exit.patch
queue-4.14/powerpc-64s-wire-up-cpu_show_spectre_v1.patch
queue-4.14/powerpc-powernv-support-firmware-disable-of-rfi-flush.patch
queue-4.14/powerpc-pseries-support-firmware-disable-of-rfi-flush.patch
queue-4.14/powerpc-64s-wire-up-cpu_show_spectre_v2.patch
next prev parent reply other threads:[~2018-05-27 13:51 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-26 4:27 [PATCH stable 4.14 v2 00/23] powerpc backports for 4.14 Michael Ellerman
2018-05-26 4:27 ` [PATCH stable 4.14 v2 01/23] powerpc/64s: Improve RFI L1-D cache flush fallback Michael Ellerman
2018-05-27 13:49 ` Patch "powerpc/64s: Improve RFI L1-D cache flush fallback" has been added to the 4.14-stable tree gregkh
2018-05-26 4:27 ` [PATCH stable 4.14 v2 02/23] powerpc/pseries: Support firmware disable of RFI flush Michael Ellerman
2018-05-27 13:49 ` Patch "powerpc/pseries: Support firmware disable of RFI flush" has been added to the 4.14-stable tree gregkh
2018-05-26 4:27 ` [PATCH stable 4.14 v2 03/23] powerpc/powernv: Support firmware disable of RFI flush Michael Ellerman
2018-05-27 13:49 ` Patch "powerpc/powernv: Support firmware disable of RFI flush" has been added to the 4.14-stable tree gregkh
2018-05-26 4:27 ` [PATCH stable 4.14 v2 04/23] powerpc/rfi-flush: Move the logic to avoid a redo into the debugfs code Michael Ellerman
2018-05-27 13:49 ` gregkh [this message]
2018-05-26 4:27 ` [PATCH stable 4.14 v2 05/23] powerpc/rfi-flush: Make it possible to call setup_rfi_flush() again Michael Ellerman
2018-05-27 13:49 ` Patch "powerpc/rfi-flush: Make it possible to call setup_rfi_flush() again" has been added to the 4.14-stable tree gregkh
2018-05-26 4:27 ` [PATCH stable 4.14 v2 06/23] powerpc/rfi-flush: Always enable fallback flush on pseries Michael Ellerman
2018-05-27 13:49 ` Patch "powerpc/rfi-flush: Always enable fallback flush on pseries" has been added to the 4.14-stable tree gregkh
2018-05-26 4:27 ` [PATCH stable 4.14 v2 07/23] powerpc/rfi-flush: Differentiate enabled and patched flush types Michael Ellerman
2018-05-27 13:49 ` Patch "powerpc/rfi-flush: Differentiate enabled and patched flush types" has been added to the 4.14-stable tree gregkh
2018-05-26 4:27 ` [PATCH stable 4.14 v2 08/23] powerpc/rfi-flush: Call setup_rfi_flush() after LPM migration Michael Ellerman
2018-05-27 13:49 ` Patch "powerpc/rfi-flush: Call setup_rfi_flush() after LPM migration" has been added to the 4.14-stable tree gregkh
2018-05-26 4:27 ` [PATCH stable 4.14 v2 09/23] powerpc/pseries: Add new H_GET_CPU_CHARACTERISTICS flags Michael Ellerman
2018-05-27 13:49 ` Patch "powerpc/pseries: Add new H_GET_CPU_CHARACTERISTICS flags" has been added to the 4.14-stable tree gregkh
2018-05-26 4:27 ` [PATCH stable 4.14 v2 10/23] powerpc: Add security feature flags for Spectre/Meltdown Michael Ellerman
2018-05-27 13:49 ` Patch "powerpc: Add security feature flags for Spectre/Meltdown" has been added to the 4.14-stable tree gregkh
2018-05-26 4:27 ` [PATCH stable 4.14 v2 11/23] powerpc/pseries: Set or clear security feature flags Michael Ellerman
2018-05-27 13:49 ` Patch "powerpc/pseries: Set or clear security feature flags" has been added to the 4.14-stable tree gregkh
2018-05-26 4:27 ` [PATCH stable 4.14 v2 12/23] powerpc/powernv: Set or clear security feature flags Michael Ellerman
2018-05-27 13:49 ` Patch "powerpc/powernv: Set or clear security feature flags" has been added to the 4.14-stable tree gregkh
2018-05-26 4:27 ` [PATCH stable 4.14 v2 13/23] powerpc/64s: Move cpu_show_meltdown() Michael Ellerman
2018-05-27 13:49 ` Patch "powerpc/64s: Move cpu_show_meltdown()" has been added to the 4.14-stable tree gregkh
2018-05-26 4:27 ` [PATCH stable 4.14 v2 14/23] powerpc/64s: Enhance the information in cpu_show_meltdown() Michael Ellerman
2018-05-27 13:49 ` Patch "powerpc/64s: Enhance the information in cpu_show_meltdown()" has been added to the 4.14-stable tree gregkh
2018-05-26 4:27 ` [PATCH stable 4.14 v2 15/23] powerpc/powernv: Use the security flags in pnv_setup_rfi_flush() Michael Ellerman
2018-05-27 13:49 ` Patch "powerpc/powernv: Use the security flags in pnv_setup_rfi_flush()" has been added to the 4.14-stable tree gregkh
2018-05-26 4:27 ` [PATCH stable 4.14 v2 16/23] powerpc/pseries: Use the security flags in pseries_setup_rfi_flush() Michael Ellerman
2018-05-27 13:49 ` Patch "powerpc/pseries: Use the security flags in pseries_setup_rfi_flush()" has been added to the 4.14-stable tree gregkh
2018-05-26 4:27 ` [PATCH stable 4.14 v2 17/23] powerpc/64s: Wire up cpu_show_spectre_v1() Michael Ellerman
2018-05-27 13:49 ` Patch "powerpc/64s: Wire up cpu_show_spectre_v1()" has been added to the 4.14-stable tree gregkh
2018-05-26 4:27 ` [PATCH stable 4.14 v2 18/23] powerpc/64s: Wire up cpu_show_spectre_v2() Michael Ellerman
2018-05-27 13:49 ` Patch "powerpc/64s: Wire up cpu_show_spectre_v2()" has been added to the 4.14-stable tree gregkh
2018-05-26 4:27 ` [PATCH stable 4.14 v2 19/23] powerpc/pseries: Fix clearing of security feature flags Michael Ellerman
2018-05-27 13:49 ` Patch "powerpc/pseries: Fix clearing of security feature flags" has been added to the 4.14-stable tree gregkh
2018-05-26 4:27 ` [PATCH stable 4.14 v2 20/23] powerpc: Move default security feature flags Michael Ellerman
2018-05-27 13:49 ` Patch "powerpc: Move default security feature flags" has been added to the 4.14-stable tree gregkh
2018-05-26 4:27 ` [PATCH stable 4.14 v2 21/23] powerpc/pseries: Restore default security feature flags on setup Michael Ellerman
2018-05-27 13:49 ` Patch "powerpc/pseries: Restore default security feature flags on setup" has been added to the 4.14-stable tree gregkh
2018-05-26 4:27 ` [PATCH stable 4.14 v2 22/23] powerpc/64s: Fix section mismatch warnings from setup_rfi_flush() Michael Ellerman
2018-05-27 13:49 ` Patch "powerpc/64s: Fix section mismatch warnings from setup_rfi_flush()" has been added to the 4.14-stable tree gregkh
2018-05-26 4:27 ` [PATCH stable 4.14 v2 23/23] powerpc/64s: Add support for a store forwarding barrier at kernel entry/exit Michael Ellerman
2018-05-27 13:49 ` Patch "powerpc/64s: Add support for a store forwarding barrier at kernel entry/exit" has been added to the 4.14-stable tree gregkh
2018-05-27 13:50 ` [PATCH stable 4.14 v2 00/23] powerpc backports for 4.14 Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=152742899472148@kroah.com \
--to=gregkh@linuxfoundation$(echo .)org \
--cc=greg@kroah$(echo .)com \
--cc=linuxppc-dev@ozlabs$(echo .)org \
--cc=mauricfo@linux$(echo .)vnet.ibm.com \
--cc=mpe@ellerman$(echo .)id.au \
--cc=stable-commits@vger$(echo .)kernel.org \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox