From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5973DC4338F for ; Sat, 14 Aug 2021 05:25:59 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 0BC4E60E9B for ; Sat, 14 Aug 2021 05:25:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 0BC4E60E9B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=bytedance.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 9F20E8D0006; Sat, 14 Aug 2021 01:25:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9A1468D0002; Sat, 14 Aug 2021 01:25:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 842288D0006; Sat, 14 Aug 2021 01:25:58 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0147.hostedemail.com [216.40.44.147]) by kanga.kvack.org (Postfix) with ESMTP id 6A6E68D0002 for ; Sat, 14 Aug 2021 01:25:58 -0400 (EDT) Received: from smtpin04.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 0E5CE1BCBF for ; Sat, 14 Aug 2021 05:25:58 +0000 (UTC) X-FDA: 78472549596.04.10DB3D0 Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by imf16.hostedemail.com (Postfix) with ESMTP id AFF4DF000AED for ; Sat, 14 Aug 2021 05:25:57 +0000 (UTC) Received: by mail-pj1-f47.google.com with SMTP id n13-20020a17090a4e0d00b0017946980d8dso4895339pjh.5 for ; Fri, 13 Aug 2021 22:25:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mvg4Ru6OOrx7XzBZqzJfbp8SqJQxo34cv//v2Oh/ogE=; b=PjaMCXr/tBJxktavybYNAuh2+QETydbRTzNTgSwoI5BZSjFzlocpe6ZIPVAXfGgVjw 0ruTlV+TlLVCkUvheXfvaIXlPzzkCysN2wK09r+hxhc0+fSq81eqEa6tWwiSJ3PP0Lvh 0u117eDiXQylKBmDZA/bTv2wDSwo4gQgY6TGv1q145w1aNO8UeJC17tg3FepAZ1Ib7CP oT8L2w+TPja+ECohJnh+9DO+l3dNtdQYaTFcA/jwd6fBnr0oZE0m8q2HQhg+/jVGbvAD o31LFEsSQgRAdhMdj1UqvxD3LK4/phGXWzPt6M/hsYgg/jekV/Hl+RWvGuTrc/7voXAL 4/tQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mvg4Ru6OOrx7XzBZqzJfbp8SqJQxo34cv//v2Oh/ogE=; b=NqJH5ioEFMcDcpropeOpInh6mVO7nl82CozH2iDGwlP9EjpnDUFcO4LzFsUBzmmwlg Tbo9MoogPV1In9faKmZqGb1pGgn29xFyyJ+6SRWShWmBZ6aaVrucNLt9pE+Iq9JiJ2wm Zf2LlMz+tbo/er/v5w7qvLe/w0tpj9c8kwT/pB5+0YevRtDQnZi0helvSTOWicuv0wgE 4nkSAztY8Ynf7xMeMx5GCXFovHVcVAGJCJYgM4vIeerEc8L5HwJ9d8+Un3+pIDRiLHeM pDQi+63XFKNLYzPjx5BtMWXDpKdYRO1/TaP/GSFClRifaQmQLNDs/032YwHr9VKjoaUZ eT+w== X-Gm-Message-State: AOAM533lXHpMO07hgc6P8ggc6h2ckVWIHmvhwb2rOAJhjyp7RGC0hVMC Ef1TK94lEbNPOCYvzYJhKcWXsg== X-Google-Smtp-Source: ABdhPJzrOflGrSuy6eiUo+AH+dxSxM4GEOboB7Uia7lzJ43Ep96CMpPU06BUSLILMUiwhGfjANruXA== X-Received: by 2002:a62:ee0f:0:b029:335:a681:34f6 with SMTP id e15-20020a62ee0f0000b0290335a68134f6mr5682382pfi.55.1628918756877; Fri, 13 Aug 2021 22:25:56 -0700 (PDT) Received: from localhost.localdomain ([139.177.225.237]) by smtp.gmail.com with ESMTPSA id s5sm4783133pgp.81.2021.08.13.22.25.51 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Aug 2021 22:25:56 -0700 (PDT) From: Muchun Song To: guro@fb.com, hannes@cmpxchg.org, mhocko@kernel.org, akpm@linux-foundation.org, shakeelb@google.com, vdavydov.dev@gmail.com Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, duanxiongchun@bytedance.com, fam.zheng@bytedance.com, bsingharora@gmail.com, shy828301@gmail.com, alexs@kernel.org, smuchun@gmail.com, zhengqi.arch@bytedance.com, Muchun Song Subject: [PATCH v1 04/12] mm: vmscan: rework move_pages_to_lru() Date: Sat, 14 Aug 2021 13:25:11 +0800 Message-Id: <20210814052519.86679-5-songmuchun@bytedance.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) In-Reply-To: <20210814052519.86679-1-songmuchun@bytedance.com> References: <20210814052519.86679-1-songmuchun@bytedance.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: AFF4DF000AED Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=bytedance-com.20150623.gappssmtp.com header.s=20150623 header.b="PjaMCXr/"; dmarc=pass (policy=none) header.from=bytedance.com; spf=pass (imf16.hostedemail.com: domain of songmuchun@bytedance.com designates 209.85.216.47 as permitted sender) smtp.mailfrom=songmuchun@bytedance.com X-Rspamd-Server: rspam04 X-Stat-Signature: ok49cfaudbkiysu9ru11up84yxgpf7pw X-HE-Tag: 1628918757-343747 Content-Transfer-Encoding: quoted-printable 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: In the later patch, we will reparent the LRU pages. The pages moved to appropriate LRU list can be reparented during the process of the move_pages_to_lru(). So holding a lruvec lock by the caller is wrong, we should use the more general interface of folio_lruvec_relock_irq() to acquire the correct lruvec lock. Signed-off-by: Muchun Song --- include/linux/mm.h | 1 + mm/vmscan.c | 49 +++++++++++++++++++++++++-----------------------= - 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index ce8fc0fd6d6e..1e7f06bc5f2d 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -227,6 +227,7 @@ int overcommit_policy_handler(struct ctl_table *, int= , void *, size_t *, #define PAGE_ALIGNED(addr) IS_ALIGNED((unsigned long)(addr), PAGE_SIZE) =20 #define lru_to_page(head) (list_entry((head)->prev, struct page, lru)) +#define lru_to_folio(head) (list_entry((head)->prev, struct folio, lru)) =20 void setup_initial_init_mm(void *start_code, void *end_code, void *end_data, void *brk); diff --git a/mm/vmscan.c b/mm/vmscan.c index 403a175a720f..8ce42858ad5d 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -2153,23 +2153,28 @@ static int too_many_isolated(struct pglist_data *= pgdat, int file, * move_pages_to_lru() moves pages from private @list to appropriate LRU= list. * On return, @list is reused as a list of pages to be freed by the call= er. * - * Returns the number of pages moved to the given lruvec. + * Returns the number of pages moved to the appropriate LRU list. + * + * Note: The caller must not hold any lruvec lock. */ -static unsigned int move_pages_to_lru(struct lruvec *lruvec, - struct list_head *list) +static unsigned int move_pages_to_lru(struct list_head *list) { - int nr_pages, nr_moved =3D 0; + int nr_moved =3D 0; + struct lruvec *lruvec =3D NULL; LIST_HEAD(pages_to_free); - struct page *page; =20 while (!list_empty(list)) { - page =3D lru_to_page(list); + int nr_pages; + struct folio *folio =3D lru_to_folio(list); + struct page *page =3D &folio->page; + + lruvec =3D folio_lruvec_relock_irq(folio, lruvec); VM_BUG_ON_PAGE(PageLRU(page), page); list_del(&page->lru); if (unlikely(!page_evictable(page))) { - spin_unlock_irq(&lruvec->lru_lock); + unlock_page_lruvec_irq(lruvec); putback_lru_page(page); - spin_lock_irq(&lruvec->lru_lock); + lruvec =3D NULL; continue; } =20 @@ -2190,20 +2195,16 @@ static unsigned int move_pages_to_lru(struct lruv= ec *lruvec, __clear_page_lru_flags(page); =20 if (unlikely(PageCompound(page))) { - spin_unlock_irq(&lruvec->lru_lock); + unlock_page_lruvec_irq(lruvec); destroy_compound_page(page); - spin_lock_irq(&lruvec->lru_lock); + lruvec =3D NULL; } else list_add(&page->lru, &pages_to_free); =20 continue; } =20 - /* - * All pages were isolated from the same lruvec (and isolation - * inhibits memcg migration). - */ - VM_BUG_ON_PAGE(!folio_matches_lruvec(page_folio(page), lruvec), page); + VM_BUG_ON_PAGE(!folio_matches_lruvec(folio, lruvec), page); add_page_to_lru_list(page, lruvec); nr_pages =3D thp_nr_pages(page); nr_moved +=3D nr_pages; @@ -2211,6 +2212,8 @@ static unsigned int move_pages_to_lru(struct lruvec= *lruvec, workingset_age_nonresident(lruvec, nr_pages); } =20 + if (lruvec) + unlock_page_lruvec_irq(lruvec); /* * To save our caller's stack, now use input list for pages to free. */ @@ -2284,16 +2287,16 @@ shrink_inactive_list(unsigned long nr_to_scan, st= ruct lruvec *lruvec, =20 nr_reclaimed =3D shrink_page_list(&page_list, pgdat, sc, &stat, false); =20 - spin_lock_irq(&lruvec->lru_lock); - move_pages_to_lru(lruvec, &page_list); + move_pages_to_lru(&page_list); =20 + local_irq_disable(); __mod_node_page_state(pgdat, NR_ISOLATED_ANON + file, -nr_taken); item =3D current_is_kswapd() ? PGSTEAL_KSWAPD : PGSTEAL_DIRECT; if (!cgroup_reclaim(sc)) __count_vm_events(item, nr_reclaimed); __count_memcg_events(lruvec_memcg(lruvec), item, nr_reclaimed); __count_vm_events(PGSTEAL_ANON + file, nr_reclaimed); - spin_unlock_irq(&lruvec->lru_lock); + local_irq_enable(); =20 lru_note_cost(lruvec, file, stat.nr_pageout); mem_cgroup_uncharge_list(&page_list); @@ -2420,18 +2423,16 @@ static void shrink_active_list(unsigned long nr_t= o_scan, /* * Move pages back to the lru list. */ - spin_lock_irq(&lruvec->lru_lock); - - nr_activate =3D move_pages_to_lru(lruvec, &l_active); - nr_deactivate =3D move_pages_to_lru(lruvec, &l_inactive); + nr_activate =3D move_pages_to_lru(&l_active); + nr_deactivate =3D move_pages_to_lru(&l_inactive); /* Keep all free pages in l_active list */ list_splice(&l_inactive, &l_active); =20 + local_irq_disable(); __count_vm_events(PGDEACTIVATE, nr_deactivate); __count_memcg_events(lruvec_memcg(lruvec), PGDEACTIVATE, nr_deactivate)= ; - __mod_node_page_state(pgdat, NR_ISOLATED_ANON + file, -nr_taken); - spin_unlock_irq(&lruvec->lru_lock); + local_irq_enable(); =20 mem_cgroup_uncharge_list(&l_active); free_unref_page_list(&l_active); --=20 2.11.0