arm64: insn: cleanups
Mark Rutland
reviewercover arm64: insn: cleanups
Hi Will,
These couple of patches are fixups for the arm64 for-next/insn branch, which try to bring that inline with the intent of the original patches.
The main change is to have users of patching code explicitly include <asm/patching.h> (which was the intent of the original patches), as having <asm/insn.h> include <asm/patching.h> can create some painful header dependencies, and this more clearly separates the insn parts under arm64/lib/ from the parts under arm64/kernel/. The header dependencies don't appear to be an issue today, but get in the way of some subsequent rework patches I'm developing, and I'd like to fix that now before there's any additional reliance on <asm/insn.h> pulling things in.
The other change is to move AARCH64_INSN_SIZE into <asm/insn.h>, to keep all the insn bits in one place.
The big diff for kprobes.c is due to sorting the includes, which are unchanged other than the <asm/patching.h> inclusion.
Thanks.
Mark.
Mark Rutland (2):
arm64: insn: decouple patching from insn code
arm64: insn: move AARCH64_INSN_SIZE into <asm/insn.h>
arch/arm64/include/asm/alternative-macros.h | 4 +--- arch/arm64/include/asm/insn.h | 4 +++- arch/arm64/include/asm/kvm_asm.h | 1 + arch/arm64/include/asm/patching.h | 2 -- arch/arm64/kernel/cpufeature.c | 1 + arch/arm64/kernel/ftrace.c | 1 + arch/arm64/kernel/jump_label.c | 1 + arch/arm64/kernel/kgdb.c | 1 + arch/arm64/kernel/patching.c | 2 ++ arch/arm64/kernel/probes/kprobes.c | 18 ++++++++++-------- arch/arm64/kernel/traps.c | 2 ++ arch/arm64/net/bpf_jit_comp.c | 1 + 12 files changed, 24 insertions(+), 14 deletions(-)
Signature · 7 lines
2.11.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Mark Rutland
reviewerPATCH 1/2 arm64: insn: decouple patching from insn code
Currently, <asm/insn.h> includes <asm/patching.h>. We intend that <asm/insn.h> will be usable from userspace, so it doesn't make sense to include headers for kernel-only features such as the patching routines, and we'd intended to restrict <asm/insn.h> to instruction encoding details.
Let's decouple the patching code from <asm/insn.h>, and explicitly include <asm/patching.h> where it is needed. Since <asm/patching.h> isn't included from assembly, we can drop the __ASSEMBLY__ guards.
At the same time, sort the kprobes includes so that it's easier to see what is and isn't incldued.
--- arch/arm64/include/asm/insn.h | 1 - arch/arm64/include/asm/patching.h | 2 -- arch/arm64/kernel/ftrace.c | 1 + arch/arm64/kernel/jump_label.c | 1 + arch/arm64/kernel/kgdb.c | 1 + arch/arm64/kernel/patching.c | 1 + arch/arm64/kernel/probes/kprobes.c | 18 ++++++++++-------- arch/arm64/kernel/traps.c | 1 + 8 files changed, 15 insertions(+), 11 deletions(-)
arch/arm64/include/asm/insn.h +0 -1
@@ -11,7 +11,6 @@#include <linux/types.h> #include <asm/alternative.h> -#include <asm/patching.h> #ifndef __ASSEMBLY__/*
arch/arm64/include/asm/patching.h +0 -2
@@ -4,12 +4,10 @@#include <linux/types.h> -#ifndef __ASSEMBLY__int aarch64_insn_read (void *addr,u32 *insnp);int aarch64_insn_write (void *addr,u32 insn);int aarch64_insn_patch_text_nosync (void *addr,u32 insn);int aarch64_insn_patch_text (void *addrs[],u32 insns[],int cnt); -#endif /* __ASSEMBLY__ */ #endif /* __ASM_PATCHING_H */
arch/arm64/kernel/ftrace.c +1 -0
@@ -15,6 +15,7 @@#include <asm/debug-monitors.h> #include <asm/ftrace.h> #include <asm/insn.h> +#include <asm/patching.h> #ifdef CONFIG_DYNAMIC_FTRACE /*
arch/arm64/kernel/jump_label.c +1 -0
@@ -8,6 +8,7 @@#include <linux/kernel.h> #include <linux/jump_label.h> #include <asm/insn.h> +#include <asm/patching.h> void arch_jump_label_transform (struct jump_entry *entry,enum jump_label_type type)
arch/arm64/kernel/kgdb.c +1 -0
@@ -17,6 +17,7 @@#include <asm/debug-monitors.h> #include <asm/insn.h> +#include <asm/patching.h> #include <asm/traps.h> struct dbg_reg_def_t dbg_reg_def[DBG_MAX_REG_NUM ] = {
arch/arm64/kernel/patching.c +1 -0
@@ -9,6 +9,7 @@#include <asm/cacheflush.h> #include <asm/fixmap.h> #include <asm/kprobes.h> +#include <asm/patching.h> #include <asm/sections.h> static DEFINE_RAW_SPINLOCK (patch_lock);
arch/arm64/kernel/probes/kprobes.c +10 -8
@@ -7,26 +7,28 @@* Copyright (C) 2013 Linaro Limited. * Author: Sandeepa Prabhu <[email protected]> */ +#include <linux/extable.h> #include <linux/kasan.h> #include <linux/kernel.h> #include <linux/kprobes.h> -#include <linux/extable.h> -#include <linux/slab.h> -#include <linux/stop_machine.h> #include <linux/sched/debug.h> #include <linux/set_memory.h> +#include <linux/slab.h> +#include <linux/stop_machine.h> #include <linux/stringify.h> +#include <linux/uaccess.h> #include <linux/vmalloc.h> -#include <asm/traps.h> -#include <asm/ptrace.h> +#include <asm/cacheflush.h> -#include <asm/debug-monitors.h> #include <asm/daifflags.h> -#include <asm/system_misc.h> +#include <asm/debug-monitors.h> #include <asm/insn.h> -#include <linux/uaccess.h> #include <asm/irq.h> +#include <asm/patching.h> +#include <asm/ptrace.h> #include <asm/sections.h> +#include <asm/system_misc.h> +#include <asm/traps.h> #include "decode-insn.h"
arch/arm64/kernel/traps.c +1 -0
@@ -37,6 +37,7 @@#include <asm/exception.h> #include <asm/extable.h> #include <asm/kprobes.h> +#include <asm/patching.h> #include <asm/traps.h> #include <asm/smp.h> #include <asm/stack_pointer.h>
Signature · 7 lines
2.11.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Mark Rutland
reviewerPATCH 2/2 arm64: insn: move AARCH64_INSN_SIZE into <asm/insn.h>
In reply to Mark RutlandFor histroical reasons, we define AARCH64_INSN_SIZE in <asm/alternative-macros.h>, but it would make more sense to do so in <asm/insn.h>. Let's move it into <asm/insn.h>, and add the necessary include directives for this.
--- arch/arm64/include/asm/alternative-macros.h | 4 +--- arch/arm64/include/asm/insn.h | 3 +++ arch/arm64/include/asm/kvm_asm.h | 1 + arch/arm64/kernel/cpufeature.c | 1 + arch/arm64/kernel/patching.c | 1 + arch/arm64/kernel/traps.c | 1 + arch/arm64/net/bpf_jit_comp.c | 1 + 7 files changed, 9 insertions(+), 3 deletions(-)
arch/arm64/include/asm/alternative-macros.h +1 -3
@@ -3,12 +3,10 @@#define __ASM_ALTERNATIVE_MACROS_H#include <asm/cpucaps.h> +#include <asm/insn.h> #define ARM64_CB_PATCH ARM64_NCAPS -/* A64 instructions are always 32 bits. */ -#define AARCH64_INSN_SIZE 4 -#ifndef __ASSEMBLY__#include <linux/stringify.h>
arch/arm64/include/asm/insn.h +3 -0
@@ -12,6 +12,9 @@#include <asm/alternative.h> +/* A64 instructions are always 32 bits. */ +#define AARCH64_INSN_SIZE 4 +#ifndef __ASSEMBLY__/* * ARM Architecture Reference Manual for ARMv8 Profile-A, Issue A.a
arch/arm64/include/asm/kvm_asm.h +1 -0
@@ -8,6 +8,7 @@#define __ARM_KVM_ASM_H__#include <asm/hyp_image.h> +#include <asm/insn.h> #include <asm/virt.h> #define ARM_EXIT_WITH_SERROR_BIT 31
arch/arm64/kernel/cpufeature.c +1 -0
@@ -76,6 +76,7 @@#include <asm/cpufeature.h> #include <asm/cpu_ops.h> #include <asm/fpsimd.h> +#include <asm/insn.h> #include <asm/kvm_host.h> #include <asm/mmu_context.h> #include <asm/mte.h>
arch/arm64/kernel/patching.c +1 -0
@@ -8,6 +8,7 @@#include <asm/cacheflush.h> #include <asm/fixmap.h> +#include <asm/insn.h> #include <asm/kprobes.h> #include <asm/patching.h> #include <asm/sections.h>
arch/arm64/kernel/traps.c +1 -0
@@ -36,6 +36,7 @@#include <asm/esr.h> #include <asm/exception.h> #include <asm/extable.h> +#include <asm/insn.h> #include <asm/kprobes.h> #include <asm/patching.h> #include <asm/traps.h>
arch/arm64/net/bpf_jit_comp.c +1 -0
@@ -16,6 +16,7 @@#include <asm/byteorder.h> #include <asm/cacheflush.h> #include <asm/debug-monitors.h> +#include <asm/insn.h> #include <asm/set_memory.h> #include "bpf_jit.h"
Signature · 7 lines
2.11.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 2/2] arm64: insn: move AARCH64_INSN_SIZE into <asm/insn.h>
Hi Mark,
Quoted 113 lines · Mark Rutland
For histroical reasons, we define
AARCH64_INSN_SIZEin <asm/alternative-macros.h>, but it would make more sense to do so in <asm/insn.h>. Let's move it into <asm/insn.h>, and add the necessary include directives for this.Signed-off-by Mark Rutland <[email protected]>Cc Catalin Marinas <[email protected]>Cc Will Deacon <[email protected]>--- arch/arm64/include/asm/alternative-macros.h | 4 +--- arch/arm64/include/asm/insn.h | 3 +++ arch/arm64/include/asm/kvm_asm.h | 1 + arch/arm64/kernel/cpufeature.c | 1 + arch/arm64/kernel/patching.c | 1 + arch/arm64/kernel/traps.c | 1 + arch/arm64/net/bpf_jit_comp.c | 1 + 7 files changed, 9 insertions(+), 3 deletions(-)arch/arm64/include/asm/alternative-macros.h +1
-3@@ -3,12 +3,10 @@#define __ASM_ALTERNATIVE_MACROS_H#include <asm/cpucaps.h> +#include <asm/insn.h> #define ARM64_CB_PATCH ARM64_NCAPS -/* A64 instructions are always 32 bits. */ -#define AARCH64_INSN_SIZE 4 -#ifndef __ASSEMBLY__#include <linux/stringify.h> arch/arm64/include/asm/insn.h +3
-0@@ -12,6 +12,9 @@#include <asm/alternative.h> +/* A64 instructions are always 32 bits. */ +#define AARCH64_INSN_SIZE 4 +#ifndef __ASSEMBLY__/* * ARM Architecture Reference Manual for ARMv8 Profile-A, Issue A.a arch/arm64/include/asm/kvm_asm.h +1
-0@@ -8,6 +8,7 @@#define __ARM_KVM_ASM_H__#include <asm/hyp_image.h> +#include <asm/insn.h> #include <asm/virt.h> #define ARM_EXIT_WITH_SERROR_BIT 31arch/arm64/kernel/cpufeature.c +1
-0@@ -76,6 +76,7 @@#include <asm/cpufeature.h> #include <asm/cpu_ops.h> #include <asm/fpsimd.h> +#include <asm/insn.h> #include <asm/kvm_host.h> #include <asm/mmu_context.h> #include <asm/mte.h> arch/arm64/kernel/patching.c +1
-0@@ -8,6 +8,7 @@#include <asm/cacheflush.h> #include <asm/fixmap.h> +#include <asm/insn.h> #include <asm/kprobes.h> #include <asm/patching.h> #include <asm/sections.h> arch/arm64/kernel/traps.c +1
-0@@ -36,6 +36,7 @@#include <asm/esr.h> #include <asm/exception.h> #include <asm/extable.h> +#include <asm/insn.h> #include <asm/kprobes.h> #include <asm/patching.h> #include <asm/traps.h> arch/arm64/net/bpf_jit_comp.c +1
-0@@ -16,6 +16,7 @@#include <asm/byteorder.h> #include <asm/cacheflush.h> #include <asm/debug-monitors.h> +#include <asm/insn.h> #include <asm/set_memory.h> #include "bpf_jit.h" Signature · 1 line
2.11.0
I bisected a CONFIG_LTO_CLANG_THIN=y build failure that our CI reported to this patch:
https://builds.tuxbuild.com/1u4Fpx2FQkkgkyPxWtq0Ke4YFCQ/build.log
I have not had a whole ton of time to look into this (dealing with a million fires it seems :^) but it is not immediately obvious to me why this fails because include/linux/build_bug.h is included within arch/arm64/include/asm/insn.h. It seems only CONFIG_LTO_CLANG_THIN=y (or FULL) is enough to trigger this, a regular defconfig build is fine:
https://builds.tuxbuild.com/1u4Fpt5M8quEVUd4kNSMrdzobC2/build.log
I will try to look into this tomorrow but I figured I would let you know in case something obviously stuck out.
Cheers,
Nathan
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Mark Rutland
reviewerRe: [PATCH 2/2] arm64: insn: move AARCH64_INSN_SIZE into <asm/insn.h>
Quoted 1 line · Nathan Chancellor
Hi Mark,
Hi Nathan,
Quoted 10 lines · Mark Rutland
Quoted 4 lines
For histroical reasons, we define
AARCH64_INSN_SIZEin <asm/alternative-macros.h>, but it would make more sense to do so in <asm/insn.h>. Let's move it into <asm/insn.h>, and add the necessary include directives for this.I bisected a
CONFIG_LTO_CLANG_THIN=ybuild failure that our CI reported to this patch:https://builds.tuxbuild.com/1u4Fpx2FQkkgkyPxWtq0Ke4YFCQ/build.log
Thanks for reporting this; the lopg is really helpful!
Quoted 4 lines
I have not had a whole ton of time to look into this (dealing with a million fires it seems :^) but it is not immediately obvious to me why this fails because
include/linux/build_bug.his included withinarch/arm64/include/asm/insn.h.
The problem is that with LTO, we patch READ_ONCE(), and <asm/rwonce.h> includes <asm/insn.h>, creating a circular include chain:
<linux/build_bug.h> <linux/compiler.h> <asm/rwonce.h> <asm/alternative-macros.h> <asm/insn.h> <linux/build-bug.h>
... and so when <asm/insn.h> includes <linux/build_bug.h>, none of the BUILD_BUG* definitions have happened yet.
Will, are you happy to take the fixup patch below, or would you prefer to drop this patch for now?
Thanks,
Mark.
---->8----
From 0acc3d92302f54475d938f55749805adf74faec1 Mon Sep 17 00:00:00 2001
From: Mark Rutland <[email protected]>
Date: Fri, 18 Jun 2021 16:11:22 +0100
Subject: [PATCH] arm64: insn: avoid circular include dependency
Nathan reports that when building with CONFIG_LTO_CLANG_THIN=y, the build fails due to BUILD_BUG_ON() not being defined before its uss in <asm/insn.h>.
The problem is that with LTO, we patch READ_ONCE(), and <asm/rwonce.h> includes <asm/insn.h>, creating a circular include chain:
<linux/build_bug.h>
<linux/compiler.h>
<asm/rwonce.h>
<asm/alternative-macros.h>
<asm/insn.h>
<linux/build-bug.h>... and so when <asm/insn.h> includes <linux/build_bug.h>, none of the BUILD_BUG* definitions have happened yet.
To avoid this, let's move AARCH64_INSN_SIZE into a header without any dependencies, such that it can always be safely included. At the same time, avoid including <asm/alternative.h> in <asm/insn.h>, which should no longer be necessary (and doesn't make sense when insn.h is consumed by userspace).
--- arch/arm64/include/asm/alternative-macros.h | 2 +- arch/arm64/include/asm/insn.h | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-)
arch/arm64/include/asm/alternative-macros.h +1 -1
@@ -3,7 +3,7 @@#define __ASM_ALTERNATIVE_MACROS_H#include <asm/cpucaps.h> -#include <asm/insn.h> +#include <asm/insn-def.h> #define ARM64_CB_PATCH ARM64_NCAPS
arch/arm64/include/asm/insn.h +1 -4
@@ -10,10 +10,7 @@#include <linux/build_bug.h> #include <linux/types.h> -#include <asm/alternative.h> - -/* A64 instructions are always 32 bits. */ -#define AARCH64_INSN_SIZE 4 +#include <asm/insn-def.h> #ifndef __ASSEMBLY__/*
Signature · 7 lines
2.11.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Nathan Chancellor
Tested-byRe: [PATCH 2/2] arm64: insn: move AARCH64_INSN_SIZE into <asm/insn.h>
Quoted 33 lines · Mark Rutland
Quoted 1 line · Nathan Chancellor
Hi Mark,
Hi Nathan,
Quoted 10 lines · Mark Rutland
Quoted 4 lines
For histroical reasons, we define
AARCH64_INSN_SIZEin <asm/alternative-macros.h>, but it would make more sense to do so in <asm/insn.h>. Let's move it into <asm/insn.h>, and add the necessary include directives for this.I bisected a
CONFIG_LTO_CLANG_THIN=ybuild failure that our CI reported to this patch:https://builds.tuxbuild.com/1u4Fpx2FQkkgkyPxWtq0Ke4YFCQ/build.log
Thanks for reporting this; the lopg is really helpful!
Quoted 4 lines
I have not had a whole ton of time to look into this (dealing with a million fires it seems :^) but it is not immediately obvious to me why this fails because
include/linux/build_bug.his included withinarch/arm64/include/asm/insn.h.The problem is that with LTO, we patch
READ_ONCE(), and <asm/rwonce.h> includes <asm/insn.h>, creating a circular include chain:<linux/build_bug.h> <linux/compiler.h> <asm/rwonce.h> <asm/alternative-macros.h> <asm/insn.h> <linux/build-bug.h>
Quoted 2 lines
... and so when <
asm/insn.h> includes <linux/build_bug.h>, none of the BUILD_BUG* definitions have happened yet.
Aha, that would certainly explain it. I figured something like this would be the root cause but figuring out header dependencies is not my cup of tea.
Quoted 35 lines
Will, are you happy to take the fixup patch below, or would you prefer to drop this patch for now?
Thanks,
Mark.---->8----
Quoted 1 line
From
0acc3d92302f54475d938f55749805adf74faec1Mon Sep 17 00:00:00 2001From: Mark Rutland <[email protected]>
Date: Fri, 18 Jun 2021 16:11:22 +0100
Subject: [PATCH] arm64: insn: avoid circular include dependencyNathan reports that when building with
CONFIG_LTO_CLANG_THIN=y, the build fails due toBUILD_BUG_ON()not being defined before its uss in <asm/insn.h>.The problem is that with LTO, we patch
READ_ONCE(), and <asm/rwonce.h> includes <asm/insn.h>, creating a circular include chain:<linux/build_bug.h> <linux/compiler.h> <asm/rwonce.h> <asm/alternative-macros.h> <asm/insn.h> <linux/build-bug.h>... and so when <
asm/insn.h> includes <linux/build_bug.h>, none of the BUILD_BUG* definitions have happened yet.To avoid this, let's move
AARCH64_INSN_SIZEinto a header without any dependencies, such that it can always be safely included. At the same time, avoid including <asm/alternative.h> in <asm/insn.h>, which should no longer be necessary (and doesn't make sense wheninsn.his consumed by userspace).
Quoted 7 lines
Reported-by Nathan Chancellor <[email protected]>Signed-off-by Mark Rutland <[email protected]>Cc Catalin Marinas <[email protected]>Cc Will Deacon <[email protected]>--- arch/arm64/include/asm/alternative-macros.h | 2 +- arch/arm64/include/asm/insn.h | 5 +----
Looks like arch/arm64/include/asm/insn-def.h is missing from this patch?
If I add one with just the two deleted lines plus a header guard, the build passes.
Thank you for the quick fix!
Cheers,
Nathan
Quoted 39 lines
2 files changed, 2 insertions(+), 5 deletions(-)arch/arm64/include/asm/alternative-macros.h +1
-1@@ -3,7 +3,7 @@#define __ASM_ALTERNATIVE_MACROS_H#include <asm/cpucaps.h> -#include <asm/insn.h> +#include <asm/insn-def.h> #define ARM64_CB_PATCH ARM64_NCAPSarch/arm64/include/asm/insn.h +1
-4@@ -10,10 +10,7 @@#include <linux/build_bug.h> #include <linux/types.h> -#include <asm/alternative.h> - -/* A64 instructions are always 32 bits. */ -#define AARCH64_INSN_SIZE 4 +#include <asm/insn-def.h> #ifndef __ASSEMBLY__/* Signature · 7 lines
2.11.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Mark Rutland
reviewerRe: [PATCH 2/2] arm64: insn: move AARCH64_INSN_SIZE into <asm/insn.h>
Quoted 47 lines · Nathan Chancellor
Quoted 33 lines · Mark Rutland
Quoted 1 line · Nathan Chancellor
Hi Mark,
Hi Nathan,
Quoted 10 lines · Mark Rutland
Quoted 4 lines
For histroical reasons, we define
AARCH64_INSN_SIZEin <asm/alternative-macros.h>, but it would make more sense to do so in <asm/insn.h>. Let's move it into <asm/insn.h>, and add the necessary include directives for this.I bisected a
CONFIG_LTO_CLANG_THIN=ybuild failure that our CI reported to this patch:https://builds.tuxbuild.com/1u4Fpx2FQkkgkyPxWtq0Ke4YFCQ/build.log
Thanks for reporting this; the lopg is really helpful!
Quoted 4 lines
I have not had a whole ton of time to look into this (dealing with a million fires it seems :^) but it is not immediately obvious to me why this fails because
include/linux/build_bug.his included withinarch/arm64/include/asm/insn.h.The problem is that with LTO, we patch
READ_ONCE(), and <asm/rwonce.h> includes <asm/insn.h>, creating a circular include chain:<linux/build_bug.h> <linux/compiler.h> <asm/rwonce.h> <asm/alternative-macros.h> <asm/insn.h> <linux/build-bug.h>Quoted 2 lines
... and so when <
asm/insn.h> includes <linux/build_bug.h>, none of the BUILD_BUG* definitions have happened yet.Aha, that would certainly explain it. I figured something like this would be the root cause but figuring out header dependencies is not my cup of tea.
Quoted 5 lines
Will, are you happy to take the fixup patch below, or would you prefer to drop this patch for now?
arch/arm64/include/asm/alternative-macros.h | 2 +- arch/arm64/include/asm/insn.h | 5 +----
Quoted 6 lines
Looks like
arch/arm64/include/asm/insn-def.his missing from this patch?If I add one with just the two deleted lines plus a header guard, the build passes.
Tested-by Nathan Chancellor <[email protected]>
Whoops; that should have been as below.
Was that the same as you tested?
Thanks,
Mark.
---->8----
From 622fd784c57423b1a276fbbfb270b84839e3afa8 Mon Sep 17 00:00:00 2001
From: Mark Rutland <[email protected]>
Date: Fri, 18 Jun 2021 16:11:22 +0100
Subject: [PATCH] arm64: insn: avoid circular include dependency
Nathan reports that when building with CONFIG_LTO_CLANG_THIN=y, the build fails due to BUILD_BUG_ON() not being defined before its uss in <asm/insn.h>.
The problem is that with LTO, we patch READ_ONCE(), and <asm/rwonce.h> includes <asm/insn.h>, creating a circular include chain:
<linux/build_bug.h>
<linux/compiler.h>
<asm/rwonce.h>
<asm/alternative-macros.h>
<asm/insn.h>
<linux/build-bug.h>... and so when <asm/insn.h> includes <linux/build_bug.h>, none of the BUILD_BUG* definitions have happened yet.
To avoid this, let's move AARCH64_INSN_SIZE into a header without any dependencies, such that it can always be safely included. At the same time, avoid including <asm/alternative.h> in <asm/insn.h>, which should no longer be necessary (and doesn't make sense when insn.h is consumed by userspace).
--- arch/arm64/include/asm/alternative-macros.h | 2 +- arch/arm64/include/asm/insn-def.h | 9 +++++++++ arch/arm64/include/asm/insn.h | 5 +---- 3 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 arch/arm64/include/asm/insn-def.h
arch/arm64/include/asm/alternative-macros.h +1 -1
@@ -3,7 +3,7 @@#define __ASM_ALTERNATIVE_MACROS_H#include <asm/cpucaps.h> -#include <asm/insn.h> +#include <asm/insn-def.h> #define ARM64_CB_PATCH ARM64_NCAPS
arch/arm64/include/asm/insn-def.h new file +9 -0
@@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef __ASM_INSN_DEF_H +#define __ASM_INSN_DEF_H + +/* A64 instructions are always 32 bits. */ +#define AARCH64_INSN_SIZE 4 + +#endif /* __ASM_INSN_DEF_H */
arch/arm64/include/asm/insn.h +1 -4
@@ -10,10 +10,7 @@#include <linux/build_bug.h> #include <linux/types.h> -#include <asm/alternative.h> - -/* A64 instructions are always 32 bits. */ -#define AARCH64_INSN_SIZE 4 +#include <asm/insn-def.h> #ifndef __ASSEMBLY__/*
Signature · 7 lines
2.11.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Will Deacon
maintainerRe: [PATCH 2/2] arm64: insn: move AARCH64_INSN_SIZE into <asm/insn.h>
Quoted 48 lines · Mark Rutland
Quoted 47 lines · Nathan Chancellor
Quoted 33 lines · Mark Rutland
Quoted 1 line · Nathan Chancellor
Hi Mark,
Hi Nathan,
Quoted 10 lines · Mark Rutland
Quoted 4 lines
For histroical reasons, we define
AARCH64_INSN_SIZEin <asm/alternative-macros.h>, but it would make more sense to do so in <asm/insn.h>. Let's move it into <asm/insn.h>, and add the necessary include directives for this.I bisected a
CONFIG_LTO_CLANG_THIN=ybuild failure that our CI reported to this patch:https://builds.tuxbuild.com/1u4Fpx2FQkkgkyPxWtq0Ke4YFCQ/build.log
Thanks for reporting this; the lopg is really helpful!
Quoted 4 lines
I have not had a whole ton of time to look into this (dealing with a million fires it seems :^) but it is not immediately obvious to me why this fails because
include/linux/build_bug.his included withinarch/arm64/include/asm/insn.h.The problem is that with LTO, we patch
READ_ONCE(), and <asm/rwonce.h> includes <asm/insn.h>, creating a circular include chain:<linux/build_bug.h> <linux/compiler.h> <asm/rwonce.h> <asm/alternative-macros.h> <asm/insn.h> <linux/build-bug.h>Quoted 2 lines
... and so when <
asm/insn.h> includes <linux/build_bug.h>, none of the BUILD_BUG* definitions have happened yet.Aha, that would certainly explain it. I figured something like this would be the root cause but figuring out header dependencies is not my cup of tea.
Quoted 5 lines
Will, are you happy to take the fixup patch below, or would you prefer to drop this patch for now?
arch/arm64/include/asm/alternative-macros.h | 2 +- arch/arm64/include/asm/insn.h | 5 +----
Quoted 8 lines
Quoted 6 lines
Looks like
arch/arm64/include/asm/insn-def.his missing from this patch?If I add one with just the two deleted lines plus a header guard, the build passes.
Tested-by Nathan Chancellor <[email protected]>Whoops; that should have been as below.
I've queued this locally on top of for-next/insn and will push out later on (once my LTO build has finished).
Will
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 2/2] arm64: insn: move AARCH64_INSN_SIZE into <asm/insn.h>
In reply to Mark RutlandQuoted 50 lines · Mark Rutland
Quoted 49 lines · Nathan Chancellor
Quoted 33 lines · Mark Rutland
Quoted 1 line · Nathan Chancellor
Hi Mark,
Hi Nathan,
Quoted 10 lines · Mark Rutland
Quoted 4 lines
For histroical reasons, we define
AARCH64_INSN_SIZEin <asm/alternative-macros.h>, but it would make more sense to do so in <asm/insn.h>. Let's move it into <asm/insn.h>, and add the necessary include directives for this.I bisected a
CONFIG_LTO_CLANG_THIN=ybuild failure that our CI reported to this patch:https://builds.tuxbuild.com/1u4Fpx2FQkkgkyPxWtq0Ke4YFCQ/build.log
Thanks for reporting this; the lopg is really helpful!
Quoted 4 lines
I have not had a whole ton of time to look into this (dealing with a million fires it seems :^) but it is not immediately obvious to me why this fails because
include/linux/build_bug.his included withinarch/arm64/include/asm/insn.h.The problem is that with LTO, we patch
READ_ONCE(), and <asm/rwonce.h> includes <asm/insn.h>, creating a circular include chain:<linux/build_bug.h> <linux/compiler.h> <asm/rwonce.h> <asm/alternative-macros.h> <asm/insn.h> <linux/build-bug.h>Quoted 2 lines
... and so when <
asm/insn.h> includes <linux/build_bug.h>, none of the BUILD_BUG* definitions have happened yet.Aha, that would certainly explain it. I figured something like this would be the root cause but figuring out header dependencies is not my cup of tea.
Quoted 5 lines
Will, are you happy to take the fixup patch below, or would you prefer to drop this patch for now?
arch/arm64/include/asm/alternative-macros.h | 2 +- arch/arm64/include/asm/insn.h | 5 +----Looks like
arch/arm64/include/asm/insn-def.his missing from this patch?
Quoted 8 lines
Quoted 4 lines
If I add one with just the two deleted lines plus a header guard, the build passes.
Tested-by Nathan Chancellor <[email protected]>Whoops; that should have been as below.
Was that the same as you tested?
Yes, that is exactly what I did so the tag should still be good.
Cheers,
Nathan
Quoted 78 lines
Thanks,
Mark.---->8----
From622fd784c57423b1a276fbbfb270b84839e3afa8Mon Sep 17 00:00:00 2001
From: Mark Rutland <[email protected]>
Date: Fri, 18 Jun 2021 16:11:22 +0100
Subject: [PATCH] arm64: insn: avoid circular include dependencyNathan reports that when building with
CONFIG_LTO_CLANG_THIN=y, the build fails due toBUILD_BUG_ON()not being defined before its uss in <asm/insn.h>.The problem is that with LTO, we patch
READ_ONCE(), and <asm/rwonce.h> includes <asm/insn.h>, creating a circular include chain:<linux/build_bug.h> <linux/compiler.h> <asm/rwonce.h> <asm/alternative-macros.h> <asm/insn.h> <linux/build-bug.h>... and so when <
asm/insn.h> includes <linux/build_bug.h>, none of the BUILD_BUG* definitions have happened yet.To avoid this, let's move
AARCH64_INSN_SIZEinto a header without any dependencies, such that it can always be safely included. At the same time, avoid including <asm/alternative.h> in <asm/insn.h>, which should no longer be necessary (and doesn't make sense wheninsn.his consumed by userspace).Reported-by Nathan Chancellor <[email protected]>Signed-off-by Mark Rutland <[email protected]>Cc Catalin Marinas <[email protected]>Cc Will Deacon <[email protected]>--- arch/arm64/include/asm/alternative-macros.h | 2 +- arch/arm64/include/asm/insn-def.h | 9 +++++++++ arch/arm64/include/asm/insn.h | 5 +---- 3 files changed, 11 insertions(+), 5 deletions(-)create mode 100644
arch/arm64/include/asm/insn-def.harch/arm64/include/asm/alternative-macros.h +1
-1@@ -3,7 +3,7 @@#define __ASM_ALTERNATIVE_MACROS_H#include <asm/cpucaps.h> -#include <asm/insn.h> +#include <asm/insn-def.h> #define ARM64_CB_PATCH ARM64_NCAPSarch/arm64/include/asm/insn-def.h new file +9
-0@@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef __ASM_INSN_DEF_H +#define __ASM_INSN_DEF_H + +/* A64 instructions are always 32 bits. */ +#define AARCH64_INSN_SIZE 4 + +#endif /* __ASM_INSN_DEF_H */ arch/arm64/include/asm/insn.h +0
-0@@ -10,10 +10,7 @@#include <linux/build_bug.h>
arch/arm64/include/asm/insn.h line 16
Quoted 10 lines
arch/arm64/include/asm/insn.h +1
-4#include <linux/types.h> -#include <asm/alternative.h> - -/* A64 instructions are always 32 bits. */ -#define AARCH64_INSN_SIZE 4 +#include <asm/insn-def.h> #ifndef __ASSEMBLY__/*
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 12 lines · Mark Rutland
These couple of patches are fixups for the arm64 for-next/insn branch, which try to bring that inline with the intent of the original patches.
The main change is to have users of patching code explicitly include <
asm/patching.h> (which was the intent of the original patches), as having <asm/insn.h> include <asm/patching.h> can create some painful header dependencies, and this more clearly separates the insn parts under arm64/lib/ from the parts under arm64/kernel/. The header dependencies don't appear to be an issue today, but get in the way of some subsequent rework patches I'm developing, and I'd like to fix that now before there's any additional reliance on <asm/insn.h> pulling things in.
Quoted 1 line
[...]
Applied to arm64 (for-next/insn), thanks!
[1/2] arm64: insn: decouple patching from insn code
https://git.kernel.org/arm64/c/78b92c7337e1 [2/2] arm64: insn: move AARCH64_INSN_SIZE into <asm/insn.h> https://git.kernel.org/arm64/c/3e00e39d9dad
Cheers,
Signature · 10 lines
Will https://fixes.arm64.dev https://next.arm64.dev https://will.arm64.dev _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel