From patchwork Wed Aug 23 17:05:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mateusz Guzik X-Patchwork-Id: 13362948 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id D617EC3DA66 for ; Wed, 23 Aug 2023 17:06:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 36BEB280091; Wed, 23 Aug 2023 13:06:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 31B95280090; Wed, 23 Aug 2023 13:06:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1BC45280091; Wed, 23 Aug 2023 13:06:28 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 09817280090 for ; Wed, 23 Aug 2023 13:06:28 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id D4DC2B18CF for ; Wed, 23 Aug 2023 17:06:27 +0000 (UTC) X-FDA: 81155998014.27.C3707AB Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) by imf16.hostedemail.com (Postfix) with ESMTP id 10C09180006 for ; Wed, 23 Aug 2023 17:06:25 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=ooiGKtMg; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf16.hostedemail.com: domain of mjguzik@gmail.com designates 209.85.218.46 as permitted sender) smtp.mailfrom=mjguzik@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1692810386; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=U8kJXJjKS7h/p3miaRvaSI19tMqauTHvoSS/iJ/+kvA=; b=OcJbmrTGY7LqoTz2sFUl7/h//euIKZX1feyGSLAXTEOdyFwf72MbCWsoJD01EKIyzjDGyb vQAbxTu+LhyY1TBH+iRFX+RLGjQE4ua85TK9OOdFjRD2dpPaOyBIIgt2FnaDcp8Bvm23fv OVKxkROAunYq750zyACMUy5C+X93vXc= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=ooiGKtMg; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf16.hostedemail.com: domain of mjguzik@gmail.com designates 209.85.218.46 as permitted sender) smtp.mailfrom=mjguzik@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692810386; a=rsa-sha256; cv=none; b=vlFvBcNMjPyGrBAegBqrhFmm+GfOZ00h36uM3wHc5Gh88RVP5VIvyjpG5V2tC0zXHtI+my ylyv4bjA0xiswU9QwkgP1FPVRv4+5L9AYdR9KDy7McKIx9pF3y0+RMqNNVMudqpdiFMirN 4YbTs93ymUKmNRhmsRjuT/nx7gLe2ok= Received: by mail-ej1-f46.google.com with SMTP id a640c23a62f3a-98377c5d53eso742414466b.0 for ; Wed, 23 Aug 2023 10:06:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692810384; x=1693415184; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=U8kJXJjKS7h/p3miaRvaSI19tMqauTHvoSS/iJ/+kvA=; b=ooiGKtMgetH+xepHc/qXTlGSmDpflYMO6h0Ql/Zn0vuW2YLq6hUmfElWbvbg7COdZY mn3qHiQ/8HSGAxmS8O0ShkeguiF+dcgp7WZ1fXPKCIbpTYduVFDqNAPpE0jRSP7xkqyJ 7DfkufiPQ35eg6q3HHEIurnR3HnRyPhuUN0iSvEwxWJwaE2/ZhktIOdWh377WzTf2Jm8 Y0nmgrFnQ//NDtJYe6J50qGF9dv7KhYfwXG+sJLzk8sQU0T6nUtCSUQrXXvbec3WlqFH CH3MuUpc6Wcfi/roboeHNtPC533QQ4Miu8N0UNjr8egIZMLIp/SWe5iqoG5VENYmb66L RG+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692810384; x=1693415184; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=U8kJXJjKS7h/p3miaRvaSI19tMqauTHvoSS/iJ/+kvA=; b=bM8lSbEwGuEcj0eGuQpMx2l5mgSW+r3G5aJpbJyAjao/IzG5tnEMakSRxF6X61Nvi2 x0X+m7F5XwrO3ksAUVmfsQL0V+GM+9yxeGCImOGcnmRhtfqoBuRmjGk//e7Zz5mamYER SQM8b2oo1932Bpt3zH5rsyBUcybGuyokRy5N2vzI1Jr1lpxw/8ttuENLVh4tZ0lizifa lf3sKizsU46wkFaJKRWmxi9xR9UrQ7UfmQ3HX9IWxt8ibFV0qRmfvU4wXDCKyyNcIgqi +/zHlfk8bsvj9jQ/c/r3ic+Ikou1YIBKkCjCC93VCVR/QH0Nf8MoJa9SGgG2C/WEaYkM cBQQ== X-Gm-Message-State: AOJu0YxUoillNK/ibk7OmOrf3Ggo5tyQ6lfTFJdxV2cW92bXM2WrXYtZ Dbz2tgDahQj1huSaVYseP5U= X-Google-Smtp-Source: AGHT+IESP9RTMkkyzae8SZmQBGuyiRP8rEypwpL3VDKZieqMoqb4UKuzRUjh6CLDOsGpNi9KQtJltw== X-Received: by 2002:a17:907:7898:b0:9a1:b407:54c7 with SMTP id ku24-20020a170907789800b009a1b40754c7mr5200322ejc.2.1692810384119; Wed, 23 Aug 2023 10:06:24 -0700 (PDT) Received: from f.. (cst-prg-6-172.cust.vodafone.cz. [46.135.6.172]) by smtp.gmail.com with ESMTPSA id u7-20020a1709067d0700b0099ce188be7fsm10005222ejo.3.2023.08.23.10.06.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Aug 2023 10:06:23 -0700 (PDT) From: Mateusz Guzik To: akpm@linux-foundation.org Cc: shakeelb@google.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Mateusz Guzik Subject: [PATCH] mm: remove remnants of SPLIT_RSS_COUNTING Date: Wed, 23 Aug 2023 19:05:56 +0200 Message-Id: <20230823170556.2281747-1-mjguzik@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Rspamd-Queue-Id: 10C09180006 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: 1631p4nczne5itcmrmsf6pzbweb7sy5r X-HE-Tag: 1692810385-304734 X-HE-Meta: U2FsdGVkX18tIaEv3JRQHqo4GAqKG0D3EwNoyzm5Dgs/xwrvOwmQUBqPLIxZ0gWqljUsrXvmOembDvCry+4ukdtzNlObS0l9r9XYJBiLMfTqXhOw/uT9v58usBLNo24jEfFhppNEgQsYjFFT+2V9zYl3xEqgt9Q25aMO3H8Wli4tKBhsGO8kyBFJW4JmmwiZ8LBG//F3WsMNma/WLdTzV5DfJdNKMDnYcoSQ/ENkD9yMTSjx3MuUpVnj/urULgvWEbKJ2f0mD+CbABhsEAsYRrHz1z2dk5bthVTTkfHXC+QEXuTOfZAP5QzrZxKCtnldjNsEDa3y0tXz8ip/0CxUM/Ba+nvWyFe0H6oN3+Va/JdWfU7Kmpmve+NAYjBUdMVj86Ay+JNAJDX61DPHDKExoS/xVOTIEn+9RVlQs6n0g8PpV5U6sp5bBgrSHx3QkKRV20fXioS4qJCk3OW7ZG1T2IBi0QD5AuRXe1pDa62BkFuV+ukLc5fbjIhk0IqJJ67nYS3r80hGyVDqOeWtMhzEiKmlbqQoPP5pvZMDd+VlERz1BgIs8vPC+d224WjgmgR6MwC/MummsjGaoa8zkvi+5NbZVaa1Lgsjz5KzHUT7/CaG486BE02BCW6nBMqupc+Xgp6UWlAegGEbp1xmF/MLcH7F/yzggCWFChtXtqs64lkplGpzhnMcAbQBk6Ch3rFq+zKNjELVj8nAFGJd58XFiVtBEt5XxWtrojL9Gf1WO0wJVlKLtlH/9Cy/zAv3RoOv/KaGKBkL9Gn1ONMquZ2dos0cHnOc2e8dqBi+J9/EqsQjvBvPaIEcqhB/pfr9ADJanc7VzRFAQ+0sT3f/gHmWWGIG/WM9y7PRwhYFZxBtbQGk35DmtzJUCT1TiEaxW+yDQuFBCwhe3pg/aRKgOYf64JAcAYqk29yvPbpzmQL2oCNbSs2pCkHt7g4LJjHpD1g3ge1mg+HRUXeqz/LpqNj kmBjx32v WROMuKn5R4tpW2uvZRcKdoCJBVXaqgw01ZkXaoddjuTslhqjFeqlPu6ULDEZ/kj8SIK/oIS/Dc2UOQIol+QImXzfe/Fb7q/+rwrnLgw2erpwYKz3+2z2v1FeKr7u6EbTFrrnIMyT4hqSJ9OPItgkGqBuFISfm/XWvN34yHKwgPz16bTOZEu3Ivg+H3lJcbIOBZ1bL4vMezuqaC/Lw7vq5JR7tUssiuNwizosGV/g1THwEo3akUNGKwPVcIfmc5gFTgqgj9P6XwPaZwiagNfR+7SDBlsovGlC8PEtxknY0Zv7qUVYw4vtDpY3zqy5p7CGu0J19A7pfYRzJs0++UdYlfP1fiFnUQonhjOO4cb60UvKUCCIdgguoExjRdzdUAb3ZWiWrrvhGPj8183xsrlHgrVwpRCCLd1RQOUloGp3gy9EiMC1Za0xoMnP1tVQyVIScAMtoc8iVmwM6lCHZRNnJ6JmBWIUlW5vwP+WyqqFQAknCUKo= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: The feature got retired in f1a7941243c1 ("mm: convert mm's rss stats into percpu_counter"), but the patch failed to fully clean it up. Signed-off-by: Mateusz Guzik Acked-by: Shakeel Butt --- 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(-) diff --git a/fs/exec.c b/fs/exec.c index 1a827d55ba94..8d31d5fc658f 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -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) diff --git a/include/linux/mm.h b/include/linux/mm.h index 406ab9ea818f..08402054767a 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -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) { diff --git a/kernel/exit.c b/kernel/exit.c index edb50b4c9972..3cdbe797008f 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -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) { diff --git a/kernel/fork.c b/kernel/fork.c index d2e12b6d2b18..1ac1d850f7ab 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -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 diff --git a/kernel/kthread.c b/kernel/kthread.c index 4fff7df17a68..0cf5582122b3 100644 --- a/kernel/kthread.c +++ b/kernel/kthread.c @@ -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); diff --git a/mm/madvise.c b/mm/madvise.c index 886f06066622..39bed9e4b08b 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -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); diff --git a/mm/memory.c b/mm/memory.c index cdc4d4c1c858..b72d90ece7fe 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -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]);