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

Merge tag 'mm-hotfixes-stable-2024-09-27-09-45' of... 

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

Pull  misc fixes from Andrew Morton:
 "19 hotfixes.  13 are cc:stable.

  There's a focus on fixes for the memfd_pin_folios() work which was
  added into 6.11. Apart from that, the usual shower of singleton fixes"

* tag 'mm-hotfixes-stable-2024-09-27-09-45' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
  ocfs2: fix uninit-value in ocfs2_get_block()
  zram: don't free statically defined names
  memory tiers: use default_dram_perf_ref_source in log message
  Revert "list: test: fix tests for list_cut_position()"
  kselftests: mm: fix wrong __NR_userfaultfd value
  compiler.h: specify correct attribute for .rodata..c_jump_table
  mm/damon/Kconfig: update DAMON doc URL
  mm: kfence: fix elapsed time for allocated/freed track
  ocfs2: fix deadlock in ocfs2_get_system_file_inode
  ocfs2: reserve space for inline xattr before attaching reflink tree
  mm: migrate: annotate data-race in migrate_folio_unmap()
  mm/hugetlb: simplify refs in memfd_alloc_folio
  mm/gup: fix memfd_pin_folios alloc race panic
  mm/gup: fix memfd_pin_folios hugetlb page allocation
  mm/hugetlb: fix memfd_pin_folios resv_huge_pages leak
  mm/hugetlb: fix memfd_pin_folios free_huge_pages leak
  mm/filemap: fix filemap_get_folios_contig THP panic
  mm: make SPLIT_PTE_PTLOCKS depend on SMP
  tools: fix shared radix-tree build
parents 36304006 2af148ef

drivers/block/zram/zram_drv.c

+4 −2
Original line number Diff line number Diff line
@@ -2115,7 +2115,9 @@ static void zram_destroy_comps(struct zram *zram) 
		zram->num_active_comps--;

	}



	for (prio = ZRAM_SECONDARY_COMP; prio < ZRAM_MAX_COMPS; prio++) {

	for (prio = ZRAM_PRIMARY_COMP; prio < ZRAM_MAX_COMPS; prio++) {

		/* Do not free statically defined compression algorithms */

		if (zram->comp_algs[prio] != default_compressor)

			kfree(zram->comp_algs[prio]);

		zram->comp_algs[prio] = NULL;

	}

fs/ocfs2/aops.c

+2 −3
Original line number Diff line number Diff line
@@ -156,9 +156,8 @@ int ocfs2_get_block(struct inode *inode, sector_t iblock, 
	err = ocfs2_extent_map_get_blocks(inode, iblock, &p_blkno, &count,

					  &ext_flags);

	if (err) {

		mlog(ML_ERROR, "Error %d from get_blocks(0x%p, %llu, 1, "

		     "%llu, NULL)\n", err, inode, (unsigned long long)iblock,

		     (unsigned long long)p_blkno);

		mlog(ML_ERROR, "get_blocks() failed, inode: 0x%p, "

		     "block: %llu\n", inode, (unsigned long long)iblock);

		goto bail;

	}

fs/ocfs2/extent_map.c

+7 −1
Original line number Diff line number Diff line
@@ -973,7 +973,13 @@ int ocfs2_read_virt_blocks(struct inode *inode, u64 v_block, int nr, 
	}



	while (done < nr) {

		down_read(&OCFS2_I(inode)->ip_alloc_sem);

		if (!down_read_trylock(&OCFS2_I(inode)->ip_alloc_sem)) {

			rc = -EAGAIN;

			mlog(ML_ERROR,

				 "Inode #%llu ip_alloc_sem is temporarily unavailable\n",

				 (unsigned long long)OCFS2_I(inode)->ip_blkno);

			break;

		}

		rc = ocfs2_extent_map_get_blocks(inode, v_block + done,

						 &p_block, &p_count, NULL);

		up_read(&OCFS2_I(inode)->ip_alloc_sem);

fs/ocfs2/refcounttree.c

+24 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include "namei.h"

#include "ocfs2_trace.h"

#include "file.h"

#include "symlink.h"



#include <linux/bio.h>

#include <linux/blkdev.h>
@@ -4148,8 +4149,9 @@ static int __ocfs2_reflink(struct dentry *old_dentry, 
	int ret;

	struct inode *inode = d_inode(old_dentry);

	struct buffer_head *new_bh = NULL;

	struct ocfs2_inode_info *oi = OCFS2_I(inode);



	if (OCFS2_I(inode)->ip_flags & OCFS2_INODE_SYSTEM_FILE) {

	if (oi->ip_flags & OCFS2_INODE_SYSTEM_FILE) {

		ret = -EINVAL;

		mlog_errno(ret);

		goto out;
@@ -4175,6 +4177,26 @@ static int __ocfs2_reflink(struct dentry *old_dentry, 
		goto out_unlock;

	}



	if ((oi->ip_dyn_features & OCFS2_HAS_XATTR_FL) &&

	    (oi->ip_dyn_features & OCFS2_INLINE_XATTR_FL)) {

		/*

		 * Adjust extent record count to reserve space for extended attribute.

		 * Inline data count had been adjusted in ocfs2_duplicate_inline_data().

		 */

		struct ocfs2_inode_info *new_oi = OCFS2_I(new_inode);



		if (!(new_oi->ip_dyn_features & OCFS2_INLINE_DATA_FL) &&

		    !(ocfs2_inode_is_fast_symlink(new_inode))) {

			struct ocfs2_dinode *new_di = (struct ocfs2_dinode *)new_bh->b_data;

			struct ocfs2_dinode *old_di = (struct ocfs2_dinode *)old_bh->b_data;

			struct ocfs2_extent_list *el = &new_di->id2.i_list;

			int inline_size = le16_to_cpu(old_di->i_xattr_inline_size);



			le16_add_cpu(&el->l_count, -(inline_size /

					sizeof(struct ocfs2_extent_rec)));

		}

	}



	ret = ocfs2_create_reflink_node(inode, old_bh,

					new_inode, new_bh, preserve);

	if (ret) {
@@ -4182,7 +4204,7 @@ static int __ocfs2_reflink(struct dentry *old_dentry, 
		goto inode_unlock;

	}



	if (OCFS2_I(inode)->ip_dyn_features & OCFS2_HAS_XATTR_FL) {

	if (oi->ip_dyn_features & OCFS2_HAS_XATTR_FL) {

		ret = ocfs2_reflink_xattrs(inode, old_bh,

					   new_inode, new_bh,

					   preserve);

fs/ocfs2/xattr.c

+1 −10
Original line number Diff line number Diff line
@@ -6511,16 +6511,7 @@ static int ocfs2_reflink_xattr_inline(struct ocfs2_xattr_reflink *args) 
	}



	new_oi = OCFS2_I(args->new_inode);

	/*

	 * Adjust extent record count to reserve space for extended attribute.

	 * Inline data count had been adjusted in ocfs2_duplicate_inline_data().

	 */

	if (!(new_oi->ip_dyn_features & OCFS2_INLINE_DATA_FL) &&

	    !(ocfs2_inode_is_fast_symlink(args->new_inode))) {

		struct ocfs2_extent_list *el = &new_di->id2.i_list;

		le16_add_cpu(&el->l_count, -(inline_size /

					sizeof(struct ocfs2_extent_rec)));

	}



	spin_lock(&new_oi->ip_lock);

	new_oi->ip_dyn_features |= OCFS2_HAS_XATTR_FL | OCFS2_INLINE_XATTR_FL;

	new_di->i_dyn_features = cpu_to_le16(new_oi->ip_dyn_features);