Commit 3c5c9b7c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mm-hotfixes-stable-2023-09-05-11-51' of... 

Merge tag 'mm-hotfixes-stable-2023-09-05-11-51' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Pull misc fixes from Andrew Morton:
 "Seven hotfixes. Four are cc:stable and the remainder pertain to issues
  which were introduced in the current merge window"

* tag 'mm-hotfixes-stable-2023-09-05-11-51' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
  sparc64: add missing initialization of folio in tlb_batch_add()
  mm: memory-failure: use rcu lock instead of tasklist_lock when collect_procs()
  revert "memfd: improve userspace warnings for missing exec-related flags".
  rcu: dump vmalloc memory info safely
  mm/vmalloc: add a safer version of find_vm_area() for debug
  tools/mm: fix undefined reference to pthread_once
  memcontrol: ensure memcg acquired by id is properly set up
parents 6155a3b8 f4b4f3ec

arch/sparc/mm/tlb.c

+1 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ void tlb_batch_add(struct mm_struct *mm, unsigned long vaddr, 
			goto no_cache_flush;



		/* A real file page? */

		folio = page_folio(page);

		mapping = folio_flush_mapping(folio);

		if (!mapping)

			goto no_cache_flush;

mm/filemap.c

+0 −3
Original line number Diff line number Diff line
@@ -121,9 +121,6 @@ 
 *    bdi.wb->list_lock		(zap_pte_range->set_page_dirty)

 *    ->inode->i_lock		(zap_pte_range->set_page_dirty)

 *    ->private_lock		(zap_pte_range->block_dirty_folio)

 *

 * ->i_mmap_rwsem

 *   ->tasklist_lock            (memory_failure, collect_procs_ao)

 */



static void page_cache_delete(struct address_space *mapping,

mm/ksm.c

+2 −2
Original line number Diff line number Diff line
@@ -2925,7 +2925,7 @@ void collect_procs_ksm(struct page *page, struct list_head *to_kill, 
		struct anon_vma *av = rmap_item->anon_vma;



		anon_vma_lock_read(av);

		read_lock(&tasklist_lock);

		rcu_read_lock();

		for_each_process(tsk) {

			struct anon_vma_chain *vmac;

			unsigned long addr;
@@ -2944,7 +2944,7 @@ void collect_procs_ksm(struct page *page, struct list_head *to_kill, 
				}

			}

		}

		read_unlock(&tasklist_lock);

		rcu_read_unlock();

		anon_vma_unlock_read(av);

	}

}

mm/memcontrol.c

+17 −5
Original line number Diff line number Diff line
@@ -5326,7 +5326,6 @@ static struct mem_cgroup *mem_cgroup_alloc(void) 
	INIT_LIST_HEAD(&memcg->deferred_split_queue.split_queue);

	memcg->deferred_split_queue.split_queue_len = 0;

#endif

	idr_replace(&mem_cgroup_idr, memcg, memcg->id.id);

	lru_gen_init_memcg(memcg);

	return memcg;

fail:
@@ -5398,14 +5397,27 @@ static int mem_cgroup_css_online(struct cgroup_subsys_state *css) 
	if (alloc_shrinker_info(memcg))

		goto offline_kmem;



	/* Online state pins memcg ID, memcg ID pins CSS */

	refcount_set(&memcg->id.ref, 1);

	css_get(css);



	if (unlikely(mem_cgroup_is_root(memcg)))

		queue_delayed_work(system_unbound_wq, &stats_flush_dwork,

				   FLUSH_TIME);

	lru_gen_online_memcg(memcg);



	/* Online state pins memcg ID, memcg ID pins CSS */

	refcount_set(&memcg->id.ref, 1);

	css_get(css);



	/*

	 * Ensure mem_cgroup_from_id() works once we're fully online.

	 *

	 * We could do this earlier and require callers to filter with

	 * css_tryget_online(). But right now there are no users that

	 * need earlier access, and the workingset code relies on the

	 * cgroup tree linkage (mem_cgroup_get_nr_swap_pages()). So

	 * publish it here at the end of onlining. This matches the

	 * regular ID destruction during offlining.

	 */

	idr_replace(&mem_cgroup_idr, memcg, memcg->id.id);



	return 0;

offline_kmem:

	memcg_offline_kmem(memcg);

mm/memfd.c

+1 −1
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ SYSCALL_DEFINE2(memfd_create, 
		return -EINVAL;



	if (!(flags & (MFD_EXEC | MFD_NOEXEC_SEAL))) {

		pr_info_ratelimited(

		pr_warn_once(

			"%s[%d]: memfd_create() called without MFD_EXEC or MFD_NOEXEC_SEAL set\n",

			current->comm, task_pid_nr(current));

	}