Hi Linus,
Could you please pull the changes below? There are a few arm64 fixes
that turned up during the merging window or just before it opened. They
are based on top of the arm64-upstream tag I sent last week. There is a
near conflict in arch/arm64/Kconfig but it seems that git is smart
enough to figure it out. Thanks.
The following changes since commit d54170812ef1c80e0fa3ed3e554a0bbfc2920d9d:
arm64: fix .idmap.text assertion for large kernels (2023-02-20 18:23:35 +0000)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux tags/arm64-fixes
for you to fetch changes up to 010338d729c1090036eb40d2a60b7b7bce2445b8:
arm64: kaslr: don't pretend KASLR is enabled if offset < MIN_KIMG_ALIGN (2023-02-28 11:21:04 +0000)
----------------------------------------------------------------
arm64 fixes:
- In copy_highpage(), only reset the tag of the destination pointer if
KASAN_HW_TAGS is enabled so that user-space MTE does not interfere
with KASAN_SW_TAGS (which relies on top-byte-ignore).
- Remove warning if SME is detected without SVE, the kernel can cope
with such configuration (though none in the field currently).
- In cfi_handler(), pass the ESR_EL1 value to die() for consistency with
other die() callers.
- Disable HUGETLB_PAGE_OPTIMIZE_VMEMMAP on arm64 since the pte
manipulation from the generic vmemmap_remap_pte() does not follow the
required ARM break-before-make sequence (clear the pte, flush the
TLBs, set the new pte). It may be re-enabled once this sequence is
sorted.
- Fix possible memory leak in the arm64 ACPI code if the SMCCC version
and conduit checks fail.
- Forbid CALL_OPS with CC_OPTIMIZE_FOR_SIZE since gcc ignores
-falign-functions=N with -Os.
- Don't pretend KASLR is enabled if offset < MIN_KIMG_ALIGN as no
randomisation would actually take place.
----------------------------------------------------------------
Ard Biesheuvel (1):
arm64: kaslr: don't pretend KASLR is enabled if offset < MIN_KIMG_ALIGN
Catalin Marinas (1):
arm64: mm: hugetlb: Disable HUGETLB_PAGE_OPTIMIZE_VMEMMAP
Mark Brown (1):
arm64/fpsimd: Remove warning for SME without SVE
Mark Rutland (1):
arm64: ftrace: forbid CALL_OPS with CC_OPTIMIZE_FOR_SIZE
Peter Collingbourne (1):
arm64: Reset KASAN tag in copy_highpage with HW tags only
Sangmoon Kim (1):
arm64: pass ESR_ELx to die() of cfi_handler
Sudeep Holla (1):
arm64: acpi: Fix possible memory leak of ffh_ctxt
arch/arm64/Kconfig | 4 ++--
arch/arm64/include/asm/memory.h | 11 +++++++++++
arch/arm64/kernel/acpi.c | 8 ++++----
arch/arm64/kernel/cpufeature.c | 2 +-
arch/arm64/kernel/fpsimd.c | 3 ---
arch/arm64/kernel/kaslr.c | 2 +-
arch/arm64/kernel/traps.c | 2 +-
arch/arm64/mm/copypage.c | 3 ++-
8 files changed, 22 insertions(+), 13 deletions(-)
--
Catalin
The pull request you sent on Thu, 2 Mar 2023 22:47:50 +0000:
> git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux tags/arm64-fixes
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/39ce4395c3ba730341b067e1fb8abbdf9c47ca77
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html