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 BB7A8C3DA7A for ; Fri, 6 Jan 2023 07:57:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C32108E0002; Fri, 6 Jan 2023 02:57:39 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BE30B8E0001; Fri, 6 Jan 2023 02:57:39 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AAA498E0002; Fri, 6 Jan 2023 02:57:39 -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 9702D8E0001 for ; Fri, 6 Jan 2023 02:57:39 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 62696160127 for ; Fri, 6 Jan 2023 07:57:39 +0000 (UTC) X-FDA: 80323619838.19.C3D227A Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf16.hostedemail.com (Postfix) with ESMTP id 4955A180002 for ; Fri, 6 Jan 2023 07:57:37 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=NgJF793Y; spf=pass (imf16.hostedemail.com: domain of agruenba@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=agruenba@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1672991857; 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=xmb3IcLHCLsi/xOiQHUkWYlXfS8doiaC8cJwdmVUFK4=; b=8hICtktXv3VnxRYzW0tTs8NVHrK6yWfOJsfF8pjtq+TP3FwYZyxOkJrN6qRjHChGQLdS7s fSsF7blvsk0sMkf1Oqxd9IEksWUOERkkA7tSZMoJIttOSoqEBzkXgWPqZgTHhnKmo1YlhW 7fg3V6UvvlFDAQEhBOBKbINRt5ppXY4= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=NgJF793Y; spf=pass (imf16.hostedemail.com: domain of agruenba@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=agruenba@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1672991857; a=rsa-sha256; cv=none; b=eBqGeaRUZTdt7byNLr21uWnDvREPpoep3XiA28LtAEt5nP95F7RwkomHYnUlvkm+/AU3cJ p8GCfdBaegDNpPIRzg57v9tICHa6Ln+ANhmjPiBU9uiNcazAyeSUvHNal1MKtrtd7hGv4O nO5xZzRKojks2JhObqgJMoC+7wiB8nQ= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672991856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=xmb3IcLHCLsi/xOiQHUkWYlXfS8doiaC8cJwdmVUFK4=; b=NgJF793Ykhh72eIttfyi6DUZhDuOMk+5V3fi4zhIHwH7Ta7hYZpJ2Q1w56h6wp62Ag2u56 ZVBrM21XiTfS8rUjShMDzesK5Z8PdhA5t/5sFsv34FsbzSQoKlNrICTfp+hAeIMJ77Z7Hi oIqh1U1VbC5P/M3uwxFu1TAZez4w3+0= Received: from mail-yw1-f200.google.com (mail-yw1-f200.google.com [209.85.128.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-404-nLZQfuO8M7KL2NRR2SZj-g-1; Fri, 06 Jan 2023 02:57:32 -0500 X-MC-Unique: nLZQfuO8M7KL2NRR2SZj-g-1 Received: by mail-yw1-f200.google.com with SMTP id 00721157ae682-4c1fa94a786so7784017b3.23 for ; Thu, 05 Jan 2023 23:57:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=xmb3IcLHCLsi/xOiQHUkWYlXfS8doiaC8cJwdmVUFK4=; b=3EXsUBqEJrkEZYxwFOIPSILfJVJTTHlcVNgW8gQbxrHv7vOTX7JH7KTX6b2/i6v82s wuAR1FVBNU1ZroN+qTjvOqEqXIEHFpBMSwOd42NqWieExUMjHi/Mk7jlYAFHSvnPiFql VUfQgn0HCWJcaP6vZ/iKTwmoTwGl53rhLKHF66fxjMLRAcLra7qNH3p5IhEueP5Wsjlc 3vVIh1JhSm88dXd/xyuPH2ObPL0noOw6Dc6H34s8mzOh1iFlCemsLGwq9pfj0/1eaQWJ oxagHgg1UDQQaaOe1KPeUFzDxPJkBb066uZbdXwi48QgCmlXHmd8eAsYVWXHKSdzIG41 WBmg== X-Gm-Message-State: AFqh2kohj8Nq7iHyAxtwnzSG3uVSzDAHr8Z2UKFAu/EErwMIcpADMZq5 HAE5rdTB/Nyb9gYMsdo9n04+pbEJKK+HI9zofMeVYfleBUCRSEohNwpUwGX/hZf8drSkoevSBpO Mx66sf63SJqoZF9y2tlGPXWDGdag= X-Received: by 2002:a05:690c:87:b0:46f:36b1:a27 with SMTP id be7-20020a05690c008700b0046f36b10a27mr4200662ywb.147.1672991851850; Thu, 05 Jan 2023 23:57:31 -0800 (PST) X-Google-Smtp-Source: AMrXdXuC/bbIcMr4bQ8ok16zXLqM2NrU98mA2WJd0uc+HAfHs8BnKxPTLzGpg1jIsSESD/q9eqv3v1Jyw7xgl7+RWvk= X-Received: by 2002:a05:690c:87:b0:46f:36b1:a27 with SMTP id be7-20020a05690c008700b0046f36b10a27mr4200651ywb.147.1672991851590; Thu, 05 Jan 2023 23:57:31 -0800 (PST) MIME-Version: 1.0 References: <20230104211448.4804-1-vishal.moola@gmail.com> <20230104211448.4804-18-vishal.moola@gmail.com> In-Reply-To: <20230104211448.4804-18-vishal.moola@gmail.com> From: Andreas Gruenbacher Date: Fri, 6 Jan 2023 08:57:20 +0100 Message-ID: Subject: Re: [Cluster-devel] [PATCH v5 17/23] gfs2: Convert gfs2_write_cache_jdata() to use filemap_get_folios_tag() To: "Vishal Moola (Oracle)" Cc: linux-fsdevel@vger.kernel.org, linux-cifs@vger.kernel.org, linux-nilfs@vger.kernel.org, linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, cluster-devel@redhat.com, linux-mm@kvack.org, ceph-devel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-afs@lists.infradead.org, linux-btrfs@vger.kernel.org X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4955A180002 X-Stat-Signature: yi399s9n594aszmsjb9othyaxs6fyrei X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1672991857-812643 X-HE-Meta: U2FsdGVkX19mYb1F3SKtoh4QLmJ8+0bizWE+60d90np8vkJpJS/GXxzeTlWxbzQnD/L/YTDjejttYSHiW7ttRoqDhsMp9KXHlmwK3u+sU3h6N9g07RXis3YfxS80VmXM60LQXFkATbRExjS9pQYRFqSzkzxIol9NCpQwkK/CGi3mV4eLT9/mLLQEPbx+xzycr1fE1O8FaiF7yr3XgGUf4LLq9wAXJcFkPypndaVtnaUD6zZNBZFzzeyO+g4gArJ/aeBAbOAVwmSiDCqS9Kg6gFfcMnZDR9Ja5vWRiVknu6yBc/DZjMbH+YkRxL/ASodgAAo6Do7Ia4b51Bv7xEWv2FDkcS6/ksL50IwvHIlQim0fodCTMMFZ07AOfb9ACyjgr3rspiZ/r3TCqFtCGIMzSiWBoMAHFWHHN2oTSJpLLcRq6ebjZeP8J2YlAiaMtOM0HUGSkL/Sj2nUnUVkPhYNuEy16xTEuirKvGNCcccVo9vxu72994tBQNyo6kDEUVNE6czXPel2qOb4yf6+7bV03SI5E89AJtIcXPWFEECdhXdP8/lCZ6plc1qQ5QPq2vB4P62VjTAqg1LVg+qdX+fMy3z9xm6pHXDvvs3tmi5ckDzs71ctFo8qaAd00vX8nYK5QIU1EjS8Sp2LSyUY/XvNKt9NKLTsemSCkp2ru67eoDxN6Z26kYfsbR+9MTH6pH2WMYgtC7Sk/O5XLiDFwCKIjiQf0tKIMejZo1FRbpIKT2rod2LSGJO+ymmzIKxDK3/PplBlgcFEyZ4mIHFRovMUZF/tbUVm3NyHM7aAHUYo1zjvNXueDdzyXxeWQIAAdc8W3CoQ5DLu1mvQw2JMr7JUuioYH1eAM9DwOpGsl4Zbczi2zyCLJ8w18yPoE5WYAU27pZeZvym/UHaNs6jpB4a8S19U0pfZOhFNzI0A8J87uiVjl3kNc83Eqe+xrIZ0nh16k26X2Dr8/TYvmwY+Jji +7QHY7SC o7hxvobNM3XyltWN/Z6nJ5OMgepnSWYwidM2kkcNw9VUdbkN/96nSYzDLwTKGqqPZq5DKXQJEnNDjGz6iqeUkDHVYJKoluyIeVv+VTWSCrMXp6oq8ZiiabY6INajiYjC2pOulA2+2N9nAYF4Q7t48Qjoh6g== 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 Wed, Jan 4, 2023 at 10:15 PM Vishal Moola (Oracle) wrote: > Converted function to use folios throughout. This is in preparation for > the removal of find_get_pgaes_range_tag(). This change removes 8 calls > to compound_head(). > > Also had to modify and rename gfs2_write_jdata_pagevec() to take in > and utilize folio_batch rather than pagevec and use folios rather > than pages. gfs2_write_jdata_batch() now supports large folios. > > Signed-off-by: Vishal Moola (Oracle) > --- > fs/gfs2/aops.c | 64 +++++++++++++++++++++++++++----------------------- > 1 file changed, 35 insertions(+), 29 deletions(-) > > diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c > index e782b4f1d104..0a47068f9acc 100644 > --- a/fs/gfs2/aops.c > +++ b/fs/gfs2/aops.c > @@ -195,67 +195,71 @@ static int gfs2_writepages(struct address_space *mapping, > } > > /** > - * gfs2_write_jdata_pagevec - Write back a pagevec's worth of pages > + * gfs2_write_jdata_batch - Write back a folio batch's worth of folios > * @mapping: The mapping > * @wbc: The writeback control > - * @pvec: The vector of pages > - * @nr_pages: The number of pages to write > + * @fbatch: The batch of folios > * @done_index: Page index > * > * Returns: non-zero if loop should terminate, zero otherwise > */ > > -static int gfs2_write_jdata_pagevec(struct address_space *mapping, > +static int gfs2_write_jdata_batch(struct address_space *mapping, > struct writeback_control *wbc, > - struct pagevec *pvec, > - int nr_pages, > + struct folio_batch *fbatch, > pgoff_t *done_index) > { > struct inode *inode = mapping->host; > struct gfs2_sbd *sdp = GFS2_SB(inode); > - unsigned nrblocks = nr_pages * (PAGE_SIZE >> inode->i_blkbits); > + unsigned nrblocks; > int i; > int ret; > + int nr_pages = 0; > + int nr_folios = folio_batch_count(fbatch); > + > + for (i = 0; i < nr_folios; i++) > + nr_pages += folio_nr_pages(fbatch->folios[i]); > + nrblocks = nr_pages * (PAGE_SIZE >> inode->i_blkbits); > > ret = gfs2_trans_begin(sdp, nrblocks, nrblocks); > if (ret < 0) > return ret; > > - 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]; > > - *done_index = page->index; > + *done_index = folio->index; > > - 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) > - wait_on_page_writeback(page); > + folio_wait_writeback(folio); > else > goto continue_unlock; > } > > - BUG_ON(PageWriteback(page)); > - if (!clear_page_dirty_for_io(page)) > + BUG_ON(folio_test_writeback(folio)); > + if (!folio_clear_dirty_for_io(folio)) > goto continue_unlock; > > trace_wbc_writepage(wbc, inode_to_bdi(inode)); > > - ret = __gfs2_jdata_writepage(page, wbc); > + ret = __gfs2_jdata_writepage(&folio->page, wbc); > if (unlikely(ret)) { > if (ret == AOP_WRITEPAGE_ACTIVATE) { > - unlock_page(page); > + folio_unlock(folio); > ret = 0; > } else { > > @@ -268,7 +272,8 @@ static int gfs2_write_jdata_pagevec(struct address_space *mapping, > * not be suitable for data integrity > * writeout). > */ > - *done_index = page->index + 1; > + *done_index = folio->index + > + folio_nr_pages(folio); > ret = 1; > break; > } > @@ -305,8 +310,8 @@ static int gfs2_write_cache_jdata(struct address_space *mapping, > { > int ret = 0; > int done = 0; > - struct pagevec pvec; > - int nr_pages; > + struct folio_batch fbatch; > + int nr_folios; > pgoff_t writeback_index; > pgoff_t index; > pgoff_t end; > @@ -315,7 +320,7 @@ static int gfs2_write_cache_jdata(struct address_space *mapping, > int range_whole = 0; > xa_mark_t tag; > > - pagevec_init(&pvec); > + folio_batch_init(&fbatch); > if (wbc->range_cyclic) { > writeback_index = mapping->writeback_index; /* prev offset */ > index = writeback_index; > @@ -341,17 +346,18 @@ static int gfs2_write_cache_jdata(struct address_space *mapping, > tag_pages_for_writeback(mapping, index, end); > done_index = index; > while (!done && (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; > > - ret = gfs2_write_jdata_pagevec(mapping, wbc, &pvec, nr_pages, &done_index); > + ret = gfs2_write_jdata_batch(mapping, wbc, &fbatch, > + &done_index); > if (ret) > done = 1; > if (ret > 0) > ret = 0; > - pagevec_release(&pvec); > + folio_batch_release(&fbatch); > cond_resched(); > } > > -- > 2.38.1 > Reviewed-by: Andreas Gruenbacher Thanks, Andreas