Commit ad26fc09 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mm-hotfixes-stable-2025-01-16-21-11' of... 

Merge tag 'mm-hotfixes-stable-2025-01-16-21-11' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Pull misc fixes from Andrew Morton:
 "7 singleton hotfixes.  6 are MM.

  Two are cc:stable and the remainder address post-6.12 issues"

* tag 'mm-hotfixes-stable-2025-01-16-21-11' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
  ocfs2: check dir i_size in ocfs2_find_entry
  mailmap: update entry for Ethan Carter Edwards
  mm: zswap: move allocations during CPU init outside the lock
  mm: khugepaged: fix call hpage_collapse_scan_file() for anonymous vma
  mm: shmem: use signed int for version handling in casefold option
  alloc_tag: skip pgalloc_tag_swap if profiling is disabled
  mm: page_alloc: fix missed updates of lowmem_reserve in adjust_managed_page_count
parents 9ca27296 b0fce54b

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ Elliot Berman <quic_eberman@quicinc.com> <eberman@codeaurora.org> 
Enric Balletbo i Serra <eballetbo@kernel.org> <enric.balletbo@collabora.com>

Enric Balletbo i Serra <eballetbo@kernel.org> <eballetbo@iseebcn.com>

Erik Kaneda <erik.kaneda@intel.com> <erik.schmauss@intel.com>

Ethan Carter Edwards <ethan@ethancedwards.com> Ethan Edwards <ethancarteredwards@gmail.com>

Eugen Hristev <eugen.hristev@linaro.org> <eugen.hristev@microchip.com>

Eugen Hristev <eugen.hristev@linaro.org> <eugen.hristev@collabora.com>

Evgeniy Polyakov <johnpol@2ka.mipt.ru>

fs/ocfs2/dir.c

+21 −4
Original line number Diff line number Diff line
@@ -1065,26 +1065,39 @@ int ocfs2_find_entry(const char *name, int namelen, 
{

	struct buffer_head *bh;

	struct ocfs2_dir_entry *res_dir = NULL;

	int ret = 0;



	if (ocfs2_dir_indexed(dir))

		return ocfs2_find_entry_dx(name, namelen, dir, lookup);



	if (unlikely(i_size_read(dir) <= 0)) {

		ret = -EFSCORRUPTED;

		mlog_errno(ret);

		goto out;

	}

	/*

	 * The unindexed dir code only uses part of the lookup

	 * structure, so there's no reason to push it down further

	 * than this.

	 */

	if (OCFS2_I(dir)->ip_dyn_features & OCFS2_INLINE_DATA_FL)

	if (OCFS2_I(dir)->ip_dyn_features & OCFS2_INLINE_DATA_FL) {

		if (unlikely(i_size_read(dir) > dir->i_sb->s_blocksize)) {

			ret = -EFSCORRUPTED;

			mlog_errno(ret);

			goto out;

		}

		bh = ocfs2_find_entry_id(name, namelen, dir, &res_dir);

	else

	} else {

		bh = ocfs2_find_entry_el(name, namelen, dir, &res_dir);

	}



	if (bh == NULL)

		return -ENOENT;



	lookup->dl_leaf_bh = bh;

	lookup->dl_entry = res_dir;

	return 0;

out:

	return ret;

}



/*
@@ -2010,6 +2023,7 @@ int ocfs2_lookup_ino_from_name(struct inode *dir, const char *name, 
 *

 * Return 0 if the name does not exist

 * Return -EEXIST if the directory contains the name

 * Return -EFSCORRUPTED if found corruption

 *

 * Callers should have i_rwsem + a cluster lock on dir

 */
@@ -2023,9 +2037,12 @@ int ocfs2_check_dir_for_entry(struct inode *dir, 
	trace_ocfs2_check_dir_for_entry(

		(unsigned long long)OCFS2_I(dir)->ip_blkno, namelen, name);



	if (ocfs2_find_entry(name, namelen, dir, &lookup) == 0) {

	ret = ocfs2_find_entry(name, namelen, dir, &lookup);

	if (ret == 0) {

		ret = -EEXIST;

		mlog_errno(ret);

	} else if (ret == -ENOENT) {

		ret = 0;

	}



	ocfs2_free_dir_lookup_result(&lookup);

lib/alloc_tag.c

+3 −0
Original line number Diff line number Diff line
@@ -195,6 +195,9 @@ void pgalloc_tag_swap(struct folio *new, struct folio *old) 
	union codetag_ref ref_old, ref_new;

	struct alloc_tag *tag_old, *tag_new;



	if (!mem_alloc_profiling_enabled())

		return;



	tag_old = pgalloc_tag_get(&old->page);

	if (!tag_old)

		return;

mm/khugepaged.c

+2 −2
Original line number Diff line number Diff line
@@ -2422,7 +2422,7 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages, int *result, 
			VM_BUG_ON(khugepaged_scan.address < hstart ||

				  khugepaged_scan.address + HPAGE_PMD_SIZE >

				  hend);

			if (IS_ENABLED(CONFIG_SHMEM) && vma->vm_file) {

			if (IS_ENABLED(CONFIG_SHMEM) && !vma_is_anonymous(vma)) {

				struct file *file = get_file(vma->vm_file);

				pgoff_t pgoff = linear_page_index(vma,

						khugepaged_scan.address);
@@ -2768,7 +2768,7 @@ int madvise_collapse(struct vm_area_struct *vma, struct vm_area_struct **prev, 
		mmap_assert_locked(mm);

		memset(cc->node_load, 0, sizeof(cc->node_load));

		nodes_clear(cc->alloc_nmask);

		if (IS_ENABLED(CONFIG_SHMEM) && vma->vm_file) {

		if (IS_ENABLED(CONFIG_SHMEM) && !vma_is_anonymous(vma)) {

			struct file *file = get_file(vma->vm_file);

			pgoff_t pgoff = linear_page_index(vma, addr);

mm/page_alloc.c

+3 −0
Original line number Diff line number Diff line
@@ -5692,10 +5692,13 @@ __meminit void zone_pcp_init(struct zone *zone) 
			 zone->present_pages, zone_batchsize(zone));

}



static void setup_per_zone_lowmem_reserve(void);



void adjust_managed_page_count(struct page *page, long count)

{

	atomic_long_add(count, &page_zone(page)->managed_pages);

	totalram_pages_add(count);

	setup_per_zone_lowmem_reserve();

}

EXPORT_SYMBOL(adjust_managed_page_count);