From: Nick Desaulniers <ndesaulniers@google.com>
To: linux-arm-kernel@lists.infradead.org
Cc: "Fangrui Song" <maskray@google.com>,
"Peter Smith" <peter.smith@arm.com>,
"Nick Desaulniers" <ndesaulniers@google.com>,
"Ard Biesheuvel" <ardb@kernel.org>,
"Nathan Chancellor" <nathan@kernel.org>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Russell King" <linux@armlinux.org.uk>,
"Arnd Bergmann" <arnd@arndb.de>,
"Geert Uytterhoeven" <geert+renesas@glider.be>,
"Linus Walleij" <linus.walleij@linaro.org>,
"Andrew Morton" <akpm@linux-foundation.org>,
"Anshuman Khandual" <anshuman.khandual@arm.com>,
"Mike Rapoport" <rppt@kernel.org>,
"YiFei Zhu" <yifeifz2@illinois.edu>,
"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
"Dave Martin" <dave.martin@linaro.org>,
"Nicolas Pitre" <nico@fluxnic.net>,
linux-kernel@vger.kernel.org, llvm@lists.linux.dev
Subject: [PATCH] ARM: mm: proc-macros: ensure *_tlb_fns are 4B aligned
Date: Wed, 29 Sep 2021 12:08:05 -0700 [thread overview]
Message-ID: <20210929190810.1597399-1-ndesaulniers@google.com> (raw)
QEMU 6.1.0 is more correct about trapping on misaligned accesses. A
kernel built with CONFIG_THUMB2_KERNEL=y and using clang as the
assembler could generate non-naturally-aligned v7wbi_tlb_fns which
results in a boot failure. The original commit adding the macro missed
the .align directive on this data.
Fixes: 66a625a88174 ("ARM: mm: proc-macros: Add generic proc/cache/tlb struct definition macros")
Link: https://github.com/ClangBuiltLinux/linux/issues/1447
Link: https://lore.kernel.org/all/0699da7b-354f-aecc-a62f-e25693209af4@linaro.org/
Debugged-by: Ard Biesheuvel <ardb@kernel.org>
Debugged-by: Nathan Chancellor <nathan@kernel.org>
Debugged-by: Richard Henderson <richard.henderson@linaro.org>
Suggested-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
---
arch/arm/Kconfig | 1 +
arch/arm/mm/proc-macros.S | 1 +
2 files changed, 2 insertions(+)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index fc196421b2ce..b760dd45b734 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -92,6 +92,7 @@ config ARM
select HAVE_FTRACE_MCOUNT_RECORD if !XIP_KERNEL
select HAVE_FUNCTION_GRAPH_TRACER if !THUMB2_KERNEL && !CC_IS_CLANG
select HAVE_FUNCTION_TRACER if !XIP_KERNEL
+ select HAVE_FUTEX_CMPXCHG if FUTEX
select HAVE_GCC_PLUGINS
select HAVE_HW_BREAKPOINT if PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7)
select HAVE_IRQ_TIME_ACCOUNTING
diff --git a/arch/arm/mm/proc-macros.S b/arch/arm/mm/proc-macros.S
index e2c743aa2eb2..d9f7dfe2a7ed 100644
--- a/arch/arm/mm/proc-macros.S
+++ b/arch/arm/mm/proc-macros.S
@@ -340,6 +340,7 @@ ENTRY(\name\()_cache_fns)
.macro define_tlb_functions name:req, flags_up:req, flags_smp
.type \name\()_tlb_fns, #object
+ .align 2
ENTRY(\name\()_tlb_fns)
.long \name\()_flush_user_tlb_range
.long \name\()_flush_kern_tlb_range
--
2.33.0.685.g46640cef36-goog
next reply other threads:[~2021-09-29 19:08 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-29 19:08 Nick Desaulniers [this message]
2021-09-29 19:10 ` [PATCH] ARM: mm: proc-macros: ensure *_tlb_fns are 4B aligned Nick Desaulniers
2021-09-29 19:14 ` Nick Desaulniers
2021-09-29 19:20 ` [PATCH v2] " Nick Desaulniers
2021-09-29 20:37 ` Nathan Chancellor
2021-09-29 20:57 ` Ard Biesheuvel
2021-09-29 20:59 ` Nick Desaulniers
2021-09-29 19:14 ` [PATCH] " Ard Biesheuvel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210929190810.1597399-1-ndesaulniers@google.com \
--to=ndesaulniers@google.com \
--cc=akpm@linux-foundation.org \
--cc=anshuman.khandual@arm.com \
--cc=ardb@kernel.org \
--cc=arnd@arndb.de \
--cc=dave.martin@linaro.org \
--cc=geert+renesas@glider.be \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=llvm@lists.linux.dev \
--cc=maskray@google.com \
--cc=nathan@kernel.org \
--cc=nico@fluxnic.net \
--cc=peter.smith@arm.com \
--cc=richard.henderson@linaro.org \
--cc=rppt@kernel.org \
--cc=u.kleine-koenig@pengutronix.de \
--cc=yifeifz2@illinois.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).