mbox series

[GIT,PULL] hotfixes for 6.7

Message ID 20231227150354.9437b5c792000b8eb22758e9@linux-foundation.org (mailing list archive)
State New
Headers show
Series [GIT,PULL] hotfixes for 6.7 | expand

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm tags/mm-hotfixes-stable-2023-12-27-15-00

Message

Andrew Morton Dec. 27, 2023, 11:03 p.m. UTC
Linus, please merge this batch of hotfixes, thanks.


The following changes since commit 4376807bf2d5371c3e00080c972be568c3f8a7d1:

  mm/mglru: reclaim offlined memcgs harder (2023-12-12 17:20:20 -0800)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm tags/mm-hotfixes-stable-2023-12-27-15-00

for you to fetch changes up to 1803d0c5ee1a3bbee23db2336e21add067824f02:

  mailmap: add an old address for Naoya Horiguchi (2023-12-20 13:46:20 -0800)

----------------------------------------------------------------
11 hotfixes.  7 are cc:stable and the other 4 address post-6.6 issues or
are not considered backporting material.

----------------------------------------------------------------
Arnd Bergmann (2):
      kexec: fix KEXEC_FILE dependencies
      kexec: select CRYPTO from KEXEC_FILE instead of depending on it

Baokun Li (1):
      mm/filemap: avoid buffered read/write race to read inconsistent data

Charan Teja Kalla (1):
      mm: migrate high-order folios in swap cache correctly

Matthew Wilcox (Oracle) (4):
      mm/memory-failure: pass the folio and the page to collect_procs()
      mm/memory-failure: check the mapcount of the precise page
      mm/memory-failure: cast index to loff_t before shifting it
      mailmap: add an old address for Naoya Horiguchi

Muhammad Usama Anjum (1):
      selftests: secretmem: floor the memory size to the multiple of page_size

Nico Pache (1):
      kunit: kasan_test: disable fortify string checker on kmalloc_oob_memset

Sidhartha Kumar (1):
      maple_tree: do not preallocate nodes for slot stores

 .mailmap                                  |  1 +
 arch/powerpc/Kconfig                      |  4 ++--
 arch/riscv/Kconfig                        |  4 +---
 arch/s390/Kconfig                         |  4 ++--
 arch/x86/Kconfig                          |  4 ++--
 kernel/Kconfig.kexec                      |  2 ++
 lib/maple_tree.c                          | 11 +++++++++++
 mm/filemap.c                              |  9 +++++++++
 mm/kasan/kasan_test.c                     | 20 +++++++++++++++----
 mm/memory-failure.c                       | 33 +++++++++++++++----------------
 mm/migrate.c                              |  9 ++++++++-
 tools/testing/radix-tree/maple.c          |  2 +-
 tools/testing/selftests/mm/memfd_secret.c |  3 +++
 13 files changed, 74 insertions(+), 32 deletions(-)

Comments

Linus Torvalds Dec. 28, 2023, 12:36 a.m. UTC | #1
On Wed, 27 Dec 2023 at 15:03, Andrew Morton <akpm@linux-foundation.org> wrote:
>
> Baokun Li (1):
>       mm/filemap: avoid buffered read/write race to read inconsistent data

Hmm. I wonder if we should have made the i_size_read/write helpers be
smp_load_acquire/store_release()?

The existing smp_wmb() are almost accidental, and aren't primarily
about the inode size, but about the page/folio uptodate bit. I guess
they work, but it's all a bit messy.

Which might *also* be better off with acquire/release, but we don't
have those bitops, I guess. Oh well.

             Linus
pr-tracker-bot@kernel.org Dec. 28, 2023, 12:40 a.m. UTC | #2
The pull request you sent on Wed, 27 Dec 2023 15:03:54 -0800:

> git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm tags/mm-hotfixes-stable-2023-12-27-15-00

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/f5837722ffecbbedf1b1dbab072a063565f0dad1

Thank you!