From patchwork Mon Nov 7 06:36:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qingfang Deng X-Patchwork-Id: 1700413 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=t0FKP5zY; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=LexuCg8y; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4N5M712RCbz23lW for ; Mon, 7 Nov 2022 17:40:20 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=NMzE+ZX9E8XQGbOLOzs3jvweZ8lEzrXkn/RXSGuFG5Q=; b=t0FKP5zYCjo+XQ 8pZN9ZCDJkSEsHI5pNdwx2kX4q8kycucUO+ZreEv5pH9BvV2jGv7eAlTX6xHYfzz4zFLZD8A9f4CH oFcJs0gIQgxQishfAGSTG2i8PH24DgbgV32l0Gc9NSFxL4rxqFBiuUyA3ekXfpHh6ljPWkAo889e8 9nDGAWWhli+78TWfo7yUtU2P5QPmBGAB/E9tGMSngRed7WwogGjxuDCtNqvXn8bGHwADvxHsEIaDt iJZ96tUKxli8Rl9CshFHwUst4W3cL+ATq592GjLkXev1Tifpjs1mVaC6fHNsa+PRpBqQZ+yGXFBx+ x9eJ2s4YsH31cjODEkuA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1orvkB-00CAb6-6Q; Mon, 07 Nov 2022 06:36:27 +0000 Received: from mail-pf1-x430.google.com ([2607:f8b0:4864:20::430]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1orvk8-00CAa2-6d for openwrt-devel@lists.openwrt.org; Mon, 07 Nov 2022 06:36:25 +0000 Received: by mail-pf1-x430.google.com with SMTP id z26so9733938pff.1 for ; Sun, 06 Nov 2022 22:36:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=Kxj44LPFikyTbOTZBwToKhoPH7+FQ48/vRZRS5p2cco=; b=LexuCg8yrOcbB7TtLCv0oBw8bicGd61cCvwv5sXU8dY4fX3wW9ZHYIAm9nU8XTEYdz QM+OJWNTDWD0lFz+S4qJgxmwp7El8UuR+7Srf5LJ5vvzNDBHhMkrpxoSycNyxsqPL/Wi wH2p4QJjuZWTK2KHMIRotCXqGB3EPgeSEmtylsBj80ev8HYLsDkVsPC8BmeVV+v0NVKy pQQumAuQRaXXzpxJfeVRfvnMq2jsfh+dUShikagauE+Z5yKhyi7kHgJCezBGWUkKoI9H 4CT5S6yw50s8y7hlagUOYtKk02203gAlYmnkHg4Tx5zEpCuGOLRlHekz6d59/bm2WHr7 JFJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Kxj44LPFikyTbOTZBwToKhoPH7+FQ48/vRZRS5p2cco=; b=tyYB++gUwB3wWYHQ75HAzBcX3VmzKUbhaOjlBAuFbTaEwGKAgcVwXzH3jHTet7WnFm q+IOobPYsq1YjGvB6oipEmA8ppIa2Gi45GXdvOemKlxBjUlLk6EhZuTcyV+krciQ142T JwJFfi18u1zL10ny94LzgGeKaxhF1bM40+M/gtdM+X8RNgWuukf3ttPWkV82+h+/3iEy teG41uk3xJvbQBdm5m6LffD0moCTquRgQwBMCwqC8hwL5iY/85D9+cRt/oNKnvu/WCQE E872tdmb8Mp9GupZYrgaS8L8ipPiyHWjmcQ5u/SuP79A1JnYS1Mu7TZrVq2CewBBTaar eEmA== X-Gm-Message-State: ANoB5pnNrkkVI3EYIOkB2PXART56juRaXR0kB6RdbSrBS/L8PfYG8Y5q bxmrC7hIS1/6yZuxa5YmrPCD4ki7rPFCvbkQ2yg= X-Google-Smtp-Source: AA0mqf5zQNXi/1a+LRN9u6pS3WCNieQJ0WdXocRrRnBHaC8CinK1UJ0Vw4E51Qu8EBc+gzs7qFWyQQ== X-Received: by 2002:a05:6a00:895:b0:56f:15c:500a with SMTP id q21-20020a056a00089500b0056f015c500amr5181188pfj.64.1667802981707; Sun, 06 Nov 2022 22:36:21 -0800 (PST) Received: from localhost.localdomain ([218.82.138.176]) by smtp.gmail.com with ESMTPSA id z27-20020aa7991b000000b005626a1c77c8sm3611504pff.80.2022.11.06.22.36.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Nov 2022 22:36:21 -0800 (PST) From: DENG Qingfang To: openwrt-devel@lists.openwrt.org Subject: [PATCH] arm64: only enable BHI mitigation on affected CPUs Date: Mon, 7 Nov 2022 14:36:17 +0800 Message-Id: <20221107063617.872524-1-dqfext@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221106_223624_281365_DC30F34D X-CRM114-Status: GOOD ( 10.79 ) X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: When kernel 5.15 support was added, a new config symbol for ARM64 BHI mitigation was enabled, which was also later backported to 5.10. However, only a few CPUs are affected by BHI [0]. Disable it by d [...] Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:430 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [dqfext[at]gmail.com] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org When kernel 5.15 support was added, a new config symbol for ARM64 BHI mitigation was enabled, which was also later backported to 5.10. However, only a few CPUs are affected by BHI [0]. Disable it by default, and enable it only on Cortex-A72 targets. [0] https://developer.arm.com/Arm%20Security%20Center/Spectre-BHB Fixes: 9a038e7fd12e ("generic: 5.15: copy config and patch from 5.10") Fixes: 048f0b170296 ("kernel: bump 5.10 to 5.10.105") Signed-off-by: DENG Qingfang --- target/linux/bcm27xx/bcm2711/config-5.15 | 1 + target/linux/generic/config-5.10 | 2 +- target/linux/generic/config-5.15 | 2 +- target/linux/mvebu/cortexa72/config-5.10 | 1 + target/linux/mvebu/cortexa72/config-5.15 | 1 + 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/target/linux/bcm27xx/bcm2711/config-5.15 b/target/linux/bcm27xx/bcm2711/config-5.15 index d98d76c333..37bc00b942 100644 --- a/target/linux/bcm27xx/bcm2711/config-5.15 +++ b/target/linux/bcm27xx/bcm2711/config-5.15 @@ -296,6 +296,7 @@ CONFIG_MFD_CORE=y # CONFIG_MFD_RPISENSE_CORE is not set CONFIG_MFD_SYSCON=y CONFIG_MIGRATION=y +CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y CONFIG_MMC=y CONFIG_MMC_BCM2835=y CONFIG_MMC_BCM2835_DMA=y diff --git a/target/linux/generic/config-5.10 b/target/linux/generic/config-5.10 index 5220f65b56..3d229c0f4c 100644 --- a/target/linux/generic/config-5.10 +++ b/target/linux/generic/config-5.10 @@ -3419,7 +3419,7 @@ CONFIG_MISC_FILESYSTEMS=y # CONFIG_MISDN_NETJET is not set # CONFIG_MISDN_SPEEDFAX is not set # CONFIG_MISDN_W6692 is not set -CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y +# CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY is not set # CONFIG_MKISS is not set # CONFIG_MLX4_CORE is not set # CONFIG_MLX4_EN is not set diff --git a/target/linux/generic/config-5.15 b/target/linux/generic/config-5.15 index 699be4d6fb..fcfa51254c 100644 --- a/target/linux/generic/config-5.15 +++ b/target/linux/generic/config-5.15 @@ -3572,7 +3572,7 @@ CONFIG_MISC_FILESYSTEMS=y # CONFIG_MISDN_NETJET is not set # CONFIG_MISDN_SPEEDFAX is not set # CONFIG_MISDN_W6692 is not set -CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y +# CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY is not set # CONFIG_MKISS is not set # CONFIG_MLX4_CORE is not set # CONFIG_MLX4_EN is not set diff --git a/target/linux/mvebu/cortexa72/config-5.10 b/target/linux/mvebu/cortexa72/config-5.10 index 584c3fc9b8..94d04602b0 100644 --- a/target/linux/mvebu/cortexa72/config-5.10 +++ b/target/linux/mvebu/cortexa72/config-5.10 @@ -65,6 +65,7 @@ CONFIG_MDIO_DEVRES=y CONFIG_MFD_CORE=y CONFIG_MFD_IEI_WT61P803_PUZZLE=y CONFIG_MFD_SYSCON=y +CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y CONFIG_MMC_SDHCI_XENON=y CONFIG_MODULES_USE_ELF_RELA=y CONFIG_MVEBU_GICP=y diff --git a/target/linux/mvebu/cortexa72/config-5.15 b/target/linux/mvebu/cortexa72/config-5.15 index cb27e0285f..7981609b12 100644 --- a/target/linux/mvebu/cortexa72/config-5.15 +++ b/target/linux/mvebu/cortexa72/config-5.15 @@ -52,6 +52,7 @@ CONFIG_MARVELL_10G_PHY=y CONFIG_MFD_CORE=y CONFIG_MFD_IEI_WT61P803_PUZZLE=y CONFIG_MFD_SYSCON=y +CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y CONFIG_MMC_SDHCI_XENON=y CONFIG_MODULES_USE_ELF_RELA=y CONFIG_MVEBU_GICP=y