mm: remove remnants of SPLIT_RSS_COUNTING
Subsystems (6)
PATCH 1/1 mm: remove remnants of SPLIT_RSS_COUNTING
The feature got retired in f1a7941243c1 ("mm: convert mm's rss stats into percpu_counter"), but the patch failed to fully clean it up.
--- fs/exec.c | 2 -- include/linux/mm.h | 8 -------- kernel/exit.c | 4 ---- kernel/fork.c | 4 ---- kernel/kthread.c | 1 - mm/madvise.c | 5 +---- mm/memory.c | 2 -- 7 files changed, 1 insertion(+), 25 deletions(-)
fs/exec.c +0 -2
@@ -985,8 +985,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
@@ -2606,14 +2606,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
@@ -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
@@ -2409,10 +2409,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
@@ -1470,7 +1470,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 );
mm/madvise.c +1 -4
@@ -741,11 +741,8 @@ static int madvise_free_pte_range(pmd_t *pmd, unsigned long addr,folio_mark_lazyfree (folio); } -if (nr_swap) { -if (current->mm == mm) -sync_mm_rss (mm); +if (nr_swap)add_mm_counter (mm,MM_SWAPENTS , nr_swap); - }if (start_pte) {arch_leave_lazy_mmu_mode ();pte_unmap_unlock (start_pte, ptl);
mm/memory.c +0 -2
@@ -474,8 +474,6 @@ static inline void add_mm_rss_vec(struct mm_struct *mm, int *rss) {int i; -if (current->mm == mm) -sync_mm_rss (mm);for (i =0 ; i <NR_MM_COUNTERS ; i++)if (rss[i])add_mm_counter (mm, i, rss[i]);
Signature · 1 line
2.39.2
anyone in particular I should cc to get this reviewed?
this finishes a removal from an earlier commit, there is not much to think about ;)
Quoted 132 lines · Mateusz Guzik
The feature got retired in
f1a7941243c1("mm: convert mm's rss stats intopercpu_counter"), but the patch failed to fully clean it up.Signed-off-by Mateusz Guzik <[email protected]>--- fs/exec.c | 2 -- include/linux/mm.h | 8 -------- kernel/exit.c | 4 ---- kernel/fork.c | 4 ---- kernel/kthread.c | 1 - mm/madvise.c | 5 +---- mm/memory.c | 2 -- 7 files changed, 1 insertion(+), 25 deletions(-)fs/exec.c +0
-2@@ -985,8 +985,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@@ -2606,14 +2606,6 @@ static inline void setmax_mm_hiwater_rss(unsignedlong *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@@ -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@@ -2409,10 +2409,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@@ -1470,7 +1470,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 );mm/madvise.c +1
-4@@ -741,11 +741,8 @@ static int madvise_free_pte_range(pmd_t *pmd, unsignedlong addr,folio_mark_lazyfree (folio ); } -if (nr_swap) { -if (current->mm == mm) -sync_mm_rss (mm); +if (nr_swap)add_mm_counter (mm,MM_SWAPENTS , nr_swap); - }if (start_pte) {arch_leave_lazy_mmu_mode ();mm/madvise.c +0
-0pte_unmap_unlock (start_pte, ptl);mm/memory.c +0
-2@@ -474,8 +474,6 @@ static inline void add_mm_rss_vec(struct mm_struct *mm, int *rss) {int i; -if (current->mm == mm) -sync_mm_rss (mm);for (i =0 ; i <NR_MM_COUNTERS ; i++)if (rss[i])
add_mm_counter(mm, i, rss[i]);
--
2.39.2
Signature · 1 line
Mateusz Guzik <mjguzik gmail.com>
Andrew Morton
maintainerQuoted 4 lines · On Fri, 25 Aug 2023 21:58:33 +0200 Mateusz Guzik <[email protected]> wrote:
anyone in particular I should cc to get this reviewed?
this finishes a removal from an earlier commit, there is not much to think about ;)
We're in late -rc7. I have this saved away for consideration
after the merge window has closed.
Quoted 5 lines · Mateusz Guzik
The feature got retired in
f1a7941243c1("mm: convert mm's rss stats intopercpu_counter"), but the patch failed to fully clean it up.Signed-off-by Mateusz Guzik <[email protected]>