| Message ID | 20241001195300.GB4135693@ZenIV (mailing list archive) |
|---|---|
| State | Awaiting Upstream, archived |
| Headers | show |
| Series | [1/3] parisc: get rid of private asm/unaligned.h | expand |
On 10/1/24 12:53, Al Viro wrote: > Declarations local to arch/*/kernel/*.c are better off *not* in a public > header - arch/arc/kernel/unaligned.h is just fine for those > bits. > > Unlike the parisc case, here we have an extra twist - asm/mmu.h > has an implicit dependency on struct pt_regs, and in some users > that used to be satisfied by include of asm/ptrace.h from > asm/unaligned.h (note that asm/mmu.h itself did _not_ pull asm/unaligned.h > - it relied upon the users having pulled asm/unaligned.h before asm/mmu.h > got there). > > Seeing that asm/mmu.h only wants struct pt_regs * arguments in > an extern, just pre-declare it there - less brittle that way. > > With that done _all_ asm/unaligned.h instances are reduced to include > of asm-generic/unaligned.h and can be removed - unaligned.h is in > mandatory-y in include/asm-generic/Kbuild. > > What's more, we can move asm-generic/unaligned.h to linux/unaligned.h > and switch includes of <asm/unaligned.h> to <linux/unaligned.h>; that's > better off as an auto-generated commit, though, to be done by Linus > at -rc1 time next cycle. > > Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Acked-by: Vineet Gupta <vgupta@kernel.org> LGTM. And by your next tree is fine/preferred. Thx, -Vineet
On Wed, Oct 02, 2024 at 02:03:30PM -0700, Vineet Gupta wrote: > On 10/1/24 12:53, Al Viro wrote: > > Declarations local to arch/*/kernel/*.c are better off *not* in a public > > header - arch/arc/kernel/unaligned.h is just fine for those > > bits. > > > > Unlike the parisc case, here we have an extra twist - asm/mmu.h > > has an implicit dependency on struct pt_regs, and in some users > > that used to be satisfied by include of asm/ptrace.h from > > asm/unaligned.h (note that asm/mmu.h itself did _not_ pull asm/unaligned.h > > - it relied upon the users having pulled asm/unaligned.h before asm/mmu.h > > got there). > > > > Seeing that asm/mmu.h only wants struct pt_regs * arguments in > > an extern, just pre-declare it there - less brittle that way. > > > > With that done _all_ asm/unaligned.h instances are reduced to include > > of asm-generic/unaligned.h and can be removed - unaligned.h is in > > mandatory-y in include/asm-generic/Kbuild. > > > > What's more, we can move asm-generic/unaligned.h to linux/unaligned.h > > and switch includes of <asm/unaligned.h> to <linux/unaligned.h>; that's > > better off as an auto-generated commit, though, to be done by Linus > > at -rc1 time next cycle. > > > > Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> > > Acked-by: Vineet Gupta <vgupta@kernel.org> > > LGTM. And by your next tree is fine/preferred. Done. It's in #for-next, and if nobody introduces arch/*/include/asm/unaligned.h this cycle, the pull request will be followed by request to run the conversion script at -rc1...
diff --git a/arch/arc/include/asm/mmu.h b/arch/arc/include/asm/mmu.h index 9febf5bc3de6..4ae2db59d494 100644 --- a/arch/arc/include/asm/mmu.h +++ b/arch/arc/include/asm/mmu.h @@ -14,6 +14,7 @@ typedef struct { unsigned long asid[NR_CPUS]; /* 8 bit MMU PID + Generation cycle */ } mm_context_t; +struct pt_regs; extern void do_tlb_overlap_fault(unsigned long, unsigned long, struct pt_regs *); #endif diff --git a/arch/arc/include/asm/unaligned.h b/arch/arc/include/asm/unaligned.h deleted file mode 100644 index cf5a02382e0e..000000000000 --- a/arch/arc/include/asm/unaligned.h +++ /dev/null @@ -1,27 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (www.synopsys.com) - */ - -#ifndef _ASM_ARC_UNALIGNED_H -#define _ASM_ARC_UNALIGNED_H - -/* ARC700 can't handle unaligned Data accesses. */ - -#include <asm-generic/unaligned.h> -#include <asm/ptrace.h> - -#ifdef CONFIG_ARC_EMUL_UNALIGNED -int misaligned_fixup(unsigned long address, struct pt_regs *regs, - struct callee_regs *cregs); -#else -static inline int -misaligned_fixup(unsigned long address, struct pt_regs *regs, - struct callee_regs *cregs) -{ - /* Not fixed */ - return 1; -} -#endif - -#endif /* _ASM_ARC_UNALIGNED_H */ diff --git a/arch/arc/kernel/traps.c b/arch/arc/kernel/traps.c index a19751e824fb..41af02081549 100644 --- a/arch/arc/kernel/traps.c +++ b/arch/arc/kernel/traps.c @@ -20,6 +20,7 @@ #include <asm/setup.h> #include <asm/unaligned.h> #include <asm/kprobes.h> +#include "unaligned.h" void die(const char *str, struct pt_regs *regs, unsigned long address) { diff --git a/arch/arc/kernel/unaligned.c b/arch/arc/kernel/unaligned.c index 99a9b92ed98d..d2f5ceaaed1b 100644 --- a/arch/arc/kernel/unaligned.c +++ b/arch/arc/kernel/unaligned.c @@ -12,6 +12,7 @@ #include <linux/ptrace.h> #include <linux/uaccess.h> #include <asm/disasm.h> +#include "unaligned.h" #ifdef CONFIG_CPU_BIG_ENDIAN #define BE 1 diff --git a/arch/arc/kernel/unaligned.h b/arch/arc/kernel/unaligned.h new file mode 100644 index 000000000000..5244453bb85f --- /dev/null +++ b/arch/arc/kernel/unaligned.h @@ -0,0 +1,16 @@ +struct pt_regs; +struct callee_regs; + +#ifdef CONFIG_ARC_EMUL_UNALIGNED +int misaligned_fixup(unsigned long address, struct pt_regs *regs, + struct callee_regs *cregs); +#else +static inline int +misaligned_fixup(unsigned long address, struct pt_regs *regs, + struct callee_regs *cregs) +{ + /* Not fixed */ + return 1; +} +#endif +
Declarations local to arch/*/kernel/*.c are better off *not* in a public header - arch/arc/kernel/unaligned.h is just fine for those bits. Unlike the parisc case, here we have an extra twist - asm/mmu.h has an implicit dependency on struct pt_regs, and in some users that used to be satisfied by include of asm/ptrace.h from asm/unaligned.h (note that asm/mmu.h itself did _not_ pull asm/unaligned.h - it relied upon the users having pulled asm/unaligned.h before asm/mmu.h got there). Seeing that asm/mmu.h only wants struct pt_regs * arguments in an extern, just pre-declare it there - less brittle that way. With that done _all_ asm/unaligned.h instances are reduced to include of asm-generic/unaligned.h and can be removed - unaligned.h is in mandatory-y in include/asm-generic/Kbuild. What's more, we can move asm-generic/unaligned.h to linux/unaligned.h and switch includes of <asm/unaligned.h> to <linux/unaligned.h>; that's better off as an auto-generated commit, though, to be done by Linus at -rc1 time next cycle. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> --- arch/arc/include/asm/mmu.h | 1 + arch/arc/include/asm/unaligned.h | 27 --------------------------- arch/arc/kernel/traps.c | 1 + arch/arc/kernel/unaligned.c | 1 + arch/arc/kernel/unaligned.h | 16 ++++++++++++++++ 5 files changed, 19 insertions(+), 27 deletions(-) delete mode 100644 arch/arc/include/asm/unaligned.h create mode 100644 arch/arc/kernel/unaligned.h