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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6F370C43334 for ; Mon, 11 Jul 2022 20:53:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C3D3794001D; Mon, 11 Jul 2022 16:53:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BEC55940010; Mon, 11 Jul 2022 16:53:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id ADA6894001D; Mon, 11 Jul 2022 16:53:07 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 9B50B940010 for ; Mon, 11 Jul 2022 16:53:07 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 6B38F60A15 for ; Mon, 11 Jul 2022 20:53:07 +0000 (UTC) X-FDA: 79676018814.29.B594C34 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf10.hostedemail.com (Postfix) with ESMTP id 082BDC0064 for ; Mon, 11 Jul 2022 20:53:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=cYRYmTzr571um7GDP95HWu7iH0GeQMezu9CVoItfaC0=; b=FsIocDSC2YlvaBvaMuYKfOZ+8g XL43HzltA7EaToj69wUq+a3L/iOPQvCAICzJQGSfdq/6xktgAtpQsrmEKpKnJimXOP0nJQ3z+9LzI Lhrp4np51y8jCS+K7bGk0g1GuhDLOgY+aOsJD94WeYhGk3uo1vjQKGgMACnOM4jsHHzpKcRFfu/RO pX1LjwsCXYUC3q+ZdOPvAxTlxeZSyWV6uQKtVJ+/OSlIrgfnJHh++fIZ8WNQ8JxqmCpk68sG8CCv1 DpCYVjjXHuaVKcqbZ6y3Fnl+25/KNFbn+aDoKhhFao9A4fjKflcE16Vs32Ze1cuYXKdTvn4iwmMEv pm1Bhrww==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oB0Ou-006HZw-7n; Mon, 11 Jul 2022 20:53:04 +0000 Date: Mon, 11 Jul 2022 21:53:04 +0100 From: Matthew Wilcox To: linux-mm@kvack.org, Andrew Morton Cc: Hugh Dickins Subject: Re: [PATCH 4/5] mm/vmscan: Convert shrink_active_list() to use a folio Message-ID: References: <20220617154248.700416-1-willy@infradead.org> <20220617154248.700416-5-willy@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220617154248.700416-5-willy@infradead.org> ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1657572787; a=rsa-sha256; cv=none; b=qW4mHhL7tIAKMHvaQ5lNC9Ag1n0QO8mueegw+jpI08M3XNFLbiotIhUXORtlie8ZB/KXGd qxlBGHu6MnIxNpXq5EMQqZlFvoQpjK4FKvV+R08iKMyvrBygKTytreHcWsmelaeJh9YLL/ U4ps+bZxCLCA6sLlphQe9mPY/9Ov7Ls= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=FsIocDSC; dmarc=none; spf=none (imf10.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1657572787; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=cYRYmTzr571um7GDP95HWu7iH0GeQMezu9CVoItfaC0=; b=I20D3eCnnJiFu1Tbss4OTFtX4k0/P0ttshUJwzDOoePlQ+kqsiGInAA+jhHedIuytO8Tkv aGDoJ44JNwcIcBEACLc+bkBtP5TipkOQtVSBrSrhwNlMMPnf99LdQZ9afxbBQ6jdQD9aCu 5hckfhEkfDMrOWwiqxUx+QU4Lw1F7QU= X-Stat-Signature: wjaqimxks6d4xo7wahfu6m394x5w67ku Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=FsIocDSC; dmarc=none; spf=none (imf10.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 082BDC0064 X-Rspam-User: X-HE-Tag: 1657572786-140834 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: On Fri, Jun 17, 2022 at 04:42:47PM +0100, Matthew Wilcox (Oracle) wrote: > @@ -2478,23 +2477,21 @@ static void shrink_active_list(unsigned long nr_to_scan, > > while (!list_empty(&l_hold)) { > struct folio *folio; > - struct page *page; > > cond_resched(); > folio = lru_to_folio(&l_hold); > list_del(&folio->lru); > - page = &folio->page; > > - if (unlikely(!page_evictable(page))) { > - putback_lru_page(page); > + if (unlikely(!folio_evictable(folio))) { > + folio_putback_lru(folio); > continue; > } > > if (unlikely(buffer_heads_over_limit)) { > - if (page_has_private(page) && trylock_page(page)) { > - if (page_has_private(page)) > - try_to_release_page(page, 0); > - unlock_page(page); > + if (folio_get_private(folio) && folio_trylock(folio)) { > + if (folio_get_private(folio)) > + filemap_release_folio(folio, 0); > + folio_unlock(folio); > } > } > Hi Andrew. Hugh points out that the above is not an equivalent transformation for pages which are in the swapcache. Can you apply this fix, or would you like a full patch? diff --git a/mm/vmscan.c b/mm/vmscan.c index 0070c7fb600a..7e34f4c8d956 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -2544,8 +2544,8 @@ static void shrink_active_list(unsigned long nr_to_scan, } if (unlikely(buffer_heads_over_limit)) { - if (folio_get_private(folio) && folio_trylock(folio)) { - if (folio_get_private(folio)) + if (folio_test_private(folio) && folio_trylock(folio)) { + if (folio_test_private(folio)) filemap_release_folio(folio, 0); folio_unlock(folio); }