From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A80AAC04AB4 for ; Tue, 14 May 2019 18:53:03 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 22B3320818 for ; Tue, 14 May 2019 18:53:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="DjoDOKY5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 22B3320818 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 453Rdn143hzDqLj for ; Wed, 15 May 2019 04:53:01 +1000 (AEST) Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=linuxfoundation.org (client-ip=198.145.29.99; helo=mail.kernel.org; envelope-from=gregkh@linuxfoundation.org; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="DjoDOKY5"; dkim-atps=neutral Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 453RcM0MYFzDqKD for ; Wed, 15 May 2019 04:51:46 +1000 (AEST) Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2A33420881; Tue, 14 May 2019 18:51:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557859904; bh=VGp6G7WBo75TIjlb/MR2z2MnnjmhZTgWCXdktMbfxXI=; h=Subject:To:Cc:From:Date:From; b=DjoDOKY5DVPW7HD0SKMXn7l29ElKvqsr0yntPGOQPFV1FZBNU6k6LJaTbL1+FL8qU mEZhbFftMZklsXnTpFipgiKnbXTdxDL077C9B2XCa9oIrkKreZMEtWG8epIrPHA22b Dbr1uzvb+vChEGUNduTtsq8mMpcY0YeNgQD0IpsU= Subject: Patch "x86/speculation: Support 'mitigations=' cmdline option" has been added to the 4.4-stable tree To: 6616d0ae169308516cfdf5216bedd169f8a8291b.1555085500.git.jpoimboe@redhat.com, aarcange@redhat.com, ben@decadent.org.uk, benh@kernel.crashing.org, bp@alien8.de, catalin.marinas@arm.com, gregkh@linuxfoundation.org, heiko.carstens@de.ibm.com, hpa@zytor.com, jcm@redhat.com, jikos@kernel.org, jkosina@suse.cz, jpoimboe@redhat.com, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, longman@redhat.com, luto@kernel.org, mpe@ellerman.id.au, pauld@redhat.com, paulus@samba.org, peterz@infradead.org, rdunlap@infradead.org, schwidefsky@de.ibm.com, steven.price@arm.com, tglx@linutronix.de, torvalds@linux-foundation.org, tyhicks@canonical.com, will.deacon@arm.com From: Date: Tue, 14 May 2019 20:30:41 +0200 Message-ID: <1557858641110224@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit X-stable: commit X-Patchwork-Hint: ignore X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: stable-commits@vger.kernel.org Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" This is a note to let you know that I've just added the patch titled x86/speculation: Support 'mitigations=' cmdline option to the 4.4-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: x86-speculation-support-mitigations-cmdline-option.patch and it can be found in the queue-4.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From foo@baz Tue 14 May 2019 08:29:35 PM CEST From: Josh Poimboeuf Date: Fri, 12 Apr 2019 15:39:29 -0500 Subject: x86/speculation: Support 'mitigations=' cmdline option From: Josh Poimboeuf commit d68be4c4d31295ff6ae34a8ddfaa4c1a8ff42812 upstream. Configure x86 runtime CPU speculation bug mitigations in accordance with the 'mitigations=' cmdline option. This affects Meltdown, Spectre v2, Speculative Store Bypass, and L1TF. The default behavior is unchanged. Signed-off-by: Josh Poimboeuf Signed-off-by: Thomas Gleixner Tested-by: Jiri Kosina (on x86) Reviewed-by: Jiri Kosina Cc: Borislav Petkov Cc: "H . Peter Anvin" Cc: Andy Lutomirski Cc: Peter Zijlstra Cc: Jiri Kosina Cc: Waiman Long Cc: Andrea Arcangeli Cc: Jon Masters Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Michael Ellerman Cc: linuxppc-dev@lists.ozlabs.org Cc: Martin Schwidefsky Cc: Heiko Carstens Cc: linux-s390@vger.kernel.org Cc: Catalin Marinas Cc: Will Deacon Cc: linux-arm-kernel@lists.infradead.org Cc: linux-arch@vger.kernel.org Cc: Greg Kroah-Hartman Cc: Tyler Hicks Cc: Linus Torvalds Cc: Randy Dunlap Cc: Steven Price Cc: Phil Auld Link: https://lkml.kernel.org/r/6616d0ae169308516cfdf5216bedd169f8a8291b.1555085500.git.jpoimboe@redhat.com [bwh: Backported to 4.4: - Drop the auto,nosmt option and the l1tf mitigation selection, which we can't support - Adjust filenames, context] Signed-off-by: Ben Hutchings Signed-off-by: Greg Kroah-Hartman --- Documentation/kernel-parameters.txt | 14 +++++++++----- arch/x86/kernel/cpu/bugs.c | 6 ++++-- arch/x86/mm/kaiser.c | 4 +++- 3 files changed, 16 insertions(+), 8 deletions(-) --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -2174,15 +2174,19 @@ bytes respectively. Such letter suffixes http://repo.or.cz/w/linux-2.6/mini2440.git mitigations= - Control optional mitigations for CPU vulnerabilities. - This is a set of curated, arch-independent options, each - of which is an aggregation of existing arch-specific - options. + [X86] Control optional mitigations for CPU + vulnerabilities. This is a set of curated, + arch-independent options, each of which is an + aggregation of existing arch-specific options. off Disable all optional CPU mitigations. This improves system performance, but it may also expose users to several CPU vulnerabilities. + Equivalent to: nopti [X86] + nospectre_v2 [X86] + spectre_v2_user=off [X86] + spec_store_bypass_disable=off [X86] auto (default) Mitigate all CPU vulnerabilities, but leave SMT @@ -2190,7 +2194,7 @@ bytes respectively. Such letter suffixes users who don't want to be surprised by SMT getting disabled across kernel upgrades, or who have other ways of avoiding SMT-based attacks. - This is the default behavior. + Equivalent to: (default behavior) mminit_loglevel= [KNL] When CONFIG_DEBUG_MEMORY_INIT is set, this --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -479,7 +479,8 @@ static enum spectre_v2_mitigation_cmd __ char arg[20]; int ret, i; - if (cmdline_find_option_bool(boot_command_line, "nospectre_v2")) + if (cmdline_find_option_bool(boot_command_line, "nospectre_v2") || + cpu_mitigations_off()) return SPECTRE_V2_CMD_NONE; ret = cmdline_find_option(boot_command_line, "spectre_v2", arg, sizeof(arg)); @@ -743,7 +744,8 @@ static enum ssb_mitigation_cmd __init ss char arg[20]; int ret, i; - if (cmdline_find_option_bool(boot_command_line, "nospec_store_bypass_disable")) { + if (cmdline_find_option_bool(boot_command_line, "nospec_store_bypass_disable") || + cpu_mitigations_off()) { return SPEC_STORE_BYPASS_CMD_NONE; } else { ret = cmdline_find_option(boot_command_line, "spec_store_bypass_disable", --- a/arch/x86/mm/kaiser.c +++ b/arch/x86/mm/kaiser.c @@ -10,6 +10,7 @@ #include #include #include +#include #undef pr_fmt #define pr_fmt(fmt) "Kernel/User page tables isolation: " fmt @@ -297,7 +298,8 @@ void __init kaiser_check_boottime_disabl goto skip; } - if (cmdline_find_option_bool(boot_command_line, "nopti")) + if (cmdline_find_option_bool(boot_command_line, "nopti") || + cpu_mitigations_off()) goto disable; skip: Patches currently in stable-queue which might be from jpoimboe@redhat.com are queue-4.4/x86-speculation-mds-fix-documentation-typo.patch queue-4.4/x86-speculation-mds-add-mitigations-support-for-mds.patch queue-4.4/x86-speculation-rework-smt-state-change.patch queue-4.4/cpu-speculation-add-mitigations-cmdline-option.patch queue-4.4/x86-speculation-mds-fix-comment.patch queue-4.4/x86-speculation-reorder-the-spec_v2-code.patch queue-4.4/x86-speculation-add-prctl-control-for-indirect-branch-speculation.patch queue-4.4/x86-speculation-provide-ibpb-always-command-line-options.patch queue-4.4/x86-kconfig-select-sched_smt-if-smp-enabled.patch queue-4.4/x86-speculation-mds-add-smt-warning-message.patch queue-4.4/x86-process-consolidate-and-simplify-switch_to_xtra-code.patch queue-4.4/x86-speculation-reorganize-speculation-control-msrs-update.patch queue-4.4/x86-speculation-update-the-tif_ssbd-comment.patch queue-4.4/x86-speculation-propagate-information-about-rsb-filling-mitigation-to-sysfs.patch queue-4.4/x86-speculation-unify-conditional-spectre-v2-print-functions.patch queue-4.4/x86-speculation-disable-stibp-when-enhanced-ibrs-is-in-use.patch queue-4.4/x86-speculation-rename-ssbd-update-functions.patch queue-4.4/x86-speculation-enable-prctl-mode-for-spectre_v2_user.patch queue-4.4/x86-speculation-mark-string-arrays-const-correctly.patch queue-4.4/x86-speculation-move-arch_smt_update-call-to-after-mitigation-decisions.patch queue-4.4/x86-speculation-add-seccomp-spectre-v2-user-space-protection-mode.patch queue-4.4/x86-speculation-clean-up-spectre_v2_parse_cmdline.patch queue-4.4/x86-mm-use-write_once-when-setting-ptes.patch queue-4.4/x86-speculation-apply-ibpb-more-strictly-to-avoid-cross-process-data-leak.patch queue-4.4/x86-speculation-add-command-line-control-for-indirect-branch-speculation.patch queue-4.4/x86-speculation-move-stipb-ibpb-string-conditionals-out-of-cpu_show_common.patch queue-4.4/x86-speculation-support-mitigations-cmdline-option.patch queue-4.4/x86-speculation-remove-unnecessary-ret-variable-in-cpu_show_common.patch queue-4.4/x86-speculation-prepare-for-per-task-indirect-branch-speculation-control.patch queue-4.4/x86-speculation-avoid-__switch_to_xtra-calls.patch queue-4.4/x86-speculation-mds-print-smt-vulnerable-on-msbds-with-mitigations-off.patch queue-4.4/x86-speculation-split-out-tif-update.patch queue-4.4/x86-speculation-prepare-for-conditional-ibpb-in-switch_mm.patch queue-4.4/x86-speculation-prepare-arch_smt_update-for-prctl-mode.patch queue-4.4/x86-speculation-enable-cross-hyperthread-spectre-v2-stibp-mitigation.patch queue-4.4/x86-speculataion-mark-command-line-parser-data-__initdata.patch queue-4.4/x86-speculation-prevent-stale-spec_ctrl-msr-content.patch