From patchwork Wed Nov 8 18:28:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13450387 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 E5AF9C4332F for ; Wed, 8 Nov 2023 18:28:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 310518D00C7; Wed, 8 Nov 2023 13:28:35 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2BFDF8D00C3; Wed, 8 Nov 2023 13:28:35 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 187D18D00C7; Wed, 8 Nov 2023 13:28:35 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 0ACA88D00C3 for ; Wed, 8 Nov 2023 13:28:35 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id D68271602B5 for ; Wed, 8 Nov 2023 18:28:34 +0000 (UTC) X-FDA: 81435622548.15.D1BC022 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf29.hostedemail.com (Postfix) with ESMTP id 252C7120027 for ; Wed, 8 Nov 2023 18:28:32 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=DHCbyKu7; dmarc=none; spf=none (imf29.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=1699468113; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=yzk7MZdb5d77onPKXJjjtQ/h/XdKpGzRY4if9O/N7pE=; b=RpcI404yKZahdb2jTFczUanks4rCQWa3pt1+twENGV01i9/CG3kIArsQ+5um3c9cy7ljx3 lefZQfhP7j/9hZ7AkF1rg/Sg5r4Y0/RvGZVRFMkQ1hgx+vn/5e7II+Ny9waK98B81Hb93z nOztxx1VN+ARuHDAp6alldDzPIIYORg= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=DHCbyKu7; dmarc=none; spf=none (imf29.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1699468113; a=rsa-sha256; cv=none; b=Tp7kr/L68HpC4F0oYEAtxqCnCBOC/u7QuinRij+lC7o6YI4s1jOLfV68WdwNDhovikHXc6 W6I+uDCC7NDnzgDjnyrcR/+iGQO8nieknwfnq+WTISfIoKSr/DB/7PjYAZ/tISxCHNdCef VHRZsw91Dlza7VWK4f1tzyVsZ/Xg390= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=yzk7MZdb5d77onPKXJjjtQ/h/XdKpGzRY4if9O/N7pE=; b=DHCbyKu7Ae6BaMQbftKibYWFO5 pBbpE+EfFScZKAHhwckAt8Z4pRgFzGvbF2oWTidSUKTBPBHM3SlJNk6+n8CzBkQP4SbdF/CVJM4Gy 4zbIMybu5ep6GkE8G65vmFNfwSBmxuBPOkiHL7+FvTb6K89NruHlu9N/HUuNgAo8u2oYgSVIuOdIG pjATqwhpxkuQIKILBOZQ9w2bUo213AelZx0QViifquLiOveuvTpJPITPWYnqUhw1v4Il714K90uL6 Is+tW2BPdSeVxwj7/pXX8LTJuf5WOvXhiaJ6hDfBBGQgMdKheq1P4zI4+AqcWf5950bz3N0SYwG3b XVJngHmg==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1r0nHe-002WdG-Ur; Wed, 08 Nov 2023 18:28:10 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , Naoya Horiguchi , linux-mm@kvack.org Subject: [PATCH 1/6] mm: Make mapping_evict_folio() the preferred way to evict clean folios Date: Wed, 8 Nov 2023 18:28:04 +0000 Message-Id: <20231108182809.602073-2-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20231108182809.602073-1-willy@infradead.org> References: <20231108182809.602073-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 252C7120027 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: ggfggnoxrdpcuzyss8n81y33ieetfrw5 X-HE-Tag: 1699468112-740971 X-HE-Meta: U2FsdGVkX1/n5OUCB6gJElzahgQiVglYjsfGlTBWsW4jXl6Yq5hySIiNd8Zs+tw5/BNz0ecVJww+WRv2tqq1Jm5lv+139qmKDQeCO5xeSnDYN7ax+tg3t/+QJCyRT0Z5dgA5Jl8hE3seL1Qz4eAiKF3XFC0dE/qdHcUGLUk5Qtd2f0GXgbOuAzmPdueFGvzC+TK6cVJz8wm9IaGUbpVROxOftjHGYt84DTs9eJdUltCiIc/QaErz+re7N1OsvM8yfa+DMi0VZjw9wWS1ddrjXSZiisDXt+qPTEldQC2cRBzjnl++JN3Q/TYXO+FOlVAaziQkR92inrfFVQj/oaCCfe/ULmG8VTzh/G6tMpp75qMLm5jtVW2Ru15Bgd4LrIaXG55mkS239bgBUYfXj8uKpKIAUObTU6k0VVqL+T/x0eWPlC2i1GOeelyrHlzEmQhN4gnzPSqWZEmkKkmsUSZL5SSUBs0d07xjlJhw+wsfGPS3k+sPOgx4KEvz+VEn0sk3W3AUnMDhd8f4KtOx8lTisrZm2xUl5LA12ZWH4tAbB5MKCzxJWGETznNnqosGtH4V3uiqbbzQuKnR6nyOL2TcscPO36zc+KYPx1aqA9e9Xl3AndL+avzybOyZWZ7n+ZiAbBfr+ml+bk2LZhyg/kt74gXE6fZqaZajY/ooMB/Yrgc2FAPEWha6cgr7krKakfwwv1dPD/GtW/U82cNOecpbcouwf4H7cKynKZNTmwofcZTRDqXAdVRjyzp5ur8PvP9aU2rGwBCn7aMeFIitvxNZtIUvz3z9WEdP88REtVrM8+nZx5IJG3Suwy9FGuQsli2LBmu44l2JULi/aY5LzH6Ei5oIzWjdK9vcDzzyqrJLL3nejGkDtFCbXPH1u7gbYyEW+1TlYwksTCbXea6MK2mCW3AIBLCTd/WswFOVtsPpoBJIWiw2lojtkoDXPOwK1O/JVPnn0y3tZfMM5sEUFLr 8TJuY8jA vvbkZ3RrXDBWLovSyn74vOSAjc6jBckBcdvGnC1mfODGNqfpTLTDl9BLrQ7FDJ7cJiBM/XDSjhBsl2FJzEHEp3DppNuuMJjKg67gIG8xIEHZqYWWmj9iYcE7VT76N06lu4tr3p5SqcnYEWtyhvbCMgR0He5XexqpeuHrD8d/jZ4KG06RT+MFZqWP7Np+fzChbOLjm5tcW2DNu5onAiTWnRThvxPiImTNq8wJI 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: List-Subscribe: List-Unsubscribe: invalidate_inode_page() does very little beyond calling mapping_evict_folio(). Move the check for mapping being NULL into mapping_evict_folio() and make it available to the rest of the MM for use in the next few patches. Signed-off-by: Matthew Wilcox (Oracle) --- mm/internal.h | 1 + mm/truncate.c | 33 ++++++++++++++++----------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index b61034bd50f5..687d89d317d0 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -138,6 +138,7 @@ void filemap_free_folio(struct address_space *mapping, struct folio *folio); int truncate_inode_folio(struct address_space *mapping, struct folio *folio); bool truncate_inode_partial_folio(struct folio *folio, loff_t start, loff_t end); +long mapping_evict_folio(struct address_space *mapping, struct folio *folio); long invalidate_inode_page(struct page *page); unsigned long mapping_try_invalidate(struct address_space *mapping, pgoff_t start, pgoff_t end, unsigned long *nr_failed); diff --git a/mm/truncate.c b/mm/truncate.c index 8e3aa9e8618e..1d516e51e29d 100644 --- a/mm/truncate.c +++ b/mm/truncate.c @@ -266,9 +266,22 @@ int generic_error_remove_page(struct address_space *mapping, struct page *page) } EXPORT_SYMBOL(generic_error_remove_page); -static long mapping_evict_folio(struct address_space *mapping, - struct folio *folio) +/** + * mapping_evict_folio() - Remove an unused folio from the page-cache. + * @mapping: The mapping this folio belongs to. + * @folio: The folio to remove. + * + * Safely remove one folio from the page cache. + * It only drops clean, unused folios. + * + * Context: Folio must be locked. + * Return: The number of pages successfully removed. + */ +long mapping_evict_folio(struct address_space *mapping, struct folio *folio) { + /* The page may have been truncated before it was locked */ + if (!mapping) + return 0; if (folio_test_dirty(folio) || folio_test_writeback(folio)) return 0; /* The refcount will be elevated if any page in the folio is mapped */ @@ -281,25 +294,11 @@ static long mapping_evict_folio(struct address_space *mapping, return remove_mapping(mapping, folio); } -/** - * invalidate_inode_page() - Remove an unused page from the pagecache. - * @page: The page to remove. - * - * Safely invalidate one page from its pagecache mapping. - * It only drops clean, unused pages. - * - * Context: Page must be locked. - * Return: The number of pages successfully removed. - */ long invalidate_inode_page(struct page *page) { struct folio *folio = page_folio(page); - struct address_space *mapping = folio_mapping(folio); - /* The page may have been truncated before it was locked */ - if (!mapping) - return 0; - return mapping_evict_folio(mapping, folio); + return mapping_evict_folio(folio_mapping(folio), folio); } /**