From patchwork Wed Feb 22 03:30:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 60334 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp369818wrd; Tue, 21 Feb 2023 20:01:06 -0800 (PST) X-Google-Smtp-Source: AK7set9HzZXgeQ5e5+hCTHNLq7FH1pODs09ZKsyxWwZwjiTX55WBb4b0b4F0CKP+K1wm+0wTKw0Z X-Received: by 2002:a50:ee1a:0:b0:4ad:7c6c:5386 with SMTP id g26-20020a50ee1a000000b004ad7c6c5386mr5623220eds.30.1677038466158; Tue, 21 Feb 2023 20:01:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677038466; cv=none; d=google.com; s=arc-20160816; b=lwsIbcIDAx95acLFpuvhBSq8csRAjYe/Eh+ZbF8kz9K9kpuLKJoDwHZ/nVIvQhIQnF Oka7pl2rbPVCsB05A2VloHLQ3QrMhtz4BdN6qEYyLHKZKe9XLcgtbAx8+nQUcBD8a249 3KeMriC4pOS7JzQ8W47D6nQpazTqbK6nQyYsjlTKkBA9gMrL7dWJMm5hRp4C2kRMZ+X4 g4Ky/dcG6pdgUkELnBmgBsnLbbAqIErVhLO0Py/D99s9ZNoFrxCUYfzPx7tdnCN0gwP8 cPkIjhcdRXaT/s6kYEEMbiwjLpykvw1z65X007oa3dhINHFV2atJpgU+cViPLIxc67Zb NSuw== 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=ObODXWKMXtYZnmcU1ed7eqoF69vB9ftEniaRpayf+6o=; b=kOeYnpKfHxnrHz191cwvX6GLpDfGwDdGm3uxORp914MLi0ledo/oe6tDXJWLEtQRzi 4A2jsU72YlHVUFXmyO+yQAt0o7wYf5avIKtdfFV0jqkPmZCNhMqVhTtVKfhufMizD37k PlleSTW3OhHYunek6hWdR2MSmtBlUGMoILt0GGQWyhT6caJV1BjbPod+dx/YnN3GhEnq TB4TuRsbAqUY861biVFtMP1doBNTCxmA4wWaH47F2OApSoij2f5CilwIQAJUCHFapt3I FkQq7YqWX1CLLxmJzFdhPkp+RejIbu18geXUBrLeMoSL0EttKNjkxij+KHTZauufuIhn myug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="sdHZ/xn3"; 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 r6-20020aa7d146000000b004ab25817358si20845250edo.251.2023.02.21.20.00.34; Tue, 21 Feb 2023 20:01:06 -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="sdHZ/xn3"; 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 S230252AbjBVDba (ORCPT + 99 others); Tue, 21 Feb 2023 22:31:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53966 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230356AbjBVDbZ (ORCPT ); Tue, 21 Feb 2023 22:31:25 -0500 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BEB4F30E90; Tue, 21 Feb 2023 19:31:13 -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 sin.source.kernel.org (Postfix) with ESMTPS id 10FA1CE1CDF; Wed, 22 Feb 2023 03:31:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 80929C433D2; Wed, 22 Feb 2023 03:31:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677036670; bh=NU2D9m2f+OBXEEFPkBj55AyydgpUBKeOwXAIsCjdO1U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sdHZ/xn3PjRbbdAOXrh+rV2ZDUn4Bdki5FuC3j7BK/P+6tl9/rJ3XlLaC54xlCmFl nx1t89Q+ic/YVNEUyL3BwMIO2FOpwJ7XEc2mJdUUO9tknv7Bii8zb6ksU+QckXzhO3 aKCDBMnWWqoZ507u7f0Ahc45pa0hH+aNpZQ3Df3ZDUsOC1hQyRWda2rat/gp5c7M9E Zcd95+w0+adlQmOZFb6Qty0hCsmh6Mai1ZkvyF8+e91EzfuRLV/AzNmdwB0iCpST2c YaRoBKEM+pWnoQF4Wa4eeI7JwowAFLS+LFggynDEjwrgQlgLmBfOoYYEIB8aY8RcWV 2se6fwh7Evigg== 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, palmer@dabbelt.com 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 V17 3/7] riscv: entry: Add noinstr to prevent instrumentation inserted Date: Tue, 21 Feb 2023 22:30:17 -0500 Message-Id: <20230222033021.983168-4-guoren@kernel.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20230222033021.983168-1-guoren@kernel.org> References: <20230222033021.983168-1-guoren@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1758502286622950229?= X-GMAIL-MSGID: =?utf-8?q?1758502286622950229?= 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 f6fda94e8e59..02727a4fe8be 100644 --- a/arch/riscv/kernel/traps.c +++ b/arch/riscv/kernel/traps.c @@ -119,9 +119,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) \