From patchwork Fri Mar 7 13:54:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 14006513 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 8DD13C28B23 for ; Fri, 7 Mar 2025 13:54:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A96476B008A; Fri, 7 Mar 2025 08:54:19 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 986D66B0095; Fri, 7 Mar 2025 08:54:19 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6074D280002; Fri, 7 Mar 2025 08:54:19 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 25E086B0088 for ; Fri, 7 Mar 2025 08:54:19 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 18AE580B9D for ; Fri, 7 Mar 2025 13:54:20 +0000 (UTC) X-FDA: 83194899480.12.F523EA9 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf06.hostedemail.com (Postfix) with ESMTP id D988718000B for ; Fri, 7 Mar 2025 13:54:17 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=X62+uKJW; dmarc=none; spf=none (imf06.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=1741355658; 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=TkS8MMSXr1V47Aygjy0xD3fBh6jvlfrlC7n0css79m8=; b=XIispXeY64/3kPp5if6gQCFlEoB5nmk/x1Mvq6kAFws1MYTww92belLzqQdVvBvRo9ns+T xmO0UG2sbL9xs/IwG8pe8U45X1eGD3X5kcYa4ou0zBhCE1Aj1w04SayD29d1wq10E7RNoE sb0x1qBpdL/cSDRfP1vALqyXpF5FCbU= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=X62+uKJW; dmarc=none; spf=none (imf06.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=1741355658; a=rsa-sha256; cv=none; b=Ts8PPZGW9pZpIYvdzQ7MvVNs/oVyA408tu25oLBwGUPUB2Oox4wUsgWqWHSqlDClOU1Biw pi3XFl8eOWAgiXWQqYSH+jw5kk8PcsWwpiaoOtCkw7fHXjdznQQFX2wI9RHb8NuOT+csOK mauCSoA/6e/PhoyI5zzx/FIgH8Mjw50= 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=TkS8MMSXr1V47Aygjy0xD3fBh6jvlfrlC7n0css79m8=; b=X62+uKJW5uRc3AljrZOB8IJcR5 FcWRKLLJWmGSKzfnl4nxJjjgjv9O1gFQr2Szy9TLcBuGwadTSn34XR9hOcZkcZB41Pi+9vltTSGsj I5/5wHK5D1RaK79iQCgyfbAFpEJuEk5yD2wnvMggodf32rYwV4qgFknQP1XxeJieUk5Dffkwer1v0 P1PMhVwX0aSgYrj9gT+Fdm8zYV1k4WH7jzshbgcNhuIWt3B2Qu/RHhF1rKuIRU4FoMfpkyTN43Cmm kXhVONT5gXXOwk7DWD7OpEqI5fKlE2Ht6lIInk/kTeTe6+SDyXkE3Lxa5g5W15n2omOLZ1ep3SK1d bhjLPAUw==; Received: from willy by casper.infradead.org with local (Exim 4.98 #2 (Red Hat Linux)) id 1tqY9Y-0000000CXGa-2Mrx; Fri, 07 Mar 2025 13:54:16 +0000 From: "Matthew Wilcox (Oracle)" To: linux-fsdevel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, intel-gfx@lists.freedesktop.org Subject: [PATCH 08/11] shmem: Add shmem_writeout() Date: Fri, 7 Mar 2025 13:54:08 +0000 Message-ID: <20250307135414.2987755-9-willy@infradead.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250307135414.2987755-1-willy@infradead.org> References: <20250307135414.2987755-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: D988718000B X-Rspam-User: X-Stat-Signature: o5qf3odrw73c5ddwnjdbainhx4n4zfcp X-HE-Tag: 1741355657-533869 X-HE-Meta: U2FsdGVkX19VCr9ZVHh2mQ2egBxwElTKCwiT3fEcvj1pgZpt7yqLzGJ44nMXHzg8kPlhyARi97yqtgy9O23CtQGqcqneAintN19hTjsQfZGQRmUro/zgrCO+OKTXldaHDfShO6dkaLCbLieWALSOfComVHVn+tRioEWQgvm3M37ZtsxV4xaNUWu/klzLGAictCeb+k3sA2fkyfMyABSU/1V2MG/Q8TE80VGJw/8MBKb4n9U8KeJ0+/7o6RCqga8OvEw/7FNLDQoBNn3kwb3AuSTxU6FS6RBi6j6dkE3ShpQ+0FVXJf7jZPiDfJqtTmFLUtzskHYTHjm6hwDXyQyzAbAh1yg5J/6hoZDgUaRcu9sHCnyrZHjXJpMgjZEueZMU95ajXiPfxHO5/OC4k/PWlRdWz23X46rE8WwzT4E9XHHg7bHJwasuYcWISrinZZRfJUUVYHH+wup2LFsIcISvamNTbCtc58pKThCcBPg4H6vsYuD1wzw6R88HXVn8NZgQP5N4pGgL6azw9tQ81COvONPe0fLDiZ0gA8KDlwJKL4kDu/PCUzwSBrh64L8/gcvwa8Y0Muz1H35HHt3ClNQm3vVePu2K14pJyV/K0jHJT7/lVGCatjFXQNuGeoOTir2zYr3c1IQ9HP64WFPDfmP/uPasxB5Rqzqzhlnh0k5UjniKBpHahVZqRa9vRfSmaQC5ru+OwT3NZ45bkjXP2KvJBcPrlbA2lX4MHYu5CmVBkUANXwjBPn1rmZ/SjSAT6FVDhDdBh/v6ROBmYAZFqmSq1Yu/LUip+WqB/kKoF45esfxkQqxp7p7i+LL3cwSLE+/iyDZP2fJb4tsyDmBl6m+iqZpJhFNIFMnmLhMrW+l8jtH66JSQA1aUbGJpVU3Vn9ExtSrmhV/X4ykIjY3C8XD6gm5DtvN1KToumslsMGmbYAprdZEX9RE9SObrnKcDUMgLxgC0Z1SnXsS0YUMIQwD ae0m57Ko 7OaOupQz4IH+Wubr9Tx0HSu96hTyPwxvw4O50R+WTpGTnx+ug0SG8Lhbngpvfg+kS7cELpk1gMgIil+aQ+7IWe4g2DQciSXW74LdcULI1UoCJPfJVjH9Eqn8WXbLGttpf27vxi/1r87lJTatoXI7X7yN6EygendDdEnlq8ROoZo9K/mCzUHU4SAQhfzMQcoC2YqTGgI6z3ys9IoXO/ejSlr/4M2tHysth5YpkJW3TgN4/IdDjWp2BwgGJO8V5uIhB5+AdIOX/142OF3UCqJQr6XooV+Rg3tfxUYVG 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: This will be the replacement for shmem_writepage(). Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: Baolin Wang --- include/linux/shmem_fs.h | 7 ++++--- mm/shmem.c | 20 ++++++++++++++------ 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h index 0b273a7b9f01..5f03a39a26f7 100644 --- a/include/linux/shmem_fs.h +++ b/include/linux/shmem_fs.h @@ -104,10 +104,11 @@ static inline bool shmem_mapping(struct address_space *mapping) return false; } #endif /* CONFIG_SHMEM */ -extern void shmem_unlock_mapping(struct address_space *mapping); -extern struct page *shmem_read_mapping_page_gfp(struct address_space *mapping, +void shmem_unlock_mapping(struct address_space *mapping); +struct page *shmem_read_mapping_page_gfp(struct address_space *mapping, pgoff_t index, gfp_t gfp_mask); -extern void shmem_truncate_range(struct inode *inode, loff_t start, loff_t end); +int shmem_writeout(struct folio *folio, struct writeback_control *wbc); +void shmem_truncate_range(struct inode *inode, loff_t start, loff_t end); int shmem_unuse(unsigned int type); #ifdef CONFIG_TRANSPARENT_HUGEPAGE diff --git a/mm/shmem.c b/mm/shmem.c index ba162e991285..427b7f70fffb 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1536,12 +1536,20 @@ int shmem_unuse(unsigned int type) return error; } -/* - * Move the page from the page cache to the swap cache. - */ static int shmem_writepage(struct page *page, struct writeback_control *wbc) { - struct folio *folio = page_folio(page); + return shmem_writeout(page_folio(page), wbc); +} + +/** + * shmem_writeout - Write the folio to swap + * @folio: The folio to write + * @wbc: How writeback is to be done + * + * Move the folio from the page cache to the swap cache. + */ +int shmem_writeout(struct folio *folio, struct writeback_control *wbc) +{ struct address_space *mapping = folio->mapping; struct inode *inode = mapping->host; struct shmem_inode_info *info = SHMEM_I(inode); @@ -1586,9 +1594,8 @@ static int shmem_writepage(struct page *page, struct writeback_control *wbc) try_split: /* Ensure the subpages are still dirty */ folio_test_set_dirty(folio); - if (split_huge_page_to_list_to_order(page, wbc->list, 0)) + if (split_folio_to_list(folio, wbc->list)) goto redirty; - folio = page_folio(page); folio_clear_dirty(folio); } @@ -1660,6 +1667,7 @@ static int shmem_writepage(struct page *page, struct writeback_control *wbc) folio_unlock(folio); return 0; } +EXPORT_SYMBOL_GPL(shmem_writeout); #if defined(CONFIG_NUMA) && defined(CONFIG_TMPFS) static void shmem_show_mpol(struct seq_file *seq, struct mempolicy *mpol)