Commit bc0c3357 authored by Mateusz Guzik's avatar Mateusz Guzik Committed by Andrew Morton
Browse files

mm: remove remnants of SPLIT_RSS_COUNTING 

The feature got retired in f1a79412 ("mm: convert mm's rss stats into
percpu_counter"), but the patch failed to fully clean it up.

Link: https://lkml.kernel.org/r/20230823170556.2281747-1-mjguzik@gmail.com


Signed-off-by: default avatarMateusz Guzik <mjguzik@gmail.com>
Acked-by: default avatarShakeel Butt <shakeelb@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 97144ce0

fs/exec.c

+0 −2
Original line number Diff line number Diff line
@@ -986,8 +986,6 @@ static int exec_mmap(struct mm_struct *mm) 
	tsk = current;

	old_mm = current->mm;

	exec_mm_release(tsk, old_mm);

	if (old_mm)

		sync_mm_rss(old_mm);



	ret = down_write_killable(&tsk->signal->exec_update_lock);

	if (ret)

include/linux/mm.h

+0 −8
Original line number Diff line number Diff line
@@ -2628,14 +2628,6 @@ static inline void setmax_mm_hiwater_rss(unsigned long *maxrss, 
		*maxrss = hiwater_rss;

}



#if defined(SPLIT_RSS_COUNTING)

void sync_mm_rss(struct mm_struct *mm);

#else

static inline void sync_mm_rss(struct mm_struct *mm)

{

}

#endif



#ifndef CONFIG_ARCH_HAS_PTE_SPECIAL

static inline int pte_special(pte_t pte)

{

kernel/exit.c

+0 −4
Original line number Diff line number Diff line
@@ -539,7 +539,6 @@ static void exit_mm(void) 
	exit_mm_release(current, mm);

	if (!mm)

		return;

	sync_mm_rss(mm);

	mmap_read_lock(mm);

	mmgrab_lazy_tlb(mm);

	BUG_ON(mm != current->active_mm);
@@ -829,9 +828,6 @@ void __noreturn do_exit(long code) 
	io_uring_files_cancel();

	exit_signals(tsk);  /* sets PF_EXITING */



	/* sync mm's RSS info before statistics gathering */

	if (tsk->mm)

		sync_mm_rss(tsk->mm);

	acct_update_integrals(tsk);

	group_dead = atomic_dec_and_test(&tsk->signal->live);

	if (group_dead) {

kernel/fork.c

+0 −4
Original line number Diff line number Diff line
@@ -2406,10 +2406,6 @@ __latent_entropy struct task_struct *copy_process( 
	p->io_uring = NULL;

#endif



#if defined(SPLIT_RSS_COUNTING)

	memset(&p->rss_stat, 0, sizeof(p->rss_stat));

#endif



	p->default_timer_slack_ns = current->timer_slack_ns;



#ifdef CONFIG_PSI

kernel/kthread.c

+0 −1
Original line number Diff line number Diff line
@@ -1469,7 +1469,6 @@ void kthread_unuse_mm(struct mm_struct *mm) 
	 * clearing tsk->mm.

	 */

	smp_mb__after_spinlock();

	sync_mm_rss(mm);

	local_irq_disable();

	tsk->mm = NULL;

	membarrier_update_current_mm(NULL);