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=-7.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS autolearn=ham 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 574E0C04AB4 for ; Tue, 14 May 2019 17:14:33 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 2A49421473 for ; Tue, 14 May 2019 17:14:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="t4SeB7Xg"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="ErGgTNX0" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2A49421473 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:From:To: Subject:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=A77q33DmD+86wDEKBlwktzIt6a9MqBXQA930TcR+Op0=; b=t4SeB7XgtGyaby 5mL+9XrHwGnQE3N6Z88m1Nmd7aakx2VcywnkdD2Fy5wDehyKSdDxVOulfTh+lAZihZDV0291sKr0C rHNsrhKhyou/LgbM8fzgATyzKxzfIdeFN117WyDAotzV+SLGcmzBdCuL4z1Svh52dJuW4Ify3HdeG 0uwmV+G8OXjDu/QJ3n2otFlEcDR6rXeDMru6GI3dqsR7rTkuk3dRyEa/OsgWpaTzqW26P3fOBQN54 QVX1PdP6LKZ8QI1+xZpUiNPxRggfrYldjdo3YM84AAW3fndtBhK8jObDnB5sdSzg9YGQ/BqDZaqSI 7aOsLTjjujmlEB0YBXMA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hQb0U-0007Ds-2Y; Tue, 14 May 2019 17:14:26 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hQb0G-0006z3-8d for linux-arm-kernel@lists.infradead.org; Tue, 14 May 2019 17:14:15 +0000 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 78A2F20578; Tue, 14 May 2019 17:14:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557854052; bh=3P6sxOvETPD96s1YvHYryOml9n7tG5msfcNUTIrzo8U=; h=Subject:To:Cc:From:Date:From; b=ErGgTNX0LC5NMb1NMuyAvzHoERARf5v5imFwIWD9phSOk7i/v30qdhn1zzh5YtJWJ bbxE/CeL/+92H6cNwOZMbq0TI838MEa5i0Jl6f5dgkr9gP308jXOu/IRGjvzkMGlRi 7lSU9gi/2/DigZgk3hK4uhLs2vtJWBcwZ3xurzBw= Subject: Patch "[PATCH 23/27] s390/speculation: Support 'mitigations=' cmdline option" has been added to the 5.1-stable tree To: aarcange@redhat.com, benh@kernel.crashing.org, bp@alien8.de, catalin.marinas@arm.com, e4a161805458a5ec88812aac0307ae3908a030fc.1555085500.git.jpoimboe@redhat.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 19:06:20 +0200 Message-ID: <155785358010470@kroah.com> MIME-Version: 1.0 X-stable: commit X-Patchwork-Hint: ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190514_101412_345505_FA9A2D2D X-CRM114-Status: GOOD ( 15.25 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: stable-commits@vger.kernel.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org This is a note to let you know that I've just added the patch titled [PATCH 23/27] s390/speculation: Support 'mitigations=' cmdline option to the 5.1-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: 0023-s390-speculation-Support-mitigations-cmdline-option.patch and it can be found in the queue-5.1 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From e6d932f77faa0f3f1430f083f74792cd391b1ada Mon Sep 17 00:00:00 2001 From: Josh Poimboeuf Date: Fri, 12 Apr 2019 15:39:31 -0500 Subject: [PATCH 23/27] s390/speculation: Support 'mitigations=' cmdline option commit 0336e04a6520bdaefdb0769d2a70084fa52e81ed upstream Configure s390 runtime CPU speculation bug mitigations in accordance with the 'mitigations=' cmdline option. This affects Spectre v1 and Spectre v2. 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/e4a161805458a5ec88812aac0307ae3908a030fc.1555085500.git.jpoimboe@redhat.com Signed-off-by: Greg Kroah-Hartman --- Documentation/admin-guide/kernel-parameters.txt | 5 +++-- arch/s390/kernel/nospec-branch.c | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 3294030d7f57..2bf137f97902 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -2571,7 +2571,7 @@ http://repo.or.cz/w/linux-2.6/mini2440.git mitigations= - [X86,PPC] Control optional mitigations for CPU + [X86,PPC,S390] 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. @@ -2582,7 +2582,8 @@ expose users to several CPU vulnerabilities. Equivalent to: nopti [X86,PPC] nospectre_v1 [PPC] - nospectre_v2 [X86,PPC] + nobp=0 [S390] + nospectre_v2 [X86,PPC,S390] spectre_v2_user=off [X86] spec_store_bypass_disable=off [X86,PPC] l1tf=off [X86] diff --git a/arch/s390/kernel/nospec-branch.c b/arch/s390/kernel/nospec-branch.c index bdddaae96559..649135cbedd5 100644 --- a/arch/s390/kernel/nospec-branch.c +++ b/arch/s390/kernel/nospec-branch.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 #include #include +#include #include static int __init nobp_setup_early(char *str) @@ -58,7 +59,7 @@ early_param("nospectre_v2", nospectre_v2_setup_early); void __init nospec_auto_detect(void) { - if (test_facility(156)) { + if (test_facility(156) || cpu_mitigations_off()) { /* * The machine supports etokens. * Disable expolines and disable nobp. -- 2.21.0 Patches currently in stable-queue which might be from jpoimboe@redhat.com are queue-5.1/0019-x86-speculation-mds-Print-SMT-vulnerable-on-MSBDS-wi.patch queue-5.1/0016-x86-speculation-Move-arch_smt_update-call-to-after-m.patch queue-5.1/0024-x86-speculation-mds-Add-mitigations-support-for-MDS.patch queue-5.1/0021-x86-speculation-Support-mitigations-cmdline-option.patch queue-5.1/0022-powerpc-speculation-Support-mitigations-cmdline-opti.patch queue-5.1/0020-cpu-speculation-Add-mitigations-cmdline-option.patch queue-5.1/0023-s390-speculation-Support-mitigations-cmdline-option.patch queue-5.1/0015-x86-speculation-mds-Add-mds-full-nosmt-cmdline-optio.patch queue-5.1/0027-x86-speculation-mds-Fix-documentation-typo.patch queue-5.1/0017-x86-speculation-mds-Add-SMT-warning-message.patch queue-5.1/0018-x86-speculation-mds-Fix-comment.patch _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel