From patchwork Thu Jan 12 09:58:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 42341 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3797114wrt; Thu, 12 Jan 2023 02:04:45 -0800 (PST) X-Google-Smtp-Source: AMrXdXtuTs1pa5Ief22RpZa4yWOfmBIwW++LWuODEdvvfZLFI5ZsUc7unAn43YOqZnsD3jznZXnV X-Received: by 2002:a17:902:bd98:b0:188:8cfc:6ba7 with SMTP id q24-20020a170902bd9800b001888cfc6ba7mr76776706pls.68.1673517885019; Thu, 12 Jan 2023 02:04:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673517885; cv=none; d=google.com; s=arc-20160816; b=o+JzX1sXU/5D1g8khBJac8wM7eWTF2RUXlrc1C3WMeTCdIvjs70q55TxKeVUJWHLVi NC8cR6ZunHY7uYT6FyHLmVEu9oydPa820dvLDJ55XJw7iAY+yJx7s993iTM6U0IC81lo lkMdNGpXmAXtxQSXwxF7yhuKCahD3sRzCw8C+T2M7VHnTmBcoACPgSeuI6aDSAuFZzcY U5RS2clSdQfiFo6wOsdmVfY9DpIu1HCtiXyPyjzN89DAMU6L9UyLm36X1vBWvLWG518l eu8+Wrt1VESsedZZOVV3FmFX3IODX5S8v0tldNYN86ClWGRfVhQ6RX1ba8JX5069Rbmw u7Ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ybBh2iRtj6cXkTaN1/AfILA9cFoLaPn/oIlUM/j9anI=; b=WWeZBemSGBc49kqwPXIzNl2Rn6TNxpDjH2PKpj9JjiWTuo+8wgqqLttX3hW82imZt3 BLTvAzdtNp1ESO72mEbK4Eb3io+ZrXXTKX/XHJzYNf8KPO+A3uJyjhfgn5o6w8y8+VkH DhjLJLW5StbnE1wtWUSZnZTSeUTnrfCZi0CAsLgnyZaRRpH1DxphCIhrU8Ax1bF4I8Pb boNP9G8Nhq5E9Xq1f5iGhMWWTyS/ZlUibzuv6xHWl9XEX1Jk79s8gv/eK6XKpooybCHo Sz0He+G+dDJkyMCTS3HhHpyZGTkXXHc5Em/cuu7loGt14AjPA7AaqSN5SGD7leq4RVJW fcwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=rQWzZ88L; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n6-20020a170902f60600b001929aeb0d60si16929890plg.180.2023.01.12.02.04.32; Thu, 12 Jan 2023 02:04:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=rQWzZ88L; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236771AbjALKBw (ORCPT + 99 others); Thu, 12 Jan 2023 05:01:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39358 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229529AbjALKAk (ORCPT ); Thu, 12 Jan 2023 05:00:40 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CF1FA25EA; Thu, 12 Jan 2023 01:59:29 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 889B5B81DF9; Thu, 12 Jan 2023 09:59:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8E868C433D2; Thu, 12 Jan 2023 09:59:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1673517567; bh=TdYTdj6H5Qbtgmh1te0rA9iZLTDxbWp//XNrh7RF5Pk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rQWzZ88LaYJ0PFPrPx9eOnoBxUSeN8/kBCYwJN8YenKdcBxGSnv3j8njsTpAX6p0P gFClgJY2E7WFpj5BuxaJheWD/j/YWyX2o4aD3NL/dMUchsM37hyi4YUnekdSezmFuA 1RQLmvvhTublszcENMciVH1fpqyxFnzH5DwZdKRu+lCdLILlhnvwbn/tLSpXdJUeja Pp0+qSxgbSD1B+WOJyfrR9pUPQnYJ3f3s35MBl23u/+QlqqNN4mVIiDeShSbdsgTbh PHyPYWlS+J287n/mvr0bWdP3m2yWPdB9nBwBdwIiMhQJo+UnqNTbyR7XTXBsJQVnDF PLXI5+z7BUo4Q== From: guoren@kernel.org To: arnd@arndb.de, guoren@kernel.org, palmer@rivosinc.com, tglx@linutronix.de, peterz@infradead.org, luto@kernel.org, conor.dooley@microchip.com, heiko@sntech.de, jszhang@kernel.org, lazyparser@gmail.com, falcon@tinylab.org, chenhuacai@kernel.org, apatel@ventanamicro.com, atishp@atishpatra.org, mark.rutland@arm.com, ben@decadent.org.uk, bjorn@kernel.org Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, Guo Ren , =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= Subject: [PATCH -next V14 3/7] riscv: entry: Add noinstr to prevent instrumentation inserted Date: Thu, 12 Jan 2023 04:58:44 -0500 Message-Id: <20230112095848.1464404-4-guoren@kernel.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20230112095848.1464404-1-guoren@kernel.org> References: <20230112095848.1464404-1-guoren@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754810689879619219?= X-GMAIL-MSGID: =?utf-8?q?1754810689879619219?= From: Guo Ren Without noinstr the compiler is free to insert instrumentation (think all the k*SAN, KCov, GCov, ftrace etc..) which can call code we're not yet ready to run this early in the entry path, for instance it could rely on RCU which isn't on yet, or expect lockdep state. (by peterz) Link: https://lore.kernel.org/linux-riscv/YxcQ6NoPf3AH0EXe@hirez.programming.kicks-ass.net/ Reviewed-by: Björn Töpel Suggested-by: Peter Zijlstra Tested-by: Jisheng Zhang Signed-off-by: Guo Ren Signed-off-by: Guo Ren --- arch/riscv/kernel/traps.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/riscv/kernel/traps.c b/arch/riscv/kernel/traps.c index 549bde5c970a..96ec76c54ff2 100644 --- a/arch/riscv/kernel/traps.c +++ b/arch/riscv/kernel/traps.c @@ -95,9 +95,9 @@ static void do_trap_error(struct pt_regs *regs, int signo, int code, } #if defined(CONFIG_XIP_KERNEL) && defined(CONFIG_RISCV_ALTERNATIVE) -#define __trap_section __section(".xip.traps") +#define __trap_section __noinstr_section(".xip.traps") #else -#define __trap_section +#define __trap_section noinstr #endif #define DO_ERROR_INFO(name, signo, code, str) \ asmlinkage __visible __trap_section void name(struct pt_regs *regs) \