From patchwork Mon Dec 12 19:13:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vishal Moola X-Patchwork-Id: 13071393 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 EE50DC00145 for ; Mon, 12 Dec 2022 19:15:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5A2138E0003; Mon, 12 Dec 2022 14:15:32 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 552378E0002; Mon, 12 Dec 2022 14:15:32 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 419A08E0003; Mon, 12 Dec 2022 14:15:32 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 2F6DB8E0002 for ; Mon, 12 Dec 2022 14:15:32 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id E18561406B8 for ; Mon, 12 Dec 2022 19:15:31 +0000 (UTC) X-FDA: 80234608062.23.B19DA76 Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by imf19.hostedemail.com (Postfix) with ESMTP id 2D8CD1A0006 for ; Mon, 12 Dec 2022 19:15:29 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=nw6aRHz5; spf=pass (imf19.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.210.179 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1670872530; 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=xkM+afTsz5CqxyM8zs9D+iGsBZPiJzEAQMC/u5lyTL0=; b=dNMA1eCtLYn25bmKU1Ka5Uls3eWeGgzBUOpIVqLTy17AWtaN+cIKJXLwY4/komHywkyXSC XQWx8q/adDPT3WkYac6WOK+fIM/6iH5eW9cxIVGYsutxmNINkVDpBScxqpa2dQfl7I4NTe 9aDJGMzEdxrk5nZ6LSh9T6sedUhdC6E= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=nw6aRHz5; spf=pass (imf19.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.210.179 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1670872530; a=rsa-sha256; cv=none; b=DVMUYuo+viQGeE9c9Q++uPDAiTvAooMWrC5h4qKxASsNWdGvNqi3phiiVtjzAt5n5G8Eoa k2FxEXor38swBJfT/4BKKbbOwJBaqxD7UtYu9PV8URKVOgBhwpKIlp4VMQo5BLhAr2rMmz izryekErPT7ue9F3pYLZFS1JZ5+qXXI= Received: by mail-pf1-f179.google.com with SMTP id a14so606159pfa.1 for ; Mon, 12 Dec 2022 11:15:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xkM+afTsz5CqxyM8zs9D+iGsBZPiJzEAQMC/u5lyTL0=; b=nw6aRHz51wqaynmeH7AmMW3V+PrnQ7b13g7pdbT/3q/sYZ6zf4XwtfYCZ1rpiCiYqH pI4I/LqRIb5iTeb4DR9bwnqEWbh0bvxLhQnFn8DDCpiX7obMqaaacq4ZoujxXeeAtIpD iP7+Suj0lV5uFqedHjnmOEzupb/AZwifYl82gFtBMlsiuJNR2DjNQj/2WGXWaCy/Kups algKTyoa3OMcY7nFxh1KVtC2ohQx1eUS2udKylCSa7afpl0T2bCptskCXIT4SX0TNFr/ w/+oa1x9pbOn//nzx0oIMuN1NiDR8cz9CT8LQu4zlDddjaJ0U19JkVnLzOrpPVnwvYqe zExQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xkM+afTsz5CqxyM8zs9D+iGsBZPiJzEAQMC/u5lyTL0=; b=OaiOCxwMqmStf9/I++a6OTOaugfeqEiwu3a5LlDm8eF5E9l4pBUhNvaMqEoUG9Reny K/YXTOLCS4V75/10VcdUsSMXjU7lE/JwUg4oWLtCyquZP4TsGfgvPE7gY7/onOHaJOiO dkn42JYWVzDNBlywafGeJT0lNaO938lTU4Q9wn18zyQy/6717DmkrsJjSpOmoPE6dv6Z 5SBak7lYYaY+g6qkXVtGA/hQ+BY2JQM6vTEtXg53u9lnuVz2bHHxYDBpFSMsnf5vzj0o aMn5gXyLuoIWysumE2AQaO2gSIRLdI3fTb2lwlYuvj7+i7jZWmaPIa/kTyiGeKre6vsJ k0Vg== X-Gm-Message-State: ANoB5pkNbRf4vdmw/Yq180QlfG0DqYIikiwc3md/JaINgtH2aW+WexDi 79Gmma41NCfBGfwGDA/GsnA= X-Google-Smtp-Source: AA0mqf6xHmaysAxy1tMtGrFaKJFTa1JaRWPfex9MBQgoDXluY4qrM4PveChIIQzp53ZYM19xWdXpBg== X-Received: by 2002:a05:6a00:1c9c:b0:577:3126:704b with SMTP id y28-20020a056a001c9c00b005773126704bmr18893111pfw.17.1670872528763; Mon, 12 Dec 2022 11:15:28 -0800 (PST) Received: from fedora.hsd1.ca.comcast.net ([2601:644:8002:1c20::2c6b]) by smtp.googlemail.com with ESMTPSA id u24-20020a62d458000000b00574345ee12csm6149470pfl.23.2022.12.12.11.15.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Dec 2022 11:15:28 -0800 (PST) From: "Vishal Moola (Oracle)" To: chao@kernel.org Cc: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-mm@kvack.org, fengnanchang@gmail.com, linux-fsdevel@vger.kernel.org, "Vishal Moola (Oracle)" Subject: [RFC PATCH] f2fs: Convert f2fs_write_cache_pages() to use filemap_get_folios_tag() Date: Mon, 12 Dec 2022 11:13:18 -0800 Message-Id: <20221212191317.9730-1-vishal.moola@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <0a95ba7b-9335-ce03-0f47-5d9f4cce988f@kernel.org> References: <0a95ba7b-9335-ce03-0f47-5d9f4cce988f@kernel.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 2D8CD1A0006 X-Stat-Signature: ytjnph3a9nnatq45i7j7min56pkoka19 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1670872529-10834 X-HE-Meta: U2FsdGVkX1+knVvVBjPH5GcMO1WjXRC77qmxMqMZVAP58OrUew8qmUMIfacaP7E00gf6351VYypf5tBnu8dOEk2UyOsh5YbUtgwvZsGjncW1mbB6TPa7t3Ao+VjpvQVGi3bvnZKEDgDn09Zi252mhUSJLxXUoK89CpCBN0b6ktx4EaasYlEEAJ+QDh6PtVAYBWmP32123Z6ThOgDzws0t4U5F59oO2xybA17N0fMcqpl7fh+JFfPReSVrosddL21aou2G0i3XrIp5vJPFW45WUwtnxeSl2BEenpeDSgDQG9vnVOQvj6XZLwk2ZNo96o/fdetp2S3qLtsR8XWj/PaqrU6fEAExwJS31uvrZIaDEbiK+7T1xAjY3zvL0Sf+wxe99QVCnNfWWdhorcA6xWaDDQBDaWo2JukTqMk+EUdUNgosnZmArJt7PfUh9KxzkwZy40RrKrnSS+QHNkU9w3GPr69rqfF1wWZC843eyz8frKobwF1MqBpEsEVcIrWh0q7BacL8YRU45bGc13jgv0yWtwBf7G56irfBCEIy1rHNVQqU0I864ZO+/3NSn395no8lT9uNk0vxI8BIeQoddLu8MHD4TR4PdlmCfjiM2fJjJbL0B50duN753IdJtN99zyg9fTDGOufhF/p/feYrHowpBskFcnja1qK4ADZAmWeD1DEFz+Sd0iwkE0UbU/71Yrf/mPsHkvk/DQvZDlrtdlT6Ogw/WOt/90ispGexQhKlWQFPmgDNkCkZN0tJG6jw4xWk8ElZMZFXFxEAO9VGxHUAxSKulv3SRIgdxPYMW49z/lXwnlb7AiFur7iFDDbzHTTph/2nQGEHo+uSOrHnCq9AMBTbC3+TSjkSU8tEPqs2NDodGe6h3E9LCX/lZLeF2e0KAtTk/DMPadM+H8z6nura4VSAu/PJhM5DDmNmHnTpqq5t5RjApG5bstIJGKpxwZ2ujxUs7JYaCkDLgwwPmn TiUBct9L nqF+xIhiHLZv11pGF1+dk2SsNJgYU6aAl4bwlLh968BU4C4TyCrWHWPKIBbgYD1sLD3B1uQGpz17XnuzTrkw2ykumoI46M9GZbs1bUAUxXiO65PxR47Q0cl7Wqgv3k4G12XgsRfw3VGY8fiJ3yrsyNjovLk+YMHr0+p+A896tzfq7ooV9mVedYdCEJkwRV67pJXnmPO18ucV5xcSRduggcr020/U7lDakKH5BUDcFqNEGmarkAfoGbnqAh6jIhBFFNU769QHh3PRKTvY1ytxTUXJveg== 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: 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); + 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