Skip to content

Commit 6fea5fa

Browse files
torvaldstorvalds
committed
Merge tag 'mm-hotfixes-stable-2025-04-19-21-24' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Pull misc hotfixes from Andrew Morton: "16 hotfixes. 2 are cc:stable and the remainder address post-6.14 issues or aren't considered necessary for -stable kernels. All patches are basically for MM although five are alterations to MAINTAINERS" [ Basic counting skills are clearly not a strictly necessary requirement for kernel maintainers. - Linus ] * tag 'mm-hotfixes-stable-2025-04-19-21-24' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm: MAINTAINERS: add section for locking of mm's and VMAs mm: vmscan: fix kswapd exit condition in defrag_mode mm: vmscan: restore high-cpu watermark safety in kswapd MAINTAINERS: add Pedro as reviewer to the MEMORY MAPPING section mm/memory: move sanity checks in do_wp_page() after mapcount vs. refcount stabilization mm, hugetlb: increment the number of pages to be reset on HVO writeback: fix false warning in inode_to_wb() docs: ABI: replace mcroce@microsoft.com with new Meta address mm/gup: fix wrongly calculated returned value in fault_in_safe_writeable() MAINTAINERS: add memory advice section MAINTAINERS: add mmap trace events to MEMORY MAPPING mm: memcontrol: fix swap counter leak from offline cgroup MAINTAINERS: add MM subsection for the page allocator MAINTAINERS: update SLAB ALLOCATOR maintainers fs/dax: fix folio splitting issue by resetting old folio order + _nr_pages mm/page_alloc: fix deadlock on cpu_hotplug_lock in __accept_page()
2 parents 119009d + ea21641 commit 6fea5fa

File tree

16 files changed

+141
-35
lines changed

16 files changed

+141
-35
lines changed

‎CREDITS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2071,6 +2071,10 @@ S: 660 Harvard Ave. #7
20712071
S: Santa Clara, CA 95051
20722072
S: USA
20732073

2074+
N: Joonsoo Kim
2075+
E: iamjoonsoo.kim@lge.com
2076+
D: Slab allocators
2077+
20742078
N: Kukjin Kim
20752079
E: kgene@kernel.org
20762080
D: Samsung S3C, S5P and Exynos ARM architectures

‎Documentation/ABI/stable/sysfs-block

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Description:
7777

7878
What: /sys/block/<disk>/diskseq
7979
Date: February 2021
80-
Contact: Matteo Croce <mcroce@microsoft.com>
80+
Contact: Matteo Croce <teknoraver@meta.com>
8181
Description:
8282
The /sys/block/<disk>/diskseq files reports the disk
8383
sequence number, which is a monotonically increasing

‎Documentation/ABI/testing/sysfs-kernel-reboot

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
What: /sys/kernel/reboot
22
Date: November 2020
33
KernelVersion: 5.11
4-
Contact: Matteo Croce <mcroce@microsoft.com>
4+
Contact: Matteo Croce <teknoraver@meta.com>
55
Description: Interface to set the kernel reboot behavior, similarly to
66
what can be done via the reboot= cmdline option.
77
(see Documentation/admin-guide/kernel-parameters.txt)
88

99
What: /sys/kernel/reboot/mode
1010
Date: November 2020
1111
KernelVersion: 5.11
12-
Contact: Matteo Croce <mcroce@microsoft.com>
12+
Contact: Matteo Croce <teknoraver@meta.com>
1313
Description: Reboot mode. Valid values are: cold warm hard soft gpio
1414

1515
What: /sys/kernel/reboot/type
1616
Date: November 2020
1717
KernelVersion: 5.11
18-
Contact: Matteo Croce <mcroce@microsoft.com>
18+
Contact: Matteo Croce <teknoraver@meta.com>
1919
Description: Reboot type. Valid values are: bios acpi kbd triple efi pci
2020

2121
What: /sys/kernel/reboot/cpu
2222
Date: November 2020
2323
KernelVersion: 5.11
24-
Contact: Matteo Croce <mcroce@microsoft.com>
24+
Contact: Matteo Croce <teknoraver@meta.com>
2525
Description: CPU number to use to reboot.
2626

2727
What: /sys/kernel/reboot/force
2828
Date: November 2020
2929
KernelVersion: 5.11
30-
Contact: Matteo Croce <mcroce@microsoft.com>
30+
Contact: Matteo Croce <teknoraver@meta.com>
3131
Description: Don't wait for any other CPUs on reboot and
3232
avoid anything that could hang.
3333

‎MAINTAINERS

Lines changed: 47 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15517,6 +15517,21 @@ F: mm/numa.c
1551715517
F: mm/numa_emulation.c
1551815518
F: mm/numa_memblks.c
1551915519

15520+
MEMORY MANAGEMENT - PAGE ALLOCATOR
15521+
M: Andrew Morton <akpm@linux-foundation.org>
15522+
R: Vlastimil Babka <vbabka@suse.cz>
15523+
R: Suren Baghdasaryan <surenb@google.com>
15524+
R: Michal Hocko <mhocko@suse.com>
15525+
R: Brendan Jackman <jackmanb@google.com>
15526+
R: Johannes Weiner <hannes@cmpxchg.org>
15527+
R: Zi Yan <ziy@nvidia.com>
15528+
L: linux-mm@kvack.org
15529+
S: Maintained
15530+
F: mm/compaction.c
15531+
F: mm/page_alloc.c
15532+
F: include/linux/gfp.h
15533+
F: include/linux/compaction.h
15534+
1552015535
MEMORY MANAGEMENT - SECRETMEM
1552115536
M: Andrew Morton <akpm@linux-foundation.org>
1552215537
M: Mike Rapoport <rppt@kernel.org>
@@ -15544,10 +15559,12 @@ M: Liam R. Howlett <Liam.Howlett@oracle.com>
1554415559
M: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
1554515560
R: Vlastimil Babka <vbabka@suse.cz>
1554615561
R: Jann Horn <jannh@google.com>
15562+
R: Pedro Falcato <pfalcato@suse.de>
1554715563
L: linux-mm@kvack.org
1554815564
S: Maintained
1554915565
W: http://www.linux-mm.org
1555015566
T: git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
15567+
F: include/trace/events/mmap.h
1555115568
F: mm/mlock.c
1555215569
F: mm/mmap.c
1555315570
F: mm/mprotect.c
@@ -15558,6 +15575,36 @@ F: mm/vma.h
1555815575
F: mm/vma_internal.h
1555915576
F: tools/testing/vma/
1556015577

15578+
MEMORY MAPPING - LOCKING
15579+
M: Andrew Morton <akpm@linux-foundation.org>
15580+
M: Suren Baghdasaryan <surenb@google.com>
15581+
M: Liam R. Howlett <Liam.Howlett@oracle.com>
15582+
M: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
15583+
R: Vlastimil Babka <vbabka@suse.cz>
15584+
R: Shakeel Butt <shakeel.butt@linux.dev>
15585+
L: linux-mm@kvack.org
15586+
S: Maintained
15587+
W: http://www.linux-mm.org
15588+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
15589+
F: Documentation/mm/process_addrs.rst
15590+
F: include/linux/mmap_lock.h
15591+
F: include/trace/events/mmap_lock.h
15592+
F: mm/mmap_lock.c
15593+
15594+
MEMORY MAPPING - MADVISE (MEMORY ADVICE)
15595+
M: Andrew Morton <akpm@linux-foundation.org>
15596+
M: Liam R. Howlett <Liam.Howlett@oracle.com>
15597+
M: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
15598+
M: David Hildenbrand <david@redhat.com>
15599+
R: Vlastimil Babka <vbabka@suse.cz>
15600+
R: Jann Horn <jannh@google.com>
15601+
L: linux-mm@kvack.org
15602+
S: Maintained
15603+
W: http://www.linux-mm.org
15604+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
15605+
F: include/uapi/asm-generic/mman-common.h
15606+
F: mm/madvise.c
15607+
1556115608
MEMORY TECHNOLOGY DEVICES (MTD)
1556215609
M: Miquel Raynal <miquel.raynal@bootlin.com>
1556315610
M: Richard Weinberger <richard@nod.at>
@@ -22250,9 +22297,7 @@ F: drivers/nvmem/layouts/sl28vpd.c
2225022297

2225122298
SLAB ALLOCATOR
2225222299
M: Christoph Lameter <cl@linux.com>
22253-
M: Pekka Enberg <penberg@kernel.org>
2225422300
M: David Rientjes <rientjes@google.com>
22255-
M: Joonsoo Kim <iamjoonsoo.kim@lge.com>
2225622301
M: Andrew Morton <akpm@linux-foundation.org>
2225722302
M: Vlastimil Babka <vbabka@suse.cz>
2225822303
R: Roman Gushchin <roman.gushchin@linux.dev>

‎fs/dax.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -396,6 +396,7 @@ static inline unsigned long dax_folio_put(struct folio *folio)
396396
order = folio_order(folio);
397397
if (!order)
398398
return 0;
399+
folio_reset_order(folio);
399400

400401
for (i = 0; i < (1UL << order); i++) {
401402
struct dev_pagemap *pgmap = page_pgmap(&folio->page);

‎include/linux/backing-dev.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,7 @@ static inline struct bdi_writeback *inode_to_wb(const struct inode *inode)
249249
{
250250
#ifdef CONFIG_LOCKDEP
251251
WARN_ON_ONCE(debug_locks &&
252+
(inode->i_sb->s_iflags & SB_I_CGROUPWB) &&
252253
(!lockdep_is_held(&inode->i_lock) &&
253254
!lockdep_is_held(&inode->i_mapping->i_pages.xa_lock) &&
254255
!lockdep_is_held(&inode->i_wb->list_lock)));

‎include/linux/mm.h

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1218,6 +1218,23 @@ static inline unsigned int folio_order(const struct folio *folio)
12181218
return folio_large_order(folio);
12191219
}
12201220

1221+
/**
1222+
* folio_reset_order - Reset the folio order and derived _nr_pages
1223+
* @folio: The folio.
1224+
*
1225+
* Reset the order and derived _nr_pages to 0. Must only be used in the
1226+
* process of splitting large folios.
1227+
*/
1228+
static inline void folio_reset_order(struct folio *folio)
1229+
{
1230+
if (WARN_ON_ONCE(!folio_test_large(folio)))
1231+
return;
1232+
folio->_flags_1 &= ~0xffUL;
1233+
#ifdef NR_PAGES_IN_LARGE_FOLIO
1234+
folio->_nr_pages = 0;
1235+
#endif
1236+
}
1237+
12211238
#include <linux/huge_mm.h>
12221239

12231240
/*

‎include/linux/mmzone.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -967,6 +967,9 @@ struct zone {
967967
#ifdef CONFIG_UNACCEPTED_MEMORY
968968
/* Pages to be accepted. All pages on the list are MAX_PAGE_ORDER */
969969
struct list_head unaccepted_pages;
970+
971+
/* To be called once the last page in the zone is accepted */
972+
struct work_struct unaccepted_cleanup;
970973
#endif
971974

972975
/* zone flags, see below */
@@ -1499,8 +1502,6 @@ bool __zone_watermark_ok(struct zone *z, unsigned int order, unsigned long mark,
14991502
bool zone_watermark_ok(struct zone *z, unsigned int order,
15001503
unsigned long mark, int highest_zoneidx,
15011504
unsigned int alloc_flags);
1502-
bool zone_watermark_ok_safe(struct zone *z, unsigned int order,
1503-
unsigned long mark, int highest_zoneidx);
15041505
/*
15051506
* Memory initialization context, use to differentiate memory added by
15061507
* the platform statically or via memory hotplug interface.

‎mm/gup.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2207,8 +2207,8 @@ size_t fault_in_safe_writeable(const char __user *uaddr, size_t size)
22072207
} while (start != end);
22082208
mmap_read_unlock(mm);
22092209

2210-
if (size > (unsigned long)uaddr - start)
2211-
return size - ((unsigned long)uaddr - start);
2210+
if (size > start - (unsigned long)uaddr)
2211+
return size - (start - (unsigned long)uaddr);
22122212
return 0;
22132213
}
22142214
EXPORT_SYMBOL(fault_in_safe_writeable);

‎mm/hugetlb_vmemmap.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -238,11 +238,11 @@ static void vmemmap_remap_pte(pte_t *pte, unsigned long addr,
238238
* struct page, the special metadata (e.g. page->flags or page->mapping)
239239
* cannot copy to the tail struct page structs. The invalid value will be
240240
* checked in the free_tail_page_prepare(). In order to avoid the message
241-
* of "corrupted mapping in tail page". We need to reset at least 3 (one
242-
* head struct page struct and two tail struct page structs) struct page
241+
* of "corrupted mapping in tail page". We need to reset at least 4 (one
242+
* head struct page struct and three tail struct page structs) struct page
243243
* structs.
244244
*/
245-
#define NR_RESET_STRUCT_PAGE 3
245+
#define NR_RESET_STRUCT_PAGE 4
246246

247247
static inline void reset_struct_pages(struct page *start)
248248
{

0 commit comments

Comments
 (0)