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 3CDADC4332F for ; Thu, 15 Dec 2022 19:02:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5EB018E0003; Thu, 15 Dec 2022 14:02:31 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5741B8E0002; Thu, 15 Dec 2022 14:02:31 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 415688E0003; Thu, 15 Dec 2022 14:02:31 -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 2C48A8E0002 for ; Thu, 15 Dec 2022 14:02:31 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id E6919120821 for ; Thu, 15 Dec 2022 19:02:30 +0000 (UTC) X-FDA: 80245461660.15.DEF1C5D Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf28.hostedemail.com (Postfix) with ESMTP id 18F28C001E for ; Thu, 15 Dec 2022 19:02:28 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=BdNkBTkL; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf28.hostedemail.com: domain of jaegeuk@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=jaegeuk@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1671130949; 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=/EMDtMgjJ9tyC1qXtsmt5hvaUzvUMsQ1VlSbfHv5CuE=; b=wrTUMR8MwwWuu7LXnq7nI/9SwnhrvUirRVJDW+vwU050VZcnxM+w384YYGAbWaR+GBY9HV KXikLqiyUssuUC8xVdpyNErNMYgXffO8Ro0wMOk9CNtyJSJMp3ycG+/onR2SYvpqpreRDT y7rqsUP0k1Qgq6YFPxK4Df9kjSJNFDw= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=BdNkBTkL; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf28.hostedemail.com: domain of jaegeuk@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=jaegeuk@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1671130949; a=rsa-sha256; cv=none; b=eIc0QemmEw8nJ9dyAY7aBHx1Bv908gy9pVsUcXXvwg9nBfxwvq50RpXF9YN1bA49dr/VSV DrK69Q0SjDANNn3pIq6/fEwGDr3+2WD8lizr89/cOO+mZYn8eN7QLmubb2x/Y9ixw9Z9TB bpASl/+Und+tZCt0M+1IUwUU0z5WJv8= 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 ams.source.kernel.org (Postfix) with ESMTPS id 38B90B81C4D; Thu, 15 Dec 2022 19:02:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C6356C433EF; Thu, 15 Dec 2022 19:02:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1671130946; bh=RvgQ0++wR/IOMA6LXXSWoZBj4HT01wsLNsnKu9rXtk8=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=BdNkBTkL8yaDMDg2xzwNtbyZhvzgsWiOTh3uq6lK69OX8BFuSe8mjq7V1zu4RYtQ+ 1Aaik1kA/igxVryaLEy9lgudpZWXtzWVHa86MRsNQuOAkanoRXopGRYjM8hO8ZWBjZ ppXGsj2CZtz8W+NQAWtu3H9WWXkOoy1lLHpf7iRAYUvZhg2Ceq5XQgDjLa0TuSZwFQ KgSt7XAkKy9zi0SRX179LQvQxGNtRSOsW517432/44rNVMfwtv2akM/nOP6yKxyLaE A+xZvMxQdE4y8v2I5OM9lD2qojDW+sq3neJ4DLRM4yVGDyFKxf8/lkIhE6u7rViB38 4O3C1uM4Y+wbQ== Date: Thu, 15 Dec 2022 11:02:24 -0800 From: Jaegeuk Kim To: "Vishal Moola (Oracle)" Cc: chao@kernel.org, linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-mm@kvack.org, fengnanchang@gmail.com, linux-fsdevel@vger.kernel.org Subject: Re: [RFC PATCH] f2fs: Convert f2fs_write_cache_pages() to use filemap_get_folios_tag() Message-ID: References: <0a95ba7b-9335-ce03-0f47-5d9f4cce988f@kernel.org> <20221212191317.9730-1-vishal.moola@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20221212191317.9730-1-vishal.moola@gmail.com> X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 18F28C001E X-Stat-Signature: udwpzipg6bxtd78hgz7tgbkohqkcktky X-HE-Tag: 1671130948-174648 X-HE-Meta: U2FsdGVkX18dicuQfU4xML77U/qBsjjMm+gCSPmgZB4Cd9pHEekxlspWegjSQ0ZYIor4vx3vT2rTgTydnbSG8MscwdPOuyZgj5Iuh24QZnqn7fZKeZv29iz1W8woTPJDiBkfVzdkYpkcUNQ3nV6lrH/0fLOBN0cTWBK87xGxH9AxdVDllflnFtJqy3X1p82nLt/3oHhx5OAqBqXYDEe4/MNza4K7w7Q6QUpxKPt1mLjmA5A/OkgCtErAkWuDbXaAgRK62fCbhY56WLuV7Fv+SPMxWpb692JlBPEcBbEDPYG+ONEVVT8dnLoufAeH0ODkmx+O9hHe2pCXzNV3hPpMJV1zJEPPqIQMBrvOhd1TLBzHUxV78cV8VGeYc3CI2QQlqyjCO4nVqes4zt4GBo2cRxUSmtO6iHG3OlPVqbvnAkGJv0j5nTmNp6jIsjZFbbkuIvtPaq07Dc1FUnbJKWiMoIKCSP9/XhG+MQfgWpG4YPnX+GeGar6lpes8DdRRFOWXH6dzY4NllIw3j4zL5vcqwvwaxlJ+gUMKWsJ4oboPhg5LJdK1JCbgshiB95HSjM+PFAm8vrHLpueg5UHeplI2qBTG4rh7c6DNBLqe8YRwNiugIOSgy5CmBp2oQhEBe53fEuyYDfdtO1Mko8gBFKyRRJakMYIv1vHee9PSiD0LHmYQz2Yo12/TiGnDAPn5Bj+cMrqDymEJqFaK2343O5/0+HknbuJmBPyS0YQD6VamswVKuXFVcpBjh1oaQofVvTMup/D+qAKbw1DPn2Chuk9hVYRldFlmRLEk2usTu8rqzGB2HVy3ckiWD5Sny3WdgqFViD8i2CUBhxgKc2UK57dWuTp/P8zhP+lshTlqf8se5mP46z55MF3lMwX+o7zMR/PVsv7m2lsUsHKl+rvtrAKfM3UOG8hF0fHQ4MojJGDWPRTtPqC7N90Zja9PpFdmtc7x58JqWpX30GNQViCXJrd 8+g2a3qE WnzVVq163CWeordYy0QLtqUI8MlhHDBJDJcpyLdfPLsAm8eGKFPuxDF3p+Fmc+1lhzqU7ccRz5z90YyGT5dnA8eLkp9Usee8mKn4UPbA8b0SgfXQ= 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 12/12, 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); Can't folio handle this internally with F2FS_ONSTACK_PAGES and pages? > + 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); > + if (++nr_pages == F2FS_ONSTACK_PAGES) { > + index = folio->index + idx + 1; > + folio_batch_release(&fbatch); > + 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); > cond_resched(); > } > #ifdef CONFIG_F2FS_FS_COMPRESSION > -- > 2.38.1