From patchwork Fri Jun 7 14:58:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Pankaj Raghav (Samsung)" X-Patchwork-Id: 13690328 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 22BC2C27C53 for ; Fri, 7 Jun 2024 14:59:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E92FE6B0098; Fri, 7 Jun 2024 10:59:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E18616B009A; Fri, 7 Jun 2024 10:59:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C6A106B009B; Fri, 7 Jun 2024 10:59:24 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id A25786B0098 for ; Fri, 7 Jun 2024 10:59:24 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 5BA37140277 for ; Fri, 7 Jun 2024 14:59:24 +0000 (UTC) X-FDA: 82204401048.06.81C2D5A Received: from mout-p-202.mailbox.org (mout-p-202.mailbox.org [80.241.56.172]) by imf30.hostedemail.com (Postfix) with ESMTP id 8779680002 for ; Fri, 7 Jun 2024 14:59:22 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=l6vv1KfM; spf=pass (imf30.hostedemail.com: domain of kernel@pankajraghav.com designates 80.241.56.172 as permitted sender) smtp.mailfrom=kernel@pankajraghav.com; dmarc=pass (policy=quarantine) header.from=pankajraghav.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1717772362; 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=4mzOvE/Z1tPhlQ1A0hhzAMqXJSB3DKrNdQ2eVNMhu3Y=; b=dWFWieQ1T2q55q+xND+vt/Kk9cn5B6vdbkGyyh8X1zIFlj1FfwFtjiRVm9ATpFzBg5PCk9 cWEGmokjOsnLiLkgl80bnXUrTnaBkJyjmRNwOGsUBVOGUTY3KYDnORvAXy03odZQFMliUQ 1DuxyyIFYkfXJkDlyYpGGmOi/aBVlMU= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1717772362; a=rsa-sha256; cv=none; b=pPrf6aGz8mkdW98wgvTuX+NRVl1c96RSOLTTy2BS1sBUsOS6qdT4HYJHtQnFjnRdWGkHyL xNjnVD89tkAFIneOZ1Ygj6tt9ezngCK6tWVtKhm5laNIE+xGQVocBk3KsMZDNdmSJMYEjr +NLP0qexK8rrHB2J1WybVvfJrtXeMf0= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=l6vv1KfM; spf=pass (imf30.hostedemail.com: domain of kernel@pankajraghav.com designates 80.241.56.172 as permitted sender) smtp.mailfrom=kernel@pankajraghav.com; dmarc=pass (policy=quarantine) header.from=pankajraghav.com Received: from smtp202.mailbox.org (smtp202.mailbox.org [10.196.197.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4Vwkqq2KNNz9sQg; Fri, 7 Jun 2024 16:59:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pankajraghav.com; s=MBO0001; t=1717772359; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4mzOvE/Z1tPhlQ1A0hhzAMqXJSB3DKrNdQ2eVNMhu3Y=; b=l6vv1KfMVqrMdMRoq9TGWnHlDH6KVSjw/LT3A24s+OjF9ypgQRMKtZ/ooen93DzpjvwQbQ XcUICgY4UiYD7QTHiM4NdWGsuNyLz51Ddw7nzDdItHJVNkkM1LYKxzVUXLnwMychNd2xK0 qqR3j0RQlX9JxGOC1BqlEgnsozRVeViDsIfdHbIS348tmkxi160IDAALHb4pq2TDal65YW HhlBHffpLPkLidrHxPGeen6N6gT0+KL0UqRf6wMjrpzNUhGCXLUVcrgsO1qW0ynWH+wXF9 up2BzOu2BC9JkoJSsmaz7TtsC3KY0xKMpwHwzbY2X1Vsh2nNl8ko0b7eaWJd4w== From: "Pankaj Raghav (Samsung)" To: david@fromorbit.com, djwong@kernel.org, chandan.babu@oracle.com, brauner@kernel.org, akpm@linux-foundation.org, willy@infradead.org Cc: mcgrof@kernel.org, linux-mm@kvack.org, hare@suse.de, linux-kernel@vger.kernel.org, yang@os.amperecomputing.com, Zi Yan , linux-xfs@vger.kernel.org, p.raghav@samsung.com, linux-fsdevel@vger.kernel.org, kernel@pankajraghav.com, hch@lst.de, gost.dev@samsung.com, cl@os.amperecomputing.com, john.g.garry@oracle.com Subject: [PATCH v7 02/11] fs: Allow fine-grained control of folio sizes Date: Fri, 7 Jun 2024 14:58:53 +0000 Message-ID: <20240607145902.1137853-3-kernel@pankajraghav.com> In-Reply-To: <20240607145902.1137853-1-kernel@pankajraghav.com> References: <20240607145902.1137853-1-kernel@pankajraghav.com> MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: a7xnr91n7t3dorjtgq4pqmn8wxzgnnwi X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 8779680002 X-HE-Tag: 1717772362-688136 X-HE-Meta: U2FsdGVkX1/PuS3bcYh9jwPfoUPBLoOf+det5BmdwDeuHKFJS3ofRY2z6yrsjcnOQgnIxShqkqUVFiUI7R4ZfH03Ga+xbtNzD+Os8QW1vsq+a1sYRTCXgE6p1W/4ayVayKddU9hf9qoEhtEmnXF2+HgI5NsEUaVaaXXf+p0QRIe2r6lUNSFoaUon6iHE18L40TXCBEXdq/qzfN2xvKIBjNS4luyQAnn5WjpzOEQfGHFpNBaxyrEnziLcDIS7nwaxwUcwn7fT50JYZF83m4jWxaPcrTAbnj5M541mvJh/CK1kAU1ogms58+P/ayiHl3tXADzyjpjsOM2LW5qX9CY/UNJUvdNukCy0PzG1bUyJpjx7TO5rWEP9/re1ptBOVCJYiAnJZ6DIJcxD6LJYknGAZWffwY4ghRuSwOPjtodJ/jQTG+sye1eLx5aEeU9w7vCiR7P291Buk+jOfrRWzbh7l8nl9+GPcQccz0z9qkLyVeJBEXzzXpv1nZ/7LQXPkhCWTQlP0InUuA81d6gZTaIvkVNr/Ho2eslZr4Q/VMzAPDVrLGYR40fO27TG0LhP8qdKlD5j/3JZO/qg52zTfOp+Ge8m/SgjT8w0YPSFoUMYh8V/bmB4QKl7oph0A729ybASXu238TzL05Aah0n70DLSfPBgrmnDmKikqKffY1yJpX9NocS6VscLHtJCftZGLgcrxtNbCGIEwbTJcxMNieg6JhW5IU/wFFY3KejvNvoFT9MSSKy7IxJ6vZiK2wls0OjFk+206kY3LRWTs1bfzB0nulaK1vAJ0lBHkk46YctmpbwZhrUZQ3LGh0gaycdNrbd7LswlRc/qr8NnotyOWxwzXzwoUO8nWY5x3FhksD4Ukbi+h2uKWIeWiQh20cNUrKekOUoUSbmcc0+E/0izc2YXq3qVR4hSVyevQudO3OieT+Rsus54Yk5iiU95AN/WMfkUqhJl6Z+a8ygl8qIWbpQ Z+SQQKXA 9ccf1HHUhAcMffGA+cu0Z8KGwgRbWWH5RTFYiOBiVo9JPY9lJUFKdtSfCSzwfrXuCWV72kMJVaW3/arPFtvb/T7+soDd+ATCpmyNkxIvsYWL8Uhb6zBq8pOiWDeTsGAWV0WdGDTAQslupFbdM1b57qmkVqPnUWZiN6ZalA1m5NCCFju/Elh1Ff0LfUeQAVHiFZiqRnb1iXzN6hun4L6TAB13qCI4uCiQFNMPBFFKTgUF+j4xlXamE3ijgWxFWp096JgV1SY0tiPhdWcc= 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: List-Subscribe: List-Unsubscribe: From: "Matthew Wilcox (Oracle)" We need filesystems to be able to communicate acceptable folio sizes to the pagecache for a variety of uses (e.g. large block sizes). Support a range of folio sizes between order-0 and order-31. Signed-off-by: Matthew Wilcox (Oracle) Co-developed-by: Pankaj Raghav Signed-off-by: Pankaj Raghav Reviewed-by: Hannes Reinecke Reviewed-by: Darrick J. Wong --- include/linux/pagemap.h | 86 ++++++++++++++++++++++++++++++++++------- mm/filemap.c | 6 +-- mm/readahead.c | 4 +- 3 files changed, 77 insertions(+), 19 deletions(-) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 8f09ed4a4451..228275e7049f 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -204,14 +204,21 @@ enum mapping_flags { AS_EXITING = 4, /* final truncate in progress */ /* writeback related tags are not used */ AS_NO_WRITEBACK_TAGS = 5, - AS_LARGE_FOLIO_SUPPORT = 6, - AS_RELEASE_ALWAYS, /* Call ->release_folio(), even if no private data */ - AS_STABLE_WRITES, /* must wait for writeback before modifying + AS_RELEASE_ALWAYS = 6, /* Call ->release_folio(), even if no private data */ + AS_STABLE_WRITES = 7, /* must wait for writeback before modifying folio contents */ - AS_UNMOVABLE, /* The mapping cannot be moved, ever */ - AS_INACCESSIBLE, /* Do not attempt direct R/W access to the mapping */ + AS_UNMOVABLE = 8, /* The mapping cannot be moved, ever */ + AS_INACCESSIBLE = 9, /* Do not attempt direct R/W access to the mapping */ + /* Bits 16-25 are used for FOLIO_ORDER */ + AS_FOLIO_ORDER_BITS = 5, + AS_FOLIO_ORDER_MIN = 16, + AS_FOLIO_ORDER_MAX = AS_FOLIO_ORDER_MIN + AS_FOLIO_ORDER_BITS, }; +#define AS_FOLIO_ORDER_MASK ((1u << AS_FOLIO_ORDER_BITS) - 1) +#define AS_FOLIO_ORDER_MIN_MASK (AS_FOLIO_ORDER_MASK << AS_FOLIO_ORDER_MIN) +#define AS_FOLIO_ORDER_MAX_MASK (AS_FOLIO_ORDER_MASK << AS_FOLIO_ORDER_MAX) + /** * mapping_set_error - record a writeback error in the address_space * @mapping: the mapping in which an error should be set @@ -360,9 +367,49 @@ static inline void mapping_set_gfp_mask(struct address_space *m, gfp_t mask) #define MAX_PAGECACHE_ORDER 8 #endif +/* + * mapping_set_folio_order_range() - Set the orders supported by a file. + * @mapping: The address space of the file. + * @min: Minimum folio order (between 0-MAX_PAGECACHE_ORDER inclusive). + * @max: Maximum folio order (between @min-MAX_PAGECACHE_ORDER inclusive). + * + * The filesystem should call this function in its inode constructor to + * indicate which base size (min) and maximum size (max) of folio the VFS + * can use to cache the contents of the file. This should only be used + * if the filesystem needs special handling of folio sizes (ie there is + * something the core cannot know). + * Do not tune it based on, eg, i_size. + * + * Context: This should not be called while the inode is active as it + * is non-atomic. + */ +static inline void mapping_set_folio_order_range(struct address_space *mapping, + unsigned int min, + unsigned int max) +{ + if (!IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)) + return; + + if (min > MAX_PAGECACHE_ORDER) + min = MAX_PAGECACHE_ORDER; + if (max > MAX_PAGECACHE_ORDER) + max = MAX_PAGECACHE_ORDER; + if (max < min) + max = min; + + mapping->flags = (mapping->flags & ~AS_FOLIO_ORDER_MASK) | + (min << AS_FOLIO_ORDER_MIN) | (max << AS_FOLIO_ORDER_MAX); +} + +static inline void mapping_set_folio_min_order(struct address_space *mapping, + unsigned int min) +{ + mapping_set_folio_order_range(mapping, min, MAX_PAGECACHE_ORDER); +} + /** * mapping_set_large_folios() - Indicate the file supports large folios. - * @mapping: The file. + * @mapping: The address space of the file. * * The filesystem should call this function in its inode constructor to * indicate that the VFS can use large folios to cache the contents of @@ -373,7 +420,23 @@ static inline void mapping_set_gfp_mask(struct address_space *m, gfp_t mask) */ static inline void mapping_set_large_folios(struct address_space *mapping) { - __set_bit(AS_LARGE_FOLIO_SUPPORT, &mapping->flags); + mapping_set_folio_order_range(mapping, 0, MAX_PAGECACHE_ORDER); +} + +static inline +unsigned int mapping_max_folio_order(const struct address_space *mapping) +{ + if (!IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)) + return 0; + return (mapping->flags & AS_FOLIO_ORDER_MAX_MASK) >> AS_FOLIO_ORDER_MAX; +} + +static inline +unsigned int mapping_min_folio_order(const struct address_space *mapping) +{ + if (!IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)) + return 0; + return (mapping->flags & AS_FOLIO_ORDER_MIN_MASK) >> AS_FOLIO_ORDER_MIN; } /* @@ -382,16 +445,13 @@ static inline void mapping_set_large_folios(struct address_space *mapping) */ static inline bool mapping_large_folio_support(struct address_space *mapping) { - return IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE) && - test_bit(AS_LARGE_FOLIO_SUPPORT, &mapping->flags); + return mapping_max_folio_order(mapping) > 0; } /* Return the maximum folio size for this pagecache mapping, in bytes. */ -static inline size_t mapping_max_folio_size(struct address_space *mapping) +static inline size_t mapping_max_folio_size(const struct address_space *mapping) { - if (mapping_large_folio_support(mapping)) - return PAGE_SIZE << MAX_PAGECACHE_ORDER; - return PAGE_SIZE; + return PAGE_SIZE << mapping_max_folio_order(mapping); } static inline int filemap_nr_thps(struct address_space *mapping) diff --git a/mm/filemap.c b/mm/filemap.c index 37061aafd191..46c7a6f59788 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1933,10 +1933,8 @@ struct folio *__filemap_get_folio(struct address_space *mapping, pgoff_t index, if (WARN_ON_ONCE(!(fgp_flags & (FGP_LOCK | FGP_FOR_MMAP)))) fgp_flags |= FGP_LOCK; - if (!mapping_large_folio_support(mapping)) - order = 0; - if (order > MAX_PAGECACHE_ORDER) - order = MAX_PAGECACHE_ORDER; + if (order > mapping_max_folio_order(mapping)) + order = mapping_max_folio_order(mapping); /* If we're not aligned, allocate a smaller folio */ if (index & ((1UL << order) - 1)) order = __ffs(index); diff --git a/mm/readahead.c b/mm/readahead.c index 75e934a1fd78..da34b28da02c 100644 --- a/mm/readahead.c +++ b/mm/readahead.c @@ -504,9 +504,9 @@ void page_cache_ra_order(struct readahead_control *ractl, limit = min(limit, index + ra->size - 1); - if (new_order < MAX_PAGECACHE_ORDER) { + if (new_order < mapping_max_folio_order(mapping)) { new_order += 2; - new_order = min_t(unsigned int, MAX_PAGECACHE_ORDER, new_order); + new_order = min(mapping_max_folio_order(mapping), new_order); new_order = min_t(unsigned int, new_order, ilog2(ra->size)); }