From patchwork Thu Aug 22 13:50:09 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: 13773522 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 23C87C52D7C for ; Thu, 22 Aug 2024 13:50:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A68F88002B; Thu, 22 Aug 2024 09:50:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A184B8001E; Thu, 22 Aug 2024 09:50:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 81D108002B; Thu, 22 Aug 2024 09:50:43 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 5DAF48001E for ; Thu, 22 Aug 2024 09:50:43 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id C10511A167C for ; Thu, 22 Aug 2024 13:50:42 +0000 (UTC) X-FDA: 82480016724.24.AB0A589 Received: from mout-p-101.mailbox.org (mout-p-101.mailbox.org [80.241.56.151]) by imf25.hostedemail.com (Postfix) with ESMTP id E7AADA000F for ; Thu, 22 Aug 2024 13:50:40 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=jfXFi1QO; spf=pass (imf25.hostedemail.com: domain of kernel@pankajraghav.com designates 80.241.56.151 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=1724334624; 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=bCh2Mfck7pG+h4bk7FvrFyJ1HyWBpBOqTfsdjvoqNHw=; b=QJqp5HgGDjO3RNinZhe3uzW3EOzCBvBB//V1Lqz94zW6Ykha1AVCa9I8OEZ7bI2Sc6OPIW slDMbKXO4cwRnqrv/NyoSKZFTWyCrLMLUylevN7dU99nXYDfRvg0Lg78eyeukSo4YMChkT ApsnM6VRXS/M9lAnUKnR0LyCofBzyWE= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=jfXFi1QO; spf=pass (imf25.hostedemail.com: domain of kernel@pankajraghav.com designates 80.241.56.151 as permitted sender) smtp.mailfrom=kernel@pankajraghav.com; dmarc=pass (policy=quarantine) header.from=pankajraghav.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1724334624; a=rsa-sha256; cv=none; b=46q8jjki96Gtx0J3Kuu99yxlEHEpNAF6cDZzouG+Eha+04IfjoayLPMYmntqlsM7Y0lXX3 azH/Ptfzj0hvOGOCBTeAE7+eDgTrKqSF5oCo4+UNOqEeT/LMyDbS2e19NomU74gKTatz/Z iVOzHVvosI7/zpbZi9FEAHu4sxCRxMc= Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:b231:465::1]) (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-101.mailbox.org (Postfix) with ESMTPS id 4WqPjS6Rdkz9stn; Thu, 22 Aug 2024 15:50:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pankajraghav.com; s=MBO0001; t=1724334636; 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=bCh2Mfck7pG+h4bk7FvrFyJ1HyWBpBOqTfsdjvoqNHw=; b=jfXFi1QOy2xu2P8kWGm+or+GzRmOhe624PufF6krIKSFYWzrR1hIWMJuHtdKa46+5ZLQVu HoYvm2kVAqvaOhi1P9SEM7wwXs0ZqfaHwFajS5mtzldEl32u0wB519WfZEkEYfcv4Q0fe1 vEpQnUxVAkmci7r0IgZyq48pYgMRnZwCWQsNtiyepw1M5cLeAZHcjvc96RfMtfI30YbIki /J4pPwCLFCXGjpB6qkQ0iIxxxxx+z/4/qA2YMgF17Y6iISWAS8vUtaakEFsdQYw78Unz/l XncodzkjmCzfOKn7QhlBCQ6sLBGPjlHynhkfkFogXUOrG09PR9MWnNJ3VH2jIQ== From: "Pankaj Raghav (Samsung)" To: brauner@kernel.org, akpm@linux-foundation.org Cc: chandan.babu@oracle.com, linux-fsdevel@vger.kernel.org, djwong@kernel.org, hare@suse.de, gost.dev@samsung.com, linux-xfs@vger.kernel.org, kernel@pankajraghav.com, hch@lst.de, david@fromorbit.com, Zi Yan , yang@os.amperecomputing.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, willy@infradead.org, john.g.garry@oracle.com, cl@os.amperecomputing.com, p.raghav@samsung.com, mcgrof@kernel.org, ryan.roberts@arm.com, David Howells Subject: [PATCH v13 01/10] fs: Allow fine-grained control of folio sizes Date: Thu, 22 Aug 2024 15:50:09 +0200 Message-ID: <20240822135018.1931258-2-kernel@pankajraghav.com> In-Reply-To: <20240822135018.1931258-1-kernel@pankajraghav.com> References: <20240822135018.1931258-1-kernel@pankajraghav.com> MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: eqzwdzfaiqu6q5gkisuaebesubiwypdz X-Rspamd-Queue-Id: E7AADA000F X-Rspamd-Server: rspam11 X-HE-Tag: 1724334640-983826 X-HE-Meta: U2FsdGVkX1+IkGLLpLo2k8dPoAs5jov15M03XFd89s+i8+YMiWERlTZFbl9LMOspfqocgVz3v1+W5GuvtBSncK/THbfpMRHRi5c6CMp7ePFWSsorB2OxGy6ixeuXU6pGkg3UmQ8+OieGLaBXXCCnXG1NSS1p0U1H+ha3FzlxoEgBf7WyrvuXrUM4bP4XHPEbIRLZbCUBb6FLkcIu9uvwm9/s3PHYQh+LJ2YvohdeBD0+hGWI3Aw6ieQabo0P8xLLQeDM6Mp+/WS9XmMcYyv110fM+cOdFkvbUL22+unfj3U9KnPbmm5U9EIlPeeX+vzRqG5l/GP7jqzfMzyqyRRII2vjCYqVd7PWlfI2IUAbIu/w/NU4cQDrXpI/i0imtU0JbfwyP32988Cx+eK3ANuTEquvm8VhPscm68zWa+Dml+lDaWeEYU0wFQAoyH4JjM7j31IjMN9hxSmMgeY9PHQbm0DM+KnMmzzSO12WHjPSVDRMexNiGtCfOh3O93HrbtcQPkR+rj5iC27CY/dU0/VkL1946Rul/RY4pxsMNzcTp76XXF4kz6DvJvhTDkBZ7nMfDcPxHFD1B74o8vI2sCXP4IkPubuzK65qJglwfuN0JjvlsPWnq2dSOpwSKDz9nSBOuGSS9HayDmNser6FiWtEJzBSubQCn90Zm/1YOVDQf1qPgmcTTDRnpWQuttzlXZqgyMbROhm4cezRKv6Qx+cYKrH5UfIzGf21CBuWAlu3OJyoe1dCzZRERTvMZUYsJWehOz22W/bbaQiGIK/wN1b2DAaLRsHdyXJb5XKyC9M9fpRrD22G+6qU6a5jPSg36RxrOSnlwm6glr7sBDlxjF3MWgdVpvd6muyXx8aA4omHb7zmAGMEa8pZv6ozznKKFUQUac1eDkGw+ujYRoierWB8jbPRejTcDJpqmArk/j9V+K8pcqKyht1zJUCXTXg0CGI+903retqmB8pOP1W/jNk qAlgH8NF eVCCkmOowUiGWl3TnSZysxLd+YiXrC1y78E5JCkkng3gw3xIQWr16C2mAQugHqIYVdsvf06ichX5Fst+gQyRzR+eEGCN0MEuHfjBIwij+z2XoDC91KJ++svBQDuoBBLSJPD143TwmQOXRBbJuxULeQQyxUMO7QcnFBxlPEB0/ExGcWQyOBrj7jjwMXfCfSmunk1FJ7RpYDoYjq9s4nw6NAV3cOHtleGQ7v11WQk3rBwoL16hVl6FUMOLi8rG7oWG2K34oXawKJRayEK5PXBwM1JyruFMMKnRVZVW/+ZoroJI8rNqp0ETuAP7++Iwg4qm6wHyktkDNkDniipYod9HQVxiJcCnDcwXzgR3lTmKvbSLKOVzPefFlxAakagQ9dAV/fTm55DQulrpLoZRDwpRFEcWRVQ== 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 Tested-by: David Howells Reviewed-by: Daniel Gomez --- include/linux/pagemap.h | 90 ++++++++++++++++++++++++++++++++++------- mm/filemap.c | 6 +-- mm/readahead.c | 4 +- 3 files changed, 80 insertions(+), 20 deletions(-) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index d9c7edb6422bd..c60025bb584c5 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_INACCESSIBLE, /* Do not attempt direct R/W access to the mapping, - including to move the mapping */ + AS_INACCESSIBLE = 8, /* 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_BITS_MASK ((1u << AS_FOLIO_ORDER_BITS) - 1) +#define AS_FOLIO_ORDER_MIN_MASK (AS_FOLIO_ORDER_BITS_MASK << AS_FOLIO_ORDER_MIN) +#define AS_FOLIO_ORDER_MAX_MASK (AS_FOLIO_ORDER_BITS_MASK << AS_FOLIO_ORDER_MAX) +#define AS_FOLIO_ORDER_MASK (AS_FOLIO_ORDER_MIN_MASK | AS_FOLIO_ORDER_MAX_MASK) + /** * mapping_set_error - record a writeback error in the address_space * @mapping: the mapping in which an error should be set @@ -367,9 +374,51 @@ static inline void mapping_set_gfp_mask(struct address_space *m, gfp_t mask) #define MAX_XAS_ORDER (XA_CHUNK_SHIFT * 2 - 1) #define MAX_PAGECACHE_ORDER min(MAX_XAS_ORDER, PREFERRED_MAX_PAGECACHE_ORDER) +/* + * 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 @@ -380,7 +429,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; } /* @@ -389,20 +454,17 @@ static inline void mapping_set_large_folios(struct address_space *mapping) */ static inline bool mapping_large_folio_support(struct address_space *mapping) { - /* AS_LARGE_FOLIO_SUPPORT is only reasonable for pagecache folios */ + /* AS_FOLIO_ORDER is only reasonable for pagecache folios */ VM_WARN_ONCE((unsigned long)mapping & PAGE_MAPPING_ANON, "Anonymous mapping always supports large folio"); - 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 d87c858465962..5c148144d5548 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1932,10 +1932,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 e83fe1c6e5acd..e0cf3bfd2b2b3 100644 --- a/mm/readahead.c +++ b/mm/readahead.c @@ -449,10 +449,10 @@ 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)); /* See comment in page_cache_ra_unbounded() */