From patchwork Tue May 9 15:04:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 91635 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2982609vqo; Tue, 9 May 2023 08:43:00 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6G1YwSoJr0aPelXH2nRtLBaBdEE5Dg+/7Sh25w1ukjcHf6HhEoLWvRXYy56Q5wgpGV+jr8 X-Received: by 2002:a05:6a20:7fa2:b0:f0:916:e5d with SMTP id d34-20020a056a207fa200b000f009160e5dmr18302190pzj.42.1683646980316; Tue, 09 May 2023 08:43:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683646980; cv=none; d=google.com; s=arc-20160816; b=wm6+1y70NaB4fvxExldtCpNR5XGbcC7nLpJjBncuqx51UUBIHDPKCQOQyg1I7Du69+ XWpeXWD7Ug7Cn5dOfBWb2PUPaKOuxoM0T7OYvlCnalWK+EC4zB+VTVtJuMxnblpHHHym xQi3+N8I612xe5bcbm3wYTjt6ciIh/UC15/7ovOjoEdj58we/OxE5SFlTkp/MSrYX+xF pM/imFnNsXByTGd+3fOXE1g4knZaXyXgZpHa3vABtHdn67LiZ4dvYSOemsv2dfS48woc iUZGd0llZjz6n/CwY6xV/T1lhNXiLs5MqBVrYa8fNUc/XHwFYsBucaZAv8Ut9bOAFBPN KG7g== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=C3rk9FV/UNwLOBX0s67FLPGhDJ5miKgk3a2rqN6mmL0=; b=kfDwGvXV5zMxJKSFEy4PHhGft6wPpAfJhv7DXEgDN4e338wWHGdtQ6xp1MYrVwaAUN Vi8w2ziaj4lxMw/nSgTp4PLTItb8a02QjuFjjTqm9Isg8T7Y+garKXgWm8K1ZRE0M4NI RHlrxj1XKOqDaTM/ZHqiWafSF23AdaTObNDzDmmBdCBQ/UdBJGRz0becArWGhVBBQfAx 5CW/JA5EHhhkAQop6yLtlt7cR//Plbkq3mmaBjDNRu7rMvLtTiwXXywu5XpYpB2fFczZ B7dRyQZuLw8g5/f1ExNDrE7t8COumfycjvXerWiKUNHFJMabLMuy8IL+5aPVD7kQUEMs rBkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=osh+Lrc1; 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 z3-20020a637e03000000b005303c39c3a6si1701236pgc.600.2023.05.09.08.42.46; Tue, 09 May 2023 08:43:00 -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=osh+Lrc1; 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 S235720AbjEIPPt (ORCPT + 99 others); Tue, 9 May 2023 11:15:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40474 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230088AbjEIPPr (ORCPT ); Tue, 9 May 2023 11:15:47 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 917DE40F3 for ; Tue, 9 May 2023 08:15:46 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 218D362C76 for ; Tue, 9 May 2023 15:15:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7D6BDC433EF; Tue, 9 May 2023 15:15:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1683645345; bh=ueNs2jSBg81BPlBmRMQAY6QrnRrosCgVLhmITxyBbpo=; h=From:To:Cc:Subject:Date:From; b=osh+Lrc1XkB/Jv8dmOxZXma85u4raRZFwdPVEux+HyijVxApGpdMiD/jmb+M5QF9F Y3YvdKu7nC5GoJQKHc3loiJqzWpV3k5l67ceBi8iPmAIqKr8NqYOrDkOrr92hj3BkO /SVDS5fQODKXcw+qCGF6CPNNSBZ2oC1reTJ7f+W6eECP6DEGqeISiLaZ3UYFCXZczy HUOXeLNCdLK4RjGhjSjOq5a+NacxaQFJPKypgSre66FvGGPBQp5YDdhieshYIAvCFw 6t2TLE578gsbZQpDeO7Qaf5jYJAVvPFdXgLWkw97pntvfNq/USDm3bUpcNwiwPNmJV tHwdFiKUOdNcQ== From: Jisheng Zhang To: Paul Walmsley , Palmer Dabbelt , Albert Ou Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] riscv: mm: stub extable related functions/macros for !MMU Date: Tue, 9 May 2023 23:04:39 +0800 Message-Id: <20230509150439.612-1-jszhang@kernel.org> X-Mailer: git-send-email 2.40.0 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,T_SCC_BODY_TEXT_LINE 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?1765431815964457003?= X-GMAIL-MSGID: =?utf-8?q?1765431815964457003?= extable relies on the MMU to work properly, so it's useless to include __ex_table sections and build extable related functions for !MMU case. Signed-off-by: Jisheng Zhang --- arch/riscv/include/asm/asm-extable.h | 6 ++++++ arch/riscv/include/asm/extable.h | 4 ++++ arch/riscv/mm/Makefile | 3 +-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/arch/riscv/include/asm/asm-extable.h b/arch/riscv/include/asm/asm-extable.h index 14be0673f5b5..909d6beaf499 100644 --- a/arch/riscv/include/asm/asm-extable.h +++ b/arch/riscv/include/asm/asm-extable.h @@ -7,6 +7,8 @@ #define EX_TYPE_BPF 2 #define EX_TYPE_UACCESS_ERR_ZERO 3 +#ifdef MMU + #ifdef __ASSEMBLY__ #define __ASM_EXTABLE_RAW(insn, fixup, type, data) \ @@ -62,4 +64,8 @@ #endif /* __ASSEMBLY__ */ +#else /* CONFIG_MMU */ + #define _ASM_EXTABLE_UACCESS_ERR(insn, fixup, err) +#endif /* CONFIG_MMU */ + #endif /* __ASM_ASM_EXTABLE_H */ diff --git a/arch/riscv/include/asm/extable.h b/arch/riscv/include/asm/extable.h index 512012d193dc..3eb5c1f7bf34 100644 --- a/arch/riscv/include/asm/extable.h +++ b/arch/riscv/include/asm/extable.h @@ -32,7 +32,11 @@ do { \ (b)->data = (tmp).data; \ } while (0) +#ifdef CONFIG_MMU bool fixup_exception(struct pt_regs *regs); +#else +static inline bool fixup_exception(struct pt_regs *regs) { return false; } +#endif #if defined(CONFIG_BPF_JIT) && defined(CONFIG_ARCH_RV64I) bool ex_handler_bpf(const struct exception_table_entry *ex, struct pt_regs *regs); diff --git a/arch/riscv/mm/Makefile b/arch/riscv/mm/Makefile index b85e9e82f082..9c454f90fd3d 100644 --- a/arch/riscv/mm/Makefile +++ b/arch/riscv/mm/Makefile @@ -13,8 +13,7 @@ endif KCOV_INSTRUMENT_init.o := n obj-y += init.o -obj-y += extable.o -obj-$(CONFIG_MMU) += fault.o pageattr.o +obj-$(CONFIG_MMU) += extable.o fault.o pageattr.o obj-y += cacheflush.o obj-y += context.o obj-y += pgtable.o