Commit 7521f258 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mm-hotfixes-stable-2024-02-10-11-16' of... 

Merge tag 'mm-hotfixes-stable-2024-02-10-11-16' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Pull misc fixes from Andrew Morton:
 "21 hotfixes. 12 are cc:stable and the remainder pertain to post-6.7
  issues or aren't considered to be needed in earlier kernel versions"

* tag 'mm-hotfixes-stable-2024-02-10-11-16' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm: (21 commits)
  nilfs2: fix potential bug in end_buffer_async_write
  mm/damon/sysfs-schemes: fix wrong DAMOS tried regions update timeout setup
  nilfs2: fix hang in nilfs_lookup_dirty_data_buffers()
  MAINTAINERS: Leo Yan has moved
  mm/zswap: don't return LRU_SKIP if we have dropped lru lock
  fs,hugetlb: fix NULL pointer dereference in hugetlbs_fill_super
  mailmap: switch email address for John Moon
  mm: zswap: fix objcg use-after-free in entry destruction
  mm/madvise: don't forget to leave lazy MMU mode in madvise_cold_or_pageout_pte_range()
  arch/arm/mm: fix major fault accounting when retrying under per-VMA lock
  selftests: core: include linux/close_range.h for CLOSE_RANGE_* macros
  mm/memory-failure: fix crash in split_huge_page_to_list from soft_offline_page
  mm: memcg: optimize parent iteration in memcg_rstat_updated()
  nilfs2: fix data corruption in dsync block recovery for small block sizes
  mm/userfaultfd: UFFDIO_MOVE implementation should use ptep_get()
  exit: wait_task_zombie: kill the no longer necessary spin_lock_irq(siglock)
  fs/proc: do_task_stat: use sig->stats_lock to gather the threads/children stats
  fs/proc: do_task_stat: move thread_group_cputime_adjusted() outside of lock_task_sighand()
  getrusage: use sig->stats_lock rather than lock_task_sighand()
  getrusage: move thread_group_cputime_adjusted() outside of lock_task_sighand()
  ...
parents a5b6244c 5bc09b39

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -289,6 +289,7 @@ Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com> 
John Crispin <john@phrozen.org> <blogic@openwrt.org>

John Fastabend <john.fastabend@gmail.com> <john.r.fastabend@intel.com>

John Keeping <john@keeping.me.uk> <john@metanate.com>

John Moon <john@jmoon.dev> <quic_johmoo@quicinc.com>

John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>

John Stultz <johnstul@us.ibm.com>

<jon.toppins+linux@gmail.com> <jtoppins@cumulusnetworks.com>
@@ -344,6 +345,7 @@ Leonid I Ananiev <leonid.i.ananiev@intel.com> 
Leon Romanovsky <leon@kernel.org> <leon@leon.nu>

Leon Romanovsky <leon@kernel.org> <leonro@mellanox.com>

Leon Romanovsky <leon@kernel.org> <leonro@nvidia.com>

Leo Yan <leo.yan@linux.dev> <leo.yan@linaro.org>

Liam Mark <quic_lmark@quicinc.com> <lmark@codeaurora.org>

Linas Vepstas <linas@austin.ibm.com>

Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -17182,7 +17182,7 @@ R: John Garry <john.g.garry@oracle.com> 
R:	Will Deacon <will@kernel.org>

R:	James Clark <james.clark@arm.com>

R:	Mike Leach <mike.leach@linaro.org>

R:	Leo Yan <leo.yan@linaro.org>

R:	Leo Yan <leo.yan@linux.dev>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Supported

F:	tools/build/feature/test-libopencsd.c

arch/arm/mm/fault.c

+2 −0
Original line number Diff line number Diff line
@@ -298,6 +298,8 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs) 
		goto done;

	}

	count_vm_vma_lock_event(VMA_LOCK_RETRY);

	if (fault & VM_FAULT_MAJOR)

		flags |= FAULT_FLAG_TRIED;



	/* Quick path to respond to signals */

	if (fault_signal_pending(fault, regs)) {

fs/hugetlbfs/inode.c

+16 −3
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ static int hugetlbfs_file_mmap(struct file *file, struct vm_area_struct *vma) 
	loff_t len, vma_len;

	int ret;

	struct hstate *h = hstate_file(file);

	vm_flags_t vm_flags;



	/*

	 * vma address alignment (but not the pgoff alignment) has
@@ -141,10 +142,20 @@ static int hugetlbfs_file_mmap(struct file *file, struct vm_area_struct *vma) 
	file_accessed(file);



	ret = -ENOMEM;



	vm_flags = vma->vm_flags;

	/*

	 * for SHM_HUGETLB, the pages are reserved in the shmget() call so skip

	 * reserving here. Note: only for SHM hugetlbfs file, the inode

	 * flag S_PRIVATE is set.

	 */

	if (inode->i_flags & S_PRIVATE)

		vm_flags |= VM_NORESERVE;



	if (!hugetlb_reserve_pages(inode,

				vma->vm_pgoff >> huge_page_order(h),

				len >> huge_page_shift(h), vma,

				vma->vm_flags))

				vm_flags))

		goto out;



	ret = 0;
@@ -1354,6 +1365,7 @@ static int hugetlbfs_parse_param(struct fs_context *fc, struct fs_parameter *par 
{

	struct hugetlbfs_fs_context *ctx = fc->fs_private;

	struct fs_parse_result result;

	struct hstate *h;

	char *rest;

	unsigned long ps;

	int opt;
@@ -1398,11 +1410,12 @@ static int hugetlbfs_parse_param(struct fs_context *fc, struct fs_parameter *par 


	case Opt_pagesize:

		ps = memparse(param->string, &rest);

		ctx->hstate = size_to_hstate(ps);

		if (!ctx->hstate) {

		h = size_to_hstate(ps);

		if (!h) {

			pr_err("Unsupported page size %lu MB\n", ps / SZ_1M);

			return -EINVAL;

		}

		ctx->hstate = h;

		return 0;



	case Opt_min_size:

fs/nilfs2/file.c

+7 −1
Original line number Diff line number Diff line
@@ -107,7 +107,13 @@ static vm_fault_t nilfs_page_mkwrite(struct vm_fault *vmf) 
	nilfs_transaction_commit(inode->i_sb);



 mapped:

	folio_wait_stable(folio);

	/*

	 * Since checksumming including data blocks is performed to determine

	 * the validity of the log to be written and used for recovery, it is

	 * necessary to wait for writeback to finish here, regardless of the

	 * stable write requirement of the backing device.

	 */

	folio_wait_writeback(folio);

 out:

	sb_end_pagefault(inode->i_sb);

	return vmf_fs_error(ret);