OSDN Git Service

arm64: insn: avoid circular include dependency
authorMark Rutland <mark.rutland@arm.com>
Fri, 18 Jun 2021 15:11:22 +0000 (16:11 +0100)
committerWill Deacon <will@kernel.org>
Mon, 21 Jun 2021 10:58:03 +0000 (11:58 +0100)
commit69bb0585ebb0c48c93fc55fc27afbfc06adef2fd
tree7afd47d8cd20c9dae154f78fd57093182f8eeacd
parent3e00e39d9dad48360ebd518726ebf81da1b84c10
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).

Reported-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20210621080830.GA37068@C02TD0UTHF1T.local
Fixes: 3e00e39d9dad ("arm64: insn: move AARCH64_INSN_SIZE into <asm/insn.h>")
Signed-off-by: Will Deacon <will@kernel.org>
arch/arm64/include/asm/alternative-macros.h
arch/arm64/include/asm/insn-def.h [new file with mode: 0644]
arch/arm64/include/asm/insn.h