Commit 5eea5820 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mm-stable-2023-09-04-14-00' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm 

Pull more MM updates from Andrew Morton:

 - Stefan Roesch has added ksm statistics to /proc/pid/smaps

 - Also a number of singleton patches, mainly cleanups and leftovers

* tag 'mm-stable-2023-09-04-14-00' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
  mm/kmemleak: move up cond_resched() call in page scanning loop
  mm: page_alloc: remove stale CMA guard code
  MAINTAINERS: add rmap.h to mm entry
  rmap: remove anon_vma_link() nommu stub
  proc/ksm: add ksm stats to /proc/pid/smaps
  mm/hwpoison: rename hwp_walk* to hwpoison_walk*
  mm: memory-failure: add PageOffline() check
parents 893a259c e68d343d

Documentation/filesystems/proc.rst

+4 −0
Original line number Diff line number Diff line
@@ -461,6 +461,7 @@ Memory Area, or VMA) there is a series of lines such as the following:: 
    Private_Dirty:         0 kB

    Referenced:          892 kB

    Anonymous:             0 kB

    KSM:                   0 kB

    LazyFree:              0 kB

    AnonHugePages:         0 kB

    ShmemPmdMapped:        0 kB
@@ -501,6 +502,9 @@ accessed. 
a mapping associated with a file may contain anonymous pages: when MAP_PRIVATE

and a page is modified, the file page is replaced by a private anonymous copy.



"KSM" reports how many of the pages are KSM pages. Note that KSM-placed zeropages

are not included, only actual KSM pages.



"LazyFree" shows the amount of memory which is marked by madvise(MADV_FREE).

The memory isn't freed immediately with madvise(). It's freed in memory

pressure if the memory is clean. Please note that the printed value might

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -13742,6 +13742,7 @@ F: include/linux/memory_hotplug.h 
F:	include/linux/mm.h

F:	include/linux/mmzone.h

F:	include/linux/pagewalk.h

F:	include/linux/rmap.h

F:	include/trace/events/ksm.h

F:	mm/

F:	tools/mm/

fs/proc/task_mmu.c

+6 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include <linux/hugetlb.h>

#include <linux/huge_mm.h>

#include <linux/mount.h>

#include <linux/ksm.h>

#include <linux/seq_file.h>

#include <linux/highmem.h>

#include <linux/ptrace.h>
@@ -396,6 +397,7 @@ struct mem_size_stats { 
	unsigned long swap;

	unsigned long shared_hugetlb;

	unsigned long private_hugetlb;

	unsigned long ksm;

	u64 pss;

	u64 pss_anon;

	u64 pss_file;
@@ -452,6 +454,9 @@ static void smaps_account(struct mem_size_stats *mss, struct page *page, 
			mss->lazyfree += size;

	}



	if (PageKsm(page))

		mss->ksm += size;



	mss->resident += size;

	/* Accumulate the size in pages that have been accessed. */

	if (young || page_is_young(page) || PageReferenced(page))
@@ -825,6 +830,7 @@ static void __show_smap(struct seq_file *m, const struct mem_size_stats *mss, 
	SEQ_PUT_DEC(" kB\nPrivate_Dirty:  ", mss->private_dirty);

	SEQ_PUT_DEC(" kB\nReferenced:     ", mss->referenced);

	SEQ_PUT_DEC(" kB\nAnonymous:      ", mss->anonymous);

	SEQ_PUT_DEC(" kB\nKSM:            ", mss->ksm);

	SEQ_PUT_DEC(" kB\nLazyFree:       ", mss->lazyfree);

	SEQ_PUT_DEC(" kB\nAnonHugePages:  ", mss->anonymous_thp);

	SEQ_PUT_DEC(" kB\nShmemPmdMapped: ", mss->shmem_thp);

include/linux/rmap.h

+0 −1
Original line number Diff line number Diff line
@@ -479,7 +479,6 @@ struct anon_vma *folio_lock_anon_vma_read(struct folio *folio, 


#define anon_vma_init()		do {} while (0)

#define anon_vma_prepare(vma)	(0)

#define anon_vma_link(vma)	do {} while (0)



static inline int folio_referenced(struct folio *folio, int is_locked,

				  struct mem_cgroup *memcg,

mm/kmemleak.c

+3 −2
Original line number Diff line number Diff line
@@ -1584,6 +1584,9 @@ static void kmemleak_scan(void) 
		for (pfn = start_pfn; pfn < end_pfn; pfn++) {

			struct page *page = pfn_to_online_page(pfn);



			if (!(pfn & 63))

				cond_resched();



			if (!page)

				continue;
@@ -1594,8 +1597,6 @@ static void kmemleak_scan(void) 
			if (page_count(page) == 0)

				continue;

			scan_block(page, page + 1, NULL);

			if (!(pfn & 63))

				cond_resched();

		}

	}

	put_online_mems();