From patchwork Tue Jun 25 11:44:11 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: 13710920 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 BE65CC3065A for ; Tue, 25 Jun 2024 11:44:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4E9856B02E2; Tue, 25 Jun 2024 07:44:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 471746B02E7; Tue, 25 Jun 2024 07:44:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2C3D56B02E2; Tue, 25 Jun 2024 07:44:35 -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 087746B01F3 for ; Tue, 25 Jun 2024 07:44:35 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id B2B181A1129 for ; Tue, 25 Jun 2024 11:44:34 +0000 (UTC) X-FDA: 82269228468.06.2FE749F Received: from mout-p-101.mailbox.org (mout-p-101.mailbox.org [80.241.56.151]) by imf05.hostedemail.com (Postfix) with ESMTP id E0416100019 for ; Tue, 25 Jun 2024 11:44:32 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=SoczZoJA; spf=pass (imf05.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=1719315865; 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=tfN9Et075BXtO0w+rFRIJHZouvd8/PL1Nw0p2P4Vhow=; b=a8uEv8K5AjkTUqVXK+GmidM45L04Ui3qkWDzrkG4Tp14ofkr9+v8l0qwggcfmIU5YD+mV8 FJYLcYGl45mL24Ob3zNXLXK384J1FkDImmjtXxT+bnLziqo5XP1FJGW8Q3kVVMNxb5MhqR sO18wlU6Z0km/QpIhTRTMmtM/IbOjcc= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=SoczZoJA; spf=pass (imf05.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=1719315865; a=rsa-sha256; cv=none; b=WwzQOLLCy+o2ISODzjw6c09LMe9m4s0iC+DjSDqsUqn027gIGFh15eobNrCyHZpl2DrbA+ v0+1X8UqXuMb+3uMGrmO766CV2Ov+PpupqpIjfyHz7+CIkePA50v6YdGj1Z3Z9Hh+uZ5q8 EllwH/C1QDmXZvbNXRKynqSoFJhRqVI= Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (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 4W7jfj1jJyz9sWy; Tue, 25 Jun 2024 13:44:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pankajraghav.com; s=MBO0001; t=1719315869; 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=tfN9Et075BXtO0w+rFRIJHZouvd8/PL1Nw0p2P4Vhow=; b=SoczZoJACn34827uX93daQ8lJf6ybr2/Kjwys5/562jiLW33olc3/Nk0DvBhTfmsSiU+Fz EfrD0iUTuiXsnFbcycOTuDR+KZ2TbvDr5Knj7DSpZ/SKWpnUrnvxGowAv0Sw0NVRNgY2hg W+lmRCRB0W2dZevkmrrUeu6TUK5TWjKruyxd64SBSS/ooiBiKJ6LFXJIgZry8FINwgrWdz 2PC0PF3Cw6YvOXvxZnDnXZCGWoT2VMlW0HPLsCRUUPZS6MmhawlRsXc+2+m+1a+Wne/NZm zN71v04qXXtjBlogHNvBoYa9LPpkYTwtPglaXl/1lE99RZ2JgaURCBvb0/BK0w== 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: linux-kernel@vger.kernel.org, yang@os.amperecomputing.com, 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, hch@lst.de, Zi Yan Subject: [PATCH v8 01/10] fs: Allow fine-grained control of folio sizes Date: Tue, 25 Jun 2024 11:44:11 +0000 Message-ID: <20240625114420.719014-2-kernel@pankajraghav.com> In-Reply-To: <20240625114420.719014-1-kernel@pankajraghav.com> References: <20240625114420.719014-1-kernel@pankajraghav.com> MIME-Version: 1.0 X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: E0416100019 X-Stat-Signature: uqty3hchhcshux55fjt1ph4xr4jord1x X-Rspam-User: X-HE-Tag: 1719315872-333996 X-HE-Meta: U2FsdGVkX18K8WAyaFMMIQvDPzorvMykiNNR4RwmKWcuIa7O+2B2yc1uB9jUZlV8EBp5KB3m2ZEkYRYyjXAb2YPNDT3qUfPvl9awrG+B5VpdcUWFe9DuSzUseX8pWjMN0xL2t86/8g7R3TdDbogydIAaErdBV0jQngMd2jJTvU3Y0W/FHK5AGIDweYfGL9K+w8Lmxc2np7UVcOwhMtaNDMPPnDMM5MhcD74VvimvzK9BNfemR0hQegeXKf4CQcqgPfFa1V50ABFO2Aq+NW0eCw5SXZZ/BEHl3YRaqD59Z9q9+u2DBlasa9TOJdQf/wAhmCy/hoVOJU4KE+UV1HnxzSr/FpVDaB48gihIsoCCBhQcHLuY2OhhMg/PBHREG4lKuGK4kIm0ThwC1PDzjbMnDfz/m0a80RK2QnA9idk7ZhF7RkZcJ1/IhJs1rEGJvBUy2IS0hQAXA6FF6DxYSPwHl4vAsCr282l9w8XlSW1TjBAHt7K4TOwHz69v3FxgnrDFq+MyYza7xpl1tx55rhd51vn7jQvnUfDEYeTG6ZABBPiiw2YF6ayKu52Y+LTAAy/KdUTBMRxnSE72HoEm0LVlLTg5iHyCOO6iUV6U6fRdQgWPWIvIuSx4TX2H1kTPobcAOE242poik/zks2HL46LQLpsT3LITZzoCSK1OTB2tsvHzV+49wYWhf3iyQ7pyt/Xzk2txP0RONTTA3uEsUoH21QIw5wuGoIX2npiYesULA9oG2JmFE/C6Edk/wDX9xdHBpMlWMlNOvzRx3xQNFtSA2M6xDRZ8iugl6vnKv4Es63PPdF8QoB8kWa4tO7jlZfSMH31V/5E9yhzuLW14efgB/4y93x/juqTbF7768dJRIrPUYDAi4SqlG9JDd6stHJQH0bbaJH4IS1NYMshIwRz31cYX3QGuGTkBHmrkep3orsG5YDlOAkQsVZ7rDiEkS7B8EPL7CmwjdTtiYgxuVEG 0+HpgAdl Y/2oh2fW+fPH2wMOl4lmEh79BUPpCM/WWLkWhHdeDQtTD5kr0bopRoZSmpENvJIhV+N80q2vfBQAfZL+Rgxj/O0tvWPYy39tmRJUcEPBfwrNXIdYswzaSNQtNvxaXWWYJcQkhkkkFf8VDmgmhgYaPLc2bAXW1XEpKNJjJihM8xChM7QFENYghigm/AYTKFc+esOIxprRcoMXUcAtCNvqQkbyAP+RJFMcIsAO50THdAnD3SVsYS1DL1q8jXx55SD5kJQlBxTvKPZHe80SKBdkpjN31BpAfQb3p9RhEYDZkZxyQSac9AIa0qBINBGNRWWBJlW5Y7XnOZwUpJN/WcHtQOOmH6DBIP/HS8Sqos09FBkpKPetWhD5s+aLUvccYMBkSUz+/ 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 4b71d581091f..0c51154cdb57 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; } /* @@ -386,16 +449,13 @@ static inline bool mapping_large_folio_support(struct address_space *mapping) 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 0b8c732bb643..d617c9afca51 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 c1b23989d9ca..66058ae02f2e 100644 --- a/mm/readahead.c +++ b/mm/readahead.c @@ -503,9 +503,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)); }