From patchwork Wed Jan 4 21:14:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vishal Moola X-Patchwork-Id: 13088959 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 2BA9BC54EBD for ; Wed, 4 Jan 2023 21:15:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BE6EE8E0006; Wed, 4 Jan 2023 16:15:13 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id ACC808E0001; Wed, 4 Jan 2023 16:15:13 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 946648E000E; Wed, 4 Jan 2023 16:15:13 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 8537E8E0001 for ; Wed, 4 Jan 2023 16:15:13 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 518041602BF for ; Wed, 4 Jan 2023 21:15:13 +0000 (UTC) X-FDA: 80318372106.13.ABFCD12 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by imf28.hostedemail.com (Postfix) with ESMTP id AB70DC0019 for ; Wed, 4 Jan 2023 21:15:11 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b="O/D+NyPT"; spf=pass (imf28.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.214.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=1672866911; 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=bHssniIq+RlTj6I0G4i7GbLR9EaGoRL5pu7+dnl0w2w=; b=19FIDFimQu6PM8auo8jEzY2purQ77IeIEGCSg/+jDcqYCbOVVt+JN7NCO30pECRPxeVQ8q zAYpkx+oos+hDF7QYyZpZkz2b1+ZIblKB5bxCwLW9sGbmiOvnUN7Q5qLux3saA6ayq1Gp2 5zPU32QRQcvrhiD33X5s/7F5zx65fA4= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b="O/D+NyPT"; spf=pass (imf28.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.214.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=1672866911; a=rsa-sha256; cv=none; b=fvJaCMiGr8MgKRaXcpQktb89r9nh4zrrA9WK8uy4NIiQVNaMDZ11dW8AkTKeNZyMjN+NDN MUmOeskCN+DRnEFnYwvVYodr1pwkNVHCgBSA5IGg4TS/X+l5JPLeywQy7UagwmXBqo4u0v vTEp61FqsM9Vgi0oL2MNc0ueNTfII/c= Received: by mail-pl1-f179.google.com with SMTP id y1so1704606plb.2 for ; Wed, 04 Jan 2023 13:15:11 -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=bHssniIq+RlTj6I0G4i7GbLR9EaGoRL5pu7+dnl0w2w=; b=O/D+NyPTy4M1sTh+3k/lC1rj/VKJWtCGwMlhTfn6qpBhtlxCb9k3sWDk9Z0oOhWhza 3YwunlQmpmQxHIwc3slP5cWFOfArgatFhNuDOerJW0qUBaI5Zgn5t2tO2YQmHBKWt0/g MFSh/uQIxzlLLmgNa+OoXc3BzfvnfBPdtpNgXKui16mDPVeraZQtRKVUTS73rT71TPkz aIA4qX4NfhLb32N2QF9lXy9drDX9/rkV28NsYpAoVy0G5yfIgIIv+sWh1wOSNzvEDIG6 wJ4oTDHW5KSfgFq7up1/6mIHSjyF7qj/i6841phIxUGWM6AsJ76lWkCXX+vMLrxxAo9V fPYQ== 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=bHssniIq+RlTj6I0G4i7GbLR9EaGoRL5pu7+dnl0w2w=; b=5h+92ESVhNac1XA2Eus04bhFdAJqkpWatZYkUp/LVO/5WkuT0X0ZmC+DenkX6v5FWK nN8NTGPRAikjvKTy87A30WVFmJ7WVtGSFMBRTaRnff83v2Vfv5jQee/VDl8ne6+jDUz8 Gte2slxs/V1WsOo2dK4WldnNjQh66B/dKgjxalQrETXT41U8QSktQ3GJSAFuqYXQQF2T JuFeUT3l1StaPAI+DUp9k4vKOxmhgyXOWmi3yClEg5qsfJp4Ao5oy37BUllj3TVCLX6e BCp+5D6gCiQbKFq9PCbLyTYlGJhWbXL7h5B/v9Cb5qabP915MPtLV2m4guRtKGwqN7IF UssQ== X-Gm-Message-State: AFqh2krAT3q4UG3VuOrL6UmPgnvD6kwIb+XK3OrhnXmD2+eEd79naZ5u ALUUMx85//8a+snmSZhcdMI= X-Google-Smtp-Source: AMrXdXvz9PRTiN1Iw35FsCYmgqPK+8WXm1LuX9COnFA/dLcxFRJCp85h7YOKjNSg0G/oIOwdsOogTA== X-Received: by 2002:a17:90b:3793:b0:226:744:d46a with SMTP id mz19-20020a17090b379300b002260744d46amr31270463pjb.41.1672866910524; Wed, 04 Jan 2023 13:15:10 -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.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Jan 2023 13:15:10 -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 10/23] ext4: Convert mpage_prepare_extent_to_map() to use filemap_get_folios_tag() Date: Wed, 4 Jan 2023 13:14:35 -0800 Message-Id: <20230104211448.4804-11-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: AB70DC0019 X-Stat-Signature: 8aqdoqbhf4fwtqxoakbgyhhyudr9u1su X-HE-Tag: 1672866911-153481 X-HE-Meta: U2FsdGVkX1/+zXcE3G6eB0mjj8WSHnQMNzCDVuRDkpuDSjzojoJLZppfOtCS8ud6h3S/XdeLeDW6S2SOYncmXZjIK/lsadAEonVHBQGGmn9qHNckK8IDoGrCEwLIOIDTcvGtU6YZVXwH1/nyv6FqEpaG4h4sCfqRytjrZbVrP70P91PmC2Hmib4iKuvLx+pEwKP7Ez6eLc0KOFuicom58l7m6qshHKeSYmfr9CJR8fRAUhu2YLMYBSQdYhbBmhsikiYpGUg345Wc7o6z1qqhwID1rAfWGw2EKj32xQxyBmCu2BRTha3ao6jksBS6LTcLrHuBRunDTrKgwZKB79fDD1yDJmII/GrCBJDK1NbqLDWue6XwAc81DPSbKiG75g9EC0uPwnRiiJCFHFUou2ds8huMOfbES32bDrEkNpqm5qceDGDAUE9KbNEzUfW6lMIgbVpHHdREzB/+Rr0I12FFWDiEPx0kt5w/v1k3mJoj5efWT6GzRUSKPSCgJOitHDLmPcbvvjII2KQ451KABTPZUx4WKdybgarBX27EMV3RH0uJ5/ctfcF9xzSwL5MHKADoJUJ4Uq5HbxfI4c2wj5Fk123u54sQhxJSP0/ksAzT53b2fEvEXb2bSYa1VYzbwKOjyodBM/7bWrOz2dN4SNGXTqycnQr5f6YEM886/VItD1VuhvvrLhgmEhKW2LuEGpRk5x1f0ypCiajqhFmH+58udULAFNQZyMmVOM/RtFsF8yWGXwkxYyZkmxVBHxeVDR26p+DxFdO+tON3u4AljGX528iZ2n+4bwNNVd9Wc1m7mmlxpXGpZ5hq4X74sawa52Wk42CYIBO0UMklTOGlxG8vP/VQlP8VLFYRTWsCv47qmIvEdctwfR7DxyPPNaZwzruHjSMN8ch4CfDyLukHrBxaeHG97oTSeYt7Qug01ottTwlnuWoKZt5yTHKaSFI3MaDzdCJm6cIgeSRTtJqxoTl TB1EdpbI frw4kyfOHQVzEMczOVZGm7gFCt09Z0b36COjjH5ChFI9oc2JAXDGYT+ogpHk7avzsfWdZ5jjzQLLMRutL+Mdb9jvaZu9yrPwiRrDTNOYWF47NvoI6aflJds6Y0Z6MPBaqXVK+R5cftFIpdrV0pKZJYbggn3V2bVSj8gr0jyPGtTy7i/gfgEq1boHkOS1IPpNIbcoob6G2/v6FxEHnRsMJBr3bwAlpzpTN8FIhKf/vmGGcAn/fxpJTx94eYEWoBkP9OrbyLRx0017F5QmMnTZ8grEUfmyX2NpDqFUn 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 folios throughout. This is in preparation for the removal of find_get_pages_range_tag(). Now supports large folios. This change removes 11 calls to compound_head(). Signed-off-by: Vishal Moola (Oracle) --- fs/ext4/inode.c | 65 ++++++++++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 33 deletions(-) diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 9d9f414f99fe..fb6cd994e59a 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -2595,8 +2595,8 @@ static bool ext4_page_nomap_can_writeout(struct page *page) static int mpage_prepare_extent_to_map(struct mpage_da_data *mpd) { struct address_space *mapping = mpd->inode->i_mapping; - struct pagevec pvec; - unsigned int nr_pages; + struct folio_batch fbatch; + unsigned int nr_folios; long left = mpd->wbc->nr_to_write; pgoff_t index = mpd->first_page; pgoff_t end = mpd->last_page; @@ -2610,18 +2610,17 @@ static int mpage_prepare_extent_to_map(struct mpage_da_data *mpd) tag = PAGECACHE_TAG_TOWRITE; else tag = PAGECACHE_TAG_DIRTY; - - pagevec_init(&pvec); + folio_batch_init(&fbatch); mpd->map.m_len = 0; mpd->next_page = index; while (index <= end) { - nr_pages = pagevec_lookup_range_tag(&pvec, mapping, &index, end, - tag); - if (nr_pages == 0) + nr_folios = filemap_get_folios_tag(mapping, &index, end, + tag, &fbatch); + if (nr_folios == 0) break; - for (i = 0; i < nr_pages; i++) { - struct page *page = pvec.pages[i]; + for (i = 0; i < nr_folios; i++) { + struct folio *folio = fbatch.folios[i]; /* * Accumulated enough dirty pages? This doesn't apply @@ -2635,10 +2634,10 @@ static int mpage_prepare_extent_to_map(struct mpage_da_data *mpd) goto out; /* If we can't merge this page, we are done. */ - if (mpd->map.m_len > 0 && mpd->next_page != page->index) + if (mpd->map.m_len > 0 && mpd->next_page != folio->index) goto out; - lock_page(page); + folio_lock(folio); /* * If the page is no longer dirty, or its mapping no * longer corresponds to inode we are writing (which @@ -2646,16 +2645,16 @@ static int mpage_prepare_extent_to_map(struct mpage_da_data *mpd) * page is already under writeback and we are not doing * a data integrity writeback, skip the page */ - if (!PageDirty(page) || - (PageWriteback(page) && + if (!folio_test_dirty(folio) || + (folio_test_writeback(folio) && (mpd->wbc->sync_mode == WB_SYNC_NONE)) || - unlikely(page->mapping != mapping)) { - unlock_page(page); + unlikely(folio->mapping != mapping)) { + folio_unlock(folio); continue; } - wait_on_page_writeback(page); - BUG_ON(PageWriteback(page)); + folio_wait_writeback(folio); + BUG_ON(folio_test_writeback(folio)); /* * Should never happen but for buggy code in @@ -2666,49 +2665,49 @@ static int mpage_prepare_extent_to_map(struct mpage_da_data *mpd) * * [1] https://lore.kernel.org/linux-mm/20180103100430.GE4911@quack2.suse.cz */ - if (!page_has_buffers(page)) { - ext4_warning_inode(mpd->inode, "page %lu does not have buffers attached", page->index); - ClearPageDirty(page); - unlock_page(page); + if (!folio_buffers(folio)) { + ext4_warning_inode(mpd->inode, "page %lu does not have buffers attached", folio->index); + folio_clear_dirty(folio); + folio_unlock(folio); continue; } if (mpd->map.m_len == 0) - mpd->first_page = page->index; - mpd->next_page = page->index + 1; + mpd->first_page = folio->index; + mpd->next_page = folio->index + folio_nr_pages(folio); /* * Writeout for transaction commit where we cannot * modify metadata is simple. Just submit the page. */ if (!mpd->can_map) { - if (ext4_page_nomap_can_writeout(page)) { - err = mpage_submit_page(mpd, page); + if (ext4_page_nomap_can_writeout(&folio->page)) { + err = mpage_submit_page(mpd, &folio->page); if (err < 0) goto out; } else { - unlock_page(page); - mpd->first_page++; + folio_unlock(folio); + mpd->first_page += folio_nr_pages(folio); } } else { /* Add all dirty buffers to mpd */ - lblk = ((ext4_lblk_t)page->index) << + lblk = ((ext4_lblk_t)folio->index) << (PAGE_SHIFT - blkbits); - head = page_buffers(page); + head = folio_buffers(folio); err = mpage_process_page_bufs(mpd, head, head, - lblk); + lblk); if (err <= 0) goto out; err = 0; } - left--; + left -= folio_nr_pages(folio); } - pagevec_release(&pvec); + folio_batch_release(&fbatch); cond_resched(); } mpd->scanned_until_end = 1; return 0; out: - pagevec_release(&pvec); + folio_batch_release(&fbatch); return err; }