From patchwork Fri Jul 26 11:59:47 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: 13742700 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 75FE1C3DA7F for ; Fri, 26 Jul 2024 12:00:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D32626B00A6; Fri, 26 Jul 2024 08:00:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CBA986B00A9; Fri, 26 Jul 2024 08:00:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B334D6B00A6; Fri, 26 Jul 2024 08:00:16 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 913786B00A4 for ; Fri, 26 Jul 2024 08:00:16 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 52E9712186D for ; Fri, 26 Jul 2024 12:00:16 +0000 (UTC) X-FDA: 82381760832.23.7A4FCEB Received: from mout-p-101.mailbox.org (mout-p-101.mailbox.org [80.241.56.151]) by imf16.hostedemail.com (Postfix) with ESMTP id 6F41818001A for ; Fri, 26 Jul 2024 12:00:13 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=0i2cHUhO; spf=pass (imf16.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=1721995188; a=rsa-sha256; cv=none; b=kl38ywRiqT/dJIr20oIVuquOmwG3QhLpgrI600ezNKzz+6QpHuIQ/0ccAFwZzdyDda3OLv UVsK75z5rqCNkaRz31Y1N7bz9dSYuboNp9yTcxcLuuBLZ4pwI+vwl1QOcG9qtJWRxe/1p+ t5eeodyKgk9jdSkOke7sElpm3eXJxLg= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=0i2cHUhO; spf=pass (imf16.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=1721995188; 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=Ufb0UjugC6W3KB84Hi3fjqZ2+tzYpkkK1QUCP+GQMoc=; b=Vbtp1PIvN9TwJLIzIfHXvCrIuy12t9VJXnfWPuX8Cs07eAjjVZ7tkH0iQwxVt0BRfKVi6U iMpQ3BocpKohZd74kTBrsFMpHPEsCTju6tB/FPBMRfKgVJuwIfWyZgetOv40uxbNtxIekO v7sJYj1efceNxPJdlP8t+dxEc1TIZks= 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-101.mailbox.org (Postfix) with ESMTPS id 4WVmXV0jJcz9sSs; Fri, 26 Jul 2024 14:00:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pankajraghav.com; s=MBO0001; t=1721995210; 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=Ufb0UjugC6W3KB84Hi3fjqZ2+tzYpkkK1QUCP+GQMoc=; b=0i2cHUhOqzjAf+wAofaj0KbVZVTptuFYIhU2MgraqWTKOu/C19Vaumn/RcnCHMmonK/vxF HzNy6imtVzivN9Mar+7UkeAPAigHMU/30CMMS24/Dz3LbnRQSvFMwyakkcMcdOG7hrz6wz o2jwIpZQNcLBfFaq/frp5Yt8kAVX0NXlSDx58sWiPd5NH6frRr58Q0tBdpyD3eo/R4ArI6 TFI2KoBd4gzouAeUU0gXPq2C41tIedKQ9wwgvFsHkLxJUpkSRkuW3K3fhppK7Ms8vHa+3o eCP9/RA2lB6N2NrFa61FeeKHgpflSkjYNnA604Fv4zB/WTo1jmeP5chWLkYO+g== From: "Pankaj Raghav (Samsung)" To: david@fromorbit.com, willy@infradead.org, chandan.babu@oracle.com, djwong@kernel.org, brauner@kernel.org, akpm@linux-foundation.org Cc: yang@os.amperecomputing.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, john.g.garry@oracle.com, linux-fsdevel@vger.kernel.org, hare@suse.de, p.raghav@samsung.com, mcgrof@kernel.org, gost.dev@samsung.com, cl@os.amperecomputing.com, linux-xfs@vger.kernel.org, kernel@pankajraghav.com, ryan.roberts@arm.com, hch@lst.de, Zi Yan Subject: [PATCH v11 01/10] fs: Allow fine-grained control of folio sizes Date: Fri, 26 Jul 2024 13:59:47 +0200 Message-ID: <20240726115956.643538-2-kernel@pankajraghav.com> In-Reply-To: <20240726115956.643538-1-kernel@pankajraghav.com> References: <20240726115956.643538-1-kernel@pankajraghav.com> MIME-Version: 1.0 X-Stat-Signature: szh7m45cui6bkjr1a8e31uxak3i4zxwd X-Rspamd-Queue-Id: 6F41818001A X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1721995213-466652 X-HE-Meta: U2FsdGVkX1/HnaSjZ812r3lJBmvkEUkxsaZw9/06stm8HvmmDFTFbfE0JsDfmxgA9hLvaFJvLV390aBO6Lbx+SCEIGJb3iOjEYwYCqTpNn1hOri45Up+0P9Jv9TfeGbyMzkgaIReYJ5OCxytGP20eLlyVjzLcpAeQ0VG1rPnesRB/annYvxyApKLFpVRsqx+b4pAogxrtu/8cLadLhRUp5RAMZZod2D1UCyGGybC8BbATDXzVXkvsjP/mHg0yAt3w0x4u7bmYmGHzomAPJx1N1hpJoHLjxouiJ27SzTubImnRHVKwbrXdleGyMiDe7PWqmYXYamuYnlB8DEgPUYNUhfgDK+zMdtH9DVBL4L/iV/Bzf896ZZSCus3sZn5k4q2pDo7NiS1um4H8znHglSZJcsLfO7pPM7gu6pdJgF4Dn8CllOdlAVe6YC4yFxclf4ucJUSg9v8z9ERnBhcrLpofZaNNlhrnB8KVthgyPzQx+hlY32lk2ilKod2jwDtpQ2EtjAKjFdfPq7RZis87xC4FvO1sgH4kz9Dsr8uSHSEHoJNvEOMA4NzlHaHKRrkg/cz5m1JTCRxd74la2Yks/Co0C/9bBvTQlZk3JUIWrsHadgom6/oYsLAOgQPgCYH4jL4gMZhcbYdfY6Ivc6uFWhNJI9MsHSJiuJmsDPTzyT/i7I+lpXq+BP1qI0Q4Awy8Ig6pYXElR4VBTAWuL25uU+cQX/WxY9LWArEWNzQ2zP8lljKfLUGYFnacLHuko8mQHyrVL3FMwB67BkpujkBgE+kk2J8W/7cZbMe+KSSxJoB3kyeMyPaAslYyyA2OJs292Bf6uTFsW/RASJdjq0OmgX3TYM2UPNYUjI2p1Uge0bWKj2SSBQf0e5eAfrjfTHesSEN5VDURh9yWzDMhR3jVR9wn4HOjfONKq7JLuB9c3lfwT3ASgLU85bL5L31V6QbNOW45gr7kwr8ApNrZ5bJ14Y lkFsFvaE PsMzMNE86VYRk4t6kOr4i2rf7Q7yVEfJVLhfawu6h1YRsVAbaEZ6rGnQFaSbU2tGyYDTQkNA5hzdEIbnYyFxGI8St2dT+C4kqNg4XKJvvRoKl3MtXeV1NjOj7+Lm0K81oSKc8gDK1JPwAmAQUtgykt9DSTPdSZr6jxIs4svd8q6Z73y6QhzOqpxXwzV4y7LhIhKdhiUVNn2qwzdTiqXQVmZ1wGp6kqjUMGN7XPzPtHIqtlLNkjaJXBqYG4hBFjjiX5LZ95nXWZYdpyLmi/B0uDpU8yNNe/C9YYPbRy2wJyIUpCgEkRauO5t2EyW6aqHFICYW7E8G3YTLybo8LEMHi92O7ogjCQPSqdYRNZGaMLrgXu5M= 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 | 89 ++++++++++++++++++++++++++++++++++------- mm/filemap.c | 6 +-- mm/readahead.c | 4 +- 3 files changed, 79 insertions(+), 20 deletions(-) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index d9c7edb6422bd..75bbe88b89904 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -204,14 +204,20 @@ 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_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 @@ -367,9 +373,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 +428,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 +453,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 d62150418b910..ad5e4a848070e 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 517c0be7ce665..3e5239e9e1777 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() */