From patchwork Mon Aug 15 18:54:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vishal Moola X-Patchwork-Id: 12943966 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 6E4FAC25B0E for ; Mon, 15 Aug 2022 18:56:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F3FAC8D0003; Mon, 15 Aug 2022 14:55:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EC7578D0001; Mon, 15 Aug 2022 14:55:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D19468D0003; Mon, 15 Aug 2022 14:55:59 -0400 (EDT) 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 C3A9D8D0001 for ; Mon, 15 Aug 2022 14:55:59 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 9FBE28026F for ; Mon, 15 Aug 2022 18:55:59 +0000 (UTC) X-FDA: 79802731638.16.7573CE0 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by imf15.hostedemail.com (Postfix) with ESMTP id 3966BA01C8 for ; Mon, 15 Aug 2022 18:55:59 +0000 (UTC) Received: by mail-pl1-f169.google.com with SMTP id 13so7097688plo.12 for ; Mon, 15 Aug 2022 11:55:59 -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=DC0lDtuVz6yFca92GBSK6djBgAZXj0wHc7OOD2pjghE=; b=QWwJlBuMd3BZgQulNy3FF7Q8pHPEfKIeqgRJRGAHI5ml30UD5XY5UUb29NmNZ8GBjD GxKLYh8ECcsSkfb8EV5IztKhRaUL+Onv2MfPhcIiNquRk71zD8RiLLFXvt/rviGRyCIk 8Y4upNBC2pPja+wNdchcY0q5S40PIsZtaqTiOA9sRc5a2o5UyIANJhCZaX0QOfz/9BVr GEtb3lgFajKMMwzsCGpuGJ5UlCPBFGxy93H79eQF8kL1tcdvqUpqF3vDpp8wcQvlX07b aXwTAzF6n1dZNb0C6hPPmmlC4TUj3CmYGpvXa+ZGc7hQxiNrXl1vl+Y7ZpGVOO5I7umb rtCg== 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=DC0lDtuVz6yFca92GBSK6djBgAZXj0wHc7OOD2pjghE=; b=Wxywj8CnT4270GLCBirXM8UU8C067+npzBT4mvvlbEWwASwPeSdNl4xExqkFqQ+hV6 tpIN35iZLRcvwbhFZzh6+Sp9EMtRGToRJ0ck8Xe7KZ53ew526h5XNQsI4aTmlqyUJyth HHLZh2sO/3BRhfFmuINrgwe31awbYwTtNDhwQY2QQERqz+BEE+qkAeGyrkYJDlCJzI+m xRhNQxQ+1ujbajNdCKUcwgtWkSoQMEA752+6xEnzfwY8sMILC7Vv5j8+tKeXetvVgwRd Mf/cNN6+VsJ+amT2nEmx1sobcar2auIh1c6590AJ8JKBgkJ/ME52OAdR0a+1HwIFFYLf BHJA== X-Gm-Message-State: ACgBeo2I/tCStA/iO9T8lpxNKNzyuzvsh2XCnphNTReEZ+nflLDPfKpg q33D48xC90OP8Iwh7qlMoco= X-Google-Smtp-Source: AA6agR6oRWqK8fWSNacTEJBV1JAilD8l4rIaZKnYmiUqRPSQ33T+fZtCDVjT3SqOVrTd4JO1xkIN3Q== X-Received: by 2002:a17:903:41c6:b0:16f:3d1:f63 with SMTP id u6-20020a17090341c600b0016f03d10f63mr18064404ple.50.1660589758240; Mon, 15 Aug 2022 11:55:58 -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 x190-20020a6231c7000000b0052def2e20dasm6858174pfx.167.2022.08.15.11.55.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Aug 2022 11:55:57 -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 1/7] filemap: Add filemap_get_folios_contig() Date: Mon, 15 Aug 2022 11:54:46 -0700 Message-Id: <20220815185452.37447-2-vishal.moola@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220815185452.37447-1-vishal.moola@gmail.com> References: <20220815185452.37447-1-vishal.moola@gmail.com> MIME-Version: 1.0 ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=QWwJlBuM; spf=pass (imf15.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.214.169 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1660589759; a=rsa-sha256; cv=none; b=ItjgK5BM/WNroFOb7P8pFZiHFkTCR4pIXIwdJPm3Ls+CXG6JpIJj635OnltJPcw05xRQai YXOJ/od6U83tJFPTnfE92blDoDYqtVlV60svfGTGsK1InfPN8b0Jw4BhPQmJ+nhFvMGbRG 9CphlpH0BJy4o+RGHeP83xrOczetRuI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1660589759; 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=DC0lDtuVz6yFca92GBSK6djBgAZXj0wHc7OOD2pjghE=; b=09IRZI2J84/xhMvNCER5YYtyX21LTsx8U0vKFh9We0rzCzXxHsKD7YauED7KgtxHphr1QH D4x+jEZTOn3hIvJtMbDn3FWeDCgcdvTdCIWzO1xgXgDcxCI4z7fbQtHeoLprXDbX8EYVc2 0J5xeEpvsLwQ8XHoJ3MyywW6cs7T9xQ= Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=QWwJlBuM; spf=pass (imf15.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.214.169 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Stat-Signature: akj3csd3obcrdkhx7zrswew6oqxtiwzo X-Rspamd-Server: rspam09 X-Rspam-User: X-Rspamd-Queue-Id: 3966BA01C8 X-HE-Tag: 1660589759-755441 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000005, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: This function is meant to replace find_get_pages_contig(). Unlike find_get_pages_contig(), filemap_get_folios_contig() no longer takes in a target number of pages to find - It returns up to 15 contiguous folios. To be more consistent with filemap_get_folios(), filemap_get_folios_contig() now also updates the start index passed in, and takes an end index. Signed-off-by: Vishal Moola (Oracle) --- include/linux/pagemap.h | 2 ++ mm/filemap.c | 73 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 0178b2040ea3..8689c32d628b 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -718,6 +718,8 @@ static inline struct page *find_subpage(struct page *head, pgoff_t index) unsigned filemap_get_folios(struct address_space *mapping, pgoff_t *start, pgoff_t end, struct folio_batch *fbatch); +unsigned filemap_get_folios_contig(struct address_space *mapping, + pgoff_t *start, pgoff_t end, struct folio_batch *fbatch); unsigned find_get_pages_contig(struct address_space *mapping, pgoff_t start, unsigned int nr_pages, struct page **pages); unsigned find_get_pages_range_tag(struct address_space *mapping, pgoff_t *index, diff --git a/mm/filemap.c b/mm/filemap.c index 15800334147b..3a497e178fde 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2194,6 +2194,79 @@ bool folio_more_pages(struct folio *folio, pgoff_t index, pgoff_t max) return index < folio->index + folio_nr_pages(folio) - 1; } +/** + * filemap_get_folios_contig - Get a batch of contiguous folios + * @mapping: The address_space to search + * @start: The starting page index + * @end: The final page index (inclusive) + * @fbatch: The batch to fill + * + * filemap_get_folios_contig() works exactly like filemap_get_folios(), + * except the returned folios are guaranteed to be contiguous. This may + * not return all contiguous folios if the batch gets filled up. + * + * Return: The number of folios found. + * Also update @start to be positioned for traversal of the next folio. + */ + +unsigned filemap_get_folios_contig(struct address_space *mapping, + pgoff_t *start, pgoff_t end, struct folio_batch *fbatch) +{ + XA_STATE(xas, &mapping->i_pages, *start); + unsigned long nr; + struct folio *folio; + + rcu_read_lock(); + + for (folio = xas_load(&xas); folio && xas.xa_index <= end; + folio = xas_next(&xas)) { + if (xas_retry(&xas, folio)) + continue; + /* + * If the entry has been swapped out, we can stop looking. + * No current caller is looking for DAX entries. + */ + if (xa_is_value(folio)) + goto update_start; + + if (!folio_try_get_rcu(folio)) + goto retry; + + if (unlikely(folio != xas_reload(&xas))) + goto put_folio; + + if (!folio_batch_add(fbatch, folio)) { + nr = folio_nr_pages(folio); + + if (folio_test_hugetlb(folio)) + nr = 1; + *start = folio->index + nr; + goto out; + } + continue; +put_folio: + folio_put(folio); + +retry: + xas_reset(&xas); + } + +update_start: + nr = folio_batch_count(fbatch); + + if (nr) { + folio = fbatch->folios[nr - 1]; + if (folio_test_hugetlb(folio)) + *start = folio->index + 1; + else + *start = folio->index + folio_nr_pages(folio); + } +out: + rcu_read_unlock(); + return folio_batch_count(fbatch); +} +EXPORT_SYMBOL(filemap_get_folios_contig); + /** * find_get_pages_contig - gang contiguous pagecache lookup * @mapping: The address_space to search