From patchwork Sat Oct 15 11:46:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 2926 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp605580wrs; Sat, 15 Oct 2022 04:51:49 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5OrLVOAthVYDC9p0WBPbMXPPh7AL6FujIX1UxPaYtDEvK9bCiAlseBY+NGHjPZWffiwrSh X-Received: by 2002:a63:1a07:0:b0:46b:2825:f9cf with SMTP id a7-20020a631a07000000b0046b2825f9cfmr2389770pga.370.1665834708718; Sat, 15 Oct 2022 04:51:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665834708; cv=none; d=google.com; s=arc-20160816; b=E/0Xi26JYjz/lFyqvH2jJfLdjJLgJoOwYgUhVtcE/3015kumSP2r3zvo7J/cNSefse HLp+PoEnTD9Pv4EChCXUkfHzXFQC4ifwQjBpoOUYRmZ6o88VWSKMkIiDVI0znYPEeI/c OHlvFSlESSgeKZXaT54hwx9LLZ29QIUCPcc0bqHGM0SHW0xWNrLUkmYJX6NAioL+Oi5c 4r5Q9ZLnCCGINRA2VoAXeFuVGbpGsaW4ycfwEyzjWT8rcE+PBVc4uVHfhFwbZ6hi2JHZ 5UpyuTdTpiX83vTjaPH5pWILh+ljxLRC0Q9yEHxs/PVi45PDO6NCGpZ9WYuIcRPjgerv gtfw== 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=7DUALbwDH7CiKg1qiotXo8D1TY9SIxZA5jetcJ4OK0E=; b=t/AiGxHNdB5mBMOAKuNw34Tb7H3jt9+dGNzUNcpDT0j/yNFY87PCORxdgmw7Z6FZXB bNttidVlh1lI1Z7JCT/YWbyBQemi9WEOavhXdTdtvGSYm70mo8/Rl4hs2io4+AYyQ3Rx VfDG/6W5cTSuWhH9UyENw9t4q0RpFnABY+RUM3MIuwPHyPmnMKC06xfWxvsT948RHana CI/w17mIAEH2XIFoGmKG9FqC0rbINDrVVqsRTosO8mNmUkh9/gzdTm/AY0/Njl3X9OH8 YT15Lfuo47/UEfOUxc6go//aNTES3Yx0XJGmWaOHoPV75HqfrGPXzHKGD4h3p2nOZSUn 7jqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=l8bX6hDb; 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 mq2-20020a17090b380200b001fe41707a2esi14616525pjb.90.2022.10.15.04.51.36; Sat, 15 Oct 2022 04:51:48 -0700 (PDT) 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=l8bX6hDb; 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 S229797AbiJOLvF (ORCPT + 99 others); Sat, 15 Oct 2022 07:51:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47748 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229749AbiJOLuk (ORCPT ); Sat, 15 Oct 2022 07:50:40 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5CD454360A; Sat, 15 Oct 2022 04:50:38 -0700 (PDT) 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 D95D6B80939; Sat, 15 Oct 2022 11:50:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AF334C433D7; Sat, 15 Oct 2022 11:50:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1665834635; bh=KyXvA35NcgjlVfSJ4KXXTHO0QhWLea8Z2lvKUOL8H8c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l8bX6hDbIlcSw8S9tXQ63o9xpdH1Z90MhBNgvQXJebCi9RaTTmqVg1J4xXScMQ4To BulDdlS9dQVILUBhwOQvZhqkDewDO72uRHLsO05TnQU5McxuysrNDq3Og1il2hjVkX 1Ao8CokdKJ3hjinRymxelP7MZI+jB44rN2Gywi8Rf2h7B5CyEku9WN1DoaCPCxcLtZ iFwFS7xE2UrVywbk/NB3I+4EG/ZbhrdVtNhb3TNJB6qIzV08P/Kex4cElWjYsTz90I MGVpehVrgvwm4r1uH5TtLOqf1D7+Hgvoa04kdo0Wy23Flza0yBWqUsVmYPB5G1fSux U9sor1uRgwM1g== 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, palmer@dabbelt.com, paul.walmsley@sifive.com, mark.rutland@arm.com, zouyipeng@huawei.com, bigeasy@linutronix.de, David.Laight@aculab.com, chenzhongjin@huawei.com, greentime.hu@sifive.com, andy.chiu@sifive.com Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, Guo Ren Subject: [PATCH V7 05/12] riscv: traps: Add noinstr to prevent instrumentation inserted Date: Sat, 15 Oct 2022 07:46:55 -0400 Message-Id: <20221015114702.3489989-6-guoren@kernel.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20221015114702.3489989-1-guoren@kernel.org> References: <20221015114702.3489989-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?1746754295771400229?= X-GMAIL-MSGID: =?utf-8?q?1746754295771400229?= 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/raw Suggested-by: Peter Zijlstra Signed-off-by: Guo Ren Signed-off-by: Guo Ren --- arch/riscv/kernel/traps.c | 4 ++-- arch/riscv/mm/fault.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/riscv/kernel/traps.c b/arch/riscv/kernel/traps.c index f3e96d60a2ff..f7fa973558bc 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) \ diff --git a/arch/riscv/mm/fault.c b/arch/riscv/mm/fault.c index d86f7cebd4a7..b26f68eac61c 100644 --- a/arch/riscv/mm/fault.c +++ b/arch/riscv/mm/fault.c @@ -204,7 +204,7 @@ static inline bool access_error(unsigned long cause, struct vm_area_struct *vma) * This routine handles page faults. It determines the address and the * problem, and then passes it off to one of the appropriate routines. */ -asmlinkage void do_page_fault(struct pt_regs *regs) +asmlinkage void noinstr do_page_fault(struct pt_regs *regs) { struct task_struct *tsk; struct vm_area_struct *vma;