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 23C22C38145 for ; Sat, 3 Sep 2022 17:38:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BBB7E80165; Sat, 3 Sep 2022 13:38:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B68DE8015A; Sat, 3 Sep 2022 13:38:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A327180165; Sat, 3 Sep 2022 13:38:26 -0400 (EDT) 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 9420C8015A for ; Sat, 3 Sep 2022 13:38:26 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 61B79A014A for ; Sat, 3 Sep 2022 17:38:26 +0000 (UTC) X-FDA: 79871483412.26.FB6B8D2 Received: from mail-lj1-f182.google.com (mail-lj1-f182.google.com [209.85.208.182]) by imf28.hostedemail.com (Postfix) with ESMTP id 1DDD0C0081 for ; Sat, 3 Sep 2022 17:38:25 +0000 (UTC) Received: by mail-lj1-f182.google.com with SMTP id z20so5261719ljq.3 for ; Sat, 03 Sep 2022 10:38:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date; bh=xX2O58QMupv9rWIX/wz0TD9J8Ed7HqVnisBNPZl6V04=; b=P/hsH1QKS4072Gai1EmOGCnjPTQWZiiOiE+P26T80mgV0tbTOnkDXKC3nEWi1Xoe/A Hs7LLFSp+fCaJRWZVqv/8C2xzImMvLQoTDYUfx6u9PmIwXRQtB9n4gGmx+GH0S1f7zYT EpKdDfbdqDAHgNmhwbrPGp06lVMfmsEbewBLDb/B+dQfW30xzF8F2l2F/gidKFJKBG6M xlYX6S3WMrWsrSfVCDpCmKqprjSkUDidSKYHiXrhQ6jx9rWQ1os07RE+QbroswHSap0D gOYyJOlFnRdNpKj+sEkb2UqwaGfM6EvoZTNoU3eDmRl2MoAiXkF/RCfX0IxvBDH8/V+n XD8A== 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; bh=xX2O58QMupv9rWIX/wz0TD9J8Ed7HqVnisBNPZl6V04=; b=VYy2JAUid+bBne4kv0uhVXunTtAj4rAv6KEceqrnjlcMqTVP3UnPQBaNPD+mF8tRgN o2g1/9QpkZWaPF+T36eqeF4wFUqDZ4qkFUohc1CmOjoBJHcnpTUcvB8kkRkHTY+m1zl7 VoZWBxVGuuz6yqPq2+XGZNMJWHb4M+bEG8ERAVQxsGrsxdh71tdUb45Z+JSTK6uv0POR qWAY2TMKXOP+0e3maytKrMEvNtdVWP6BB8VEfczZ8dDtIfGmKem8T5SjZkM0UApoC8gG crvRo+jli8mplv12DXn72RsJUcm1Yz90P+lI+744v01ziq9Wp3OBFZ89jJPTCnMK8WNB My0g== X-Gm-Message-State: ACgBeo3g5qTfFyw8a91Ayqvf5hhAdVbEMuKU+xDdpysalJxx7BCHyFP/ i813V/a5Nfrpqfe+zRfaSy3fhKmfmlJVqZSHEns= X-Google-Smtp-Source: AA6agR7+UPXECkLr9xecEnlHY9jJP9Sk53/z1csaRMZh+iBcI4PkxC6eajktqUCZxUcf8SInATP1uw7iY4QjQlwWETk= X-Received: by 2002:a2e:b8d5:0:b0:25f:e94d:10a2 with SMTP id s21-20020a2eb8d5000000b0025fe94d10a2mr13425885ljp.274.1662226704352; Sat, 03 Sep 2022 10:38:24 -0700 (PDT) MIME-Version: 1.0 References: <20220901220138.182896-1-vishal.moola@gmail.com> <20220901220138.182896-19-vishal.moola@gmail.com> In-Reply-To: <20220901220138.182896-19-vishal.moola@gmail.com> From: Ryusuke Konishi Date: Sun, 4 Sep 2022 02:38:06 +0900 Message-ID: Subject: Re: [PATCH 18/23] nilfs2: Convert nilfs_lookup_dirty_data_buffers() to use filemap_get_folios_tag() To: "Vishal Moola (Oracle)" Cc: linux-fsdevel@vger.kernel.org, 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 Content-Type: text/plain; charset="UTF-8" ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1662226706; a=rsa-sha256; cv=none; b=qisKwxWumtKvG7BlkJSRXi2RfMW0X9xXh/wCD4YYGrliHhZsGyRe4OAifmchf0mb6z4Ctt VSirKlqoHiwK7zdLZfycj3gycP9JZv+uxHRlD/o2haLW9Tt12jsq2rexNr9XsXTWtL6Mns ISkQLp3Q6ooiMaMszIH5UHM+pDebrrc= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b="P/hsH1QK"; spf=pass (imf28.hostedemail.com: domain of konishi.ryusuke@gmail.com designates 209.85.208.182 as permitted sender) smtp.mailfrom=konishi.ryusuke@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=1662226706; 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=xX2O58QMupv9rWIX/wz0TD9J8Ed7HqVnisBNPZl6V04=; b=MezFoyfA1lFwTeRL2vKR3ciATarrFBgX4Yee4BgqglGQGQDhbDRZrglO3NUhCaBlODzHMq eWuZKF63McYTUeW5a4MOBj64fzgnfEoaMIAeT5thRiDu4md6C7q8+Rs3aIrcRumRxtXo28 TDsNXsZd0BKxjo5X2EHoQq896hlvL7E= X-Rspam-User: X-Stat-Signature: 515n6kiothjhf736so7hpa5xduqqsjor X-Rspamd-Queue-Id: 1DDD0C0081 X-Rspamd-Server: rspam10 Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b="P/hsH1QK"; spf=pass (imf28.hostedemail.com: domain of konishi.ryusuke@gmail.com designates 209.85.208.182 as permitted sender) smtp.mailfrom=konishi.ryusuke@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-HE-Tag: 1662226705-600141 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 Fri, Sep 2, 2022 at 7:07 AM Vishal Moola (Oracle) wrote: > > Convert function to use folios throughout. This is in preparation for > the removal of find_get_pages_range_tag(). > > Signed-off-by: Vishal Moola (Oracle) > --- > fs/nilfs2/segment.c | 29 ++++++++++++++++------------- > 1 file changed, 16 insertions(+), 13 deletions(-) > > diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c > index 0afe0832c754..e95c667bdc8f 100644 > --- a/fs/nilfs2/segment.c > +++ b/fs/nilfs2/segment.c > @@ -680,7 +680,7 @@ static size_t nilfs_lookup_dirty_data_buffers(struct inode *inode, > loff_t start, loff_t end) > { > struct address_space *mapping = inode->i_mapping; > - struct pagevec pvec; > + struct folio_batch fbatch; > pgoff_t index = 0, last = ULONG_MAX; > size_t ndirties = 0; > int i; > @@ -694,23 +694,26 @@ static size_t nilfs_lookup_dirty_data_buffers(struct inode *inode, > index = start >> PAGE_SHIFT; > last = end >> PAGE_SHIFT; > } > - pagevec_init(&pvec); > + folio_batch_init(&fbatch); > repeat: > if (unlikely(index > last) || > - !pagevec_lookup_range_tag(&pvec, mapping, &index, last, > - PAGECACHE_TAG_DIRTY)) > + !filemap_get_folios_tag(mapping, &index, last, > + PAGECACHE_TAG_DIRTY, &fbatch)) > return ndirties; > > - for (i = 0; i < pagevec_count(&pvec); i++) { > + for (i = 0; i < folio_batch_count(&fbatch); i++) { > struct buffer_head *bh, *head; > - struct page *page = pvec.pages[i]; > + struct folio *folio = fbatch.folios[i]; > > - lock_page(page); > - if (!page_has_buffers(page)) > - create_empty_buffers(page, i_blocksize(inode), 0); > - unlock_page(page); > + head = folio_buffers(folio); > + folio_lock(folio); Could you please swap these two lines to keep the "head" check in the lock? Thanks, Ryusuke Konishi > + if (!head) { > + create_empty_buffers(&folio->page, i_blocksize(inode), 0); > + head = folio_buffers(folio); > + } > + folio_unlock(folio); > > - bh = head = page_buffers(page); > + bh = head; > do { > if (!buffer_dirty(bh) || buffer_async_write(bh)) > continue; > @@ -718,13 +721,13 @@ static size_t nilfs_lookup_dirty_data_buffers(struct inode *inode, > list_add_tail(&bh->b_assoc_buffers, listp); > ndirties++; > if (unlikely(ndirties >= nlimit)) { > - pagevec_release(&pvec); > + folio_batch_release(&fbatch); > cond_resched(); > return ndirties; > } > } while (bh = bh->b_this_page, bh != head); > } > - pagevec_release(&pvec); > + folio_batch_release(&fbatch); > cond_resched(); > goto repeat; > } > -- > 2.36.1 >