From patchwork Thu Nov 3 07:50:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 14726 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp379175wru; Thu, 3 Nov 2022 00:55:32 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6vkzL9ZBJ3u7J+mOJTJJsD6DjQXZOTWn4m8E14yDPbuj1o7a1KQQ7emCK69xD/rsaj/xPL X-Received: by 2002:a17:903:1109:b0:179:d220:1f55 with SMTP id n9-20020a170903110900b00179d2201f55mr12056604plh.42.1667462132511; Thu, 03 Nov 2022 00:55:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667462132; cv=none; d=google.com; s=arc-20160816; b=OaDoDZVpPqX0/y+hM4faNJiABQfhqNRdNQiuIsR2ZiPsghu0yOVbLr7/HsrWmqvaj9 BNSgaGnvvi1iq4ETF6RdtCA1JMCHWtsq3ic0cTq0onD4Ir4iGSNHy1oyt0FGFxzrdtda xiEDfolv4XQLvnn8OmxTuRnlbvEWx2qJNte8a9cObC1I8y2M9b6JeH7rCIFOrH0ylh6h Ki1+oZJeo8Yo10gEXsfBupcZfr1YCgYtxyZhL+JkdIe+NqnlT1C81PdSB/tQfX+P2V1d sWQDK+igjcyF0/uHHgS8ghnOFHld01p181LFlBQWdtuJ69xcsWf1yJw6Howm/QP0thlp GHTQ== 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=pKNesyT0NeXVqxkChlRwFCxIwHSqe3DJLHiS7IpvslxI1GirI6M0HmI8QEl3wWGY53 wkKbqitPRjGX5BwhfWWuQYYZ10WVFppJoOAFW/pQF0hBZsZHnYy67kFrPz4k2IKbQFEo xJq8aZyzH4DDoibnrV+3WfMW3m04c3g2qBbeSeUl4g1Twn5Z3jHAAofSzgZexoATNSBh N9s1YztS6kkjmfJcljV+x6OVO1wLXQgFBXO9eqLZMGkQ8H72Qe5yuYp8WfovOAa0LMxD AWUe3HRM8BcY47NsE4i1DKsYVx/EiXsQZVyme0gRqH3hC/NmljSA5j210O4D37ptttby qIow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=jL2v+zHi; 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 g7-20020a056a0023c700b0053fafd6a529si224988pfc.24.2022.11.03.00.55.19; Thu, 03 Nov 2022 00:55:32 -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=jL2v+zHi; 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 S231521AbiKCHwp (ORCPT + 99 others); Thu, 3 Nov 2022 03:52:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45074 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231428AbiKCHwW (ORCPT ); Thu, 3 Nov 2022 03:52:22 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EEEFA63F9; Thu, 3 Nov 2022 00:52:06 -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 8C13CB82695; Thu, 3 Nov 2022 07:52:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 097C6C43142; Thu, 3 Nov 2022 07:51:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1667461924; bh=KyXvA35NcgjlVfSJ4KXXTHO0QhWLea8Z2lvKUOL8H8c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jL2v+zHijdjvlre5lrvJ5TkUiBBKkQun0IFj0/KMhw2sKMz9cPxqh5GF9/DVAkMgg lx2RCFOEY5VlYGGPTGEuNR2aPKmIAIVIsS4mRGSnA7P7oeq+8gqyVb6uqcapSXoWFL 0Xhmba1CnG+ywiP4wMD3uqumUIfxXfdcWvZqLEVBHW+D6+3Tp1nuYRKdP46FAslvGR vCgqO9R2XBCNX4ai5Nx8yznxAWZ79YF2MluK4TySFYuiNtw3XnKUqlSdQuVtt3vpWZ vwWpFSPr/j6UPlUT+25ITOj6nMGvK8OreIOROL8MzDHvg8c7E781FWcbABfMIzkYkF KrZpJGnlO3Ddg== 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 -next V8 05/14] riscv: traps: Add noinstr to prevent instrumentation inserted Date: Thu, 3 Nov 2022 03:50:38 -0400 Message-Id: <20221103075047.1634923-6-guoren@kernel.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20221103075047.1634923-1-guoren@kernel.org> References: <20221103075047.1634923-1-guoren@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-8.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?1748460772905097399?= X-GMAIL-MSGID: =?utf-8?q?1748460772905097399?= 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;