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=-9.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,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 14982C3A589 for ; Tue, 20 Aug 2019 09:49:51 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id AFB7622CF7 for ; Tue, 20 Aug 2019 09:49:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AFB7622CF7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.alibaba.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 797906B0269; Tue, 20 Aug 2019 05:49:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7234F6B026A; Tue, 20 Aug 2019 05:49:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 526FD6B026B; Tue, 20 Aug 2019 05:49:43 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0150.hostedemail.com [216.40.44.150]) by kanga.kvack.org (Postfix) with ESMTP id 200E86B0269 for ; Tue, 20 Aug 2019 05:49:43 -0400 (EDT) Received: from smtpin09.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with SMTP id BD9958248AB7 for ; Tue, 20 Aug 2019 09:49:42 +0000 (UTC) X-FDA: 75842334204.09.scent80_548eab20a095f X-HE-Tag: scent80_548eab20a095f X-Filterd-Recvd-Size: 23643 Received: from out30-132.freemail.mail.aliyun.com (out30-132.freemail.mail.aliyun.com [115.124.30.132]) by imf45.hostedemail.com (Postfix) with ESMTP for ; Tue, 20 Aug 2019 09:49:40 +0000 (UTC) X-Alimail-AntiSpam:AC=PASS;BC=-1|-1;BR=01201311R991e4;CH=green;DM=||false|;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e07486;MF=alex.shi@linux.alibaba.com;NM=1;PH=DS;RN=40;SR=0;TI=SMTPD_---0Ta-AHFA_1566294571; Received: from localhost(mailfrom:alex.shi@linux.alibaba.com fp:SMTPD_---0Ta-AHFA_1566294571) by smtp.aliyun-inc.com(127.0.0.1); Tue, 20 Aug 2019 17:49:32 +0800 From: Alex Shi To: cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Andrew Morton , Mel Gorman , Tejun Heo Cc: Alex Shi , Johannes Weiner , Michal Hocko , Vladimir Davydov , Vlastimil Babka , Dan Williams , Oscar Salvador , Wei Yang , Pavel Tatashin , Arun KS , Qian Cai , Andrey Ryabinin , "Kirill A. Shutemov" , Hugh Dickins , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Andrea Arcangeli , "Aneesh Kumar K.V" , David Rientjes , Souptick Joarder , swkhack , "Potyra, Stefan" , Mike Rapoport , Alexander Duyck , Stephen Rothwell , Colin Ian King , Jason Gunthorpe , Mauro Carvalho Chehab , Matthew Wilcox , Peng Fan , Ira Weiny , Kirill Tkhai , Daniel Jordan , Yafang Shao , Yang Shi Subject: [PATCH 01/14] mm/lru: move pgdat lru_lock into lruvec Date: Tue, 20 Aug 2019 17:48:24 +0800 Message-Id: <1566294517-86418-2-git-send-email-alex.shi@linux.alibaba.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1566294517-86418-1-git-send-email-alex.shi@linux.alibaba.com> References: <1566294517-86418-1-git-send-email-alex.shi@linux.alibaba.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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: This patch move lru_lock into lruvec, give a lru_lock for each of lruvec, thus bring a lru_lock for each of memcg. Per memcg lru_lock would ease the lru_lock contention a lot in this patch series. In some data center, containers are used widely to deploy different kind of services, then multiple memcgs share per node pgdat->lru_lock which cause heavy lock contentions when doing lru operations. On my 2 socket * 6 cores E5-2630 platform, 24 containers run aim9 simultaneously with mmtests' config: # AIM9 export AIM9_TESTTIME=3D180 export AIM9_TESTLIST=3Dpage_test,brk_test perf lock report show much contentions on lru_lock in 20 second snapshot: Name acquired contended avg wait (ns) total wait (n= s) max wait (ns) min wait (ns) &(ptlock_ptr(pag... 22 0 0 0 = 0 0 ... &(&pgdat->lru_lo... 9 7 12728 89096 = 26656 1597 With this patch series, lruvec->lru_lock show no contentions &(&lruvec->lru_l... 8 0 0 0 = 0 0 and aim9 page_test/brk_test performance increased 5%~50%. Now this patch still using per pgdat lru_lock, no function changes yet. Signed-off-by: Alex Shi Cc: Johannes Weiner Cc: Michal Hocko Cc: Vladimir Davydov Cc: Andrew Morton Cc: Vlastimil Babka Cc: Dan Williams Cc: Oscar Salvador Cc: Mel Gorman Cc: Wei Yang Cc: Pavel Tatashin Cc: Arun KS Cc: Qian Cai Cc: Andrey Ryabinin Cc: "Kirill A. Shutemov" Cc: Hugh Dickins Cc: "J=C3=A9r=C3=B4me Glisse" Cc: Andrea Arcangeli Cc: "Aneesh Kumar K.V" Cc: David Rientjes Cc: Souptick Joarder Cc: swkhack Cc: "Potyra, Stefan" Cc: Mike Rapoport Cc: Alexander Duyck Cc: Stephen Rothwell Cc: Colin Ian King Cc: Jason Gunthorpe Cc: Mauro Carvalho Chehab Cc: Matthew Wilcox Cc: Peng Fan Cc: Ira Weiny Cc: Kirill Tkhai Cc: Daniel Jordan Cc: Yafang Shao Cc: Yang Shi Cc: Tejun Heo Cc: cgroups@vger.kernel.org Cc: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org --- include/linux/mmzone.h | 4 +++- mm/compaction.c | 10 +++++----- mm/huge_memory.c | 6 +++--- mm/memcontrol.c | 6 +++--- mm/mlock.c | 10 +++++----- mm/mmzone.c | 1 + mm/page_alloc.c | 1 - mm/page_idle.c | 4 ++-- mm/swap.c | 28 ++++++++++++++-------------- mm/vmscan.c | 38 +++++++++++++++++++------------------- 10 files changed, 55 insertions(+), 53 deletions(-) diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index d77d717c620c..8d0076d084be 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -295,6 +295,9 @@ struct zone_reclaim_stat { =20 struct lruvec { struct list_head lists[NR_LRU_LISTS]; + /* move lru_lock to per lruvec for memcg */ + spinlock_t lru_lock; + struct zone_reclaim_stat reclaim_stat; /* Evictions & activations on the inactive file list */ atomic_long_t inactive_age; @@ -744,7 +747,6 @@ struct zonelist { =20 /* Write-intensive fields used by page reclaim */ ZONE_PADDING(_pad1_) - spinlock_t lru_lock; =20 #ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT /* diff --git a/mm/compaction.c b/mm/compaction.c index 952dc2fb24e5..9a737f343183 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -846,7 +846,7 @@ static bool too_many_isolated(pg_data_t *pgdat) * a fatal signal is pending. */ if (!(low_pfn % SWAP_CLUSTER_MAX) - && compact_unlock_should_abort(&pgdat->lru_lock, + && compact_unlock_should_abort(&pgdat->lruvec.lru_lock, flags, &locked, cc)) { low_pfn =3D 0; goto fatal_pending; @@ -919,7 +919,7 @@ static bool too_many_isolated(pg_data_t *pgdat) if (unlikely(__PageMovable(page)) && !PageIsolated(page)) { if (locked) { - spin_unlock_irqrestore(&pgdat->lru_lock, + spin_unlock_irqrestore(&pgdat->lruvec.lru_lock, flags); locked =3D false; } @@ -949,7 +949,7 @@ static bool too_many_isolated(pg_data_t *pgdat) =20 /* If we already hold the lock, we can skip some rechecking */ if (!locked) { - locked =3D compact_lock_irqsave(&pgdat->lru_lock, + locked =3D compact_lock_irqsave(&pgdat->lruvec.lru_lock, &flags, cc); =20 /* Try get exclusive access under lock */ @@ -1016,7 +1016,7 @@ static bool too_many_isolated(pg_data_t *pgdat) */ if (nr_isolated) { if (locked) { - spin_unlock_irqrestore(&pgdat->lru_lock, flags); + spin_unlock_irqrestore(&pgdat->lruvec.lru_lock, flags); locked =3D false; } putback_movable_pages(&cc->migratepages); @@ -1043,7 +1043,7 @@ static bool too_many_isolated(pg_data_t *pgdat) =20 isolate_abort: if (locked) - spin_unlock_irqrestore(&pgdat->lru_lock, flags); + spin_unlock_irqrestore(&pgdat->lruvec.lru_lock, flags); =20 /* * Updated the cached scanner pfn once the pageblock has been scanned diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 738065f765ab..3a483deee807 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2529,7 +2529,7 @@ static void __split_huge_page(struct page *page, st= ruct list_head *list, xa_unlock(&head->mapping->i_pages); } =20 - spin_unlock_irqrestore(&pgdat->lru_lock, flags); + spin_unlock_irqrestore(&pgdat->lruvec.lru_lock, flags); =20 remap_page(head); =20 @@ -2740,7 +2740,7 @@ int split_huge_page_to_list(struct page *page, stru= ct list_head *list) lru_add_drain(); =20 /* prevent PageLRU to go away from under us, and freeze lru stats */ - spin_lock_irqsave(&pgdata->lru_lock, flags); + spin_lock_irqsave(&pgdata->lruvec.lru_lock, flags); =20 if (mapping) { XA_STATE(xas, &mapping->i_pages, page_index(head)); @@ -2785,7 +2785,7 @@ int split_huge_page_to_list(struct page *page, stru= ct list_head *list) spin_unlock(&pgdata->split_queue_lock); fail: if (mapping) xa_unlock(&mapping->i_pages); - spin_unlock_irqrestore(&pgdata->lru_lock, flags); + spin_unlock_irqrestore(&pgdata->lruvec.lru_lock, flags); remap_page(head); ret =3D -EBUSY; } diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 6f5c0c517c49..2792b8ed405f 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -2557,7 +2557,7 @@ static void lock_page_lru(struct page *page, int *i= solated) { pg_data_t *pgdat =3D page_pgdat(page); =20 - spin_lock_irq(&pgdat->lru_lock); + spin_lock_irq(&pgdat->lruvec.lru_lock); if (PageLRU(page)) { struct lruvec *lruvec; =20 @@ -2581,7 +2581,7 @@ static void unlock_page_lru(struct page *page, int = isolated) SetPageLRU(page); add_page_to_lru_list(page, lruvec, page_lru(page)); } - spin_unlock_irq(&pgdat->lru_lock); + spin_unlock_irq(&pgdat->lruvec.lru_lock); } =20 static void commit_charge(struct page *page, struct mem_cgroup *memcg, @@ -2901,7 +2901,7 @@ void __memcg_kmem_uncharge(struct page *page, int o= rder) =20 /* * Because tail pages are not marked as "used", set it. We're under - * pgdat->lru_lock and migration entries setup in all page mappings. + * pgdat->lruvec.lru_lock and migration entries setup in all page mappin= gs. */ void mem_cgroup_split_huge_fixup(struct page *head) { diff --git a/mm/mlock.c b/mm/mlock.c index a90099da4fb4..1279684bada0 100644 --- a/mm/mlock.c +++ b/mm/mlock.c @@ -194,7 +194,7 @@ unsigned int munlock_vma_page(struct page *page) * might otherwise copy PageMlocked to part of the tail pages before * we clear it in the head page. It also stabilizes hpage_nr_pages(). */ - spin_lock_irq(&pgdat->lru_lock); + spin_lock_irq(&pgdat->lruvec.lru_lock); =20 if (!TestClearPageMlocked(page)) { /* Potentially, PTE-mapped THP: do not skip the rest PTEs */ @@ -206,14 +206,14 @@ unsigned int munlock_vma_page(struct page *page) __mod_zone_page_state(page_zone(page), NR_MLOCK, -nr_pages); =20 if (__munlock_isolate_lru_page(page, true)) { - spin_unlock_irq(&pgdat->lru_lock); + spin_unlock_irq(&pgdat->lruvec.lru_lock); __munlock_isolated_page(page); goto out; } __munlock_isolation_failed(page); =20 unlock_out: - spin_unlock_irq(&pgdat->lru_lock); + spin_unlock_irq(&pgdat->lruvec.lru_lock); =20 out: return nr_pages - 1; @@ -298,7 +298,7 @@ static void __munlock_pagevec(struct pagevec *pvec, s= truct zone *zone) pagevec_init(&pvec_putback); =20 /* Phase 1: page isolation */ - spin_lock_irq(&zone->zone_pgdat->lru_lock); + spin_lock_irq(&zone->zone_pgdat->lruvec.lru_lock); for (i =3D 0; i < nr; i++) { struct page *page =3D pvec->pages[i]; =20 @@ -325,7 +325,7 @@ static void __munlock_pagevec(struct pagevec *pvec, s= truct zone *zone) pvec->pages[i] =3D NULL; } __mod_zone_page_state(zone, NR_MLOCK, delta_munlocked); - spin_unlock_irq(&zone->zone_pgdat->lru_lock); + spin_unlock_irq(&zone->zone_pgdat->lruvec.lru_lock); =20 /* Now we can release pins of pages that we are not munlocking */ pagevec_release(&pvec_putback); diff --git a/mm/mmzone.c b/mm/mmzone.c index 4686fdc23bb9..3750a90ed4a0 100644 --- a/mm/mmzone.c +++ b/mm/mmzone.c @@ -91,6 +91,7 @@ void lruvec_init(struct lruvec *lruvec) enum lru_list lru; =20 memset(lruvec, 0, sizeof(struct lruvec)); + spin_lock_init(&lruvec->lru_lock); =20 for_each_lru(lru) INIT_LIST_HEAD(&lruvec->lists[lru]); diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 272c6de1bf4e..1b07dcaabbd7 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -6677,7 +6677,6 @@ static void __meminit pgdat_init_internals(struct p= glist_data *pgdat) init_waitqueue_head(&pgdat->pfmemalloc_wait); =20 pgdat_page_ext_init(pgdat); - spin_lock_init(&pgdat->lru_lock); lruvec_init(node_lruvec(pgdat)); } =20 diff --git a/mm/page_idle.c b/mm/page_idle.c index 295512465065..420bc0ac8c1e 100644 --- a/mm/page_idle.c +++ b/mm/page_idle.c @@ -42,12 +42,12 @@ static struct page *page_idle_get_page(unsigned long = pfn) return NULL; =20 pgdat =3D page_pgdat(page); - spin_lock_irq(&pgdat->lru_lock); + spin_lock_irq(&pgdat->lruvec.lru_lock); if (unlikely(!PageLRU(page))) { put_page(page); page =3D NULL; } - spin_unlock_irq(&pgdat->lru_lock); + spin_unlock_irq(&pgdat->lruvec.lru_lock); return page; } =20 diff --git a/mm/swap.c b/mm/swap.c index ae300397dfda..63f4782af57a 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -63,12 +63,12 @@ static void __page_cache_release(struct page *page) struct lruvec *lruvec; unsigned long flags; =20 - spin_lock_irqsave(&pgdat->lru_lock, flags); + spin_lock_irqsave(&pgdat->lruvec.lru_lock, flags); lruvec =3D mem_cgroup_page_lruvec(page, pgdat); VM_BUG_ON_PAGE(!PageLRU(page), page); __ClearPageLRU(page); del_page_from_lru_list(page, lruvec, page_off_lru(page)); - spin_unlock_irqrestore(&pgdat->lru_lock, flags); + spin_unlock_irqrestore(&pgdat->lruvec.lru_lock, flags); } __ClearPageWaiters(page); mem_cgroup_uncharge(page); @@ -201,16 +201,16 @@ static void pagevec_lru_move_fn(struct pagevec *pve= c, =20 if (pagepgdat !=3D pgdat) { if (pgdat) - spin_unlock_irqrestore(&pgdat->lru_lock, flags); + spin_unlock_irqrestore(&pgdat->lruvec.lru_lock, flags); pgdat =3D pagepgdat; - spin_lock_irqsave(&pgdat->lru_lock, flags); + spin_lock_irqsave(&pgdat->lruvec.lru_lock, flags); } =20 lruvec =3D mem_cgroup_page_lruvec(page, pgdat); (*move_fn)(page, lruvec, arg); } if (pgdat) - spin_unlock_irqrestore(&pgdat->lru_lock, flags); + spin_unlock_irqrestore(&pgdat->lruvec.lru_lock, flags); release_pages(pvec->pages, pvec->nr); pagevec_reinit(pvec); } @@ -326,9 +326,9 @@ void activate_page(struct page *page) pg_data_t *pgdat =3D page_pgdat(page); =20 page =3D compound_head(page); - spin_lock_irq(&pgdat->lru_lock); + spin_lock_irq(&pgdat->lruvec.lru_lock); __activate_page(page, mem_cgroup_page_lruvec(page, pgdat), NULL); - spin_unlock_irq(&pgdat->lru_lock); + spin_unlock_irq(&pgdat->lruvec.lru_lock); } #endif =20 @@ -733,7 +733,7 @@ void release_pages(struct page **pages, int nr) * same pgdat. The lock is held only if pgdat !=3D NULL. */ if (locked_pgdat && ++lock_batch =3D=3D SWAP_CLUSTER_MAX) { - spin_unlock_irqrestore(&locked_pgdat->lru_lock, flags); + spin_unlock_irqrestore(&locked_pgdat->lruvec.lru_lock, flags); locked_pgdat =3D NULL; } =20 @@ -742,7 +742,7 @@ void release_pages(struct page **pages, int nr) =20 if (is_zone_device_page(page)) { if (locked_pgdat) { - spin_unlock_irqrestore(&locked_pgdat->lru_lock, + spin_unlock_irqrestore(&locked_pgdat->lruvec.lru_lock, flags); locked_pgdat =3D NULL; } @@ -762,7 +762,7 @@ void release_pages(struct page **pages, int nr) =20 if (PageCompound(page)) { if (locked_pgdat) { - spin_unlock_irqrestore(&locked_pgdat->lru_lock, flags); + spin_unlock_irqrestore(&locked_pgdat->lruvec.lru_lock, flags); locked_pgdat =3D NULL; } __put_compound_page(page); @@ -774,11 +774,11 @@ void release_pages(struct page **pages, int nr) =20 if (pgdat !=3D locked_pgdat) { if (locked_pgdat) - spin_unlock_irqrestore(&locked_pgdat->lru_lock, + spin_unlock_irqrestore(&locked_pgdat->lruvec.lru_lock, flags); lock_batch =3D 0; locked_pgdat =3D pgdat; - spin_lock_irqsave(&locked_pgdat->lru_lock, flags); + spin_lock_irqsave(&locked_pgdat->lruvec.lru_lock, flags); } =20 lruvec =3D mem_cgroup_page_lruvec(page, locked_pgdat); @@ -794,7 +794,7 @@ void release_pages(struct page **pages, int nr) list_add(&page->lru, &pages_to_free); } if (locked_pgdat) - spin_unlock_irqrestore(&locked_pgdat->lru_lock, flags); + spin_unlock_irqrestore(&locked_pgdat->lruvec.lru_lock, flags); =20 mem_cgroup_uncharge_list(&pages_to_free); free_unref_page_list(&pages_to_free); @@ -832,7 +832,7 @@ void lru_add_page_tail(struct page *page, struct page= *page_tail, VM_BUG_ON_PAGE(!PageHead(page), page); VM_BUG_ON_PAGE(PageCompound(page_tail), page); VM_BUG_ON_PAGE(PageLRU(page_tail), page); - lockdep_assert_held(&lruvec_pgdat(lruvec)->lru_lock); + lockdep_assert_held(&lruvec->lru_lock); =20 if (!list) SetPageLRU(page_tail); diff --git a/mm/vmscan.c b/mm/vmscan.c index c77d1e3761a7..c7a228525df0 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1805,7 +1805,7 @@ int isolate_lru_page(struct page *page) pg_data_t *pgdat =3D page_pgdat(page); struct lruvec *lruvec; =20 - spin_lock_irq(&pgdat->lru_lock); + spin_lock_irq(&pgdat->lruvec.lru_lock); lruvec =3D mem_cgroup_page_lruvec(page, pgdat); if (PageLRU(page)) { int lru =3D page_lru(page); @@ -1814,7 +1814,7 @@ int isolate_lru_page(struct page *page) del_page_from_lru_list(page, lruvec, lru); ret =3D 0; } - spin_unlock_irq(&pgdat->lru_lock); + spin_unlock_irq(&pgdat->lruvec.lru_lock); } return ret; } @@ -1890,9 +1890,9 @@ static unsigned noinline_for_stack move_pages_to_lr= u(struct lruvec *lruvec, VM_BUG_ON_PAGE(PageLRU(page), page); if (unlikely(!page_evictable(page))) { list_del(&page->lru); - spin_unlock_irq(&pgdat->lru_lock); + spin_unlock_irq(&pgdat->lruvec.lru_lock); putback_lru_page(page); - spin_lock_irq(&pgdat->lru_lock); + spin_lock_irq(&pgdat->lruvec.lru_lock); continue; } lruvec =3D mem_cgroup_page_lruvec(page, pgdat); @@ -1910,10 +1910,10 @@ static unsigned noinline_for_stack move_pages_to_= lru(struct lruvec *lruvec, del_page_from_lru_list(page, lruvec, lru); =20 if (unlikely(PageCompound(page))) { - spin_unlock_irq(&pgdat->lru_lock); + spin_unlock_irq(&pgdat->lruvec.lru_lock); mem_cgroup_uncharge(page); (*get_compound_page_dtor(page))(page); - spin_lock_irq(&pgdat->lru_lock); + spin_lock_irq(&pgdat->lruvec.lru_lock); } else list_add(&page->lru, &pages_to_free); } else { @@ -1976,7 +1976,7 @@ static int current_may_throttle(void) =20 lru_add_drain(); =20 - spin_lock_irq(&pgdat->lru_lock); + spin_lock_irq(&pgdat->lruvec.lru_lock); =20 nr_taken =3D isolate_lru_pages(nr_to_scan, lruvec, &page_list, &nr_scanned, sc, lru); @@ -1988,7 +1988,7 @@ static int current_may_throttle(void) if (global_reclaim(sc)) __count_vm_events(item, nr_scanned); __count_memcg_events(lruvec_memcg(lruvec), item, nr_scanned); - spin_unlock_irq(&pgdat->lru_lock); + spin_unlock_irq(&pgdat->lruvec.lru_lock); =20 if (nr_taken =3D=3D 0) return 0; @@ -1996,7 +1996,7 @@ static int current_may_throttle(void) nr_reclaimed =3D shrink_page_list(&page_list, pgdat, sc, 0, &stat, false); =20 - spin_lock_irq(&pgdat->lru_lock); + spin_lock_irq(&pgdat->lruvec.lru_lock); =20 item =3D current_is_kswapd() ? PGSTEAL_KSWAPD : PGSTEAL_DIRECT; if (global_reclaim(sc)) @@ -2009,7 +2009,7 @@ static int current_may_throttle(void) =20 __mod_node_page_state(pgdat, NR_ISOLATED_ANON + file, -nr_taken); =20 - spin_unlock_irq(&pgdat->lru_lock); + spin_unlock_irq(&pgdat->lruvec.lru_lock); =20 mem_cgroup_uncharge_list(&page_list); free_unref_page_list(&page_list); @@ -2062,7 +2062,7 @@ static void shrink_active_list(unsigned long nr_to_= scan, =20 lru_add_drain(); =20 - spin_lock_irq(&pgdat->lru_lock); + spin_lock_irq(&pgdat->lruvec.lru_lock); =20 nr_taken =3D isolate_lru_pages(nr_to_scan, lruvec, &l_hold, &nr_scanned, sc, lru); @@ -2073,7 +2073,7 @@ static void shrink_active_list(unsigned long nr_to_= scan, __count_vm_events(PGREFILL, nr_scanned); __count_memcg_events(lruvec_memcg(lruvec), PGREFILL, nr_scanned); =20 - spin_unlock_irq(&pgdat->lru_lock); + spin_unlock_irq(&pgdat->lruvec.lru_lock); =20 while (!list_empty(&l_hold)) { cond_resched(); @@ -2119,7 +2119,7 @@ static void shrink_active_list(unsigned long nr_to_= scan, /* * Move pages back to the lru list. */ - spin_lock_irq(&pgdat->lru_lock); + spin_lock_irq(&pgdat->lruvec.lru_lock); /* * Count referenced pages from currently used mappings as rotated, * even though only some of them are actually re-activated. This @@ -2137,7 +2137,7 @@ static void shrink_active_list(unsigned long nr_to_= scan, __count_memcg_events(lruvec_memcg(lruvec), PGDEACTIVATE, nr_deactivate)= ; =20 __mod_node_page_state(pgdat, NR_ISOLATED_ANON + file, -nr_taken); - spin_unlock_irq(&pgdat->lru_lock); + spin_unlock_irq(&pgdat->lruvec.lru_lock); =20 mem_cgroup_uncharge_list(&l_active); free_unref_page_list(&l_active); @@ -2373,7 +2373,7 @@ static void get_scan_count(struct lruvec *lruvec, s= truct mem_cgroup *memcg, file =3D lruvec_lru_size(lruvec, LRU_ACTIVE_FILE, MAX_NR_ZONES) + lruvec_lru_size(lruvec, LRU_INACTIVE_FILE, MAX_NR_ZONES); =20 - spin_lock_irq(&pgdat->lru_lock); + spin_lock_irq(&pgdat->lruvec.lru_lock); if (unlikely(reclaim_stat->recent_scanned[0] > anon / 4)) { reclaim_stat->recent_scanned[0] /=3D 2; reclaim_stat->recent_rotated[0] /=3D 2; @@ -2394,7 +2394,7 @@ static void get_scan_count(struct lruvec *lruvec, s= truct mem_cgroup *memcg, =20 fp =3D file_prio * (reclaim_stat->recent_scanned[1] + 1); fp /=3D reclaim_stat->recent_rotated[1] + 1; - spin_unlock_irq(&pgdat->lru_lock); + spin_unlock_irq(&pgdat->lruvec.lru_lock); =20 fraction[0] =3D ap; fraction[1] =3D fp; @@ -4263,9 +4263,9 @@ void check_move_unevictable_pages(struct pagevec *p= vec) pgscanned++; if (pagepgdat !=3D pgdat) { if (pgdat) - spin_unlock_irq(&pgdat->lru_lock); + spin_unlock_irq(&pgdat->lruvec.lru_lock); pgdat =3D pagepgdat; - spin_lock_irq(&pgdat->lru_lock); + spin_lock_irq(&pgdat->lruvec.lru_lock); } lruvec =3D mem_cgroup_page_lruvec(page, pgdat); =20 @@ -4286,7 +4286,7 @@ void check_move_unevictable_pages(struct pagevec *p= vec) if (pgdat) { __count_vm_events(UNEVICTABLE_PGRESCUED, pgrescued); __count_vm_events(UNEVICTABLE_PGSCANNED, pgscanned); - spin_unlock_irq(&pgdat->lru_lock); + spin_unlock_irq(&pgdat->lruvec.lru_lock); } } EXPORT_SYMBOL_GPL(check_move_unevictable_pages); --=20 1.8.3.1