Commit 28e43197 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mm-hotfixes-stable-2024-11-09-22-40' of... 

Merge tag 'mm-hotfixes-stable-2024-11-09-22-40' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Pull misc fixes from Andrew Morton:
 "20 hotfixes, 14 of which are cc:stable.

  Three affect DAMON. Lorenzo's five-patch series to address the
  mmap_region error handling is here also.

  Apart from that, various singletons"

* tag 'mm-hotfixes-stable-2024-11-09-22-40' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
  mailmap: add entry for Thorsten Blum
  ocfs2: remove entry once instead of null-ptr-dereference in ocfs2_xa_remove()
  signal: restore the override_rlimit logic
  fs/proc: fix compile warning about variable 'vmcore_mmap_ops'
  ucounts: fix counter leak in inc_rlimit_get_ucounts()
  selftests: hugetlb_dio: check for initial conditions to skip in the start
  mm: fix docs for the kernel parameter ``thp_anon=``
  mm/damon/core: avoid overflow in damon_feed_loop_next_input()
  mm/damon/core: handle zero schemes apply interval
  mm/damon/core: handle zero {aggregation,ops_update} intervals
  mm/mlock: set the correct prev on failure
  objpool: fix to make percpu slot allocation more robust
  mm/page_alloc: keep track of free highatomic
  mm: resolve faulty mmap_region() error path behaviour
  mm: refactor arch_calc_vm_flag_bits() and arm64 MTE handling
  mm: refactor map_deny_write_exec()
  mm: unconditionally close VMAs on error
  mm: avoid unsafe VMA hook invocation when error arises on mmap hook
  mm/thp: fix deferred split unqueue naming and locking
  mm/thp: fix deferred split queue not partially_mapped
parents a558cc34 c289f4de

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -665,6 +665,7 @@ Tomeu Vizoso <tomeu@tomeuvizoso.net> <tomeu.vizoso@collabora.com> 
Thomas Graf <tgraf@suug.ch>

Thomas Körper <socketcan@esd.eu> <thomas.koerper@esd.eu>

Thomas Pedersen <twp@codeaurora.org>

Thorsten Blum <thorsten.blum@linux.dev> <thorsten.blum@toblux.com>

Tiezhu Yang <yangtiezhu@loongson.cn> <kernelpatch@126.com>

Tingwei Zhang <quic_tingwei@quicinc.com> <tingwei@codeaurora.org>

Tirupathi Reddy <quic_tirupath@quicinc.com> <tirupath@codeaurora.org>

Documentation/admin-guide/kernel-parameters.txt

+1 −1
Original line number Diff line number Diff line
@@ -6688,7 +6688,7 @@ 
			0: no polling (default)



	thp_anon=	[KNL]

			Format: <size>,<size>[KMG]:<state>;<size>-<size>[KMG]:<state>

			Format: <size>[KMG],<size>[KMG]:<state>;<size>[KMG]-<size>[KMG]:<state>

			state is one of "always", "madvise", "never" or "inherit".

			Control the default behavior of the system with respect

			to anonymous transparent hugepages.

Documentation/admin-guide/mm/transhuge.rst

+1 −1
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ control by passing the parameter ``transparent_hugepage=always`` or 
kernel command line.



Alternatively, each supported anonymous THP size can be controlled by

passing ``thp_anon=<size>,<size>[KMG]:<state>;<size>-<size>[KMG]:<state>``,

passing ``thp_anon=<size>[KMG],<size>[KMG]:<state>;<size>[KMG]-<size>[KMG]:<state>``,

where ``<size>`` is the THP size (must be a power of 2 of PAGE_SIZE and

supported anonymous THP)  and ``<state>`` is one of ``always``, ``madvise``,

``never`` or ``inherit``.

arch/arm64/include/asm/mman.h

+7 −3
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ 


#ifndef BUILD_VDSO

#include <linux/compiler.h>

#include <linux/fs.h>

#include <linux/shmem_fs.h>

#include <linux/types.h>



static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot,
@@ -31,19 +33,21 @@ static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot, 
}

#define arch_calc_vm_prot_bits(prot, pkey) arch_calc_vm_prot_bits(prot, pkey)



static inline unsigned long arch_calc_vm_flag_bits(unsigned long flags)

static inline unsigned long arch_calc_vm_flag_bits(struct file *file,

						   unsigned long flags)

{

	/*

	 * Only allow MTE on anonymous mappings as these are guaranteed to be

	 * backed by tags-capable memory. The vm_flags may be overridden by a

	 * filesystem supporting MTE (RAM-based).

	 */

	if (system_supports_mte() && (flags & MAP_ANONYMOUS))

	if (system_supports_mte() &&

	    ((flags & MAP_ANONYMOUS) || shmem_file(file)))

		return VM_MTE_ALLOWED;



	return 0;

}

#define arch_calc_vm_flag_bits(flags) arch_calc_vm_flag_bits(flags)

#define arch_calc_vm_flag_bits(file, flags) arch_calc_vm_flag_bits(file, flags)



static inline bool arch_validate_prot(unsigned long prot,

	unsigned long addr __always_unused)

arch/parisc/include/asm/mman.h

+3 −2
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#ifndef __ASM_MMAN_H__

#define __ASM_MMAN_H__



#include <linux/fs.h>

#include <uapi/asm/mman.h>



/* PARISC cannot allow mdwe as it needs writable stacks */
@@ -11,7 +12,7 @@ static inline bool arch_memory_deny_write_exec_supported(void) 
}

#define arch_memory_deny_write_exec_supported arch_memory_deny_write_exec_supported



static inline unsigned long arch_calc_vm_flag_bits(unsigned long flags)

static inline unsigned long arch_calc_vm_flag_bits(struct file *file, unsigned long flags)

{

	/*

	 * The stack on parisc grows upwards, so if userspace requests memory
@@ -23,6 +24,6 @@ static inline unsigned long arch_calc_vm_flag_bits(unsigned long flags) 


	return 0;

}

#define arch_calc_vm_flag_bits(flags) arch_calc_vm_flag_bits(flags)

#define arch_calc_vm_flag_bits(file, flags) arch_calc_vm_flag_bits(file, flags)



#endif /* __ASM_MMAN_H__ */