From patchwork Wed Jan 4 21:14:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vishal Moola X-Patchwork-Id: 13088963 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 47F62C54EBD for ; Wed, 4 Jan 2023 21:15:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6D9628E0011; Wed, 4 Jan 2023 16:15:19 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5C4EE8E0001; Wed, 4 Jan 2023 16:15:19 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3A0D58E0011; Wed, 4 Jan 2023 16:15:19 -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 2CDC58E0001 for ; Wed, 4 Jan 2023 16:15:19 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 05DEF1C647E for ; Wed, 4 Jan 2023 21:15:19 +0000 (UTC) X-FDA: 80318372358.23.2D8B527 Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by imf21.hostedemail.com (Postfix) with ESMTP id 338CB1C001A for ; Wed, 4 Jan 2023 21:15:16 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b="Fd8n+f1/"; spf=pass (imf21.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.216.50 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=1672866917; 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=geJwjn4yJKU06Ftbar/y+HcHHoAvhwpeBoUnwsGYEks=; b=AyYzmkAMUg67+sGqUmJRpyyiR1PX3jpi5aAPgWvP2pyx9k/S1Y/WxG0V9oKbWS3lxi7sRT 9uZ+5MecEzcZuW3r1p/+JT3ViSCJds8hJYxyCXuhEw7wexkWf4QSVUrlybynnXHpO58wAM 9avfB+BUkBX9G9YdU/I1JGv4cfKKcKc= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b="Fd8n+f1/"; spf=pass (imf21.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.216.50 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=1672866917; a=rsa-sha256; cv=none; b=m7leSmLVDz6p8gN9uXNGe6rlwTPJ8kBYIsQCwgkAHWP0u8tdM0CSWH0SHQgEj/+L2z03hm Y4Gp8Dc6VBoPiM4FSeS8fHObzqOeD4N7JPsjVA5oLJUYBTCGR6dBPxpmg7T/CAOOHtLMg1 JSmFjpfs3l5y0lSv0vq5h/ME8lLasdo= Received: by mail-pj1-f50.google.com with SMTP id cl14so1067255pjb.2 for ; Wed, 04 Jan 2023 13:15:16 -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=geJwjn4yJKU06Ftbar/y+HcHHoAvhwpeBoUnwsGYEks=; b=Fd8n+f1/NPank65Zw/kHWJBXTOelusyND5cLXZf9F1s+KS4ORsP19uuv4siEdxBQJT 10Ra99IFy6Oh1HDT1wvzP/oAFamJWd9Qb78Y7+Dr1J5qmNaV5uUh0D+BORnnhdkICTEi hvZ+N2BPjnPfx8nWabVIQ1bECzthUh6LIjPR0RUAG1DeoReFNu2ALc98+mFNSkzv5jSF 7ilXbV6Nd18bsqHzZbqMVX3Ckh1Ya5P58tpex0qa/qLrNBKPcUgEHDw0n2jHxI1unlNg jnduvhRGFEBTsAEtI0NgpHNFrUDMt7WRZ2kUYfejbotDf+e3vgHq5Tkx9eaJHjgYE3BO Jn4w== 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=geJwjn4yJKU06Ftbar/y+HcHHoAvhwpeBoUnwsGYEks=; b=zX2a6VRZPfD5mCXMmvc4o40WEwRwmbqRR0axcAPqSK+JDE9vVWaY/ZGqi8v547Sl6I S4juHvID4MZSbsRtWmyjgtjyBRrZpOXP+H3fxRvA6asfun9M7fWMxkORpOI24Pv8uq5E ZrN+f+HHh74xP/8lIH2zUtP5h8Zbo8y39R5YTi5MIcimXsz4ZXaT8ansAVPDJStZafD6 aV6sUQYXTBbgZ+LnyB4r1hM5lo4br6yHuZXBJzWSw/M02K0Lsao8na3mME7pyuMELf8X OHv2/aNzqKEgLKBFGZOpZ/ECB3EKY+mMakB8np8QicBL3h0ySonYVkFmkj8YIMWgDJH9 izpg== X-Gm-Message-State: AFqh2kompJ34YRrf6V7Wi7cesrRMroXtsb6C/rk6F+k9/tX0dHOgVZLV wwHKl/ACdz2PvJsM0x6+82g= X-Google-Smtp-Source: AMrXdXvBKEF5T2wnCoAj1IOJ4U73abN05uBfAh53KWBYn4m7hU5hHoJzlZNlJTGgGpr6V62AVrABGQ== X-Received: by 2002:a05:6a20:8ee1:b0:ac:3f3f:9fbd with SMTP id m33-20020a056a208ee100b000ac3f3f9fbdmr49160604pzk.48.1672866916135; Wed, 04 Jan 2023 13:15:16 -0800 (PST) Received: from fedora.hsd1.ca.comcast.net ([2601:644:8002:1c20::a55d]) by smtp.googlemail.com with ESMTPSA id i8-20020a17090a138800b00226369149cesm6408pja.21.2023.01.04.13.15.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Jan 2023 13:15:15 -0800 (PST) From: "Vishal Moola (Oracle)" To: linux-fsdevel@vger.kernel.org Cc: linux-afs@lists.infradead.org, linux-kernel@vger.kernel.org, linux-btrfs@vger.kernel.org, ceph-devel@vger.kernel.org, linux-cifs@vger.kernel.org, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, cluster-devel@redhat.com, linux-nilfs@vger.kernel.org, linux-mm@kvack.org, "Vishal Moola (Oracle)" Subject: [PATCH v5 14/23] f2fs: Convert f2fs_write_cache_pages() to use filemap_get_folios_tag() Date: Wed, 4 Jan 2023 13:14:39 -0800 Message-Id: <20230104211448.4804-15-vishal.moola@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230104211448.4804-1-vishal.moola@gmail.com> References: <20230104211448.4804-1-vishal.moola@gmail.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 338CB1C001A X-Stat-Signature: 8iwj31totr69y4mixuqxy43onrcmju9j X-HE-Tag: 1672866916-233589 X-HE-Meta: U2FsdGVkX19t/V0sE1EMsqS1dfTlUrj++youJ1vTrLem7tok0f/TDK085tHKa96xHiA4urTW8AathpomU4pFBXNCITVpFawOmhv6xyi4b+Qg9JWBFSSSLhGonZaUjQ0hC0Kqdc5Yn1MO+5jLj5+kOacaJn1MgzlaXw9hRhVxG4GYrMQhFL7NgFgk6z3mdXKay0iXkku4QuokJtrqV+p4LFX3nURvrMUAdhnwZoss3flejOukXy3OFKFzXXKG+GTvM0vahp80wkgyQnnHbznWoXSN0nGrQs45RM8mdZnWbQT5m6IdeGsBPRCxfKAg68giGu7FwUwZiYt2BYsBDtMCdaOl+qEG7M2SPx5Vcivc8iIqqK04FrAal1SFcOfhxrdogWLHzUJ1/Z0yp+tiMOH4JajLHN0y883ph/CxSIwBcnMPPC4Lyk2O2JiRG0lA2McZAohkXfnI5IErdnp0hQGTX2e1/yYJaUBIo2L0fbAk+/xMY55ffJHzz2xBpwI7P+PWBL/wdJ4s3EiLGqswJZ42IBOxFFtuoywWj6Wl1dmSgjECB7RI/8DtIzngZgwRuI123jSm/l1ErDBGIZJRvNDlGUbW8hERNNzQ4IKuH2LliUvn2GUYUL1rguY3hY8WnSUjJqEHwo7OFLmaXgOpIXp3ZQyb0YyOlN5P+84uKAqYZLKTg2kGblEVivoS7KdwOEZ/pm8PVm4+8VdaWqefnzwhvp14SQCGUmIaPjHn3BoCd0NLZBZ9XyZ8nTV1UxcDK8cAPI2jt0DayQ7jiaGJDd2xAcFfpdDN90tzh+VA2+Zb3SXqjTFARN390o8sY8gnG9XrnXOgzAyp2KC0+GFuvY6KZUsZeERGNPKfWpLaCB/JrxBaoSuPkChCWhPrG1990JCoF35LXc5aR4sGqlOs4/dqwhRFaqU1kWKbMiodSzFPjZdgTDnqkLeCHfiJreuuV/Ew7NcG07KkGx29+jg0nrB 6X2XAr6I VwHGCvHwdjSQguyygFXfXIsR+wO1yJl4BT5o8JLCKinVgMxhIP86v+dfsJYM6VHLxD0D2xU5F66itu7cXxEPjMF+zp9Pj9DamLMrPEWxtN6ahcoxsz9vJwHwC16rlM7GS3HEsdKMh1oZL5tzuXX+cdGc8Dk3Cdcdw51fo787iom91kf4ln2uZ9OSvW8IvIHaOow8nzkKK79DlkLqOQApElRKK0FWD/VH6y8g0IIAs2WQhEBe9by7xlSJCtf2ucGBKS9dPQlyt+cEoEzChc83Z/5K9DA== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000003, 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) Acked-by: Chao Yu --- fs/f2fs/data.c | 84 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 58 insertions(+), 26 deletions(-) diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index 6e43e19c7d1c..ee1256e4fd92 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -2957,6 +2957,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; @@ -2977,6 +2978,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 */ @@ -2987,6 +2989,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); @@ -3012,13 +3016,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_get(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; @@ -3035,7 +3064,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) @@ -3044,27 +3073,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; } @@ -3077,46 +3107,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 @@ -3140,7 +3171,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; }