From: Daniel Jordan Subject: [RFC PATCH v2 5/8] mm: enable concurrent LRU removals Date: Mon, 10 Sep 2018 20:59:46 -0400 Message-ID: <20180911005949.5635-2-daniel.m.jordan@oracle.com> References: <20180911004240.4758-1-daniel.m.jordan@oracle.com> Return-path: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2018-07-02; bh=GIGrhLpkq/UwRHuhh/oLny6MvSnAXVnSlsgDHYSyP4U=; b=3OI9XnRydeGejeV8QwnfkqjVjJlEVTTMlsrePEqSQOp4Y9+cOHcgzFBVUPLTe7hH4VG8 de/MXWq1vMnQphx5FIDoOT4uZACs36ca8V1BVUnHkeMMNa3XwmVGXdTm0fl+uyO0nfNg He8/OjcPsPrUB0WIUZZ1f8ImYmmUv+wzyUBW7Dv3tRNEFLL+wwEJ20ujHgCATBJ9I53F mnzO7Z/KcdCSHNxoSwnBezQ7Eg/GfHI/OP+aA+M5DEUESD6TqwxBevbtVAq9C6dl5nJU Qkm34sbCV3bwoRuStRnX/I3qZSMzMh8fPlTctpw9vzGKzeLRuuj60WW1ictvvwTA04hv Ug== In-Reply-To: <20180911004240.4758-1-daniel.m.jordan@oracle.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-mm@kvack.org, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org Cc: aaron.lu@intel.com, ak@linux.intel.com, akpm@linux-foundation.org, dave.dice@oracle.com, dave.hansen@linux.intel.com, hannes@cmpxchg.org, levyossi@icloud.com, ldufour@linux.vnet.ibm.com, mgorman@techsingularity.net, mhocko@kernel.org, Pavel.Tatashin@microsoft.com, steven.sistare@oracle.com, tim.c.chen@intel.com, vdavydov.dev@gmail.com, ying.huang@intel.com The previous patch used the concurrent algorithm serially to see that it was stable for one task. Now in release_pages, take lru_lock as reader instead of writer to allow concurrent removals from one or more LRUs. Suggested-by: Yosef Lev Signed-off-by: Daniel Jordan --- mm/swap.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/mm/swap.c b/mm/swap.c index 613b841bd208..b1030eb7f459 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -737,8 +737,8 @@ void release_pages(struct page **pages, int nr) * same pgdat. The lock is held only if pgdat != NULL. */ if (locked_pgdat && ++lock_batch == SWAP_CLUSTER_MAX) { - write_unlock_irqrestore(&locked_pgdat->lru_lock, - flags); + read_unlock_irqrestore(&locked_pgdat->lru_lock, + flags); locked_pgdat = NULL; } @@ -748,9 +748,8 @@ void release_pages(struct page **pages, int nr) /* Device public page can not be huge page */ if (is_device_public_page(page)) { if (locked_pgdat) { - write_unlock_irqrestore( - &locked_pgdat->lru_lock, - flags); + read_unlock_irqrestore(&locked_pgdat->lru_lock, + flags); locked_pgdat = NULL; } put_zone_device_private_or_public_page(page); @@ -763,9 +762,8 @@ void release_pages(struct page **pages, int nr) if (PageCompound(page)) { if (locked_pgdat) { - write_unlock_irqrestore( - &locked_pgdat->lru_lock, - flags); + read_unlock_irqrestore(&locked_pgdat->lru_lock, + flags); locked_pgdat = NULL; } __put_compound_page(page); @@ -776,14 +774,14 @@ void release_pages(struct page **pages, int nr) struct pglist_data *pgdat = page_pgdat(page); if (pgdat != locked_pgdat) { - if (locked_pgdat) { - write_unlock_irqrestore( - &locked_pgdat->lru_lock, flags); - } + if (locked_pgdat) + read_unlock_irqrestore( + &locked_pgdat->lru_lock, + flags); lock_batch = 0; locked_pgdat = pgdat; - write_lock_irqsave(&locked_pgdat->lru_lock, - flags); + read_lock_irqsave(&locked_pgdat->lru_lock, + flags); } lruvec = mem_cgroup_page_lruvec(page, locked_pgdat); @@ -800,7 +798,7 @@ void release_pages(struct page **pages, int nr) list_add(&page->lru, &pages_to_free); } if (locked_pgdat) - write_unlock_irqrestore(&locked_pgdat->lru_lock, flags); + read_unlock_irqrestore(&locked_pgdat->lru_lock, flags); mem_cgroup_uncharge_list(&pages_to_free); free_unref_page_list(&pages_to_free); -- 2.18.0