From nobody Thu Sep 19 02:00:57 2024 Received: from mout-p-101.mailbox.org (mout-p-101.mailbox.org [80.241.56.151]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ACAF4183088; Thu, 22 Aug 2024 13:50:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=80.241.56.151 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724334649; cv=none; b=E0YCWYhMJ3FNbK9ZMvu4EEm5BoLO0rFASZ7vPL8/ooHlZ4DRHuP2xXJeyjxlvbILwq6VISj69bNPjuD7CydlKg0F/T8qXG75SDm8BHATbofr42yJB25VDp9pLOxPQgi5zZqSP9qDI+rMVpi1dj3PIYoAoUThfca8jLGST97V9mg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724334649; c=relaxed/simple; bh=jPrUGxHRJKo1meipWzE/OicR8M+mGRwu5GQTvUYDvAo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=op4h1B7PCRvBic+68oUYq7SwuN5H6Tl3mI0IZmQjAIwgv73Q3bnrJfDDDHmbeK5mUqFI7PN34tO1uK2GZTTZ/bvsAi3ga5009vxo+CRGoh7FMqP4VdFSyUTMW4cPw4oP6Pw60xqxggliiSK7PyrtYEROHo8UGwNmgaT0l0Tj2cE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pankajraghav.com; spf=pass smtp.mailfrom=pankajraghav.com; dkim=pass (2048-bit key) header.d=pankajraghav.com header.i=@pankajraghav.com header.b=jfXFi1QO; arc=none smtp.client-ip=80.241.56.151 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pankajraghav.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pankajraghav.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pankajraghav.com header.i=@pankajraghav.com header.b="jfXFi1QO" 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4WqPjS6Rdkz9stn Content-Type: text/plain; charset="utf-8" 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 =3D 4, /* final truncate in progress */ /* writeback related tags are not used */ AS_NO_WRITEBACK_TAGS =3D 5, - AS_LARGE_FOLIO_SUPPORT =3D 6, - AS_RELEASE_ALWAYS, /* Call ->release_folio(), even if no private data */ - AS_STABLE_WRITES, /* must wait for writeback before modifying + AS_RELEASE_ALWAYS =3D 6, /* Call ->release_folio(), even if no private da= ta */ + AS_STABLE_WRITES =3D 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 =3D 8, /* Do not attempt direct R/W access to the mapping= */ + /* Bits 16-25 are used for FOLIO_ORDER */ + AS_FOLIO_ORDER_BITS =3D 5, + AS_FOLIO_ORDER_MIN =3D 16, + AS_FOLIO_ORDER_MAX =3D AS_FOLIO_ORDER_MIN + AS_FOLIO_ORDER_BITS, }; =20 +#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_ORDE= R_MIN) +#define AS_FOLIO_ORDER_MAX_MASK (AS_FOLIO_ORDER_BITS_MASK << AS_FOLIO_ORDE= R_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_ORD= ER) =20 +/* + * 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 *map= ping, + unsigned int min, + unsigned int max) +{ + if (!IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)) + return; + + if (min > MAX_PAGECACHE_ORDER) + min =3D MAX_PAGECACHE_ORDER; + + if (max > MAX_PAGECACHE_ORDER) + max =3D MAX_PAGECACHE_ORDER; + + if (max < min) + max =3D min; + + mapping->flags =3D (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 *mappi= ng, + 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; } =20 /* @@ -389,20 +454,17 @@ static inline void mapping_set_large_folios(struct ad= dress_space *mapping) */ static inline bool mapping_large_folio_support(struct address_space *mappi= ng) { - /* 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"); =20 - return IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE) && - test_bit(AS_LARGE_FOLIO_SUPPORT, &mapping->flags); + return mapping_max_folio_order(mapping) > 0; } =20 /* 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 *ma= pping) { - if (mapping_large_folio_support(mapping)) - return PAGE_SIZE << MAX_PAGECACHE_ORDER; - return PAGE_SIZE; + return PAGE_SIZE << mapping_max_folio_order(mapping); } =20 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_spa= ce *mapping, pgoff_t index, if (WARN_ON_ONCE(!(fgp_flags & (FGP_LOCK | FGP_FOR_MMAP)))) fgp_flags |=3D FGP_LOCK; =20 - if (!mapping_large_folio_support(mapping)) - order =3D 0; - if (order > MAX_PAGECACHE_ORDER) - order =3D MAX_PAGECACHE_ORDER; + if (order > mapping_max_folio_order(mapping)) + order =3D mapping_max_folio_order(mapping); /* If we're not aligned, allocate a smaller folio */ if (index & ((1UL << order) - 1)) order =3D __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 *ra= ctl, =20 limit =3D min(limit, index + ra->size - 1); =20 - if (new_order < MAX_PAGECACHE_ORDER) + if (new_order < mapping_max_folio_order(mapping)) new_order +=3D 2; =20 - new_order =3D min_t(unsigned int, MAX_PAGECACHE_ORDER, new_order); + new_order =3D min(mapping_max_folio_order(mapping), new_order); new_order =3D min_t(unsigned int, new_order, ilog2(ra->size)); =20 /* See comment in page_cache_ra_unbounded() */ --=20 2.44.1 From nobody Thu Sep 19 02:00:57 2024 Received: from mout-p-101.mailbox.org (mout-p-101.mailbox.org [80.241.56.151]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E4AA81CCB22; Thu, 22 Aug 2024 13:50:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=80.241.56.151 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724334652; cv=none; b=WlC584uhkiNE3oemTcxF4FvCSQvAXE+IAblKcy4GO+CzPs2yP+45zyb369TXQTldGfvrf+SsqR5JXvCzVXRqki/r7OBmLVbil55f7ue35+dguk0+Tu9PP06VNdFfNSxLxvG3ZGv/uEcI/NjeatGCN+rexRvxJnuJOaXM0f2iENU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724334652; c=relaxed/simple; bh=e9KBc+PzEDCed+kd1hK3826CMsn+0IF4bbuqYt2YcWI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SLkkQ4SO2NB1/gMQFPui9vWuEfFf/Z8/3X5kJx6xQXenoXpmzSL/WbMzzXPzzYsqGYw1vYyyr3tKb6MPgsRNmPj2YKLhIjPp+MZRg9xMVKcfTr1j8nWE+7lP7x1lGcAFjh9U14c6NNPUFTiP/YNwX9rZjsf1O6bfYv7pFUJG6gA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pankajraghav.com; spf=pass smtp.mailfrom=pankajraghav.com; dkim=pass (2048-bit key) header.d=pankajraghav.com header.i=@pankajraghav.com header.b=ovaCvJpN; arc=none smtp.client-ip=80.241.56.151 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pankajraghav.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pankajraghav.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pankajraghav.com header.i=@pankajraghav.com header.b="ovaCvJpN" Received: from smtp202.mailbox.org (smtp202.mailbox.org [IPv6:2001:67c:2050:b231:465::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 4WqPjY3DRkz9t26; Thu, 22 Aug 2024 15:50:41 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pankajraghav.com; s=MBO0001; t=1724334641; 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=xvALe0si8mmJx8BbZzMNyuIQl/NHASIyzDu6VP1nIVA=; b=ovaCvJpNLGBJI2GBTEYrdBeqMLC7yel9OuonCATHEU9m6EmFu9rMSZPb/oNyjXYF5OUdNe INTtVtM4kti9F6p0oGL0VYFdbDgKEkZROQrPUorypLF+zQvSonEUz+pMqIv0pSeZdotpdS i3jSNC8CjbdShx8br9RzKyElRaMn2HvPG0q08p9vvPYSOKKZ5hDlDyLdR6X4k5ROQ2JX2j K9gJ28tjKVMl79CXcduAm2VN3+VSknitgLzx6UwdancjSb3NK8qIS9+M3dUKapxcUn3Umw FN8prU2mX2T5aAGRr2Uvr9t/wT8Uatut3aCLTVALbEoRIPIdYgaJ66LtZc2hrg== 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 02/10] filemap: allocate mapping_min_order folios in the page cache Date: Thu, 22 Aug 2024 15:50:10 +0200 Message-ID: <20240822135018.1931258-3-kernel@pankajraghav.com> In-Reply-To: <20240822135018.1931258-1-kernel@pankajraghav.com> References: <20240822135018.1931258-1-kernel@pankajraghav.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4WqPjY3DRkz9t26 Content-Type: text/plain; charset="utf-8" From: Pankaj Raghav filemap_create_folio() and do_read_cache_folio() were always allocating folio of order 0. __filemap_get_folio was trying to allocate higher order folios when fgp_flags had higher order hint set but it will default to order 0 folio if higher order memory allocation fails. Supporting mapping_min_order implies that we guarantee each folio in the page cache has at least an order of mapping_min_order. When adding new folios to the page cache we must also ensure the index used is aligned to the mapping_min_order as the page cache requires the index to be aligned to the order of the folio. Co-developed-by: Luis Chamberlain Signed-off-by: Luis Chamberlain Signed-off-by: Pankaj Raghav Reviewed-by: Hannes Reinecke Reviewed-by: Darrick J. Wong Reviewed-by: Matthew Wilcox (Oracle) Tested-by: David Howells --- include/linux/pagemap.h | 20 ++++++++++++++++++++ mm/filemap.c | 24 ++++++++++++++++-------- 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index c60025bb584c5..4cc170949e9c0 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -448,6 +448,26 @@ mapping_min_folio_order(const struct address_space *ma= pping) return (mapping->flags & AS_FOLIO_ORDER_MIN_MASK) >> AS_FOLIO_ORDER_MIN; } =20 +static inline unsigned long +mapping_min_folio_nrpages(struct address_space *mapping) +{ + return 1UL << mapping_min_folio_order(mapping); +} + +/** + * mapping_align_index() - Align index for this mapping. + * @mapping: The address_space. + * + * The index of a folio must be naturally aligned. If you are adding a + * new folio to the page cache and need to know what index to give it, + * call this function. + */ +static inline pgoff_t mapping_align_index(struct address_space *mapping, + pgoff_t index) +{ + return round_down(index, mapping_min_folio_nrpages(mapping)); +} + /* * Large folio support currently depends on THP. These dependencies are * being worked on but are not yet fixed. diff --git a/mm/filemap.c b/mm/filemap.c index 5c148144d5548..9a047c6d03e4e 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -858,6 +858,8 @@ noinline int __filemap_add_folio(struct address_space *= mapping, =20 VM_BUG_ON_FOLIO(!folio_test_locked(folio), folio); VM_BUG_ON_FOLIO(folio_test_swapbacked(folio), folio); + VM_BUG_ON_FOLIO(folio_order(folio) < mapping_min_folio_order(mapping), + folio); mapping_set_update(&xas, mapping); =20 VM_BUG_ON_FOLIO(index & (folio_nr_pages(folio) - 1), folio); @@ -1918,8 +1920,10 @@ struct folio *__filemap_get_folio(struct address_spa= ce *mapping, pgoff_t index, folio_wait_stable(folio); no_page: if (!folio && (fgp_flags & FGP_CREAT)) { - unsigned order =3D FGF_GET_ORDER(fgp_flags); + unsigned int min_order =3D mapping_min_folio_order(mapping); + unsigned int order =3D max(min_order, FGF_GET_ORDER(fgp_flags)); int err; + index =3D mapping_align_index(mapping, index); =20 if ((fgp_flags & FGP_WRITE) && mapping_can_writeback(mapping)) gfp |=3D __GFP_WRITE; @@ -1942,7 +1946,7 @@ struct folio *__filemap_get_folio(struct address_spac= e *mapping, pgoff_t index, gfp_t alloc_gfp =3D gfp; =20 err =3D -ENOMEM; - if (order > 0) + if (order > min_order) alloc_gfp |=3D __GFP_NORETRY | __GFP_NOWARN; folio =3D filemap_alloc_folio(alloc_gfp, order); if (!folio) @@ -1957,7 +1961,7 @@ struct folio *__filemap_get_folio(struct address_spac= e *mapping, pgoff_t index, break; folio_put(folio); folio =3D NULL; - } while (order-- > 0); + } while (order-- > min_order); =20 if (err =3D=3D -EEXIST) goto repeat; @@ -2443,13 +2447,15 @@ static int filemap_update_page(struct kiocb *iocb, } =20 static int filemap_create_folio(struct file *file, - struct address_space *mapping, pgoff_t index, + struct address_space *mapping, loff_t pos, struct folio_batch *fbatch) { struct folio *folio; int error; + unsigned int min_order =3D mapping_min_folio_order(mapping); + pgoff_t index; =20 - folio =3D filemap_alloc_folio(mapping_gfp_mask(mapping), 0); + folio =3D filemap_alloc_folio(mapping_gfp_mask(mapping), min_order); if (!folio) return -ENOMEM; =20 @@ -2467,6 +2473,7 @@ static int filemap_create_folio(struct file *file, * well to keep locking rules simple. */ filemap_invalidate_lock_shared(mapping); + index =3D (pos >> (PAGE_SHIFT + min_order)) << min_order; error =3D filemap_add_folio(mapping, folio, index, mapping_gfp_constraint(mapping, GFP_KERNEL)); if (error =3D=3D -EEXIST) @@ -2527,8 +2534,7 @@ static int filemap_get_pages(struct kiocb *iocb, size= _t count, if (!folio_batch_count(fbatch)) { if (iocb->ki_flags & (IOCB_NOWAIT | IOCB_WAITQ)) return -EAGAIN; - err =3D filemap_create_folio(filp, mapping, - iocb->ki_pos >> PAGE_SHIFT, fbatch); + err =3D filemap_create_folio(filp, mapping, iocb->ki_pos, fbatch); if (err =3D=3D AOP_TRUNCATED_PAGE) goto retry; return err; @@ -3748,9 +3754,11 @@ static struct folio *do_read_cache_folio(struct addr= ess_space *mapping, repeat: folio =3D filemap_get_folio(mapping, index); if (IS_ERR(folio)) { - folio =3D filemap_alloc_folio(gfp, 0); + folio =3D filemap_alloc_folio(gfp, + mapping_min_folio_order(mapping)); if (!folio) return ERR_PTR(-ENOMEM); + index =3D mapping_align_index(mapping, index); err =3D filemap_add_folio(mapping, folio, index, gfp); if (unlikely(err)) { folio_put(folio); --=20 2.44.1 From nobody Thu Sep 19 02:00:57 2024 Received: from mout-p-201.mailbox.org (mout-p-201.mailbox.org [80.241.56.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EB4A01CCB23; Thu, 22 Aug 2024 13:50:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=80.241.56.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724334652; cv=none; b=u51izsr305sLoL5izD0GJSafUCQixZSb0fvzZUe83r6B2l4P/bI3zVZKmgRio78G+Dkjm/+8KXO4purSMvnC24f68T4ByTJ1Kp65eR9f4reKKA2UyfqyQxMnz54StF8PX8vLdB9Goi/63D0JRwnhLLIsM5WAZZ0zYqAxEWW6CCE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724334652; c=relaxed/simple; bh=dPFeV3Mey129E3wN8+n/Uwka3Ayz7FiOCPAA5+5vae8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=K+aNvEjWv2yHnRILGfvoWEwluEsFN2U06xpIojQht3fQNbsLExN61voiBbv/ViRHZttCad8Z8vQQEpMCs233wK6gyXD2ng6om03VqARMxUWptt0TGJDcNla6GXYpwC3ncQffmmOngFgBT7pbZ4MZt/xPnaVcQzU8OIY6qlL8CxI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pankajraghav.com; spf=pass smtp.mailfrom=pankajraghav.com; dkim=pass (2048-bit key) header.d=pankajraghav.com header.i=@pankajraghav.com header.b=SNYmq8LI; arc=none smtp.client-ip=80.241.56.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pankajraghav.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pankajraghav.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pankajraghav.com header.i=@pankajraghav.com header.b="SNYmq8LI" Received: from smtp102.mailbox.org (smtp102.mailbox.org [10.196.197.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-201.mailbox.org (Postfix) with ESMTPS id 4WqPjg19HWz9tFG; Thu, 22 Aug 2024 15:50:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pankajraghav.com; s=MBO0001; t=1724334647; 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=V6ym79zqALc1EhwazXO34Dqur4lAVM3opZ9BwKTibbA=; b=SNYmq8LI47jO+MaSttCE92UjzwAUPmkZ3jgf0lMrm5qryjIfkW5AWKKdIuYVKjYPywWgwO IGanu2IUQAdOwh+9ThqTcC9Zk8JO003EmdeRy+FEF+7W+grLX08znRCGtgXSOtu9Wi4aMH 31TR2CMFjHfD7hUkJ79kxN+q1fiWAcBMOSfnJDdkExAm788JpOTXep8bbKVGRZrTiC8u8a fKvSM40D8sV+NnZIgJxQzua7JpKUz+xOreGn69Us/+pAk1a7sC11KxMzAbBQVOpWKEyHSa uH2R2/n7hApb6wJq/fYcpWxGe/Ywvs2pX2CWoYTlvSaYF2G5Fjhbhe2ugmeB9Q== 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 03/10] readahead: allocate folios with mapping_min_order in readahead Date: Thu, 22 Aug 2024 15:50:11 +0200 Message-ID: <20240822135018.1931258-4-kernel@pankajraghav.com> In-Reply-To: <20240822135018.1931258-1-kernel@pankajraghav.com> References: <20240822135018.1931258-1-kernel@pankajraghav.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Pankaj Raghav page_cache_ra_unbounded() was allocating single pages (0 order folios) if there was no folio found in an index. Allocate mapping_min_order folios as we need to guarantee the minimum order if it is set. page_cache_ra_order() tries to allocate folio to the page cache with a higher order if the index aligns with that order. Modify it so that the order does not go below the mapping_min_order requirement of the page cache. This function will do the right thing even if the new_order passed is less than the mapping_min_order. When adding new folios to the page cache we must also ensure the index used is aligned to the mapping_min_order as the page cache requires the index to be aligned to the order of the folio. readahead_expand() is called from readahead aops to extend the range of the readahead so this function can assume ractl->_index to be aligned with min_order. Signed-off-by: Pankaj Raghav Co-developed-by: Hannes Reinecke Signed-off-by: Hannes Reinecke Acked-by: Darrick J. Wong Tested-by: David Howells --- mm/readahead.c | 79 ++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 61 insertions(+), 18 deletions(-) diff --git a/mm/readahead.c b/mm/readahead.c index e0cf3bfd2b2b3..3dc6c7a128dd3 100644 --- a/mm/readahead.c +++ b/mm/readahead.c @@ -206,9 +206,10 @@ void page_cache_ra_unbounded(struct readahead_control = *ractl, unsigned long nr_to_read, unsigned long lookahead_size) { struct address_space *mapping =3D ractl->mapping; - unsigned long index =3D readahead_index(ractl); + unsigned long ra_folio_index, index =3D readahead_index(ractl); gfp_t gfp_mask =3D readahead_gfp_mask(mapping); - unsigned long i; + unsigned long mark, i =3D 0; + unsigned int min_nrpages =3D mapping_min_folio_nrpages(mapping); =20 /* * Partway through the readahead operation, we will have added @@ -223,10 +224,24 @@ void page_cache_ra_unbounded(struct readahead_control= *ractl, unsigned int nofs =3D memalloc_nofs_save(); =20 filemap_invalidate_lock_shared(mapping); + index =3D mapping_align_index(mapping, index); + + /* + * As iterator `i` is aligned to min_nrpages, round_up the + * difference between nr_to_read and lookahead_size to mark the + * index that only has lookahead or "async_region" to set the + * readahead flag. + */ + ra_folio_index =3D round_up(readahead_index(ractl) + nr_to_read - lookahe= ad_size, + min_nrpages); + mark =3D ra_folio_index - index; + nr_to_read +=3D readahead_index(ractl) - index; + ractl->_index =3D index; + /* * Preallocate as many pages as we will need. */ - for (i =3D 0; i < nr_to_read; i++) { + while (i < nr_to_read) { struct folio *folio =3D xa_load(&mapping->i_pages, index + i); int ret; =20 @@ -240,12 +255,13 @@ void page_cache_ra_unbounded(struct readahead_control= *ractl, * not worth getting one just for that. */ read_pages(ractl); - ractl->_index++; - i =3D ractl->_index + ractl->_nr_pages - index - 1; + ractl->_index +=3D min_nrpages; + i =3D ractl->_index + ractl->_nr_pages - index; continue; } =20 - folio =3D filemap_alloc_folio(gfp_mask, 0); + folio =3D filemap_alloc_folio(gfp_mask, + mapping_min_folio_order(mapping)); if (!folio) break; =20 @@ -255,14 +271,15 @@ void page_cache_ra_unbounded(struct readahead_control= *ractl, if (ret =3D=3D -ENOMEM) break; read_pages(ractl); - ractl->_index++; - i =3D ractl->_index + ractl->_nr_pages - index - 1; + ractl->_index +=3D min_nrpages; + i =3D ractl->_index + ractl->_nr_pages - index; continue; } - if (i =3D=3D nr_to_read - lookahead_size) + if (i =3D=3D mark) folio_set_readahead(folio); ractl->_workingset |=3D folio_test_workingset(folio); - ractl->_nr_pages++; + ractl->_nr_pages +=3D min_nrpages; + i +=3D min_nrpages; } =20 /* @@ -438,13 +455,19 @@ void page_cache_ra_order(struct readahead_control *ra= ctl, struct address_space *mapping =3D ractl->mapping; pgoff_t start =3D readahead_index(ractl); pgoff_t index =3D start; + unsigned int min_order =3D mapping_min_folio_order(mapping); pgoff_t limit =3D (i_size_read(mapping->host) - 1) >> PAGE_SHIFT; pgoff_t mark =3D index + ra->size - ra->async_size; unsigned int nofs; int err =3D 0; gfp_t gfp =3D readahead_gfp_mask(mapping); + unsigned int min_ra_size =3D max(4, mapping_min_folio_nrpages(mapping)); =20 - if (!mapping_large_folio_support(mapping) || ra->size < 4) + /* + * Fallback when size < min_nrpages as each folio should be + * at least min_nrpages anyway. + */ + if (!mapping_large_folio_support(mapping) || ra->size < min_ra_size) goto fallback; =20 limit =3D min(limit, index + ra->size - 1); @@ -454,10 +477,19 @@ void page_cache_ra_order(struct readahead_control *ra= ctl, =20 new_order =3D min(mapping_max_folio_order(mapping), new_order); new_order =3D min_t(unsigned int, new_order, ilog2(ra->size)); + new_order =3D max(new_order, min_order); =20 /* See comment in page_cache_ra_unbounded() */ nofs =3D memalloc_nofs_save(); filemap_invalidate_lock_shared(mapping); + /* + * If the new_order is greater than min_order and index is + * already aligned to new_order, then this will be noop as index + * aligned to new_order should also be aligned to min_order. + */ + ractl->_index =3D mapping_align_index(mapping, index); + index =3D readahead_index(ractl); + while (index <=3D limit) { unsigned int order =3D new_order; =20 @@ -465,7 +497,7 @@ void page_cache_ra_order(struct readahead_control *ract= l, if (index & ((1UL << order) - 1)) order =3D __ffs(index); /* Don't allocate pages past EOF */ - while (index + (1UL << order) - 1 > limit) + while (order > min_order && index + (1UL << order) - 1 > limit) order--; err =3D ra_alloc_folio(ractl, index, mark, order, gfp); if (err) @@ -703,8 +735,15 @@ void readahead_expand(struct readahead_control *ractl, struct file_ra_state *ra =3D ractl->ra; pgoff_t new_index, new_nr_pages; gfp_t gfp_mask =3D readahead_gfp_mask(mapping); + unsigned long min_nrpages =3D mapping_min_folio_nrpages(mapping); + unsigned int min_order =3D mapping_min_folio_order(mapping); =20 new_index =3D new_start / PAGE_SIZE; + /* + * Readahead code should have aligned the ractl->_index to + * min_nrpages before calling readahead aops. + */ + VM_BUG_ON(!IS_ALIGNED(ractl->_index, min_nrpages)); =20 /* Expand the leading edge downwards */ while (ractl->_index > new_index) { @@ -714,9 +753,11 @@ void readahead_expand(struct readahead_control *ractl, if (folio && !xa_is_value(folio)) return; /* Folio apparently present */ =20 - folio =3D filemap_alloc_folio(gfp_mask, 0); + folio =3D filemap_alloc_folio(gfp_mask, min_order); if (!folio) return; + + index =3D mapping_align_index(mapping, index); if (filemap_add_folio(mapping, folio, index, gfp_mask) < 0) { folio_put(folio); return; @@ -726,7 +767,7 @@ void readahead_expand(struct readahead_control *ractl, ractl->_workingset =3D true; psi_memstall_enter(&ractl->_pflags); } - ractl->_nr_pages++; + ractl->_nr_pages +=3D min_nrpages; ractl->_index =3D folio->index; } =20 @@ -741,9 +782,11 @@ void readahead_expand(struct readahead_control *ractl, if (folio && !xa_is_value(folio)) return; /* Folio apparently present */ =20 - folio =3D filemap_alloc_folio(gfp_mask, 0); + folio =3D filemap_alloc_folio(gfp_mask, min_order); if (!folio) return; + + index =3D mapping_align_index(mapping, index); if (filemap_add_folio(mapping, folio, index, gfp_mask) < 0) { folio_put(folio); return; @@ -753,10 +796,10 @@ void readahead_expand(struct readahead_control *ractl, ractl->_workingset =3D true; psi_memstall_enter(&ractl->_pflags); } - ractl->_nr_pages++; + ractl->_nr_pages +=3D min_nrpages; if (ra) { - ra->size++; - ra->async_size++; + ra->size +=3D min_nrpages; + ra->async_size +=3D min_nrpages; } } } --=20 2.44.1 From nobody Thu Sep 19 02:00:57 2024 Received: from mout-p-102.mailbox.org (mout-p-102.mailbox.org [80.241.56.152]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A38E71CCEEA; Thu, 22 Aug 2024 13:50:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=80.241.56.152 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724334656; cv=none; b=BfQDv7FArk09PHZLr+vKPVgFRFhNqZU1+PtnlvkA1Bkes0OgnTKiR+tZwH+TKFkYHCefMXgv2UqI1IHoos7RCAsKsvC8R4eMD+weN9f5iw2VBn7W7cOoOzxnu+DGS+9gcWdkSuVRtNR4G7XksOSCNQnC5ifQ35TppA+HGQUnTPc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724334656; c=relaxed/simple; bh=uDkhoe0brZm/0tAA4KagBA/lQAFsvzFiEt2ySKVkKEY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HBKuJFRsqwZEDK/ei0xRtx5Sqtv4obr/7jyLLmr5E1HUqbLVYg2dOCHHu6CjnT4dagZ1Yu2C9CAgc6X4Bx1UZP+0cA94wF5pmWC7WAB7MAfCvvenrikUK5Q5JMnG3vtnmCxUiHT/92Di2Rh3H/1dzwuRkbhsn0kNfYrDGwDH/VM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pankajraghav.com; spf=pass smtp.mailfrom=pankajraghav.com; dkim=pass (2048-bit key) header.d=pankajraghav.com header.i=@pankajraghav.com header.b=TI3XkqrO; arc=none smtp.client-ip=80.241.56.152 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pankajraghav.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pankajraghav.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pankajraghav.com header.i=@pankajraghav.com header.b="TI3XkqrO" Received: from smtp202.mailbox.org (smtp202.mailbox.org [IPv6:2001:67c:2050:b231:465::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-102.mailbox.org (Postfix) with ESMTPS id 4WqPjk6K4bz9shX; Thu, 22 Aug 2024 15:50:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pankajraghav.com; s=MBO0001; t=1724334650; 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=x4+UJEIcZLaw+P6a+NKFEvwnnHiOsE5MmywSgHb9XjU=; b=TI3XkqrOA1G5xwXEyCR1F9QdslfABIfK9sZB8HKy2iWovXDXulySJg3g87dZTPCkTT5C44 k4f8YSeu80Sbez6lb6ok73vzCwncZBmUYVJKzxwOG+Aw8p9A2YCq4Cd5reW0vK5LF/gYuY 23Q+7tPshAIXPIhqVbNRdyVEWa4tU9loSCNPaXo5yLr42au/8Kawto53+jwyjVFfKurQMD EsqyNjAiWtoV50XL7TfQealdHd01Q7HN/iIc1Mn7e3+saSIzpB4u2YHJLSTluwfivIXipl yYrPITnpRSP0mSTCPpx6KDZZ5K0836MrDORPqIy1r3Z+e42nnlmT57QA40k0pg== 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 04/10] mm: split a folio in minimum folio order chunks Date: Thu, 22 Aug 2024 15:50:12 +0200 Message-ID: <20240822135018.1931258-5-kernel@pankajraghav.com> In-Reply-To: <20240822135018.1931258-1-kernel@pankajraghav.com> References: <20240822135018.1931258-1-kernel@pankajraghav.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4WqPjk6K4bz9shX Content-Type: text/plain; charset="utf-8" From: Luis Chamberlain split_folio() and split_folio_to_list() assume order 0, to support minorder for non-anonymous folios, we must expand these to check the folio mapping order and use that. Set new_order to be at least minimum folio order if it is set in split_huge_page_to_list() so that we can maintain minimum folio order requirement in the page cache. Update the debugfs write files used for testing to ensure the order is respected as well. We simply enforce the min order when a file mapping is used. Signed-off-by: Luis Chamberlain Signed-off-by: Pankaj Raghav Reviewed-by: Hannes Reinecke Reviewed-by: Zi Yan Tested-by: David Howells --- include/linux/huge_mm.h | 14 +++++++--- mm/huge_memory.c | 60 ++++++++++++++++++++++++++++++++++++++--- 2 files changed, 66 insertions(+), 8 deletions(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index 4c32058cacfec..70424d55da088 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -96,6 +96,8 @@ extern struct kobj_attribute thpsize_shmem_enabled_attr; #define thp_vma_allowable_order(vma, vm_flags, tva_flags, order) \ (!!thp_vma_allowable_orders(vma, vm_flags, tva_flags, BIT(order))) =20 +#define split_folio(f) split_folio_to_list(f, NULL) + #ifdef CONFIG_PGTABLE_HAS_HUGE_LEAVES #define HPAGE_PMD_SHIFT PMD_SHIFT #define HPAGE_PUD_SHIFT PUD_SHIFT @@ -317,9 +319,10 @@ unsigned long thp_get_unmapped_area_vmflags(struct fil= e *filp, unsigned long add bool can_split_folio(struct folio *folio, int caller_pins, int *pextra_pin= s); int split_huge_page_to_list_to_order(struct page *page, struct list_head *= list, unsigned int new_order); +int split_folio_to_list(struct folio *folio, struct list_head *list); static inline int split_huge_page(struct page *page) { - return split_huge_page_to_list_to_order(page, NULL, 0); + return split_folio(page_folio(page)); } void deferred_split_folio(struct folio *folio); =20 @@ -495,6 +498,12 @@ static inline int split_huge_page(struct page *page) { return 0; } + +static inline int split_folio_to_list(struct folio *folio, struct list_hea= d *list) +{ + return 0; +} + static inline void deferred_split_folio(struct folio *folio) {} #define split_huge_pmd(__vma, __pmd, __address) \ do { } while (0) @@ -622,7 +631,4 @@ static inline int split_folio_to_order(struct folio *fo= lio, int new_order) return split_folio_to_list_to_order(folio, NULL, new_order); } =20 -#define split_folio_to_list(f, l) split_folio_to_list_to_order(f, l, 0) -#define split_folio(f) split_folio_to_order(f, 0) - #endif /* _LINUX_HUGE_MM_H */ diff --git a/mm/huge_memory.c b/mm/huge_memory.c index cf8e34f62976f..06384b85a3a20 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -3303,6 +3303,9 @@ bool can_split_folio(struct folio *folio, int caller_= pins, int *pextra_pins) * released, or if some unexpected race happened (e.g., anon VMA disappear= ed, * truncation). * + * Callers should ensure that the order respects the address space mapping + * min-order if one is set for non-anonymous folios. + * * Returns -EINVAL when trying to split to an order that is incompatible * with the folio. Splitting to order 0 is compatible with all folios. */ @@ -3384,6 +3387,7 @@ int split_huge_page_to_list_to_order(struct page *pag= e, struct list_head *list, mapping =3D NULL; anon_vma_lock_write(anon_vma); } else { + unsigned int min_order; gfp_t gfp; =20 mapping =3D folio->mapping; @@ -3394,6 +3398,14 @@ int split_huge_page_to_list_to_order(struct page *pa= ge, struct list_head *list, goto out; } =20 + min_order =3D mapping_min_folio_order(folio->mapping); + if (new_order < min_order) { + VM_WARN_ONCE(1, "Cannot split mapped folio below min-order: %u", + min_order); + ret =3D -EINVAL; + goto out; + } + gfp =3D current_gfp_context(mapping_gfp_mask(mapping) & GFP_RECLAIM_MASK); =20 @@ -3506,6 +3518,25 @@ int split_huge_page_to_list_to_order(struct page *pa= ge, struct list_head *list, return ret; } =20 +int split_folio_to_list(struct folio *folio, struct list_head *list) +{ + unsigned int min_order =3D 0; + + if (folio_test_anon(folio)) + goto out; + + if (!folio->mapping) { + if (folio_test_pmd_mappable(folio)) + count_vm_event(THP_SPLIT_PAGE_FAILED); + return -EBUSY; + } + + min_order =3D mapping_min_folio_order(folio->mapping); +out: + return split_huge_page_to_list_to_order(&folio->page, list, + min_order); +} + void __folio_undo_large_rmappable(struct folio *folio) { struct deferred_split *ds_queue; @@ -3736,6 +3767,8 @@ static int split_huge_pages_pid(int pid, unsigned lon= g vaddr_start, struct vm_area_struct *vma =3D vma_lookup(mm, addr); struct folio_walk fw; struct folio *folio; + struct address_space *mapping; + unsigned int target_order =3D new_order; =20 if (!vma) break; @@ -3753,7 +3786,13 @@ static int split_huge_pages_pid(int pid, unsigned lo= ng vaddr_start, if (!is_transparent_hugepage(folio)) goto next; =20 - if (new_order >=3D folio_order(folio)) + if (!folio_test_anon(folio)) { + mapping =3D folio->mapping; + target_order =3D max(new_order, + mapping_min_folio_order(mapping)); + } + + if (target_order >=3D folio_order(folio)) goto next; =20 total++; @@ -3771,9 +3810,14 @@ static int split_huge_pages_pid(int pid, unsigned lo= ng vaddr_start, folio_get(folio); folio_walk_end(&fw, vma); =20 - if (!split_folio_to_order(folio, new_order)) + if (!folio_test_anon(folio) && folio->mapping !=3D mapping) + goto unlock; + + if (!split_folio_to_order(folio, target_order)) split++; =20 +unlock: + folio_unlock(folio); folio_put(folio); =20 @@ -3802,6 +3846,8 @@ static int split_huge_pages_in_file(const char *file_= path, pgoff_t off_start, pgoff_t index; int nr_pages =3D 1; unsigned long total =3D 0, split =3D 0; + unsigned int min_order; + unsigned int target_order; =20 file =3D getname_kernel(file_path); if (IS_ERR(file)) @@ -3815,6 +3861,8 @@ static int split_huge_pages_in_file(const char *file_= path, pgoff_t off_start, file_path, off_start, off_end); =20 mapping =3D candidate->f_mapping; + min_order =3D mapping_min_folio_order(mapping); + target_order =3D max(new_order, min_order); =20 for (index =3D off_start; index < off_end; index +=3D nr_pages) { struct folio *folio =3D filemap_get_folio(mapping, index); @@ -3829,15 +3877,19 @@ static int split_huge_pages_in_file(const char *fil= e_path, pgoff_t off_start, total++; nr_pages =3D folio_nr_pages(folio); =20 - if (new_order >=3D folio_order(folio)) + if (target_order >=3D folio_order(folio)) goto next; =20 if (!folio_trylock(folio)) goto next; =20 - if (!split_folio_to_order(folio, new_order)) + if (folio->mapping !=3D mapping) + goto unlock; + + if (!split_folio_to_order(folio, target_order)) split++; =20 +unlock: folio_unlock(folio); next: folio_put(folio); --=20 2.44.1 From nobody Thu Sep 19 02:00:57 2024 Received: from mout-p-103.mailbox.org (mout-p-103.mailbox.org [80.241.56.161]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9E3221CB136; Thu, 22 Aug 2024 13:51:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=80.241.56.161 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724334666; cv=none; b=tNHX1CMBl1BdCO0Namb6NdHGuWjKIy//gCM3W0I5kK2h2ZwRBYsTcpPV45jEGn8MRYo/V/nhUfDW0ixDugZTDG7oI1Uep4UuLdW+TM2iP8ako3HwINIM7EhhX6PqG1PoyZAfvKAi2tZYZysaD2Jm3vD8D/XeV3NG2pA3JNvqQmM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724334666; c=relaxed/simple; bh=PzomrYcS5MsbwmYGtgT6nQN/QehlXO49qE1JuEEmT4c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iWkrLZIP402Dq46rUUnspWgh/tImA9LAkSxpA2u4n0DyiTKo+e9rkyYy31GE3lo1xBQqfZJxohKjMXHa6OW/PYI6e1S37vysgAoPPto7BZ8Iu+xsKozOf9qsuLVtC02In9uf/uSxbipwcsJft4/DDM1tie10NxJEhGADMWMW0xY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pankajraghav.com; spf=pass smtp.mailfrom=pankajraghav.com; dkim=pass (2048-bit key) header.d=pankajraghav.com header.i=@pankajraghav.com header.b=J0HCp7BX; arc=none smtp.client-ip=80.241.56.161 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pankajraghav.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pankajraghav.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pankajraghav.com header.i=@pankajraghav.com header.b="J0HCp7BX" 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-103.mailbox.org (Postfix) with ESMTPS id 4WqPjq2sLvz9t4y; Thu, 22 Aug 2024 15:50:55 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pankajraghav.com; s=MBO0001; t=1724334655; 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=0Q1lbNMqgjDwqXL3NMwe856kt2DWnR8U6HSjOpp9wIA=; b=J0HCp7BXa6hLOSuHOQdvc1tqzAJwVHXrI6wHgtgDZKOx5Vsa9imVJ7aEDuNgTxZZOJ45Xg vuTXxmTLHQEjTAuPYLpI2WKg9Tf40FDsa2jZJP9J+xBkawdcZ9ZXZoaebLfQBmWq+PZOvj /fZ4kfiR5/HCF0mprnb5JZHnl1Jytl5CiAZJ68wC3UdQajUvMv+S2i/kp2Es/uNeOUzhI4 BKbHhS/Sf0Wh3x5MmBQxNV9gS3KZPyfNEAoIESk3kUwDA6e/JywmZoK1G71/GODP13GZpl COWjMESiif/EilWe1/RDOigqZhf+45xezdL2GC4Wumxpcgx2YEKsWhljf2097g== 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 05/10] filemap: cap PTE range to be created to allowed zero fill in folio_map_range() Date: Thu, 22 Aug 2024 15:50:13 +0200 Message-ID: <20240822135018.1931258-6-kernel@pankajraghav.com> In-Reply-To: <20240822135018.1931258-1-kernel@pankajraghav.com> References: <20240822135018.1931258-1-kernel@pankajraghav.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Pankaj Raghav Usually the page cache does not extend beyond the size of the inode, therefore, no PTEs are created for folios that extend beyond the size. But with LBS support, we might extend page cache beyond the size of the inode as we need to guarantee folios of minimum order. While doing a read, do_fault_around() can create PTEs for pages that lie beyond the EOF leading to incorrect error return when accessing a page beyond the mapped file. Cap the PTE range to be created for the page cache up to the end of file(EOF) in filemap_map_pages() so that return error codes are consistent with POSIX[1] for LBS configurations. generic/749 has been created to trigger this edge case. This also fixes generic/749 for tmpfs with huge=3Dalways on systems with 4k base page size. [1](from mmap(2)) SIGBUS Attempted access to a page of the buffer that lies beyond the end of the mapped file. For an explanation of the treatment of the bytes in the page that corresponds to the end of a mapped file that is not a multiple of the page size, see NOTES. Signed-off-by: Luis Chamberlain Signed-off-by: Pankaj Raghav Reviewed-by: Hannes Reinecke Reviewed-by: Matthew Wilcox (Oracle) Reviewed-by: Darrick J. Wong Tested-by: David Howells --- mm/filemap.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mm/filemap.c b/mm/filemap.c index 9a047c6d03e4e..eab1f12e7b840 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -3607,7 +3607,7 @@ vm_fault_t filemap_map_pages(struct vm_fault *vmf, struct vm_area_struct *vma =3D vmf->vma; struct file *file =3D vma->vm_file; struct address_space *mapping =3D file->f_mapping; - pgoff_t last_pgoff =3D start_pgoff; + pgoff_t file_end, last_pgoff =3D start_pgoff; unsigned long addr; XA_STATE(xas, &mapping->i_pages, start_pgoff); struct folio *folio; @@ -3633,6 +3633,10 @@ vm_fault_t filemap_map_pages(struct vm_fault *vmf, goto out; } =20 + file_end =3D DIV_ROUND_UP(i_size_read(mapping->host), PAGE_SIZE) - 1; + if (end_pgoff > file_end) + end_pgoff =3D file_end; + folio_type =3D mm_counter_file(folio); do { unsigned long end; --=20 2.44.1 From nobody Thu Sep 19 02:00:57 2024 Received: from mout-p-202.mailbox.org (mout-p-202.mailbox.org [80.241.56.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 84E5A1CF283; Thu, 22 Aug 2024 13:51:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=80.241.56.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724334670; cv=none; b=EqGmW9o/Eudy7/lHswul+ZLwNC0kC5sQ3qa7ev4rwtBV0RNHtvD/wcy9MZ9xC9XaSfaLlXF/z0M0iBnp/GgSbfaVRLeMZCI/nCKCoFLHLM+x2EYr9FjIOLfEpWT6vI7+e9/wM67+pShf4XJUL/OBZZXZvKB+yJ+96DLLexpUAX0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724334670; c=relaxed/simple; bh=1iMLklpfB1/dfXOZRk1dLpcuJp8u6w+63r0ErS1kh7s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hiGqUdQzuvejGfCIPYS3On689itkTCBvrTiGvTJE4fZ+t1A0GGvCh5T1GzzkmPaR5uiemsc0qPKlruIEbWQ1zl69JwJ32rL40AJy2JAoyC6U3pqVlOls8EpcYFvEo9UfngcdLvtDmGeN8q8H3A27ucAEsNoS2N6Y0Jz3Szl383Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pankajraghav.com; spf=pass smtp.mailfrom=pankajraghav.com; dkim=pass (2048-bit key) header.d=pankajraghav.com header.i=@pankajraghav.com header.b=ZMob7FDY; arc=none smtp.client-ip=80.241.56.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pankajraghav.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pankajraghav.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pankajraghav.com header.i=@pankajraghav.com header.b="ZMob7FDY" 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-202.mailbox.org (Postfix) with ESMTPS id 4WqPjv43nRz9sny; Thu, 22 Aug 2024 15:50:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pankajraghav.com; s=MBO0001; t=1724334659; 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=pD3Ip9aPdQ9e51emhRiUmYHymg6Mc2qCEYPgRqwWlxo=; b=ZMob7FDYE+lhI6JG4HexlL05VAspa1JRUwCDmQRJj/A5r1kZWc4UD0yVvBjU/pAQZOh2ul O4SuqWb0onFo/HRZIvoPlMP/hDFZIOnijx18xKM6E3Hiz79nJMLtzjRCcuS5OmV0FH8iyl 3G8acOSnKK5HhZqRcf6qIzNjTVoQipNTYl0XBj5LXmucXWOg/Op0LW7hborfeVOeMmOpxk CA/8w6S+xRSq+OX2KQkQQR5arFkJxE+WRZZsZlqPH5FlRRVnHHs6sMmki+wDEzZ4YsIBMx FHJ7ktDsFE28pwe8KJds/Et3uhEi56dSEy0LldN5SWMwLLDBd7otktq+Vy6KAw== 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, Dave Chinner Subject: [PATCH v13 06/10] iomap: fix iomap_dio_zero() for fs bs > system page size Date: Thu, 22 Aug 2024 15:50:14 +0200 Message-ID: <20240822135018.1931258-7-kernel@pankajraghav.com> In-Reply-To: <20240822135018.1931258-1-kernel@pankajraghav.com> References: <20240822135018.1931258-1-kernel@pankajraghav.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4WqPjv43nRz9sny Content-Type: text/plain; charset="utf-8" From: Pankaj Raghav iomap_dio_zero() will pad a fs block with zeroes if the direct IO size < fs block size. iomap_dio_zero() has an implicit assumption that fs block size < page_size. This is true for most filesystems at the moment. If the block size > page size, this will send the contents of the page next to zero page(as len > PAGE_SIZE) to the underlying block device, causing FS corruption. iomap is a generic infrastructure and it should not make any assumptions about the fs block size and the page size of the system. Signed-off-by: Pankaj Raghav Reviewed-by: Hannes Reinecke Reviewed-by: Darrick J. Wong Reviewed-by: Dave Chinner --- fs/iomap/buffered-io.c | 4 ++-- fs/iomap/direct-io.c | 45 ++++++++++++++++++++++++++++++++++++------ 2 files changed, 41 insertions(+), 8 deletions(-) diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 9b4ca3811a242..cdab801e9d635 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -2007,10 +2007,10 @@ iomap_writepages(struct address_space *mapping, str= uct writeback_control *wbc, } EXPORT_SYMBOL_GPL(iomap_writepages); =20 -static int __init iomap_init(void) +static int __init iomap_buffered_init(void) { return bioset_init(&iomap_ioend_bioset, 4 * (PAGE_SIZE / SECTOR_SIZE), offsetof(struct iomap_ioend, io_bio), BIOSET_NEED_BVECS); } -fs_initcall(iomap_init); +fs_initcall(iomap_buffered_init); diff --git a/fs/iomap/direct-io.c b/fs/iomap/direct-io.c index f3b43d223a46e..c02b266bba525 100644 --- a/fs/iomap/direct-io.c +++ b/fs/iomap/direct-io.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include "trace.h" =20 @@ -27,6 +28,13 @@ #define IOMAP_DIO_WRITE (1U << 30) #define IOMAP_DIO_DIRTY (1U << 31) =20 +/* + * Used for sub block zeroing in iomap_dio_zero() + */ +#define IOMAP_ZERO_PAGE_SIZE (SZ_64K) +#define IOMAP_ZERO_PAGE_ORDER (get_order(IOMAP_ZERO_PAGE_SIZE)) +static struct page *zero_page; + struct iomap_dio { struct kiocb *iocb; const struct iomap_dio_ops *dops; @@ -232,13 +240,20 @@ void iomap_dio_bio_end_io(struct bio *bio) } EXPORT_SYMBOL_GPL(iomap_dio_bio_end_io); =20 -static void iomap_dio_zero(const struct iomap_iter *iter, struct iomap_dio= *dio, +static int iomap_dio_zero(const struct iomap_iter *iter, struct iomap_dio = *dio, loff_t pos, unsigned len) { struct inode *inode =3D file_inode(dio->iocb->ki_filp); - struct page *page =3D ZERO_PAGE(0); struct bio *bio; =20 + if (!len) + return 0; + /* + * Max block size supported is 64k + */ + if (WARN_ON_ONCE(len > IOMAP_ZERO_PAGE_SIZE)) + return -EINVAL; + bio =3D iomap_dio_alloc_bio(iter, dio, 1, REQ_OP_WRITE | REQ_SYNC | REQ_I= DLE); fscrypt_set_bio_crypt_ctx(bio, inode, pos >> inode->i_blkbits, GFP_KERNEL); @@ -246,8 +261,9 @@ static void iomap_dio_zero(const struct iomap_iter *ite= r, struct iomap_dio *dio, bio->bi_private =3D dio; bio->bi_end_io =3D iomap_dio_bio_end_io; =20 - __bio_add_page(bio, page, len, 0); + __bio_add_page(bio, zero_page, len, 0); iomap_dio_submit_bio(iter, dio, bio, pos); + return 0; } =20 /* @@ -356,8 +372,10 @@ static loff_t iomap_dio_bio_iter(const struct iomap_it= er *iter, if (need_zeroout) { /* zero out from the start of the block to the write offset */ pad =3D pos & (fs_block_size - 1); - if (pad) - iomap_dio_zero(iter, dio, pos - pad, pad); + + ret =3D iomap_dio_zero(iter, dio, pos - pad, pad); + if (ret) + goto out; } =20 /* @@ -431,7 +449,8 @@ static loff_t iomap_dio_bio_iter(const struct iomap_ite= r *iter, /* zero out from the end of the write to the end of the block */ pad =3D pos & (fs_block_size - 1); if (pad) - iomap_dio_zero(iter, dio, pos, fs_block_size - pad); + ret =3D iomap_dio_zero(iter, dio, pos, + fs_block_size - pad); } out: /* Undo iter limitation to current extent */ @@ -753,3 +772,17 @@ iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter, return iomap_dio_complete(dio); } EXPORT_SYMBOL_GPL(iomap_dio_rw); + +static int __init iomap_dio_init(void) +{ + zero_page =3D alloc_pages(GFP_KERNEL | __GFP_ZERO, + IOMAP_ZERO_PAGE_ORDER); + + if (!zero_page) + return -ENOMEM; + + set_memory_ro((unsigned long)page_address(zero_page), + 1U << IOMAP_ZERO_PAGE_ORDER); + return 0; +} +fs_initcall(iomap_dio_init); --=20 2.44.1 From nobody Thu Sep 19 02:00:57 2024 Received: from mout-p-103.mailbox.org (mout-p-103.mailbox.org [80.241.56.161]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D4C6B1CCED6; Thu, 22 Aug 2024 13:51:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=80.241.56.161 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724334669; cv=none; b=EoE+Vp696GyT3BQZVwrCvYlETNvspLwkvULnTYqqSFs53CAl353nvfoPmOTIrTiDKbLuFbZJACGmCbBHUAkTqhHiiyj+YVQn1bm5SipEkSPhxL+A/DGLao4CAKaP/TtdAExfahNrMnXJZhughArxMR0K/pN0LsiSKudvTtfiT8A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724334669; c=relaxed/simple; bh=2GhI+azvlVmJ+XNkvELFCX60TvrX+df0OCxGC4NRcjY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lrQrxdUgYDpA33BRXnfj0ygyLn/dd/BwnvoK8Y/54tUeguXOc1w5ktLAe9oAkxez4Cyufi+J1vHVH9sl0Vk5aN4HaECGd6RqNSaRA9Vb9BtNx0nTIVfVN8O7VlMNSIoIg6q0Tmdts6xiLWCACq/TR7VeRK1CGAvvOuymtNP3X+s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pankajraghav.com; spf=pass smtp.mailfrom=pankajraghav.com; dkim=pass (2048-bit key) header.d=pankajraghav.com header.i=@pankajraghav.com header.b=bKt/GB0h; arc=none smtp.client-ip=80.241.56.161 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pankajraghav.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pankajraghav.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pankajraghav.com header.i=@pankajraghav.com header.b="bKt/GB0h" 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-103.mailbox.org (Postfix) with ESMTPS id 4WqPk01Njtz9sW2; Thu, 22 Aug 2024 15:51:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pankajraghav.com; s=MBO0001; t=1724334664; 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=D613TVQCptAW9VynAGuVSOK0s4oeJXQu1SypShzHmM4=; b=bKt/GB0hYx+LKsC2vHy8ejt7D1pKON4lS+0/dv3nc15QJK6n9gyaWwk2SNmA0VgUQ3o1Sy r8d37LoR2T1fmY74GQ9P+bHUMqwJ/o/rJqpYoCObbHu0Ic4VYGbf+hqehCPcHFJfWpeTBe /X7PkbCiFiGW8XdH8Fz/NDI1NNIV/o+WhxMr9KQUNEHEQlkhvxA/wO4dJ/2YtpPe1ToWXO wmg66mqPfzHmvQHPZT4JNtFbVeqvSCNLU2Kq3gIBn+KQ9PQVo9SrIPjlm9BKn4NS8HmMdv d44jbDgbvG+h0In8m1/1KxM3Prunl0weJwgPes/0rcx++PIe2ouQNgQQWYplEQ== 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, Dave Chinner Subject: [PATCH v13 07/10] xfs: use kvmalloc for xattr buffers Date: Thu, 22 Aug 2024 15:50:15 +0200 Message-ID: <20240822135018.1931258-8-kernel@pankajraghav.com> In-Reply-To: <20240822135018.1931258-1-kernel@pankajraghav.com> References: <20240822135018.1931258-1-kernel@pankajraghav.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Dave Chinner Pankaj Raghav reported that when filesystem block size is larger than page size, the xattr code can use kmalloc() for high order allocations. This triggers a useless warning in the allocator as it is a __GFP_NOFAIL allocation here: static inline struct page *rmqueue(struct zone *preferred_zone, struct zone *zone, unsigned int order, gfp_t gfp_flags, unsigned int alloc_flags, int migratetype) { struct page *page; /* * We most definitely don't want callers attempting to * allocate greater than order-1 page units with __GFP_NOFAIL. */ >>>> WARN_ON_ONCE((gfp_flags & __GFP_NOFAIL) && (order > 1)); ... Fix this by changing all these call sites to use kvmalloc(), which will strip the NOFAIL from the kmalloc attempt and if that fails will do a __GFP_NOFAIL vmalloc(). This is not an issue that productions systems will see as filesystems with block size > page size cannot be mounted by the kernel; Pankaj is developing this functionality right now. Reported-by: Pankaj Raghav Fixes: f078d4ea8276 ("xfs: convert kmem_alloc() to kmalloc()") Signed-off-by: Dave Chinner Reviewed-by: Darrick J. Wong Reviewed-by: Pankaj Raghav --- fs/xfs/libxfs/xfs_attr_leaf.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c index b9e98950eb3d8..09f4cb061a6e0 100644 --- a/fs/xfs/libxfs/xfs_attr_leaf.c +++ b/fs/xfs/libxfs/xfs_attr_leaf.c @@ -1138,10 +1138,7 @@ xfs_attr3_leaf_to_shortform( =20 trace_xfs_attr_leaf_to_sf(args); =20 - tmpbuffer =3D kmalloc(args->geo->blksize, GFP_KERNEL | __GFP_NOFAIL); - if (!tmpbuffer) - return -ENOMEM; - + tmpbuffer =3D kvmalloc(args->geo->blksize, GFP_KERNEL | __GFP_NOFAIL); memcpy(tmpbuffer, bp->b_addr, args->geo->blksize); =20 leaf =3D (xfs_attr_leafblock_t *)tmpbuffer; @@ -1205,7 +1202,7 @@ xfs_attr3_leaf_to_shortform( error =3D 0; =20 out: - kfree(tmpbuffer); + kvfree(tmpbuffer); return error; } =20 @@ -1613,7 +1610,7 @@ xfs_attr3_leaf_compact( =20 trace_xfs_attr_leaf_compact(args); =20 - tmpbuffer =3D kmalloc(args->geo->blksize, GFP_KERNEL | __GFP_NOFAIL); + tmpbuffer =3D kvmalloc(args->geo->blksize, GFP_KERNEL | __GFP_NOFAIL); memcpy(tmpbuffer, bp->b_addr, args->geo->blksize); memset(bp->b_addr, 0, args->geo->blksize); leaf_src =3D (xfs_attr_leafblock_t *)tmpbuffer; @@ -1651,7 +1648,7 @@ xfs_attr3_leaf_compact( */ xfs_trans_log_buf(trans, bp, 0, args->geo->blksize - 1); =20 - kfree(tmpbuffer); + kvfree(tmpbuffer); } =20 /* @@ -2330,7 +2327,7 @@ xfs_attr3_leaf_unbalance( struct xfs_attr_leafblock *tmp_leaf; struct xfs_attr3_icleaf_hdr tmphdr; =20 - tmp_leaf =3D kzalloc(state->args->geo->blksize, + tmp_leaf =3D kvzalloc(state->args->geo->blksize, GFP_KERNEL | __GFP_NOFAIL); =20 /* @@ -2371,7 +2368,7 @@ xfs_attr3_leaf_unbalance( } memcpy(save_leaf, tmp_leaf, state->args->geo->blksize); savehdr =3D tmphdr; /* struct copy */ - kfree(tmp_leaf); + kvfree(tmp_leaf); } =20 xfs_attr3_leaf_hdr_to_disk(state->args->geo, save_leaf, &savehdr); --=20 2.44.1 From nobody Thu Sep 19 02:00:57 2024 Received: from mout-p-103.mailbox.org (mout-p-103.mailbox.org [80.241.56.161]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5A7401CFEA2; Thu, 22 Aug 2024 13:51:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=80.241.56.161 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724334674; cv=none; b=FC0ivqZQR4UUAKR2pih2MRzknm9/EvIXN1pKhP0KVXhCU+/4VJ3/w5TLDJDjakv0cCjKVm1JJmVGHe7eC1/z6eYjOzpCLv2MGCZa3jr63nrdZrVONhehd+tQBW7UxZttbz7f7mHR5mjvc9OInSaCO4Jd70sCmneE7K1Pt4xLAJ8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724334674; c=relaxed/simple; bh=DJ2EmpR/3LYu+ZcXHm2ZIaZfhdO6TbSJQLVoebv5eCc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=k6SjZbGA8EfuicgelaENJnmDwMfk3QIkqFAKk2sLRoo9CeNy9tHT7zpv48Ih7Uk6G5qF2RBKd67Xcu7viSwLBtPebHmSdh6qzkcJ+KHzzIVrDdhwHL4/IC7/P+Bh9l/DK9Uzz6mOs2h5xxRA5PKHW58qg8cDDak5IMLcCk8t9j0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pankajraghav.com; spf=pass smtp.mailfrom=pankajraghav.com; dkim=pass (2048-bit key) header.d=pankajraghav.com header.i=@pankajraghav.com header.b=QSmqQrxN; arc=none smtp.client-ip=80.241.56.161 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pankajraghav.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pankajraghav.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pankajraghav.com header.i=@pankajraghav.com header.b="QSmqQrxN" 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-103.mailbox.org (Postfix) with ESMTPS id 4WqPk42jmPz9t4y; Thu, 22 Aug 2024 15:51:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pankajraghav.com; s=MBO0001; t=1724334668; 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=OFCQeRoYKCpIwc/V7VVfVT8xrzJ1wqzaVy/cCyGH2d4=; b=QSmqQrxN/St3SlPpugnj/7VLtEgFH1rnm6MAu+uf+ewxUpJh1ieYAOC0IvJLtJMtB95I+E 5YP8PRjKedI61w5GTNc255JZOUFU86S3qu8aTpRUvPPBcdQCpmKjR6xQNo46fbdX9t3e4a As4fA4lrcqRmBTZXiywIKfveS7VCsXBnAnH9v0VMBfSE9vzo5IaXoq9t7YGtb9JMSyXDQa 8WOwwovh4ymZA4ygmCo87eXqRdYvQW9yuZPqAalL2vJa8Hk26WoNS6MJ8Cxq8B+SzFaI9y bt1uOGaxPJKuhni6YRaqdR4eP42qXtReewloa616gce2nIiz59bL++/23JWx/A== 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, Dave Chinner Subject: [PATCH v13 08/10] xfs: expose block size in stat Date: Thu, 22 Aug 2024 15:50:16 +0200 Message-ID: <20240822135018.1931258-9-kernel@pankajraghav.com> In-Reply-To: <20240822135018.1931258-1-kernel@pankajraghav.com> References: <20240822135018.1931258-1-kernel@pankajraghav.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4WqPk42jmPz9t4y Content-Type: text/plain; charset="utf-8" From: Pankaj Raghav For block size larger than page size, the unit of efficient IO is the block size, not the page size. Leaving stat() to report PAGE_SIZE as the block size causes test programs like fsx to issue illegal ranges for operations that require block size alignment (e.g. fallocate() insert range). Hence update the preferred IO size to reflect the block size in this case. This change is based on a patch originally from Dave Chinner.[1] [1] https://lwn.net/ml/linux-fsdevel/20181107063127.3902-16-david@fromorbit= .com/ Signed-off-by: Pankaj Raghav Signed-off-by: Luis Chamberlain Reviewed-by: Darrick J. Wong Reviewed-by: Dave Chinner --- fs/xfs/xfs_iops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c index a1c4a350a6dbf..2b8dbe8bf1381 100644 --- a/fs/xfs/xfs_iops.c +++ b/fs/xfs/xfs_iops.c @@ -567,7 +567,7 @@ xfs_stat_blksize( return 1U << mp->m_allocsize_log; } =20 - return PAGE_SIZE; + return max_t(uint32_t, PAGE_SIZE, mp->m_sb.sb_blocksize); } =20 STATIC int --=20 2.44.1 From nobody Thu Sep 19 02:00:57 2024 Received: from mout-p-202.mailbox.org (mout-p-202.mailbox.org [80.241.56.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D6F791CFEA2; Thu, 22 Aug 2024 13:51:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=80.241.56.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724334679; cv=none; b=Ahq9EG241ZdTxtUf7Yfcg7Dv4r0BsSyLHqvpzeEpZl9m+ueX7d3G4Gl/6F0uuH3Bqt8agVQ10jAlEYdnSYsP6SyBm0RIFBvpywCPIRKrKnZuyG4tLEObwhWdjmygmPUNoANio09XOSDeNwNy3S4Zdfyz2NKfABoH9FOKml+H3uA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724334679; c=relaxed/simple; bh=oVLFbpMiPlCmMAMNE+tGeHJKbYbbrzfNiFNSfbDXslo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GAP5jSA4XNz455rZYpdVpDIO7xLXTt84HsWNyW80tvdFSag3G+RyyRl+JZK7Pnbf800kQxvgwHSa2OdGQhY7zBxxBqRi89mOtWN+ZT6SPImCJYI1sp9ZNhIRD9rWp5MbfKVq0Iz/ELkWk3PWApstx6QZEmWBQtCQKXAuidd/ZAc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pankajraghav.com; spf=pass smtp.mailfrom=pankajraghav.com; dkim=pass (2048-bit key) header.d=pankajraghav.com header.i=@pankajraghav.com header.b=TFVIL2wP; arc=none smtp.client-ip=80.241.56.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pankajraghav.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pankajraghav.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pankajraghav.com header.i=@pankajraghav.com header.b="TFVIL2wP" Received: from smtp1.mailbox.org (smtp1.mailbox.org [10.196.197.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-202.mailbox.org (Postfix) with ESMTPS id 4WqPkB0fTWz9t9B; Thu, 22 Aug 2024 15:51:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pankajraghav.com; s=MBO0001; t=1724334673; 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=8rdOu+47Xth5hXKbmOu06fRFiMFY0Pwf2tkrEBizRPk=; b=TFVIL2wPAsMgSBP+VSo4hX8ZaDG/obLodnzi7AQrGoZhvWUcCm54/Pk/SnjurnYnn6DHHn 38k4im4iaU87lWQJZTscaY35ujnCbQHLGJtLOy/BkGiPKq5hK565nW0/1J84B7Tp9O5trG rZxTkr8gmKHQVOT0PxEdNhgDGiDwNW50ejNpocmMvxotg9dvxejbrdh4xhIK2tbidOyMPH DpOt+Kr0H8aIc6wW5NWQfofcgUu9u6hxDTzbK+RN59gH7OcI2aYlHFhjwsJ4V4TriGYlCv J/IbBakQr9Li0ijK8nTSg147afO6Yp2EkKqBOQ4bThDUNRhdhtiwCcwWFAZZkg== 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, Dave Chinner Subject: [PATCH v13 09/10] xfs: make the calculation generic in xfs_sb_validate_fsb_count() Date: Thu, 22 Aug 2024 15:50:17 +0200 Message-ID: <20240822135018.1931258-10-kernel@pankajraghav.com> In-Reply-To: <20240822135018.1931258-1-kernel@pankajraghav.com> References: <20240822135018.1931258-1-kernel@pankajraghav.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Pankaj Raghav Instead of assuming that PAGE_SHIFT is always higher than the blocklog, make the calculation generic so that page cache count can be calculated correctly for LBS. Signed-off-by: Pankaj Raghav Reviewed-by: Darrick J. Wong Reviewed-by: Dave Chinner --- fs/xfs/xfs_mount.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c index 09eef1721ef4f..3949f720b5354 100644 --- a/fs/xfs/xfs_mount.c +++ b/fs/xfs/xfs_mount.c @@ -132,11 +132,16 @@ xfs_sb_validate_fsb_count( xfs_sb_t *sbp, uint64_t nblocks) { + uint64_t max_bytes; + ASSERT(PAGE_SHIFT >=3D sbp->sb_blocklog); ASSERT(sbp->sb_blocklog >=3D BBSHIFT); =20 + if (check_shl_overflow(nblocks, sbp->sb_blocklog, &max_bytes)) + return -EFBIG; + /* Limited by ULONG_MAX of page cache index */ - if (nblocks >> (PAGE_SHIFT - sbp->sb_blocklog) > ULONG_MAX) + if (max_bytes >> PAGE_SHIFT > ULONG_MAX) return -EFBIG; return 0; } --=20 2.44.1 From nobody Thu Sep 19 02:00:57 2024 Received: from mout-p-101.mailbox.org (mout-p-101.mailbox.org [80.241.56.151]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 986C81CFEA2; Thu, 22 Aug 2024 13:51:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=80.241.56.151 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724334684; cv=none; b=LDbZhsFPMGqKe1uP8NwFrig2A9zQAewR+kFiNgKDKTbwRprpvWLUpy0h8++EICRJ3mR2LvMFUvkqn0YW1NFOZme2TUpaxeU9bGYolyqUfC6wfBxTY+XGGfA6RRyyEdSRz2UZaud/RU3uEUPvU69YRCAmPd9kiuxPER/4OL1iApY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724334684; c=relaxed/simple; bh=cKQSwvvpJzTxFVJVmCS7844uk2UcjOOJMnuNzHL3iHw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lOUR1BX0XDP4DJwt3q+7LYwvQn4OuaBdKw8PMQpBZE23AUEZwzpIh6d+GuoBUQTFcb1K8wc4MU17YrYwJQUtsGpufPb+eBXWvzeGBL74UUNgVAv25EKR7aaeXgZwLfRv3A8RoQ0UM170LVCtxktEMSPFLG476FTbFnQW5n6/wxk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pankajraghav.com; spf=pass smtp.mailfrom=pankajraghav.com; dkim=pass (2048-bit key) header.d=pankajraghav.com header.i=@pankajraghav.com header.b=VegWij3r; arc=none smtp.client-ip=80.241.56.151 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pankajraghav.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pankajraghav.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pankajraghav.com header.i=@pankajraghav.com header.b="VegWij3r" 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 4WqPkH1DMrz9swN; Thu, 22 Aug 2024 15:51:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pankajraghav.com; s=MBO0001; t=1724334679; 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=uKuJPTxavc2u9bTAhiaeRY690QnbuCpo0c6Cxa2GBYk=; b=VegWij3rLaHj8dGmARrjjens56tR5/JYIcYcwfp+ooIquZOFoXJ2L0sBQHuJh7uOqWy2qT 9knWMKf8O5hBLnDbIMuM5RSRQeW4ESx7KNzXJDkfAgLizL/aamh7xaayXb5I+TKBqblHzf cIXsZyKICHnGWkeZJS/tFzwOuLTB0X9pxWcXmf3mfB6n+HHFLWiRsg5F6e2RzafYBNew5c 1S5SmBJj1rFEDVDs4aPfV8Pmn8XoOpy+l77RYQ4AcdRHyHWioUmEwNeJcNeD3IzrYypLnr NQG2n4nSntJR8Qpyh4VnlU974HMgHA9t1T7tTw4I7CGSrT7PPCrMOWkXT2O13A== 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, Dave Chinner Subject: [PATCH v13 10/10] xfs: enable block size larger than page size support Date: Thu, 22 Aug 2024 15:50:18 +0200 Message-ID: <20240822135018.1931258-11-kernel@pankajraghav.com> In-Reply-To: <20240822135018.1931258-1-kernel@pankajraghav.com> References: <20240822135018.1931258-1-kernel@pankajraghav.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4WqPkH1DMrz9swN Content-Type: text/plain; charset="utf-8" From: Pankaj Raghav Page cache now has the ability to have a minimum order when allocating a folio which is a prerequisite to add support for block size > page size. Signed-off-by: Pankaj Raghav Signed-off-by: Luis Chamberlain Reviewed-by: Darrick J. Wong Reviewed-by: Dave Chinner --- fs/xfs/libxfs/xfs_ialloc.c | 5 +++++ fs/xfs/libxfs/xfs_shared.h | 3 +++ fs/xfs/xfs_icache.c | 6 ++++-- fs/xfs/xfs_mount.c | 1 - fs/xfs/xfs_super.c | 28 ++++++++++++++++++++-------- include/linux/pagemap.h | 13 +++++++++++++ 6 files changed, 45 insertions(+), 11 deletions(-) diff --git a/fs/xfs/libxfs/xfs_ialloc.c b/fs/xfs/libxfs/xfs_ialloc.c index 0af5b7a33d055..1921b689888b8 100644 --- a/fs/xfs/libxfs/xfs_ialloc.c +++ b/fs/xfs/libxfs/xfs_ialloc.c @@ -3033,6 +3033,11 @@ xfs_ialloc_setup_geometry( igeo->ialloc_align =3D mp->m_dalign; else igeo->ialloc_align =3D 0; + + if (mp->m_sb.sb_blocksize > PAGE_SIZE) + igeo->min_folio_order =3D mp->m_sb.sb_blocklog - PAGE_SHIFT; + else + igeo->min_folio_order =3D 0; } =20 /* Compute the location of the root directory inode that is laid out by mk= fs. */ diff --git a/fs/xfs/libxfs/xfs_shared.h b/fs/xfs/libxfs/xfs_shared.h index 2f7413afbf46c..33b84a3a83ff6 100644 --- a/fs/xfs/libxfs/xfs_shared.h +++ b/fs/xfs/libxfs/xfs_shared.h @@ -224,6 +224,9 @@ struct xfs_ino_geometry { /* precomputed value for di_flags2 */ uint64_t new_diflags2; =20 + /* minimum folio order of a page cache allocation */ + unsigned int min_folio_order; + }; =20 #endif /* __XFS_SHARED_H__ */ diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c index cf629302d48e7..0fcf235e50235 100644 --- a/fs/xfs/xfs_icache.c +++ b/fs/xfs/xfs_icache.c @@ -88,7 +88,8 @@ xfs_inode_alloc( =20 /* VFS doesn't initialise i_mode! */ VFS_I(ip)->i_mode =3D 0; - mapping_set_large_folios(VFS_I(ip)->i_mapping); + mapping_set_folio_min_order(VFS_I(ip)->i_mapping, + M_IGEO(mp)->min_folio_order); =20 XFS_STATS_INC(mp, vn_active); ASSERT(atomic_read(&ip->i_pincount) =3D=3D 0); @@ -325,7 +326,8 @@ xfs_reinit_inode( inode->i_uid =3D uid; inode->i_gid =3D gid; inode->i_state =3D state; - mapping_set_large_folios(inode->i_mapping); + mapping_set_folio_min_order(inode->i_mapping, + M_IGEO(mp)->min_folio_order); return error; } =20 diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c index 3949f720b5354..c6933440f8066 100644 --- a/fs/xfs/xfs_mount.c +++ b/fs/xfs/xfs_mount.c @@ -134,7 +134,6 @@ xfs_sb_validate_fsb_count( { uint64_t max_bytes; =20 - ASSERT(PAGE_SHIFT >=3D sbp->sb_blocklog); ASSERT(sbp->sb_blocklog >=3D BBSHIFT); =20 if (check_shl_overflow(nblocks, sbp->sb_blocklog, &max_bytes)) diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index 210481b03fdb4..8cd76a01b543f 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c @@ -1638,16 +1638,28 @@ xfs_fs_fill_super( goto out_free_sb; } =20 - /* - * Until this is fixed only page-sized or smaller data blocks work. - */ if (mp->m_sb.sb_blocksize > PAGE_SIZE) { - xfs_warn(mp, - "File system with blocksize %d bytes. " - "Only pagesize (%ld) or less will currently work.", + size_t max_folio_size =3D mapping_max_folio_size_supported(); + + if (!xfs_has_crc(mp)) { + xfs_warn(mp, +"V4 Filesystem with blocksize %d bytes. Only pagesize (%ld) or less is sup= ported.", mp->m_sb.sb_blocksize, PAGE_SIZE); - error =3D -ENOSYS; - goto out_free_sb; + error =3D -ENOSYS; + goto out_free_sb; + } + + if (mp->m_sb.sb_blocksize > max_folio_size) { + xfs_warn(mp, +"block size (%u bytes) not supported; Only block size (%ld) or less is sup= ported", + mp->m_sb.sb_blocksize, max_folio_size); + error =3D -ENOSYS; + goto out_free_sb; + } + + xfs_warn(mp, +"EXPERIMENTAL: V5 Filesystem with Large Block Size (%d bytes) enabled.", + mp->m_sb.sb_blocksize); } =20 /* Ensure this filesystem fits in the page cache limits */ diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 4cc170949e9c0..55b254d951da7 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -374,6 +374,19 @@ 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_ORD= ER) =20 +/* + * mapping_max_folio_size_supported() - Check the max folio size supported + * + * The filesystem should call this function at mount time if there is a + * requirement on the folio mapping size in the page cache. + */ +static inline size_t mapping_max_folio_size_supported(void) +{ + if (IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)) + return 1U << (PAGE_SHIFT + MAX_PAGECACHE_ORDER); + return PAGE_SIZE; +} + /* * mapping_set_folio_order_range() - Set the orders supported by a file. * @mapping: The address space of the file. --=20 2.44.1