From patchwork Fri May 3 09:53:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 13652562 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 EAB03C4345F for ; Fri, 3 May 2024 09:54:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 45FF46B009E; Fri, 3 May 2024 05:54:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3C1F76B009F; Fri, 3 May 2024 05:54:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1C8EC6B00A0; Fri, 3 May 2024 05:54:06 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id F131B6B009B for ; Fri, 3 May 2024 05:54:05 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id AA43E80D7B for ; Fri, 3 May 2024 09:54:05 +0000 (UTC) X-FDA: 82076623650.01.23A0D81 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf14.hostedemail.com (Postfix) with ESMTP id 0EB9D100004 for ; Fri, 3 May 2024 09:54:03 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=bOgQAmF7; dmarc=fail reason="No valid SPF, DKIM not aligned (relaxed)" header.from=kernel.org (policy=none); spf=none (imf14.hostedemail.com: domain of mcgrof@infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=mcgrof@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1714730044; h=from:from:sender: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=lkYwI3DxhOplKIZiutInpm4itL8sECCQl0FI9x8WYdo=; b=zudUra9HwsasGEhIEZ/ysHeFsuxmLxmnnyPZTqJPFazCqQGKZeR7zP7qT5LgKHEBKV8iN9 dRGWZE2qh1eiQWtSqgg9XcnycbihvkAQT1nXdAvDz75LLw3nb6UPedm4gzK3A0LTUm8M8M iI7W9Wam++WR6NOBQA3jJn4r0DUb9G0= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714730044; a=rsa-sha256; cv=none; b=XMCiGdRCDP8sfpRrc33gJHo/Vy+tFjLuBTQg/Bsg7/B8GUSnO9xC6DRjr1zbh8jXEswzz6 wufUizX+0hWF2N9+MJgTIu/8LslxVi3974z1tpw2INACpbZ65Tii5P3qcU2uRevKyhl7It onXt6fIcHGFX4pLQ0m1/Q6E1cu/RKT8= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=bOgQAmF7; dmarc=fail reason="No valid SPF, DKIM not aligned (relaxed)" header.from=kernel.org (policy=none); spf=none (imf14.hostedemail.com: domain of mcgrof@infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=mcgrof@infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=lkYwI3DxhOplKIZiutInpm4itL8sECCQl0FI9x8WYdo=; b=bOgQAmF7rbZTUaJFAeYZveRx8t 2ZECi63mHLdwirbSFokmcQf4jvuW/0Qk/giy5CROnJIqy4I3uAZaGUhEAsXlwmh0Nil4nPZ06uA7P S3ERh16w86eFfqM4EwK4kDla9ZtP06GTksnbmtpHzB9FlZuZYlYdr0DcpU6MuyKjsMq2Bx+C5TWwZ LLQCxjtXkiNHgIjikgu9Sd3ZXCwOu3uUgWltq1JnIlhHh40iTit3d9BgnfWf+bRfwNjyfjWhPQFe0 bsw/5rg0Adi7Z4vEwmT/twM5ScZuZDjeQ1jk8xKZcDx4+C/O6VEmRC32+8gkPvbFqKgIbNLcHPNWK 4ypDzOvQ==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1s2pc3-0000000Fw3w-2PBr; Fri, 03 May 2024 09:53:55 +0000 From: Luis Chamberlain To: akpm@linux-foundation.org, willy@infradead.org, djwong@kernel.org, brauner@kernel.org, david@fromorbit.com, chandan.babu@oracle.com Cc: hare@suse.de, ritesh.list@gmail.com, john.g.garry@oracle.com, ziy@nvidia.com, linux-fsdevel@vger.kernel.org, linux-xfs@vger.kernel.org, linux-mm@kvack.org, linux-block@vger.kernel.org, gost.dev@samsung.com, p.raghav@samsung.com, kernel@pankajraghav.com, mcgrof@kernel.org Subject: [PATCH v5 11/11] xfs: enable block size larger than page size support Date: Fri, 3 May 2024 02:53:53 -0700 Message-ID: <20240503095353.3798063-12-mcgrof@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240503095353.3798063-1-mcgrof@kernel.org> References: <20240503095353.3798063-1-mcgrof@kernel.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 0EB9D100004 X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: uwrz5jxqgazmoewjyykxeh4iphibhg3d X-HE-Tag: 1714730043-84243 X-HE-Meta: U2FsdGVkX1+o0gcxNz+JPTodIyxX26oKRoXwD84JEGo224OcxDHVB1nzDMLMwQHruw9Nc8C743++V9vLRAP5vNUd19q4uYQ3AaolazOZt/c6XiKuPFNBb6RGTRzZmVQlvSxunTnpXzxbIx9/RflO4iOb01X5RexWxQ9sYJH6+86BPg2FNPZG0dM8pF61rJkCG7yl6mTBznQKzrxLQa2hFJE2EdMLs2aTamSKPZp1d01Noj0OgF2pRIp5UVfweX9yQJD2PTkX58swYJNu8W8QVxOrZVNcddwwVMayQqf1EM1L3Qs3UQnLmTzOZrlcvHWRQ6fS9sHmc+gGfzLu5kQpjTUrTgJG5Conguy3u7uKvgNzl9gLye3+ylxRQaSUYnt1vOwQcvBf4iodrITbN313a4fjS073q2RQxC2FIP4A1nBwPSywfyGSWBH5UbDqP5fYLNFOLM1KLDBn3anIT4pGXKyq/ngwk1TT0VwTs8vAueCPlz/d6XTAz5WmG9/lxfuN9PzVjU5s+lFAdz5FnGaYQxMqvCqi7dKY8NSwdDDWbMVUYZpC2za5kCdYTexVtwtGnRdAeSVOvjDbA3roOiIc1HT0tmNv2av5A3DUfn7/k4DlsE9LlE8nRB7sx5M4vz7G7LUljR4fYIs8jpsLBqSf2Uw6m1JrU7EpxnKXkjHjTeA50HmV2gAlQPVnPrMiSKRv0ObV2E1BxjS36RyujQwpy4Y2ESm91fbrLapo0Bl15CUNAMR3JE+TWDxULQSWX5M5nKi3kyzPiFTtqfy0qMTo0JAfAb/JtwqTbYFrWbS+b1vZ4wUUQGj7fHHDQen22daBdKCTAiH6gj7LLqqGywKnujJ4cPq+0/GfWpnzi14YQt71AeOxnovwTH4UortdDtBRT1qwNTJKl/UCzwgngLMJOexbKwnT+d5aPPJYlSC9uoCLfvMOnUuDI2u2oBfwm4eX2OTFhA3ph6n/gCDeW2w oUeKHlU6 Iwx3pdlKNM276EkEwY6eOEpjzwFQoElECJtI56bSDvMcwq+xOkRH4X3asSIqHpeV66248SvtqTOmlunKr7Z9AvPHIm35jql0JtLv3dcoOFs6F8ly9O0X62tUjCcvC6XZ/NboOJV9k1LNXR+bpd/s9eE3J0q4Q2OWmcITF1A8Nmgnr/TZcWgAzRVCLJQcNYrxGK9plvmZyo2xH84NZ3JpdUb4c4ZmUbvH7rFvoLVWA5sRX2FLXYvmFBr2QdhD6+JGk4arhqqV543ybZwbAYATg52EWRsYOHaKpGkpgyT6nKp5gBLbdWALTHNo35Hxk2nznfNRdj1IY0rlvR62ZuqbajrrePxSXtYYbWEHjPvlTnvN4oYjieKvYHJShIwakDc5LePoMHxqiIq1rU6Amt1HFqtB3o5Is3fXygTwXHI4UoKrAx/UP976qR52HLSzaAMqPM9NPjjGt5p6UX5kXEvz3Fn0a81t9HpOiPwoJsXsn+Dnwu1KzzdBw+aUTrtbaEJHxp8Nl0ax/ntSEGIgJHyCwnoR50vv9UE0zGS8E 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 Reviewed-by: Darrick J. Wong Signed-off-by: Luis Chamberlain --- 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 | 10 ++-------- 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/fs/xfs/libxfs/xfs_ialloc.c b/fs/xfs/libxfs/xfs_ialloc.c index e5ac3e5430c4..60005feb0015 100644 --- a/fs/xfs/libxfs/xfs_ialloc.c +++ b/fs/xfs/libxfs/xfs_ialloc.c @@ -2975,6 +2975,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 dfd61fa8332e..7d3abd182322 100644 --- a/fs/xfs/libxfs/xfs_shared.h +++ b/fs/xfs/libxfs/xfs_shared.h @@ -229,6 +229,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 74f1812b03cb..a2629e00de41 100644 --- a/fs/xfs/xfs_icache.c +++ b/fs/xfs/xfs_icache.c @@ -89,7 +89,8 @@ xfs_inode_alloc( /* VFS doesn't initialise i_mode or i_state! */ VFS_I(ip)->i_mode = 0; VFS_I(ip)->i_state = 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); @@ -324,7 +325,8 @@ xfs_reinit_inode( inode->i_rdev = dev; inode->i_uid = uid; inode->i_gid = gid; - 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 56d71282972a..a451302aa258 100644 --- a/fs/xfs/xfs_mount.c +++ b/fs/xfs/xfs_mount.c @@ -131,7 +131,6 @@ xfs_sb_validate_fsb_count( xfs_sb_t *sbp, uint64_t nblocks) { - ASSERT(PAGE_SHIFT >= sbp->sb_blocklog); ASSERT(sbp->sb_blocklog >= BBSHIFT); uint64_t max_index; uint64_t max_bytes; diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index bce020374c5e..db3b82c2c381 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c @@ -1623,16 +1623,10 @@ 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.", - mp->m_sb.sb_blocksize, PAGE_SIZE); - error = -ENOSYS; - goto out_free_sb; +"EXPERIMENTAL: Filesystem with Large Block Size (%d bytes) enabled.", + mp->m_sb.sb_blocksize); } /* Ensure this filesystem fits in the page cache limits */