From patchwork Sat Jan 7 11:38:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 40377 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp1260952wrt; Sat, 7 Jan 2023 03:42:08 -0800 (PST) X-Google-Smtp-Source: AMrXdXs/yJcBKHdrarHKmGuFbTwBrn69PDLL+MWdJx3HdIjxxP/bP+Rufs0OOxVJm0WbAH0/eLs3 X-Received: by 2002:a05:6a20:b044:b0:ad:dee3:302 with SMTP id dx4-20020a056a20b04400b000addee30302mr57752032pzb.56.1673091727955; Sat, 07 Jan 2023 03:42:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673091727; cv=none; d=google.com; s=arc-20160816; b=hO1I+QAYFq21c2FpqfjcagjrDkghjEovxltYL3tkID9HZPWAp0ptErcGGGfBGrNAJI hhmk59LLBFMQeKXy9yNW9ZdYk7vF0oL6/uISJHep/VlrFNaFRM9PaBuoel47QNN145iz 6mf1ZHUIPX6MpwuZ8cUXgvJsGTsbmwXT+QYjqF9YiWMeVsxxMl2qR1aCvPf4m0ghyf2z zi5GMLZ0Hsv+RZrSCqBIYqsXUd7HTMuNy98ZFyegIE+m53WHlYfqCUiI3Ixjta/41J8Y ONxovxTFZxIZ3nLAdJIdE7127vun0pFiNiU0J0vZr8nq4oJzVdpazIVIOf8w2gQCKr8h O+Tw== 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=kvPFiEAwLXfyF1n4DNqmxSGK21NV/t4FEPILcgSCVN5iv6dtk3bb97ZOEH0qD9HBII OuJUUnEtuP5gabdrMsnyfeivccCvJiSWLS5n+LGzcVIw0hWwC/va25buknO/EhlFdh4x keSbAiI82020jTNV2ccbEfd6Cr8vvsJFW+MbV5xkiWZQN1uaXVg13mSeFHht43cjl4/d AVeugkbZYDBcxba/krJN9yF3Uc8CTZEVawH3MbmSfL1Wt/3qubTXwFmsibWU2rKw6yef IOvh/QFJgCkAAGUSKk8qnaVGL4qQAK39P7jfnjY9fn8aK3xBAsvkaVexUKNtDESHyW7n Qg5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="aBCATk/6"; 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 y9-20020a655b09000000b00493e77a24eesi4099151pgq.713.2023.01.07.03.41.54; Sat, 07 Jan 2023 03:42:07 -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="aBCATk/6"; 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 S232495AbjAGLkB (ORCPT + 99 others); Sat, 7 Jan 2023 06:40:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56970 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231921AbjAGLjT (ORCPT ); Sat, 7 Jan 2023 06:39:19 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD9C97DE02; Sat, 7 Jan 2023 03:39:15 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 43DBD60BDE; Sat, 7 Jan 2023 11:39:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D0EF7C433EF; Sat, 7 Jan 2023 11:39:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1673091554; bh=TdYTdj6H5Qbtgmh1te0rA9iZLTDxbWp//XNrh7RF5Pk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aBCATk/63WxwRQqasJFEj3FSWQeV6o0mq4mAlY2V18XfOsn7HfebXmoA8NYTnM8Lw LSGV229T2/Ngo8BMUCXdCYct0+UI2q6YOsqWqqPOEszDcV7MPgWHgBWpcf+VlUZf62 pB5BRMxfacEGXpyDsCfKu14tqNDyzPcdkctixmwusaGL3ncOTvDCsDZs+o4j2d+e2I oVAi60a9JX6ErXJKzYzEEp3H09VOnBrg97zBvgWgjaYOkn/okB3lURaQ4lsEmzdfS9 zzGI+O4dpeF7MA4V3AkDYWzFO0ia4fN40mbPJRFDEk4cmpjPhAJHhhPAk5CivQvRZ9 46ln3KSlKbvVg== 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 V13 3/7] riscv: entry: Add noinstr to prevent instrumentation inserted Date: Sat, 7 Jan 2023 06:38:34 -0500 Message-Id: <20230107113838.3969149-4-guoren@kernel.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20230107113838.3969149-1-guoren@kernel.org> References: <20230107113838.3969149-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?1754363831926360909?= X-GMAIL-MSGID: =?utf-8?q?1754363831926360909?= 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) \