Merge tag 'mm-hotfixes-stable-2024-07-26-14-33' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Pull misc hotfixes from Andrew Morton: "11 hotfixes, 7 of which are cc:stable. 7 are MM, 4 are other" * tag 'mm-hotfixes-stable-2024-07-26-14-33' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm: nilfs2: handle inconsistent state in nilfs_btnode_create_block() selftests/mm: skip test for non-LPA2 and non-LVA systems mm/page_alloc: fix pcp->count race between drain_pages_zone() vs __rmqueue_pcplist() mm: memcg: add cacheline padding after lruvec in mem_cgroup_per_node alloc_tag: outline and export free_reserved_page() decompress_bunzip2: fix rare decompression failure mm/huge_memory: avoid PMD-size page cache if needed mm: huge_memory: use !CONFIG_64BIT to relax huge page alignment on 32 bit machines mm: fix old/young bit handling in the faulting path dt-bindings: arm: update James Clark's email address MAINTAINERS: mailmap: update James Clark's email address

Author: torvalds

.mailmap

@@ -260,6 +260,7 @@ Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk@motorola.com>
 Jakub Kicinski <kuba@kernel.org> <jakub.kicinski@netronome.com>
 James Bottomley <jejb@mulgrave.(none)>
 James Bottomley <jejb@titanic.il.steeleye.com>
+James Clark <james.clark@linaro.org> <james.clark@arm.com>
 James E Wilson <wilson@specifix.com>
 James Hogan <jhogan@kernel.org> <james@albanarts.com>
 James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>

Documentation/devicetree/bindings/arm/arm,coresight-dummy-sink.yaml

@@ -30,7 +30,7 @@ description: |
 maintainers:
  - Mike Leach <mike.leach@linaro.org>
  - Suzuki K Poulose <suzuki.poulose@arm.com>
- - James Clark <james.clark@arm.com>
+ - James Clark <james.clark@linaro.org>
  - Mao Jinlong <quic_jinlmao@quicinc.com>
  - Hao Zhang <quic_hazha@quicinc.com>
 

Documentation/devicetree/bindings/arm/arm,coresight-dummy-source.yaml

@@ -29,7 +29,7 @@ description: |
 maintainers:
  - Mike Leach <mike.leach@linaro.org>
  - Suzuki K Poulose <suzuki.poulose@arm.com>
- - James Clark <james.clark@arm.com>
+ - James Clark <james.clark@linaro.org>
  - Mao Jinlong <quic_jinlmao@quicinc.com>
  - Hao Zhang <quic_hazha@quicinc.com>
 

MAINTAINERS

@@ -2196,7 +2196,7 @@ N:	digicolor
 ARM/CORESIGHT FRAMEWORK AND DRIVERS
 M:	Suzuki K Poulose <suzuki.poulose@arm.com>
 R:	Mike Leach <mike.leach@linaro.org>
-R:	James Clark <james.clark@arm.com>
+R:	James Clark <james.clark@linaro.org>
 L:	coresight@lists.linaro.org (moderated for non-subscribers)
 L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:	Maintained
@@ -17894,7 +17894,7 @@ F:	tools/perf/
 PERFORMANCE EVENTS TOOLING ARM64
 R:	John Garry <john.g.garry@oracle.com>
 R:	Will Deacon <will@kernel.org>
-R:	James Clark <james.clark@arm.com>
+R:	James Clark <james.clark@linaro.org>
 R:	Mike Leach <mike.leach@linaro.org>
 R:	Leo Yan <leo.yan@linux.dev>
 L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

fs/nilfs2/btnode.c

@@ -51,12 +51,21 @@ nilfs_btnode_create_block(struct address_space *btnc, __u64 blocknr)
 
 bh = nilfs_grab_buffer(inode, btnc, blocknr, BIT(BH_NILFS_Node));
 if (unlikely(!bh))
-return NULL;
+return ERR_PTR(-ENOMEM);
 
 if (unlikely(buffer_mapped(bh) || buffer_uptodate(bh) ||
  buffer_dirty(bh))) {
-brelse(bh);
-BUG();
+/*
+ * The block buffer at the specified new address was already
+ * in use. This can happen if it is a virtual block number
+ * and has been reallocated due to corruption of the bitmap
+ * used to manage its allocation state (if not, the buffer
+ * clearing of an abandoned b-tree node is missing somewhere).
+ */
+nilfs_error(inode->i_sb,
+ "state inconsistency probably due to duplicate use of b-tree node block address %llu (ino=%lu)",
+ (unsigned long long)blocknr, inode->i_ino);
+goto failed;
 }
 memset(bh->b_data, 0, i_blocksize(inode));
 bh->b_bdev = inode->i_sb->s_bdev;
@@ -67,6 +76,12 @@ nilfs_btnode_create_block(struct address_space *btnc, __u64 blocknr)
 folio_unlock(bh->b_folio);
 folio_put(bh->b_folio);
 return bh;
+
+failed:
+folio_unlock(bh->b_folio);
+folio_put(bh->b_folio);
+brelse(bh);
+return ERR_PTR(-EIO);
 }
 
 int nilfs_btnode_submit_block(struct address_space *btnc, __u64 blocknr,
@@ -217,8 +232,8 @@ int nilfs_btnode_prepare_change_key(struct address_space *btnc,
 }
 
 nbh = nilfs_btnode_create_block(btnc, newkey);
-if (!nbh)
-return -ENOMEM;
+if (IS_ERR(nbh))
+return PTR_ERR(nbh);
 
 BUG_ON(nbh == obh);
 ctxt->newbh = nbh;

fs/nilfs2/btree.c

@@ -63,8 +63,8 @@ static int nilfs_btree_get_new_block(const struct nilfs_bmap *btree,
 struct buffer_head *bh;
 
 bh = nilfs_btnode_create_block(btnc, ptr);
-if (!bh)
-return -ENOMEM;
+if (IS_ERR(bh))
+return PTR_ERR(bh);
 
 set_buffer_nilfs_volatile(bh);
 *bhp = bh;

include/linux/huge_mm.h

@@ -74,14 +74,20 @@ extern struct kobj_attribute thpsize_shmem_enabled_attr;
 #define THP_ORDERS_ALL_ANON((BIT(PMD_ORDER + 1) - 1) & ~(BIT(0) | BIT(1)))
 
 /*
- * Mask of all large folio orders supported for file THP.
+ * Mask of all large folio orders supported for file THP. Folios in a DAX
+ * file is never split and the MAX_PAGECACHE_ORDER limit does not apply to
+ * it.
  */
-#define THP_ORDERS_ALL_FILE(BIT(PMD_ORDER) | BIT(PUD_ORDER))
+#define THP_ORDERS_ALL_FILE_DAX\
+(BIT(PMD_ORDER) | BIT(PUD_ORDER))
+#define THP_ORDERS_ALL_FILE_DEFAULT\
+((BIT(MAX_PAGECACHE_ORDER + 1) - 1) & ~BIT(0))
 
 /*
  * Mask of all large folio orders supported for THP.
  */
-#define THP_ORDERS_ALL(THP_ORDERS_ALL_ANON | THP_ORDERS_ALL_FILE)
+#define THP_ORDERS_ALL\
+(THP_ORDERS_ALL_ANON | THP_ORDERS_ALL_FILE_DAX | THP_ORDERS_ALL_FILE_DEFAULT)
 
 #define TVA_SMAPS(1 << 0)/* Will be used for procfs */
 #define TVA_IN_PF(1 << 1)/* Page fault handler */

include/linux/memcontrol.h

@@ -109,6 +109,7 @@ struct mem_cgroup_per_node {
 
 /* Fields which get updated often at the end. */
 struct lruveclruvec;
+CACHELINE_PADDING(_pad2_);
 unsigned longlru_zone_size[MAX_NR_ZONES][NR_LRU_LISTS];
 struct mem_cgroup_reclaim_iteriter;
 };

include/linux/mm.h

@@ -3137,21 +3137,7 @@ extern void reserve_bootmem_region(phys_addr_t start,
  phys_addr_t end, int nid);
 
 /* Free the reserved page into the buddy system, so it gets managed. */
-static inline void free_reserved_page(struct page *page)
-{
-if (mem_alloc_profiling_enabled()) {
-union codetag_ref *ref = get_page_tag_ref(page);
-
-if (ref) {
-set_codetag_empty(ref);
-put_page_tag_ref(ref);
-}
-}
-ClearPageReserved(page);
-init_page_count(page);
-__free_page(page);
-adjust_managed_page_count(page, 1);
-}
+void free_reserved_page(struct page *page);
 #define free_highmem_page(page) free_reserved_page(page)
 
 static inline void mark_page_reserved(struct page *page)

lib/decompress_bunzip2.c

@@ -232,7 +232,8 @@ static int INIT get_next_block(struct bunzip_data *bd)
  RUNB) */
 symCount = symTotal+2;
 for (j = 0; j < groupCount; j++) {
-unsigned char length[MAX_SYMBOLS], temp[MAX_HUFCODE_BITS+1];
+unsigned char length[MAX_SYMBOLS];
+unsigned short temp[MAX_HUFCODE_BITS+1];
 intminLen,maxLen, pp;
 /* Read Huffman code lengths for each symbol. They're
  stored in a way similar to mtf; record a starting