Commit 8ba90f5c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mm-hotfixes-stable-2023-06-20-12-31' of... 

Merge tag 'mm-hotfixes-stable-2023-06-20-12-31' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Pull hotfixes from Andrew Morton:
 "19 hotfixes.  8 of these are cc:stable.

  This includes a wholesale reversion of the post-6.4 series 'make slab
  shrink lockless'. After input from Dave Chinner it has been decided
  that we should go a different way [1]"

Link: https://lkml.kernel.org/r/ZH6K0McWBeCjaf16@dread.disaster.area [1]

* tag 'mm-hotfixes-stable-2023-06-20-12-31' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
  selftests/mm: fix cross compilation with LLVM
  mailmap: add entries for Ben Dooks
  nilfs2: prevent general protection fault in nilfs_clear_dirty_page()
  Revert "mm: vmscan: make global slab shrink lockless"
  Revert "mm: vmscan: make memcg slab shrink lockless"
  Revert "mm: vmscan: add shrinker_srcu_generation"
  Revert "mm: shrinkers: make count and scan in shrinker debugfs lockless"
  Revert "mm: vmscan: hold write lock to reparent shrinker nr_deferred"
  Revert "mm: vmscan: remove shrinker_rwsem from synchronize_shrinkers()"
  Revert "mm: shrinkers: convert shrinker_rwsem to mutex"
  nilfs2: fix buffer corruption due to concurrent device reads
  scripts/gdb: fix SB_* constants parsing
  scripts: fix the gfp flags header path in gfp-translate
  udmabuf: revert 'Add support for mapping hugepages (v4)'
  mm/khugepaged: fix iteration in collapse_file
  memfd: check for non-NULL file_seals in memfd_create() syscall
  mm/vmalloc: do not output a spurious warning when huge vmalloc() fails
  mm/mprotect: fix do_mprotect_pkey() limit check
  writeback: fix dereferencing NULL mapping->host on writeback_page_template
parents e660abd5 0518dbe9

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -70,6 +70,8 @@ Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang@unisoc.com> 
Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang7@gmail.com>

Bart Van Assche <bvanassche@acm.org> <bart.vanassche@sandisk.com>

Bart Van Assche <bvanassche@acm.org> <bart.vanassche@wdc.com>

Ben Dooks <ben-linux@fluff.org> <ben.dooks@simtec.co.uk>

Ben Dooks <ben-linux@fluff.org> <ben.dooks@sifive.com>

Ben Gardner <bgardner@wabtec.com>

Ben M Cahill <ben.m.cahill@intel.com>

Ben Widawsky <bwidawsk@kernel.org> <ben@bwidawsk.net>

drivers/dma-buf/udmabuf.c

+6 −41
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
#include <linux/shmem_fs.h>

#include <linux/slab.h>

#include <linux/udmabuf.h>

#include <linux/hugetlb.h>

#include <linux/vmalloc.h>

#include <linux/iosys-map.h>
@@ -207,9 +206,7 @@ static long udmabuf_create(struct miscdevice *device, 
	struct udmabuf *ubuf;

	struct dma_buf *buf;

	pgoff_t pgoff, pgcnt, pgidx, pgbuf = 0, pglimit;

	struct page *page, *hpage = NULL;

	pgoff_t subpgoff, maxsubpgs;

	struct hstate *hpstate;

	struct page *page;

	int seals, ret = -EINVAL;

	u32 i, flags;
@@ -245,7 +242,7 @@ static long udmabuf_create(struct miscdevice *device, 
		if (!memfd)

			goto err;

		mapping = memfd->f_mapping;

		if (!shmem_mapping(mapping) && !is_file_hugepages(memfd))

		if (!shmem_mapping(mapping))

			goto err;

		seals = memfd_fcntl(memfd, F_GET_SEALS, 0);

		if (seals == -EINVAL)
@@ -256,48 +253,16 @@ static long udmabuf_create(struct miscdevice *device, 
			goto err;

		pgoff = list[i].offset >> PAGE_SHIFT;

		pgcnt = list[i].size   >> PAGE_SHIFT;

		if (is_file_hugepages(memfd)) {

			hpstate = hstate_file(memfd);

			pgoff = list[i].offset >> huge_page_shift(hpstate);

			subpgoff = (list[i].offset &

				    ~huge_page_mask(hpstate)) >> PAGE_SHIFT;

			maxsubpgs = huge_page_size(hpstate) >> PAGE_SHIFT;

		}

		for (pgidx = 0; pgidx < pgcnt; pgidx++) {

			if (is_file_hugepages(memfd)) {

				if (!hpage) {

					hpage = find_get_page_flags(mapping, pgoff,

								    FGP_ACCESSED);

					if (!hpage) {

						ret = -EINVAL;

						goto err;

					}

				}

				page = hpage + subpgoff;

				get_page(page);

				subpgoff++;

				if (subpgoff == maxsubpgs) {

					put_page(hpage);

					hpage = NULL;

					subpgoff = 0;

					pgoff++;

				}

			} else {

				page = shmem_read_mapping_page(mapping,

							       pgoff + pgidx);

			page = shmem_read_mapping_page(mapping, pgoff + pgidx);

			if (IS_ERR(page)) {

				ret = PTR_ERR(page);

				goto err;

			}

			}

			ubuf->pages[pgbuf++] = page;

		}

		fput(memfd);

		memfd = NULL;

		if (hpage) {

			put_page(hpage);

			hpage = NULL;

		}

	}



	exp_info.ops  = &udmabuf_ops;

drivers/md/dm-cache-metadata.c

+1 −1
Original line number Diff line number Diff line
@@ -1828,7 +1828,7 @@ int dm_cache_metadata_abort(struct dm_cache_metadata *cmd) 
	 * Replacement block manager (new_bm) is created and old_bm destroyed outside of

	 * cmd root_lock to avoid ABBA deadlock that would result (due to life-cycle of

	 * shrinker associated with the block manager's bufio client vs cmd root_lock).

	 * - must take shrinker_mutex without holding cmd->root_lock

	 * - must take shrinker_rwsem without holding cmd->root_lock

	 */

	new_bm = dm_block_manager_create(cmd->bdev, DM_CACHE_METADATA_BLOCK_SIZE << SECTOR_SHIFT,

					 CACHE_MAX_CONCURRENT_LOCKS);

drivers/md/dm-thin-metadata.c

+1 −1
Original line number Diff line number Diff line
@@ -1891,7 +1891,7 @@ int dm_pool_abort_metadata(struct dm_pool_metadata *pmd) 
	 * Replacement block manager (new_bm) is created and old_bm destroyed outside of

	 * pmd root_lock to avoid ABBA deadlock that would result (due to life-cycle of

	 * shrinker associated with the block manager's bufio client vs pmd root_lock).

	 * - must take shrinker_mutex without holding pmd->root_lock

	 * - must take shrinker_rwsem without holding pmd->root_lock

	 */

	new_bm = dm_block_manager_create(pmd->bdev, THIN_METADATA_BLOCK_SIZE << SECTOR_SHIFT,

					 THIN_MAX_CONCURRENT_LOCKS);

fs/nilfs2/page.c

+9 −1
Original line number Diff line number Diff line
@@ -370,7 +370,15 @@ void nilfs_clear_dirty_pages(struct address_space *mapping, bool silent) 
			struct folio *folio = fbatch.folios[i];



			folio_lock(folio);



			/*

			 * This folio may have been removed from the address

			 * space by truncation or invalidation when the lock

			 * was acquired.  Skip processing in that case.

			 */

			if (likely(folio->mapping == mapping))

				nilfs_clear_dirty_page(&folio->page, silent);



			folio_unlock(folio);

		}

		folio_batch_release(&fbatch);