From patchwork Thu Aug 22 13:50:18 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: 13773531 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 3AE83C52D7C for ; Thu, 22 Aug 2024 13:51:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BF03A6B014E; Thu, 22 Aug 2024 09:51:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B9F278001E; Thu, 22 Aug 2024 09:51:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9F3076B02FE; Thu, 22 Aug 2024 09:51:24 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 7DA406B014E for ; Thu, 22 Aug 2024 09:51:24 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 32C4C120611 for ; Thu, 22 Aug 2024 13:51:24 +0000 (UTC) X-FDA: 82480018488.24.8E01A82 Received: from mout-p-101.mailbox.org (mout-p-101.mailbox.org [80.241.56.151]) by imf02.hostedemail.com (Postfix) with ESMTP id 5C5998001F for ; Thu, 22 Aug 2024 13:51:22 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=VegWij3r; spf=pass (imf02.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=1724334665; 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=uKuJPTxavc2u9bTAhiaeRY690QnbuCpo0c6Cxa2GBYk=; b=bgdAufzRIg7EzT3mduHlWkC9sReWFtGuHPfI3wfACrQKXqfgd9gkFr9aSAerx0i63aNs3Q CGrrnpkTmzpSkP+gxfNLnFHibtFdl+J2IEgJHl+3J695xAlzCe5EuLOj3SaZgEO11buegm 2EjAM9LREDjjWklI+111s6kShvkujIQ= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=VegWij3r; spf=pass (imf02.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=1724334665; a=rsa-sha256; cv=none; b=54KN5v27fWkpaU7+5sZgZd1iPgzYBqyJ6JM/xtjUWEbiWBMhBwc4+UBUOeV7u3T4oLyLcK lZocgWxUPW93N+ZIMedNIQmb63+OrGnR35ZNfmfFEcbuIWGDZ7D5L4Ew3ex7Eb3t86ZaVw 8OyaXfjBZg4Mem8XnYz1FIJFzGawul4= 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> MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: tiax3tm4tkxrnprmsrigjajjte6erwq7 X-Rspamd-Queue-Id: 5C5998001F X-Rspamd-Server: rspam11 X-HE-Tag: 1724334682-957622 X-HE-Meta: U2FsdGVkX1+z3CfBl57rulxNOodBnbeWx7yvSBSIMRhJnBX2TaI7sZTeC27My3I7lA8SaWqqIQfIyFDW5PbbWd+z/LYjUiTvoVdqh/7KVGyicg8SOlKUU9Zewc9zHDw1lraVmln2oqD28qQ6BTQOy0u2leECXhQwGw7AjWupexyObMoBB9ubEM/WD6sJ3xLL18snQvynllZ+EFR8oCSHAQbRJ4Ou54jvLy8KkCRRpJojMuWQqrAIsb3JqCjpaZfGPaEBPfTDnwpcSLKyzjoIngbpReSxi3l5icTUTD+K9GGu3y5r0gPGCGzx+GcCpzC7X5gqeag2u1hz6jX09qGZoH+JLnEdLQ+yZ/173xsawgLrCNFhyHQ1hdwr0ebglyHz0MNL7+d+4xt0eCFJAxA0oKsDJxW4oBh26SPYh5HyxKGFy8gTSEh0+epBy1IjF2T6q7WGWQO13EkHg35SJgOjXL4v7WHbdlREGjQle8CA7D2O/EADXi5pa88f76vCc6lUg9/HRXRNPrZVFcZsJdyVRcUJDPfs4LDnVP4CEhEM97133Bt3h9wGWDUtpiEEnQczB3lxUFQzMLD8xv3sXOHShannJoWwpP7wUjj5aJ0FgIZX5SuWgV1KUKs3sPOIgQLM+A2dzPHzttvdEunqnCNiEvO4VVZPwtNbjHwmRCBE+lG7+UFcL74jp9PQQmw9NaNMvyBNp1xb+PEklZ5qxwUry3vCYEckJ+xba7nADmUNocou/b0jcArfhbUfChPrm+uuc1XrwUE0ZCBZkJAI0WInfltS31+LLD6X5zTpTnLdWC6wfqw6uzyuwBgU/YQxOyTeZ0Nh4SnVsygwTZmJEgTQtioDPMDQlef/uKxtwe3yxrLnrbPNwvMiT3ZV5Nv9DBuqJabJ2GjNoF4GhGDuT+ca5SqQHX/bXyDdACD/U0MoAZGcxntbJ9fl05oTUAbXW/vPuCQ63N5WF0ysvMfvVzd 0gFHXA0e oeGtXwrLWubBAcmhKrsLf3mDJX5K6dXDOHvhx3c1HzmiV1kaSkW6edTFw/9vSOidLqAGNUDi3B6BV1ctyBBDN799Il+dy6Tt8v0FE6wlIfg5uoiGM91VDTECz2knTW7AP7Qw+wgyqQHZZjWUO+0SqS58KdMviXg01pu4uuVljRL3ajBpyo15e0etw/TMNa+jzWVenu2yimxpFmYOmRi5clgvzQQiHGa1iwqC0dTRnKAe9TRENR5ycP/e228v8ZUl+QnwxfhjY9ndGVng5ghehPho53IQOn2nfuwqFaw0C+y3zdPxFma/DX8V4eFFt+zOyeVM/OElVIg7PhRl+V1b3k2a6PA== 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: 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 = mp->m_dalign; else igeo->ialloc_align = 0; + + if (mp->m_sb.sb_blocksize > PAGE_SIZE) + igeo->min_folio_order = mp->m_sb.sb_blocklog - PAGE_SHIFT; + else + igeo->min_folio_order = 0; } /* Compute the location of the root directory inode that is laid out by mkfs. */ 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; + /* minimum folio order of a page cache allocation */ + unsigned int min_folio_order; + }; #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( /* VFS doesn't initialise i_mode! */ VFS_I(ip)->i_mode = 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); XFS_STATS_INC(mp, vn_active); ASSERT(atomic_read(&ip->i_pincount) == 0); @@ -325,7 +326,8 @@ xfs_reinit_inode( inode->i_uid = uid; inode->i_gid = gid; inode->i_state = state; - mapping_set_large_folios(inode->i_mapping); + mapping_set_folio_min_order(inode->i_mapping, + M_IGEO(mp)->min_folio_order); return error; } 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; - ASSERT(PAGE_SHIFT >= sbp->sb_blocklog); ASSERT(sbp->sb_blocklog >= BBSHIFT); 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; } - /* - * 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 = 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 supported.", mp->m_sb.sb_blocksize, PAGE_SIZE); - error = -ENOSYS; - goto out_free_sb; + error = -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 supported", + mp->m_sb.sb_blocksize, max_folio_size); + error = -ENOSYS; + goto out_free_sb; + } + + xfs_warn(mp, +"EXPERIMENTAL: V5 Filesystem with Large Block Size (%d bytes) enabled.", + mp->m_sb.sb_blocksize); } /* 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_ORDER) +/* + * 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.