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 4CAAFC32772 for ; Tue, 23 Aug 2022 20:43:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8A0E96B0073; Tue, 23 Aug 2022 16:43:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8295B6B0075; Tue, 23 Aug 2022 16:43:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6A5D76B0078; Tue, 23 Aug 2022 16:43:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 556BF6B0073 for ; Tue, 23 Aug 2022 16:43:41 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 1A39C161794 for ; Tue, 23 Aug 2022 20:43:41 +0000 (UTC) X-FDA: 79832033442.19.0B5E8E5 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by imf21.hostedemail.com (Postfix) with ESMTP id A8D121C0032 for ; Tue, 23 Aug 2022 20:43:40 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 802F81F890; Tue, 23 Aug 2022 20:43:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1661287419; h=from:from:reply-to:reply-to: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=nvUii2Ere0iwPAZzLrUqcRoqaN33vJT3Za8FZvP1Oes=; b=nF/SYpX0baEzY/ugyPQ5L8m/l9RISUp24MncZFUB2HeyoHjj5+C1rsnQ0bpvcKftU+/8Ka vefiOQhXMOPer3UAUx1pWkowFjTm6itVCAjFzk+9YArJFRLGrzG6QaqSo/yXVhzE7FK6K6 g4pLpbGi7xKbCuH5cUAQeLN71T2YMuQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1661287419; h=from:from:reply-to:reply-to: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=nvUii2Ere0iwPAZzLrUqcRoqaN33vJT3Za8FZvP1Oes=; b=ZXjO/kDKQb8ICoMCdvjHznlofq/jGeDCXHPmbWtoIwgThYUGWCdKVZ6yF0G1TO2ScdvvY2 g9jX6JO4KbtX/aDg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 3B50313A89; Tue, 23 Aug 2022 20:43:39 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 4VZ6Dfs7BWNYCgAAMHmgww (envelope-from ); Tue, 23 Aug 2022 20:43:39 +0000 Date: Tue, 23 Aug 2022 22:38:25 +0200 From: David Sterba To: "Vishal Moola (Oracle)" Cc: linux-fsdevel@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-nilfs@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 4/7] btrfs: Convert process_page_range() to use filemap_get_folios_contig() Message-ID: <20220823203825.GT13489@twin.jikos.cz> Reply-To: dsterba@suse.cz Mail-Followup-To: dsterba@suse.cz, "Vishal Moola (Oracle)" , linux-fsdevel@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-nilfs@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org References: <20220816175246.42401-1-vishal.moola@gmail.com> <20220816175246.42401-5-vishal.moola@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220816175246.42401-5-vishal.moola@gmail.com> User-Agent: Mutt/1.5.23.1-rc1 (2014-03-12) ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1661287420; a=rsa-sha256; cv=none; b=MKE0SQ0OQ2MdwZ9Y/ZkLfyaqDNUs5/TCwp4G7ADoGp7ENFYdnsIznkHzug26iqPnSEPEqD eqY4cBro2htasEs+HmWqsgaz77qeCEwiIO9S7t2mZ3Vk+N4aH4vS4srFAunCbAYf99Uv+y qlTD2lNcosWKX3PYrFk24faVEYM+6xY= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b="nF/SYpX0"; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b="ZXjO/kDK"; dmarc=none; spf=pass (imf21.hostedemail.com: domain of dsterba@suse.cz designates 195.135.220.29 as permitted sender) smtp.mailfrom=dsterba@suse.cz ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1661287420; h=from:from:sender:reply-to: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=nvUii2Ere0iwPAZzLrUqcRoqaN33vJT3Za8FZvP1Oes=; b=3V+nrFgnmwAbI//E6mx8Tn6QKWgLRYyCL5Cjfddhmh1t41A31mmDrW5CwnDe+ujBz/Vtph 8UpMSh57QCN9TUrQM4ZI/hz2hq3xb4As7Zep9oCW9QraV2Zsx8BKmExbsvACs0Ch4kbKcz drMNqtegJVgCZjxQOXFx9gNYkl6VOGI= Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b="nF/SYpX0"; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b="ZXjO/kDK"; dmarc=none; spf=pass (imf21.hostedemail.com: domain of dsterba@suse.cz designates 195.135.220.29 as permitted sender) smtp.mailfrom=dsterba@suse.cz X-Stat-Signature: r1u9tggs6ddyquut7esjmjej8i6tcq71 X-Rspamd-Queue-Id: A8D121C0032 X-Rspamd-Server: rspam03 X-Rspam-User: X-HE-Tag: 1661287420-327229 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 Tue, Aug 16, 2022 at 10:52:43AM -0700, Vishal Moola (Oracle) wrote: > Converted function to use folios throughout. This is in preparation for > the removal of find_get_pages_contig(). Now also supports large folios. > > Since we may receive more than nr_pages pages, nr_pages may underflow. > Since nr_pages > 0 is equivalent to index <= end_index, we replaced it > with this check instead. > > Also minor comment renaming for consistency in subpage. > > Signed-off-by: Vishal Moola (Oracle) Acked-by: David Sterba > --- a/fs/btrfs/tests/extent-io-tests.c > +++ b/fs/btrfs/tests/extent-io-tests.c > @@ -4,6 +4,7 @@ > */ > > #include > +#include > #include > #include > #include > @@ -20,39 +21,39 @@ static noinline int process_page_range(struct inode *inode, u64 start, u64 end, > unsigned long flags) > { > int ret; > - struct page *pages[16]; > + struct folio_batch fbatch; > unsigned long index = start >> PAGE_SHIFT; > unsigned long end_index = end >> PAGE_SHIFT; > - unsigned long nr_pages = end_index - index + 1; > int i; > int count = 0; > int loops = 0; > > - while (nr_pages > 0) { > - ret = find_get_pages_contig(inode->i_mapping, index, > - min_t(unsigned long, nr_pages, > - ARRAY_SIZE(pages)), pages); > + folio_batch_init(&fbatch); > + > + while (index <= end_index) { > + ret = filemap_get_folios_contig(inode->i_mapping, &index, > + end_index, &fbatch); > for (i = 0; i < ret; i++) { > + struct folio *folio = fbatch.folios[i]; Add a newline please > if (flags & PROCESS_TEST_LOCKED && > - !PageLocked(pages[i])) > + !folio_test_locked(folio)) > count++; > - if (flags & PROCESS_UNLOCK && PageLocked(pages[i])) > - unlock_page(pages[i]); > - put_page(pages[i]); > + if (flags & PROCESS_UNLOCK && folio_test_locked(folio)) > + folio_unlock(folio); > if (flags & PROCESS_RELEASE) > - put_page(pages[i]); > + folio_put(folio); > } > - nr_pages -= ret; > - index += ret; > + folio_batch_release(&fbatch); > cond_resched(); > loops++; > if (loops > 100000) { > printk(KERN_ERR > - "stuck in a loop, start %llu, end %llu, nr_pages %lu, ret %d\n", > - start, end, nr_pages, ret); > + "stuck in a loop, start %llu, end %llu, ret %d\n", > + start, end, ret); > break; > } > } > + > return count; > } > > -- > 2.36.1