From patchwork Tue Aug 16 17:52:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vishal Moola X-Patchwork-Id: 12945136 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 2FC53C32773 for ; Tue, 16 Aug 2022 17:53:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BEC478D0005; Tue, 16 Aug 2022 13:53:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B9BD78D0001; Tue, 16 Aug 2022 13:53:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9EEA68D0005; Tue, 16 Aug 2022 13:53:26 -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 925908D0001 for ; Tue, 16 Aug 2022 13:53:26 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 56A95141311 for ; Tue, 16 Aug 2022 17:53:26 +0000 (UTC) X-FDA: 79806202812.22.03DC700 Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by imf14.hostedemail.com (Postfix) with ESMTP id E74B51001BB for ; Tue, 16 Aug 2022 17:53:25 +0000 (UTC) Received: by mail-pf1-f174.google.com with SMTP id z187so9954677pfb.12 for ; Tue, 16 Aug 2022 10:53:25 -0700 (PDT) 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; bh=jx5etBacOfgeXw8OAxR7RH5xH7gasMcsy/7VBjftCKo=; b=H4w5e03AG8w22x3dkX4OcAQ/fXJPEqBuxomQqu935pHvx9qnv6UXB89C7TehiRczmJ +FQpqijjHerlPV7QgbLD9Svk01RL23Cq8zB1agtQdTKICezXQlLztKbYqQG1U9PrYB3F zyWqZ6RrPzRD3dLiMvI5ykjFnKfybBoCI8pBmmEXw98ZnWN2weK8bBLgA5U9I2Z+eIUM QKiR22gp7i+ANjq/+XdN02Ns7oj11Mwz8KxmhJOAHV0Heca0OEqx2IZI7t82b/W2MAFn 2iMRbdUPNsHr/ID8+Wt6iBOyBWHr7BuWOnifm62JTx2pKAaCJskWB35TDHj4rVoHTHoq ts3Q== 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; bh=jx5etBacOfgeXw8OAxR7RH5xH7gasMcsy/7VBjftCKo=; b=ceuGpyl4D/pg8iRCEk6pHT4KGtEOdA78wSRh2Yudj2zpIzIeauqXvLpS2xlprNTjGL xIQczaVzn8Qt3vMYTKewLrgDMw0K1OawdzLGXQg4Nb1vDM8tMeioFAc2aHjgoc5wT4lP LT0ypbokrxuAR2pTsRklZp+dCAYjpvnS5tkVME/cPNRDgffbwohJNyRfvh0oXlyf9iV6 Ls5rSRAK5wCTVqrNjUZfxJ3O7BvmMeOMAt2i6Ai+Tt1eYco4FqXuwgjd6cpbvIbJWspI +2wFyn/jR8C3IrHgk6zQEoe1liZrPghSQRDKJcR6jSqKn0ukGTMmIf+Gu6+Ny10e7dRH yzVQ== X-Gm-Message-State: ACgBeo3VISyNEFzDkreL+Tfi/XcN+MvBVtBJSh6rRk34B+3gRZ6MEQax 7iCzRIBD0i7h3wdIcNQNIE8= X-Google-Smtp-Source: AA6agR6fqGrcGUuroXDXIutzhUk7sX/MVDFC98kOSRnE68zQD+oXaXUzXcwPc80r4Tb7267OZ3uaaw== X-Received: by 2002:a65:5382:0:b0:41c:7021:6fe9 with SMTP id x2-20020a655382000000b0041c70216fe9mr19185825pgq.191.1660672404947; Tue, 16 Aug 2022 10:53:24 -0700 (PDT) Received: from vmfolio.. (c-73-189-111-8.hsd1.ca.comcast.net. [73.189.111.8]) by smtp.googlemail.com with ESMTPSA id mi4-20020a17090b4b4400b001f52fa1704csm3379963pjb.3.2022.08.16.10.53.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Aug 2022 10:53:24 -0700 (PDT) From: "Vishal Moola (Oracle)" To: linux-fsdevel@vger.kernel.org Cc: linux-btrfs@vger.kernel.org, linux-nilfs@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, "Vishal Moola (Oracle)" Subject: [PATCH v2 2/7] btrfs: Convert __process_pages_contig() to use filemap_get_folios_contig() Date: Tue, 16 Aug 2022 10:52:41 -0700 Message-Id: <20220816175246.42401-3-vishal.moola@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220816175246.42401-1-vishal.moola@gmail.com> References: <20220816175246.42401-1-vishal.moola@gmail.com> MIME-Version: 1.0 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1660672406; a=rsa-sha256; cv=none; b=rQdofCEUtfFRThqa+BqG+SCAjA064+Slqs9unAsc25qe49acYvh86VkWrwu6x54hUM5ata Toy+3hEk3S2ljL/tHjfU7i2NCHM4KDCzzotMW+5tS8CkmuX9sQIClStTVqjMEzdpgPq1yQ lMkXZsiDHin4Y0H5L745RR8t+/WhDFg= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=H4w5e03A; spf=pass (imf14.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.210.174 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=1660672406; 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=jx5etBacOfgeXw8OAxR7RH5xH7gasMcsy/7VBjftCKo=; b=JxJeGRfk0J+bfqnuidInCwgqH/By2EP1sCOYLtY/ddu5BAotmIl3dPKB1XKmoDkFkmLZz9 3WEbfO8HPTJFfW/qdiYv0LEC9xN7HvQdLQNg01Ev5uydmy1FeNrCru9z1z50i36nMwfpiS sElGXRh5Q+9j5oHN1JDtP4zLxMb49aI= Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=H4w5e03A; spf=pass (imf14.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.210.174 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Rspam-User: X-Stat-Signature: n9thbqxum6hype61kyi6xtdzrongenfu X-Rspamd-Queue-Id: E74B51001BB X-Rspamd-Server: rspam06 X-HE-Tag: 1660672405-561774 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: Convert 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. Signed-off-by: Vishal Moola (Oracle) Acked-by: David Sterba --- fs/btrfs/extent_io.c | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 8f6b544ae616..f16929bc531b 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -1882,9 +1882,8 @@ static int __process_pages_contig(struct address_space *mapping, pgoff_t start_index = start >> PAGE_SHIFT; pgoff_t end_index = end >> PAGE_SHIFT; pgoff_t index = start_index; - unsigned long nr_pages = end_index - start_index + 1; unsigned long pages_processed = 0; - struct page *pages[16]; + struct folio_batch fbatch; int err = 0; int i; @@ -1893,16 +1892,17 @@ static int __process_pages_contig(struct address_space *mapping, ASSERT(processed_end && *processed_end == start); } - if ((page_ops & PAGE_SET_ERROR) && nr_pages > 0) + if ((page_ops & PAGE_SET_ERROR) && start_index <= end_index) mapping_set_error(mapping, -EIO); - while (nr_pages > 0) { - int found_pages; + folio_batch_init(&fbatch); + while (index <= end_index) { + int found_folios; + + found_folios = filemap_get_folios_contig(mapping, &index, + end_index, &fbatch); - found_pages = find_get_pages_contig(mapping, index, - min_t(unsigned long, - nr_pages, ARRAY_SIZE(pages)), pages); - if (found_pages == 0) { + if (found_folios == 0) { /* * Only if we're going to lock these pages, we can find * nothing at @index. @@ -1912,23 +1912,20 @@ static int __process_pages_contig(struct address_space *mapping, goto out; } - for (i = 0; i < found_pages; i++) { + for (i = 0; i < found_folios; i++) { int process_ret; - + struct folio *folio = fbatch.folios[i]; process_ret = process_one_page(fs_info, mapping, - pages[i], locked_page, page_ops, + &folio->page, locked_page, page_ops, start, end); if (process_ret < 0) { - for (; i < found_pages; i++) - put_page(pages[i]); err = -EAGAIN; + folio_batch_release(&fbatch); goto out; } - put_page(pages[i]); - pages_processed++; + pages_processed += folio_nr_pages(folio); } - nr_pages -= found_pages; - index += found_pages; + folio_batch_release(&fbatch); cond_resched(); } out: