From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 40rfWT6P7hzF0wq for ; Thu, 24 May 2018 03:24:05 +1000 (AEST) Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by bilbo.ozlabs.org (Postfix) with ESMTP id 40rfWT5t7Pz8tLb for ; Thu, 24 May 2018 03:24:05 +1000 (AEST) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40rfWT0SbKz9rxs for ; Thu, 24 May 2018 03:24:05 +1000 (AEST) Subject: Patch "powerpc/powernv: Use the security flags in pnv_setup_rfi_flush()" has been added to the 4.16-stable tree To: greg@kroah.com, gregkh@linuxfoundation.org, linuxppc-dev@ozlabs.org, mpe@ellerman.id.au, tglx@linutronix.de Cc: From: Date: Wed, 23 May 2018 19:23:13 +0200 In-Reply-To: <20180522144125.10345-9-mpe@ellerman.id.au> Message-ID: <152709619383128@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , This is a note to let you know that I've just added the patch titled powerpc/powernv: Use the security flags in pnv_setup_rfi_flush() to the 4.16-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-powernv-use-the-security-flags-in-pnv_setup_rfi_flush.patch and it can be found in the queue-4.16 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From foo@baz Wed May 23 19:18:22 CEST 2018 From: Michael Ellerman Date: Wed, 23 May 2018 00:41:19 +1000 Subject: powerpc/powernv: Use the security flags in pnv_setup_rfi_flush() To: greg@kroah.com Cc: stable@vger.kernel.org, tglx@linutronix.de, linuxppc-dev@ozlabs.org Message-ID: <20180522144125.10345-9-mpe@ellerman.id.au> From: Michael Ellerman commit 37c0bdd00d3ae83369ab60a6712c28e11e6458d5 upstream. Now that we have the security flags we can significantly simplify the code in pnv_setup_rfi_flush(), because we can use the flags instead of checking device tree properties and because the security flags have pessimistic defaults. Signed-off-by: Michael Ellerman Signed-off-by: Greg Kroah-Hartman --- arch/powerpc/platforms/powernv/setup.c | 41 ++++++++------------------------- 1 file changed, 10 insertions(+), 31 deletions(-) --- a/arch/powerpc/platforms/powernv/setup.c +++ b/arch/powerpc/platforms/powernv/setup.c @@ -66,7 +66,7 @@ static void init_fw_feat_flags(struct de if (fw_feature_is("enabled", "fw-bcctrl-serialized", np)) security_ftr_set(SEC_FTR_BCCTRL_SERIALISED); - if (fw_feature_is("enabled", "inst-spec-barrier-ori31,31,0", np)) + if (fw_feature_is("enabled", "inst-l1d-flush-ori30,30,0", np)) security_ftr_set(SEC_FTR_L1D_FLUSH_ORI30); if (fw_feature_is("enabled", "inst-l1d-flush-trig2", np)) @@ -99,11 +99,10 @@ static void pnv_setup_rfi_flush(void) { struct device_node *np, *fw_features; enum l1d_flush_type type; - int enable; + bool enable; /* Default to fallback in case fw-features are not available */ type = L1D_FLUSH_FALLBACK; - enable = 1; np = of_find_node_by_name(NULL, "ibm,opal"); fw_features = of_get_child_by_name(np, "fw-features"); @@ -111,40 +110,20 @@ static void pnv_setup_rfi_flush(void) if (fw_features) { init_fw_feat_flags(fw_features); + of_node_put(fw_features); - np = of_get_child_by_name(fw_features, "inst-l1d-flush-trig2"); - if (np && of_property_read_bool(np, "enabled")) + if (security_ftr_enabled(SEC_FTR_L1D_FLUSH_TRIG2)) type = L1D_FLUSH_MTTRIG; - of_node_put(np); - - np = of_get_child_by_name(fw_features, "inst-l1d-flush-ori30,30,0"); - if (np && of_property_read_bool(np, "enabled")) + if (security_ftr_enabled(SEC_FTR_L1D_FLUSH_ORI30)) type = L1D_FLUSH_ORI; - - of_node_put(np); - - /* Enable unless firmware says NOT to */ - enable = 2; - np = of_get_child_by_name(fw_features, "needs-l1d-flush-msr-hv-1-to-0"); - if (np && of_property_read_bool(np, "disabled")) - enable--; - - of_node_put(np); - - np = of_get_child_by_name(fw_features, "needs-l1d-flush-msr-pr-0-to-1"); - if (np && of_property_read_bool(np, "disabled")) - enable--; - - np = of_get_child_by_name(fw_features, "speculation-policy-favor-security"); - if (np && of_property_read_bool(np, "disabled")) - enable = 0; - - of_node_put(np); - of_node_put(fw_features); } - setup_rfi_flush(type, enable > 0); + enable = security_ftr_enabled(SEC_FTR_FAVOUR_SECURITY) && \ + (security_ftr_enabled(SEC_FTR_L1D_FLUSH_PR) || \ + security_ftr_enabled(SEC_FTR_L1D_FLUSH_HV)); + + setup_rfi_flush(type, enable); } static void __init pnv_setup_arch(void) Patches currently in stable-queue which might be from mpe@ellerman.id.au are queue-4.16/powerpc-pseries-fix-clearing-of-security-feature-flags.patch queue-4.16/powerpc-powernv-set-or-clear-security-feature-flags.patch queue-4.16/powerpc-64s-move-cpu_show_meltdown.patch queue-4.16/powerpc-pseries-set-or-clear-security-feature-flags.patch queue-4.16/powerpc-move-default-security-feature-flags.patch queue-4.16/powerpc-powernv-use-the-security-flags-in-pnv_setup_rfi_flush.patch queue-4.16/powerpc-add-security-feature-flags-for-spectre-meltdown.patch queue-4.16/powerpc-pseries-use-the-security-flags-in-pseries_setup_rfi_flush.patch queue-4.16/powerpc-64s-enhance-the-information-in-cpu_show_meltdown.patch queue-4.16/powerpc-rfi-flush-always-enable-fallback-flush-on-pseries.patch queue-4.16/powerpc-pseries-add-new-h_get_cpu_characteristics-flags.patch queue-4.16/powerpc-64s-add-support-for-a-store-forwarding-barrier-at-kernel-entry-exit.patch queue-4.16/powerpc-64s-wire-up-cpu_show_spectre_v1.patch queue-4.16/powerpc-64s-wire-up-cpu_show_spectre_v2.patch