From patchwork Wed May 24 09:12:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "zhaoyang.huang" X-Patchwork-Id: 13253576 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 6E8E7C77B73 for ; Wed, 24 May 2023 09:13:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0D2B7280005; Wed, 24 May 2023 05:13:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0846A900003; Wed, 24 May 2023 05:13:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EB4D8280005; Wed, 24 May 2023 05:13:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id DF06E900003 for ; Wed, 24 May 2023 05:13:45 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id B4C0A120936 for ; Wed, 24 May 2023 09:13:45 +0000 (UTC) X-FDA: 80824586010.03.704B457 Received: from SHSQR01.spreadtrum.com (unknown [222.66.158.135]) by imf07.hostedemail.com (Postfix) with ESMTP id 0B3F140013 for ; Wed, 24 May 2023 09:13:42 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf07.hostedemail.com: domain of zhaoyang.huang@unisoc.com designates 222.66.158.135 as permitted sender) smtp.mailfrom=zhaoyang.huang@unisoc.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684919624; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding:in-reply-to: references; bh=t/EsJJOLcMCr7XMbUl3dglWw/3xZHwzmm3hsF/S/RXU=; b=a+YNw4q+GeqGsKOoSIVZfRWnwgT/Ec8fEkXuHs1/jhCJbEO4Vx9QY/CoTHVUeBj+UFNQBC E9ph1lBAiZQlo1ugkI7rk8wboapw2JxqYL7nVnmQmZW4z2lDUohlLzyZZDPWZPfNqZwiL3 qzLo/LrIm+OjGZeUk4tSBUuAJRRYm2U= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf07.hostedemail.com: domain of zhaoyang.huang@unisoc.com designates 222.66.158.135 as permitted sender) smtp.mailfrom=zhaoyang.huang@unisoc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684919624; a=rsa-sha256; cv=none; b=ZFSNEMsPFh38ye2udlMYYoeyh/Ip4RHgBYSUesFbjZ2g08n6tVbeSd8q7IO3431/Opr16Y SlAxhGbbTZcHpp0lYzv97xqGPRuMN5eBiY/nJYiqGgEdLnK6vgzgR+a0YcCRlbjdkDtDP2 F74bGiDxYVaQP3HWv4qT/h/cyu5ecSM= Received: from SHSend.spreadtrum.com (bjmbx01.spreadtrum.com [10.0.64.7]) by SHSQR01.spreadtrum.com with ESMTP id 34O9DADV076637; Wed, 24 May 2023 17:13:10 +0800 (+08) (envelope-from zhaoyang.huang@unisoc.com) Received: from bj03382pcu.spreadtrum.com (10.0.73.76) by BJMBX01.spreadtrum.com (10.0.64.7) with Microsoft SMTP Server (TLS) id 15.0.1497.23; Wed, 24 May 2023 17:13:10 +0800 From: "zhaoyang.huang" To: Andrew Morton , Johannes Weiner , Suren Baghdasaryan , , , Zhaoyang Huang , Subject: [PATCH] mm: deduct the number of pages reclaimed by madvise from workingset Date: Wed, 24 May 2023 17:12:54 +0800 Message-ID: <1684919574-28368-1-git-send-email-zhaoyang.huang@unisoc.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 X-Originating-IP: [10.0.73.76] X-ClientProxiedBy: SHCAS03.spreadtrum.com (10.0.1.207) To BJMBX01.spreadtrum.com (10.0.64.7) X-MAIL: SHSQR01.spreadtrum.com 34O9DADV076637 X-Rspamd-Queue-Id: 0B3F140013 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: w6rmwkfuog1exxgksm4s5nimj9xxtar1 X-HE-Tag: 1684919622-339073 X-HE-Meta: U2FsdGVkX19tjD1JqfcS9cYlc9xtY/AE58EtcH9DauYKjcTaiNxAIBXje0F4JnCkp8H3P3XyW/k6q58XDdV2etwp0dIOocChEe4RgNjLvON4bv3xepYJ1Qwjsw7CoZfqQonnmdy+ccoaJHNX4GgX7VLHzKV51R17AHUvaa7sV7DjlnJipf9GBL51fjvn6DabBhyeUoqg5Skvi1yTxnqZuLCn1/1bSMGiksj96+It45N4Fj6MY2BecQLAFYiQnsx5fMlY3cK/1Q1DK51AJx/wKqbpJTm4OLRT8KLz10eMFJLnpAfdLZaXHhPbzSOTRQOlNrOdnv8jHKT4NvvBQYpIEbqnn7O9xzgek1zxSv7qMMKnEfdiAtS4KdWtXklRxMLE14amSrUeanq/aJna7D9jxuinTgpRSfVk0I4iO9uR60iuKc2P+gShwKYJO8kkgqeJPZoj3O583A3dQcBXJ0AzNDp4T5GoQYJDqMHXhBOoKKOiyZxwWvW8Jt7A0b/dEVDH36Vu18UTDECncoJQQ84549hFnnhVZU3qYSE6bx61i/FhfmTFAIPBNMYnfF/zvyPcVBZxVs8rNKI3rO4JUB/OVEeWR8aFTOUm9pDr3tmaEGK1QDmQF1tIRdrH7kycLkgLIl9ZmPBpnhsGUAK6X84fp90wbTyQcWCPE2u1prV/TqJmeeofEkDPPv7munPZib7SxQKIYOLe7EBfBpbah5IdmUk4NWp6bv/JkLT31rXs4QUayTTdyHAyCTz5AyjevF6Yyq7STcsJYMlt8ntRnGAhneyAWJztyRgnyy8LYlKpKVQcItlrLFSJ2Gh7byJxz9XGpRLfcJ+dEBLX4zfiTAja5Gu5k0x2n3sJFXghLV0Mf2NmNlGp4pOJLW51ougOOXOLNDN2ZlusGtHTJcQ1CMSBwoMAEosuo4Os6HWYtdKotz57HuByyvPh3pNmqIMss1fHd9oyK9XAmT9RnVt9zjO WDh6fbSf x8qq8wV+/KnWcnvERHTCzkzPCCxV2ZUSNN93MHs0o/i1p9nVv/OWHjoRLuUKDm7PIFLKoieSfrJJWVE5+SA5Dg65rWb3plbUFoYn0sQ6Zq9eAeeJmpzxJzZVtFp0BHhD2b0A52mcJuUIKTuJev+CYdEDzLJIlwCC7LAygdr7zVIRnWSB4sfi8c2oN8vnCMHiqtJNDVXp98NXT9QrqrdpU8LMPd0iA77TH1vs0bDHcIUcfeTW+Bc6sWjLgJkibJLUICQvQsFYSfh0sWKzOTmgv9TgThElv+X4UNaDOxLnpfZ336ti9791n1MN9Mw== 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: From: Zhaoyang Huang The pages reclaimed by madvise_pageout are made of inactive and dropped from LRU forcefully, which lead to the coming up refault pages possess a large refault distance than it should be. These could affect the accuracy of thrashing when madvise_pageout is used as a common way of memory reclaiming as ANDROID does now. Signed-off-by: Zhaoyang Huang --- include/linux/swap.h | 2 +- mm/madvise.c | 4 ++-- mm/vmscan.c | 8 +++++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/include/linux/swap.h b/include/linux/swap.h index 2787b84..0312142 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -428,7 +428,7 @@ extern unsigned long mem_cgroup_shrink_node(struct mem_cgroup *mem, extern int vm_swappiness; long remove_mapping(struct address_space *mapping, struct folio *folio); -extern unsigned long reclaim_pages(struct list_head *page_list); +extern unsigned long reclaim_pages(struct mm_struct *mm, struct list_head *page_list); #ifdef CONFIG_NUMA extern int node_reclaim_mode; extern int sysctl_min_unmapped_ratio; diff --git a/mm/madvise.c b/mm/madvise.c index b6ea204..61c8d7b 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -420,7 +420,7 @@ static int madvise_cold_or_pageout_pte_range(pmd_t *pmd, huge_unlock: spin_unlock(ptl); if (pageout) - reclaim_pages(&page_list); + reclaim_pages(mm, &page_list); return 0; } @@ -516,7 +516,7 @@ static int madvise_cold_or_pageout_pte_range(pmd_t *pmd, arch_leave_lazy_mmu_mode(); pte_unmap_unlock(orig_pte, ptl); if (pageout) - reclaim_pages(&page_list); + reclaim_pages(mm, &page_list); cond_resched(); return 0; diff --git a/mm/vmscan.c b/mm/vmscan.c index 20facec..048c10b 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -2741,12 +2741,14 @@ static unsigned int reclaim_folio_list(struct list_head *folio_list, return nr_reclaimed; } -unsigned long reclaim_pages(struct list_head *folio_list) +unsigned long reclaim_pages(struct mm_struct *mm, struct list_head *folio_list) { int nid; unsigned int nr_reclaimed = 0; LIST_HEAD(node_folio_list); unsigned int noreclaim_flag; + struct lruvec *lruvec; + struct mem_cgroup *memcg = get_mem_cgroup_from_mm(mm); if (list_empty(folio_list)) return nr_reclaimed; @@ -2764,10 +2766,14 @@ unsigned long reclaim_pages(struct list_head *folio_list) } nr_reclaimed += reclaim_folio_list(&node_folio_list, NODE_DATA(nid)); + lruvec = &memcg->nodeinfo[nid]->lruvec; + workingset_age_nonresident(lruvec, -nr_reclaimed); nid = folio_nid(lru_to_folio(folio_list)); } while (!list_empty(folio_list)); nr_reclaimed += reclaim_folio_list(&node_folio_list, NODE_DATA(nid)); + lruvec = &memcg->nodeinfo[nid]->lruvec; + workingset_age_nonresident(lruvec, -nr_reclaimed); memalloc_noreclaim_restore(noreclaim_flag);