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]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 50D1CF01828 for ; Fri, 6 Mar 2026 11:45:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 970696B0005; Fri, 6 Mar 2026 06:45:31 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 931736B0089; Fri, 6 Mar 2026 06:45:31 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 831176B008A; Fri, 6 Mar 2026 06:45:31 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 738FA6B0005 for ; Fri, 6 Mar 2026 06:45:31 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 03562160528 for ; Fri, 6 Mar 2026 11:45:30 +0000 (UTC) X-FDA: 84515458062.18.AA752D1 Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by imf02.hostedemail.com (Postfix) with ESMTP id 69E5180011 for ; Fri, 6 Mar 2026 11:45:29 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="fSK/XAQL"; spf=pass (imf02.hostedemail.com: domain of ljs@kernel.org designates 172.105.4.254 as permitted sender) smtp.mailfrom=ljs@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1772797529; 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=XKGG0630aPxK92Bt5eiVwX3VxA8FpDHPW+jFpl95B+k=; b=MUTZjOUT5NK1K41CVSVw7gkyto96G84I33djHY+fIvwrG5MVtLOzvIv6O0YGXHcL86lZU1 qBj6h0R2087I80KrQ3VNfaalzqMdHkkPVEi2MinHNK8DHYHa12gpRxoR0MwGnye1HLYMMy BTylcEbJpjBWfh/0RXX61FwQe0WXkSc= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1772797529; a=rsa-sha256; cv=none; b=sQKoJTw6Zt1zW6BKy/eflJXJVkQaQQQAW46rxQxJ4yaf4vd7oGq/wTSMtOhMvQFYP8YhkV acnJltmnBoVz7D0vr5/fiRHIb0GGvZ8/k2xRud0FOVVB3+3l+uXx/qvbk7xVO2Gf4btgDS Xwq5Rf+ilgDbn4Dp37ovy19UfhtpO1g= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="fSK/XAQL"; spf=pass (imf02.hostedemail.com: domain of ljs@kernel.org designates 172.105.4.254 as permitted sender) smtp.mailfrom=ljs@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id BCBCD60131; Fri, 6 Mar 2026 11:45:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D9A66C4CEF7; Fri, 6 Mar 2026 11:45:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772797528; bh=R0Pw6Rvi1Mhd+owNp6fekaCHGfNY8HGW5Ezw3BximRg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=fSK/XAQLAWrXgjeiTk3XlTolP/BrZo51IJvpeJZGw2osWtvnYdKil+TQMDx8gWiRi WjuQV6ZeyS/m6ni5W9gNsA2w9RKNJwzanT8/GnfMrboUr9Gbo4aVh2Mn/o2+vlLsjv 4PWo7PC7OublPZdNgrtwgO4Z2w9v6j7fcHKxDxv09GvTy61OlC8iHrQfKGPJGqGONd M0ALOZf6QGWhuKnQcihp+k2WJXsFw4+ryjYEvUIiElVerrlDn/O4aKeIuaVu+rMseL zWWevBBNjgHPZpEgylrlPgorL36cHHh2UT5GUH7Mk8QSGuUi3c21N1pC1/msfyBSRQ 8CjN9YQXQSKGA== Date: Fri, 6 Mar 2026 11:45:24 +0000 From: "Lorenzo Stoakes (Oracle)" To: Tal Zussman Cc: David Howells , Marc Dionne , Jaegeuk Kim , Chao Yu , Andrew Morton , David Hildenbrand , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Chris Li , Kairui Song , Kemeng Shi , Nhat Pham , Baoquan He , Barry Song , Matthew Wilcox , Dan Williams , Jan Kara , Alexander Viro , Christian Brauner , Theodore Ts'o , Andreas Dilger , Paulo Alcantara , Trond Myklebust , Anna Schumaker , Mark Fasheh , Joel Becker , Joseph Qi , Steve French , Ronnie Sahlberg , Shyam Prasad N , Tom Talpey , Bharath SM , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , Chris Mason , David Sterba , Ilya Dryomov , Alex Markuze , Viacheslav Dubeyko , Andreas Gruenbacher , Muchun Song , Oscar Salvador , Ryusuke Konishi , "Darrick J. Wong" , Chuck Lever , Jeff Layton , NeilBrown , Olga Kornievskaia , Dai Ngo , Jason Gunthorpe , John Hubbard , Peter Xu , Johannes Weiner , Roman Gushchin , Shakeel Butt , Jann Horn , Pedro Falcato , Brendan Jackman , Zi Yan , Hugh Dickins , Baolin Wang , Axel Rasmussen , Yuanchu Xie , Wei Xu , Qi Zheng , linux-afs@lists.infradead.org, linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, nvdimm@lists.linux.dev, linux-ext4@vger.kernel.org, netfs@lists.linux.dev, linux-nfs@vger.kernel.org, ocfs2-devel@lists.linux.dev, linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, linux-btrfs@vger.kernel.org, ceph-devel@vger.kernel.org, gfs2@lists.linux.dev, linux-nilfs@vger.kernel.org, linux-xfs@vger.kernel.org, cgroups@vger.kernel.org Subject: Re: [PATCH v2 4/4] folio_batch: Rename PAGEVEC_SIZE to FOLIO_BATCH_SIZE Message-ID: <56265c07-962d-4bfc-b332-17f04c97429e@lucifer.local> References: <20260225-pagevec_cleanup-v2-0-716868cc2d11@columbia.edu> <20260225-pagevec_cleanup-v2-4-716868cc2d11@columbia.edu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260225-pagevec_cleanup-v2-4-716868cc2d11@columbia.edu> X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 69E5180011 X-Stat-Signature: t5dgjha3nujwb47ykur5yiurzd5ps9jq X-Rspam-User: X-HE-Tag: 1772797529-290636 X-HE-Meta: U2FsdGVkX1/5m3ROBqBXfJNFPZ0+jI7HqLJsRPMwQ21wyzwxuOE1FZeCHRVra2ZogIkjQ4Rdeen9ZEo7tnQn75eFIBUunLM5b5CPIx0IzaifcPVGvp1hjcz3haB/1rdJEKc4tjPEh/yOCBdaBllRM2YGE1iyethO6PkwL11eDNK3wnv9NmrFBHn++LBR6jzsgAJiy5EgrsCF+pHvsGnAgvQeXfMynYlHMQ2yk0B0kR3j6iRM1lsCmgxxX8hfmBrS5kFDhkynfXVTaY3NnicDoGPBnco9PexXMzaIerqlCXdwBLhF3ciVBGW5WRJPP1S8VS4OLqdXL1RxZ8cyn68HPEeq6xLuUnMLDKWrTrwY2OlieQHcIhm0hCjCNRvUsp8Dhdxbkf6R33OkgpEnkvrF3XK+DlpbzSQDwO0nQ99JqosEFJ/AYvnkego8HTAtTEsUbcJ8C8AQeC6VGZRwM9CZvDwNXFZYHwRhX1YRjXuk2MWKBlJURkAZnJb19IJYO9uXOPthtxnexzyPPFF5TciBac1dDLYC6+zH6sZJy9z/Yvx1E139UyZMO3dnMOMNTsLqY9AK/NnFhK7ODoKFluh0xEaplnGQdoh3kQo1xpN+htLDi1vp5CShEb/hkx91gDaQehKzuGSYMawI9xpaXTQ08dXWWNJZSmEDHYs6f0+7LfcmNNZT38936dT7o9SwY/98GJdIzaTEc7valfryqAN9Ud0Zg6Kg/I3938XAvTiDruZJgvUKHaLB734EOQSm3zqK0Xkljtdw7LAE6cQT2kmXFX1RXO9owl3svZsv96PFg9FCx01hdGNu7b6QqZlQtXTCAE5obt/oiFA9CLz93r9QAYEBi5n9M8XKSSZcCKyOsHT5kDrguvKVLCHWD/+5g28kYNa3r00yJgFMwiNcSwmxjGA23ShaP3oyp+ERCkOILB+ExDgN/mtzGwD91MuYTLBRDjxAb/tJLZcJM8FUedP qO1haZu9 VXKUoLVCj4odgqmkX3R6OHNNIf4Mf8FJKXG6XQiBYWXhK51dhZqSL8tHZGIlj1jtp1UzCttXyA5L7gqvpfNtp5sdoXQWo0wywQg7TtOr5GAzgYaHdVdWH7LzsQ/XjCilEEgBAGvAGodox+Qv1Z9AiKn2V4jfLZl9WG6AqTF7yJtiWtCDZE/i7YxDFvNaB5GPfaMMfQGrqzuo76JgF4A+zWdw1BoWUh7WvGifglsrLKQW5k1M8MQehVMN8/WacirVEdr61VagNwJJEU9/7AzloYEg1kmrtiy/j6qP+wEaqv2jNQmGrN4PRjSt+Xg+Y42FelKUiN/S1H6DfVAvmFacTClQSPhVTieLfduLiYxyPrPsHvSvJwODkCjXNdE0c74xNxNNz Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On Wed, Feb 25, 2026 at 06:44:28PM -0500, Tal Zussman wrote: > struct pagevec no longer exists. Rename the macro appropriately. > > Signed-off-by: Tal Zussman Nice thanks for this! LGTM, so: Reviewed-by: Lorenzo Stoakes (Oracle) > --- > fs/btrfs/extent_io.c | 4 ++-- > include/linux/folio_batch.h | 6 +++--- > include/linux/folio_queue.h | 6 +++--- > mm/shmem.c | 4 ++-- > mm/swap.c | 2 +- > mm/swap_state.c | 2 +- > mm/truncate.c | 6 +++--- > 7 files changed, 15 insertions(+), 15 deletions(-) > > diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c > index c373d113f1e7..d82ca509503f 100644 > --- a/fs/btrfs/extent_io.c > +++ b/fs/btrfs/extent_io.c > @@ -2095,13 +2095,13 @@ static void buffer_tree_tag_for_writeback(struct btrfs_fs_info *fs_info, > struct eb_batch { > unsigned int nr; > unsigned int cur; > - struct extent_buffer *ebs[PAGEVEC_SIZE]; > + struct extent_buffer *ebs[FOLIO_BATCH_SIZE]; > }; > > static inline bool eb_batch_add(struct eb_batch *batch, struct extent_buffer *eb) > { > batch->ebs[batch->nr++] = eb; > - return (batch->nr < PAGEVEC_SIZE); > + return (batch->nr < FOLIO_BATCH_SIZE); > } > > static inline void eb_batch_init(struct eb_batch *batch) > diff --git a/include/linux/folio_batch.h b/include/linux/folio_batch.h > index a2f3d3043f7e..b45946adc50b 100644 > --- a/include/linux/folio_batch.h > +++ b/include/linux/folio_batch.h > @@ -12,7 +12,7 @@ > #include > > /* 31 pointers + header align the folio_batch structure to a power of two */ > -#define PAGEVEC_SIZE 31 > +#define FOLIO_BATCH_SIZE 31 > > struct folio; > > @@ -29,7 +29,7 @@ struct folio_batch { > unsigned char nr; > unsigned char i; > bool percpu_pvec_drained; > - struct folio *folios[PAGEVEC_SIZE]; > + struct folio *folios[FOLIO_BATCH_SIZE]; > }; > > /** > @@ -58,7 +58,7 @@ static inline unsigned int folio_batch_count(const struct folio_batch *fbatch) > > static inline unsigned int folio_batch_space(const struct folio_batch *fbatch) > { > - return PAGEVEC_SIZE - fbatch->nr; > + return FOLIO_BATCH_SIZE - fbatch->nr; > } > > /** > diff --git a/include/linux/folio_queue.h b/include/linux/folio_queue.h > index 0d3765fa9d1d..f6d5f1f127c9 100644 > --- a/include/linux/folio_queue.h > +++ b/include/linux/folio_queue.h > @@ -29,12 +29,12 @@ > */ > struct folio_queue { > struct folio_batch vec; /* Folios in the queue segment */ > - u8 orders[PAGEVEC_SIZE]; /* Order of each folio */ > + u8 orders[FOLIO_BATCH_SIZE]; /* Order of each folio */ > struct folio_queue *next; /* Next queue segment or NULL */ > struct folio_queue *prev; /* Previous queue segment of NULL */ > unsigned long marks; /* 1-bit mark per folio */ > unsigned long marks2; /* Second 1-bit mark per folio */ > -#if PAGEVEC_SIZE > BITS_PER_LONG > +#if FOLIO_BATCH_SIZE > BITS_PER_LONG > #error marks is not big enough > #endif > unsigned int rreq_id; > @@ -70,7 +70,7 @@ static inline void folioq_init(struct folio_queue *folioq, unsigned int rreq_id) > */ > static inline unsigned int folioq_nr_slots(const struct folio_queue *folioq) > { > - return PAGEVEC_SIZE; > + return FOLIO_BATCH_SIZE; > } > > /** > diff --git a/mm/shmem.c b/mm/shmem.c > index 149fdb051170..5e7dcf5bc5d3 100644 > --- a/mm/shmem.c > +++ b/mm/shmem.c > @@ -1113,7 +1113,7 @@ static void shmem_undo_range(struct inode *inode, loff_t lstart, uoff_t lend, > pgoff_t start = (lstart + PAGE_SIZE - 1) >> PAGE_SHIFT; > pgoff_t end = (lend + 1) >> PAGE_SHIFT; > struct folio_batch fbatch; > - pgoff_t indices[PAGEVEC_SIZE]; > + pgoff_t indices[FOLIO_BATCH_SIZE]; > struct folio *folio; > bool same_folio; > long nr_swaps_freed = 0; > @@ -1510,7 +1510,7 @@ static int shmem_unuse_inode(struct inode *inode, unsigned int type) > struct address_space *mapping = inode->i_mapping; > pgoff_t start = 0; > struct folio_batch fbatch; > - pgoff_t indices[PAGEVEC_SIZE]; > + pgoff_t indices[FOLIO_BATCH_SIZE]; > int ret = 0; > > do { > diff --git a/mm/swap.c b/mm/swap.c > index 2e517ede6561..78b4aa811fc6 100644 > --- a/mm/swap.c > +++ b/mm/swap.c > @@ -1018,7 +1018,7 @@ EXPORT_SYMBOL(folios_put_refs); > void release_pages(release_pages_arg arg, int nr) > { > struct folio_batch fbatch; > - int refs[PAGEVEC_SIZE]; > + int refs[FOLIO_BATCH_SIZE]; > struct encoded_page **encoded = arg.encoded_pages; > int i; > > diff --git a/mm/swap_state.c b/mm/swap_state.c > index a0c64db2b275..6313b59d7eab 100644 > --- a/mm/swap_state.c > +++ b/mm/swap_state.c > @@ -385,7 +385,7 @@ void free_folio_and_swap_cache(struct folio *folio) > void free_pages_and_swap_cache(struct encoded_page **pages, int nr) > { > struct folio_batch folios; > - unsigned int refs[PAGEVEC_SIZE]; > + unsigned int refs[FOLIO_BATCH_SIZE]; > > folio_batch_init(&folios); > for (int i = 0; i < nr; i++) { > diff --git a/mm/truncate.c b/mm/truncate.c > index df0b7a7e6aff..2931d66c16d0 100644 > --- a/mm/truncate.c > +++ b/mm/truncate.c > @@ -369,7 +369,7 @@ void truncate_inode_pages_range(struct address_space *mapping, > pgoff_t start; /* inclusive */ > pgoff_t end; /* exclusive */ > struct folio_batch fbatch; > - pgoff_t indices[PAGEVEC_SIZE]; > + pgoff_t indices[FOLIO_BATCH_SIZE]; > pgoff_t index; > int i; > struct folio *folio; > @@ -534,7 +534,7 @@ EXPORT_SYMBOL(truncate_inode_pages_final); > unsigned long mapping_try_invalidate(struct address_space *mapping, > pgoff_t start, pgoff_t end, unsigned long *nr_failed) > { > - pgoff_t indices[PAGEVEC_SIZE]; > + pgoff_t indices[FOLIO_BATCH_SIZE]; > struct folio_batch fbatch; > pgoff_t index = start; > unsigned long ret; > @@ -672,7 +672,7 @@ int folio_unmap_invalidate(struct address_space *mapping, struct folio *folio, > int invalidate_inode_pages2_range(struct address_space *mapping, > pgoff_t start, pgoff_t end) > { > - pgoff_t indices[PAGEVEC_SIZE]; > + pgoff_t indices[FOLIO_BATCH_SIZE]; > struct folio_batch fbatch; > pgoff_t index; > int i; > > -- > 2.39.5 >