2023-05-09 16:06:05

by Jisheng Zhang

Subject: [PATCH v2] riscv: mm: stub extable related functions/macros for !MMU

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 <[email protected]>
---

Since v1:
- fix a typo: s/MMU/CONFIG_MMU

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..00a96e7a9664 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 CONFIG_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
--
2.40.0

2023-06-20 01:01:03

by Palmer Dabbelt

Subject: Re: [PATCH v2] riscv: mm: stub extable related functions/macros for !MMU

On Tue, 09 May 2023 23:26:41 +0800, Jisheng Zhang wrote:
> 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.
>
>

Applied, thanks!

[1/1] riscv: mm: stub extable related functions/macros for !MMU
https://git.kernel.org/palmer/c/de658bcf0333

Best regards,
--
Palmer Dabbelt <[email protected]>

2023-06-20 01:33:17

by patchwork-bot+linux-riscv

Subject: Re: [PATCH v2] riscv: mm: stub extable related functions/macros for !MMU

Hello:

This patch was applied to riscv/linux.git (for-next)
by Palmer Dabbelt <[email protected]>:

On Tue, 9 May 2023 23:26:41 +0800 you wrote:
> 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 <[email protected]>
> ---
>
> [...]

Here is the summary with links:
- [v2] riscv: mm: stub extable related functions/macros for !MMU
https://git.kernel.org/riscv/c/de658bcf0333

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html