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 7F2C5C4332F for ; Thu, 15 Dec 2022 01:48:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DE7EF8E0006; Wed, 14 Dec 2022 20:48:48 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D986D8E0002; Wed, 14 Dec 2022 20:48:48 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C5FDC8E0006; Wed, 14 Dec 2022 20:48:48 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id B77398E0002 for ; Wed, 14 Dec 2022 20:48:48 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 8A0CCAB078 for ; Thu, 15 Dec 2022 01:48:48 +0000 (UTC) X-FDA: 80242856736.27.71B080F Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf13.hostedemail.com (Postfix) with ESMTP id D7DFA2000D for ; Thu, 15 Dec 2022 01:48:46 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=dOd9p0hI; spf=pass (imf13.hostedemail.com: domain of chao@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=chao@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1671068927; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=q+ycp5ukneiNa3xJU2JiD6SAReCy62klbbgoW451CDY=; b=QDB4k9ZgSlkj5NtQyHZgMagC6D17qZznwssO4CNWvskunyAOsgwviZXUniiVpIpshgQJ9n ibOa9Ne6pz/YP2fzEGvtAUfra8JSOisNOyJdBq0Y6D4Zns++/s05bahFtrUM3cnM9fWGcU uJL2zisDUheNeOHWaRcXPPxY8NPWPz0= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=dOd9p0hI; spf=pass (imf13.hostedemail.com: domain of chao@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=chao@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1671068927; a=rsa-sha256; cv=none; b=WGJiD5kjWEibi1qwU8uwdKqjSy8rODqsImnSRcXj4VEJYmhWlzPyvv8327YlmM2pq8kdYf KCMeQOwbH9Cx+RNSzC0SDhd6Ha15ecqORzbQvTwYue4k6mZnZf3absiDjnC6rvVbZoyqod 7WNR65WirnSC4aiWgIrMkXEav8y3BC8= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C1F7561CB4; Thu, 15 Dec 2022 01:48:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B56FDC433EF; Thu, 15 Dec 2022 01:48:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1671068925; bh=ojlxsqHj3+udjuB/zrA6wUVW60/Z8ZKDNPvSfZT7Efw=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=dOd9p0hIwuZZIOBJQh5ug6BMt9lDvWcd6AUyY9paTGx2xxa9gHoWUE+aKWjZRsnwI k5UdHjluDM1CEQbv0150adrYFUxyko/PBS9fJB9Tvu1kMZ5JNC86+sRmS/7I8iMytO CwW4T1eyL+ImKY8ASgyk54byohY1nxG1maXQBkCzWoGQtasLa/EPTDxorocKr2dHHB /9/3wX4gpJ0Sh71mwdByqZYaA13wHrhHgLMuN+GThj0c2E1iqM0Xx0h5NmUQQArsDu pvIGbFRWIGl55UMnatv8rWT8iBIb0FO+UrJjA+XdwJFay6cCdV91dU10jmqYwk9OXI oUYUdFN/yFZFg== Message-ID: <6770f692-490e-34fc-46f8-4f65aa071f58@kernel.org> Date: Thu, 15 Dec 2022 09:48:41 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.5.0 Subject: Re: [RFC PATCH] f2fs: Convert f2fs_write_cache_pages() to use filemap_get_folios_tag() Content-Language: en-US To: "Vishal Moola (Oracle)" Cc: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-mm@kvack.org, fengnanchang@gmail.com, linux-fsdevel@vger.kernel.org References: <0a95ba7b-9335-ce03-0f47-5d9f4cce988f@kernel.org> <20221212191317.9730-1-vishal.moola@gmail.com> From: Chao Yu In-Reply-To: <20221212191317.9730-1-vishal.moola@gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Stat-Signature: 3ufr59qqqwimftcu7keig9yxubko4orf X-Rspam-User: X-Rspamd-Queue-Id: D7DFA2000D X-Rspamd-Server: rspam06 X-HE-Tag: 1671068926-209276 X-HE-Meta: U2FsdGVkX1+98XaOH9oVELS/qBXfit8cBpKKzB1wZckaoc0sErK2N5BE9g58iOiYonhYhZiueIXPsbD/+7BMJ4gHsCl3fzQQHK4TODDTYd48t5IAGMs37OykC3iXFfu6KP7k0mcjyN7lZpHewUa+JRer082NaTO0/uW0H+Ctw5x/T1XwhPwUgSxsEc0OCOlElqK2OPeARLU4ykZqO1vfFGgrQ3z8UU6JUxRhx8VukPWe2MH9SqJq7htoleF1znXxT2WoOzK1ehiN5m3sai395WwD2MujzUmEo5u0o/QFajU1tiwGlIZi66sLo0XJIsnjmYbsoYbSk2YBDTt/l9t8C9+DIqJmMiGVwhjO5rM9X5k1ExsYf9PPETZA77N22olZOwl/ACpR22ynzB0HrNALQ3M4xe+DNSikLJZKPfO+ZFkGjd6iOwqbquhi0y5mbazmBhr4I5c93CmLmukOjthhfh5FOnkZ3Gk6rzRMBL8xPy/ZD3vTkXcvhWuIBd7BfLRlWS6xGC4/vh0Vv1EettBWpuP9cXpSzMBCChkFUYqBXDgu4/hmCvrO+FddD8fI5i/vzszD7Xh6u0QzDZ9xxalHi4D337+gr/fuuaB+s91jVavRWe/b2C9L4Afy+Vao3RGNga+c7HivDZefwjPnu7pfJZChCDKQ706rmkBAMYExkynJBA5RDQV+V+MUyvTeuLA/cfmTwhqVel4fm8kWrXxTklboxEVJdxgRJvuE3UYSPT6tM/tCytVF8t0s8fLaTXZQQDfjZ52NQOqQKjKJ3Dor7X+O4Z1bSQ180RSQ2HOKtCA9sm34FjPgZha0C9DbEuATRp7UMFktJib73uX19TtyEdoKb4fUPbtF+W/pZD6VbVqLsYUGH07IoJwWX4E5/kLsadzu5yB4sOq5KGTpztubd0H58v76699uGG6TdWwNSTZXPOyJ5hY7uK0PlDcH7dn07vr1kGffCBlQPsWKI1Q t9Mk9fyD wy58zOm206ysP4DOIveXI1iP0eUPUu6Yiocs7fqY9lb6tx/ZtyYoF2ozaVwxhEJVJ6hT9Jdo5gfWs5d4ksIVGjuSjk7MTd+Ssg2h0fXbm0NPFIAcmH3JOjOlQZop4G2+DISRxrDLxwaVROpDraNubdmI2XQ== 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 2022/12/13 3:13, Vishal Moola (Oracle) wrote: > Converted the function to use a folio_batch instead of pagevec. This is in > preparation for the removal of find_get_pages_range_tag(). > > Also modified f2fs_all_cluster_page_ready to take in a folio_batch instead > of pagevec. This does NOT support large folios. The function currently > only utilizes folios of size 1 so this shouldn't cause any issues right > now. > > This version of the patch limits the number of pages fetched to > F2FS_ONSTACK_PAGES. If that ever happens, update the start index here > since filemap_get_folios_tag() updates the index to be after the last > found folio, not necessarily the last used page. > > Signed-off-by: Vishal Moola (Oracle) > --- > > Let me know if you prefer this version and I'll include it in v5 > of the patch series when I rebase it after the merge window. > > --- > fs/f2fs/data.c | 86 ++++++++++++++++++++++++++++++++++---------------- > 1 file changed, 59 insertions(+), 27 deletions(-) > > diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c > index a71e818cd67b..1703e353f0e0 100644 > --- a/fs/f2fs/data.c > +++ b/fs/f2fs/data.c > @@ -2939,6 +2939,7 @@ static int f2fs_write_cache_pages(struct address_space *mapping, > int ret = 0; > int done = 0, retry = 0; > struct page *pages[F2FS_ONSTACK_PAGES]; > + struct folio_batch fbatch; > struct f2fs_sb_info *sbi = F2FS_M_SB(mapping); > struct bio *bio = NULL; > sector_t last_block; > @@ -2959,6 +2960,7 @@ static int f2fs_write_cache_pages(struct address_space *mapping, > .private = NULL, > }; > #endif > + int nr_folios, p, idx; > int nr_pages; > pgoff_t index; > pgoff_t end; /* Inclusive */ > @@ -2969,6 +2971,8 @@ static int f2fs_write_cache_pages(struct address_space *mapping, > int submitted = 0; > int i; > > + folio_batch_init(&fbatch); > + > if (get_dirty_pages(mapping->host) <= > SM_I(F2FS_M_SB(mapping))->min_hot_blocks) > set_inode_flag(mapping->host, FI_HOT_DATA); > @@ -2994,13 +2998,38 @@ static int f2fs_write_cache_pages(struct address_space *mapping, > tag_pages_for_writeback(mapping, index, end); > done_index = index; > while (!done && !retry && (index <= end)) { > - nr_pages = find_get_pages_range_tag(mapping, &index, end, > - tag, F2FS_ONSTACK_PAGES, pages); > - if (nr_pages == 0) > + nr_pages = 0; > +again: > + nr_folios = filemap_get_folios_tag(mapping, &index, end, > + tag, &fbatch); > + if (nr_folios == 0) { > + if (nr_pages) > + goto write; > break; > + } > > + for (i = 0; i < nr_folios; i++) { > + struct folio* folio = fbatch.folios[i]; > + > + idx = 0; > + p = folio_nr_pages(folio); > +add_more: > + pages[nr_pages] = folio_page(folio,idx); > + folio_ref_inc(folio); It looks if CONFIG_LRU_GEN is not set, folio_ref_inc() does nothing. For those folios recorded in pages array, we need to call folio_get() here to add one more reference on each of them? > + if (++nr_pages == F2FS_ONSTACK_PAGES) { > + index = folio->index + idx + 1; > + folio_batch_release(&fbatch); Otherwise after folio_batch_release(), it may cause use-after-free issue when accessing pages array? Or am I missing something? > + goto write; > + } > + if (++idx < p) > + goto add_more; > + } > + folio_batch_release(&fbatch); > + goto again; > +write: > for (i = 0; i < nr_pages; i++) { > struct page *page = pages[i]; > + struct folio *folio = page_folio(page); > bool need_readd; > readd: > need_readd = false; > @@ -3017,7 +3046,7 @@ static int f2fs_write_cache_pages(struct address_space *mapping, > } > > if (!f2fs_cluster_can_merge_page(&cc, > - page->index)) { > + folio->index)) { > ret = f2fs_write_multi_pages(&cc, > &submitted, wbc, io_type); > if (!ret) > @@ -3026,27 +3055,28 @@ static int f2fs_write_cache_pages(struct address_space *mapping, > } > > if (unlikely(f2fs_cp_error(sbi))) > - goto lock_page; > + goto lock_folio; > > if (!f2fs_cluster_is_empty(&cc)) > - goto lock_page; > + goto lock_folio; > > if (f2fs_all_cluster_page_ready(&cc, > pages, i, nr_pages, true)) > - goto lock_page; > + goto lock_folio; > > ret2 = f2fs_prepare_compress_overwrite( > inode, &pagep, > - page->index, &fsdata); > + folio->index, &fsdata); > if (ret2 < 0) { > ret = ret2; > done = 1; > break; > } else if (ret2 && > (!f2fs_compress_write_end(inode, > - fsdata, page->index, 1) || > + fsdata, folio->index, 1) || > !f2fs_all_cluster_page_ready(&cc, > - pages, i, nr_pages, false))) { > + pages, i, nr_pages, > + false))) { > retry = 1; > break; > } > @@ -3059,46 +3089,47 @@ static int f2fs_write_cache_pages(struct address_space *mapping, > break; > } > #ifdef CONFIG_F2FS_FS_COMPRESSION > -lock_page: > +lock_folio: > #endif > - done_index = page->index; > + done_index = folio->index; > retry_write: > - lock_page(page); > + folio_lock(folio); > > - if (unlikely(page->mapping != mapping)) { > + if (unlikely(folio->mapping != mapping)) { > continue_unlock: > - unlock_page(page); > + folio_unlock(folio); > continue; > } > > - if (!PageDirty(page)) { > + if (!folio_test_dirty(folio)) { > /* someone wrote it for us */ > goto continue_unlock; > } > > - if (PageWriteback(page)) { > + if (folio_test_writeback(folio)) { > if (wbc->sync_mode != WB_SYNC_NONE) > - f2fs_wait_on_page_writeback(page, > + f2fs_wait_on_page_writeback( > + &folio->page, > DATA, true, true); > else > goto continue_unlock; > } > > - if (!clear_page_dirty_for_io(page)) > + if (!folio_clear_dirty_for_io(folio)) > goto continue_unlock; > > #ifdef CONFIG_F2FS_FS_COMPRESSION > if (f2fs_compressed_file(inode)) { > - get_page(page); > - f2fs_compress_ctx_add_page(&cc, page); > + folio_get(folio); > + f2fs_compress_ctx_add_page(&cc, &folio->page); > continue; > } > #endif > - ret = f2fs_write_single_data_page(page, &submitted, > - &bio, &last_block, wbc, io_type, > - 0, true); > + ret = f2fs_write_single_data_page(&folio->page, > + &submitted, &bio, &last_block, > + wbc, io_type, 0, true); > if (ret == AOP_WRITEPAGE_ACTIVATE) > - unlock_page(page); > + folio_unlock(folio); > #ifdef CONFIG_F2FS_FS_COMPRESSION > result: > #endif > @@ -3122,7 +3153,8 @@ static int f2fs_write_cache_pages(struct address_space *mapping, > } > goto next; > } > - done_index = page->index + 1; > + done_index = folio->index + > + folio_nr_pages(folio); > done = 1; > break; > } > @@ -3136,7 +3168,7 @@ static int f2fs_write_cache_pages(struct address_space *mapping, > if (need_readd) > goto readd; > } > - release_pages(pages, nr_pages); > + release_pages(pages,nr_pages); No need to change? Thanks, > cond_resched(); > } > #ifdef CONFIG_F2FS_FS_COMPRESSION