Commit cac3d177 authored by Andrew Morton's avatar Andrew Morton
Browse files

Merge branch 'mm-hotfixes-stable' into mm-stable to pick up changes which 

are required for a merge of the series "mm: folio_pte_batch()
improvements".
parents fdc3bc34 db6cc3f4

Documentation/admin-guide/cgroup-v2.rst

+0 −6
Original line number Diff line number Diff line
@@ -1732,12 +1732,6 @@ The following nested keys are defined. 
	  numa_hint_faults (npn)

		Number of NUMA hinting faults.



	  numa_task_migrated (npn)

		Number of task migration by NUMA balancing.



	  numa_task_swapped (npn)

		Number of task swap by NUMA balancing.



	  pgdemote_kswapd

		Number of pages demoted by kswapd.

fs/proc/task_mmu.c

+7 −7
Original line number Diff line number Diff line
@@ -36,9 +36,9 @@ void task_mem(struct seq_file *m, struct mm_struct *mm) 
	unsigned long text, lib, swap, anon, file, shmem;

	unsigned long hiwater_vm, total_vm, hiwater_rss, total_rss;



	anon = get_mm_counter(mm, MM_ANONPAGES);

	file = get_mm_counter(mm, MM_FILEPAGES);

	shmem = get_mm_counter(mm, MM_SHMEMPAGES);

	anon = get_mm_counter_sum(mm, MM_ANONPAGES);

	file = get_mm_counter_sum(mm, MM_FILEPAGES);

	shmem = get_mm_counter_sum(mm, MM_SHMEMPAGES);



	/*

	 * Note: to minimize their overhead, mm maintains hiwater_vm and
@@ -59,7 +59,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm) 
	text = min(text, mm->exec_vm << PAGE_SHIFT);

	lib = (mm->exec_vm << PAGE_SHIFT) - text;



	swap = get_mm_counter(mm, MM_SWAPENTS);

	swap = get_mm_counter_sum(mm, MM_SWAPENTS);

	SEQ_PUT_DEC("VmPeak:\t", hiwater_vm);

	SEQ_PUT_DEC(" kB\nVmSize:\t", total_vm);

	SEQ_PUT_DEC(" kB\nVmLck:\t", mm->locked_vm);
@@ -92,12 +92,12 @@ unsigned long task_statm(struct mm_struct *mm, 
			 unsigned long *shared, unsigned long *text,

			 unsigned long *data, unsigned long *resident)

{

	*shared = get_mm_counter(mm, MM_FILEPAGES) +

			get_mm_counter(mm, MM_SHMEMPAGES);

	*shared = get_mm_counter_sum(mm, MM_FILEPAGES) +

			get_mm_counter_sum(mm, MM_SHMEMPAGES);

	*text = (PAGE_ALIGN(mm->end_code) - (mm->start_code & PAGE_MASK))

								>> PAGE_SHIFT;

	*data = mm->data_vm + mm->stack_vm;

	*resident = *shared + get_mm_counter(mm, MM_ANONPAGES);

	*resident = *shared + get_mm_counter_sum(mm, MM_ANONPAGES);

	return mm->total_vm;

}

include/linux/mm.h

+5 −0
Original line number Diff line number Diff line
@@ -2585,6 +2585,11 @@ static inline unsigned long get_mm_counter(struct mm_struct *mm, int member) 
	return percpu_counter_read_positive(&mm->rss_stat[member]);

}



static inline unsigned long get_mm_counter_sum(struct mm_struct *mm, int member)

{

	return percpu_counter_sum_positive(&mm->rss_stat[member]);

}



void mm_trace_rss_stat(struct mm_struct *mm, int member);



static inline void add_mm_counter(struct mm_struct *mm, int member, long value)

include/linux/sched.h

+0 −4
Original line number Diff line number Diff line
@@ -548,10 +548,6 @@ struct sched_statistics { 
	u64				nr_failed_migrations_running;

	u64				nr_failed_migrations_hot;

	u64				nr_forced_migrations;

#ifdef CONFIG_NUMA_BALANCING

	u64				numa_task_migrated;

	u64				numa_task_swapped;

#endif



	u64				nr_wakeups;

	u64				nr_wakeups_sync;

include/linux/vm_event_item.h

+0 −2
Original line number Diff line number Diff line
@@ -66,8 +66,6 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT, 
		NUMA_HINT_FAULTS,

		NUMA_HINT_FAULTS_LOCAL,

		NUMA_PAGE_MIGRATE,

		NUMA_TASK_MIGRATE,

		NUMA_TASK_SWAP,

#endif

#ifdef CONFIG_MIGRATION

		PGMIGRATE_SUCCESS, PGMIGRATE_FAIL,