From patchwork Thu Jul 4 11:23: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: 13723621 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 E8315C30653 for ; Thu, 4 Jul 2024 11:23:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 65D286B00B9; Thu, 4 Jul 2024 07:23:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 60B246B00BA; Thu, 4 Jul 2024 07:23:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4ADD36B00BB; Thu, 4 Jul 2024 07:23:37 -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 2DE206B00B9 for ; Thu, 4 Jul 2024 07:23:37 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id D4990411D7 for ; Thu, 4 Jul 2024 11:23:36 +0000 (UTC) X-FDA: 82301834832.22.FD01F7F Received: from mout-p-101.mailbox.org (mout-p-101.mailbox.org [80.241.56.151]) by imf17.hostedemail.com (Postfix) with ESMTP id 07E3140018 for ; Thu, 4 Jul 2024 11:23:34 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=zbhlPMoo; spf=pass (imf17.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=1720092182; 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=gGaRULCf/0Znuut1zwezXAjhqO6uznnYGs8trvEvW+Q=; b=CF87wZFF1fSDA9p/7zYyu+MINO/AwcrelCFvUYBSrdHcutP31A/lBWB+QBfO+nW0SSIGzG uD+iVSlhjfhz2KG25emEypn+79Von/K+JEFIl7YiRA/25alDIM5OXGSL3c1bNV/sIUP1Wd RM5H0eEEQncGEnqI/KP12RoQaxe5CrI= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=zbhlPMoo; spf=pass (imf17.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=1720092182; a=rsa-sha256; cv=none; b=fba1M6AEekGu9a8hdCWZS+ln1kx5WoAMsh77Ki1z390AG502lyo179A/CTt1UxCmypaZ4Y VAp31VjpeZi9+j7d6aoHFI/XgK6JKj4rU1CWpR57YtVjYTf3dsFqIHxXBIjkRt+svf5F3v +wQUun8FXABhiZtHKvevkGohs7BMg5Y= Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:b231:465::102]) (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 4WFDmM0m9Rz9tFw; Thu, 4 Jul 2024 13:23:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pankajraghav.com; s=MBO0001; t=1720092211; 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=gGaRULCf/0Znuut1zwezXAjhqO6uznnYGs8trvEvW+Q=; b=zbhlPMoo+Kc6QqQkvpg3AiBhIoDzRSZKeRNc1tiK/e4y/vyiTtTBHWvN5uPaqpzwTBt9YY 8A0IILfpGeff7e8FiFjazSW2fcFcGbOMO32GnvXTjf/BoblJkkE4CJaLSEGik9WSZnPMHb TkqAiPR4b4xxE2Paf6qNUyUBEugSGPp8e+Ju816iPdKChC28FYDooBcHifawwYotKUEuE0 OsifWhMfKanNWR4595SZ158peVOCd/SsAWx9v/nooXSsghieIneC37aTEwN4zhS0FAUddp yWYX1c6Q+P5vIwGabzEsO7uooLW4v0SBXU4m2zzOQkwEyMqab8eSbPI9/TguWw== 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, hch@lst.de, Zi Yan Subject: [PATCH v9 01/10] fs: Allow fine-grained control of folio sizes Date: Thu, 4 Jul 2024 11:23:11 +0000 Message-ID: <20240704112320.82104-2-kernel@pankajraghav.com> In-Reply-To: <20240704112320.82104-1-kernel@pankajraghav.com> References: <20240704112320.82104-1-kernel@pankajraghav.com> MIME-Version: 1.0 X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 07E3140018 X-Stat-Signature: ocwjmbpn57nnbk1coozj9f4zhojwgxtr X-Rspam-User: X-HE-Tag: 1720092214-630406 X-HE-Meta: U2FsdGVkX1/SciQfm6zDwHrIo90GGt3mvCDTClP/w8EbBrw5rmOT3ZOwhVjFW/zILUf4Yw9Uqx/NOkaBdFJ+qQlkvwaP8VKmhPYSt4kkjsz8coOTz/4axb4pbGyRMGGdIx+ZeCd7Kz8b5LSUXbWED3ja4xfeom/j0fFGDGrMEzqikf8otDcBFUEaXoR2jnb+VWck3eCdZ1+UUA/tbbQ3LUFoXNp5njz+5EH9taAgTdNAlLW6JGdx+KGbplAdbLfrZDlHDE+zWWp3oXLmkNgtuMBHNQdNhGvgkMHkraJ7kDA8WJQQs42GLx2SgRinP5TNjIoizx2ettfbX/pQBQpEU25vVErNUx27lC9XtgcwKv1xlGVrZNaFLSjCP4qjPYOrRfYmrvt1LFoHSxlCLqXlBdOY1T2coNNv9E+8VmYihDz1v38IajybMl83Fo1Caa44IpsX+bQebJ7j0ZofDe5A9h24M7JSXh20U7Wx35u+kOzjJhdnfYQNCBPKIjMRRy6aiGadBRGaXR9jlMN8dbktLb14U8kz9Jg8o5ZyC21HSL7yfqaVQv9U+uZMwh+DUe6WRAdVKiMMBtJfThZ4iMcsQi2ZvjBGNe5AlQUtYET5RBGX0SFqcEq7HD3x0oCEzHHiM5fLbrnO0ie1POg2oCZ84cYYMFrJTUARDFRvDPDyeimEt4wNbQtazd3KWuqD0jNSEPPVMrt4PENIrhMoWM1gt36HOcg1/PLl7pAr//SMmJe60OjRC3uHxLh3NVSGnD5BzRdzgibMrQmpXRt+/8bjlRLRaFcVp1KvTuhBgky1qz0qvws3i5tZeyFPuatANjt6ie4UoTVO5zFP2vXNuV0yIIXWeE8xcv699Oxp6c65KnhvJD6IaMIgI4Dxo9I1+liXnAAE1Qx5BWfxwhadaHngkNNmPnXLo/373I+m8I3jlD8YoJt3IftFLDmvWpWX4LhG6QETEbo7jcAoXUHjR5c UMasgb0G ghwQfaBuVtWkPUXiBKtop85XzkKN4stnmdIk45iJkXVqqtCeC/lXEfBqpkiBINN2tgSZggI4QB6VFR9ks/uIFl94WVxYMaC4RkUGjPstjTXu1f6hPrNggZxuxIKk526RifHlQTctAK/gWxOpLfaOFuCy/vkV9P4nOjGFfs8yaiRw+CAE16bDtiMsrpJX3f0mU5BVf5jwYJzyYcrseCRZOU+LgO12G78AnVoCEDyZOPJlc0KRYGjmXM+fzMFlJg8rQUm4q0Wj9CmPNXN4Wqgoi9SfYOgIdfYQJy7KHkNzaTDE199bZtZgWeV2kui2XETAMQpsAfieEWaJptzftWvsuV/eKqEZ+jhbTrYkwri/iO1EK8OlBXP2UPIDmJQ== 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 | 87 +++++++++++++++++++++++++++++++++++------ mm/filemap.c | 6 +-- mm/readahead.c | 4 +- 3 files changed, 78 insertions(+), 19 deletions(-) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 8026a8a433d36..71ad63e5fc061 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 @@ -367,9 +374,50 @@ 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; } /* @@ -393,16 +457,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 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() */