From patchwork Thu Apr 25 11:37:46 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: 13643188 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 355FFC4345F for ; Thu, 25 Apr 2024 11:38:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B8E966B00A3; Thu, 25 Apr 2024 07:38:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B3FBD6B00A4; Thu, 25 Apr 2024 07:38:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9E1DA6B00A5; Thu, 25 Apr 2024 07:38:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 7FE5F6B00A3 for ; Thu, 25 Apr 2024 07:38:44 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 26B2EC1196 for ; Thu, 25 Apr 2024 11:38:43 +0000 (UTC) X-FDA: 82047856926.24.4A34594 Received: from mout-p-101.mailbox.org (mout-p-101.mailbox.org [80.241.56.151]) by imf18.hostedemail.com (Postfix) with ESMTP id 48A071C0006 for ; Thu, 25 Apr 2024 11:38:36 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=qZ6LTcj4; spf=pass (imf18.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=1714045116; 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=Xr9yeLAhFPdiP5bQa/19/Lc9ERKBMv2dNCWngwYe54s=; b=3sJ8sVwBB2Anvh7kdLISJ2e78Joc9TcsjJb8dHMwCX97mtbqKn2WSUD0MBjX0hUxDTxaNh PnmEsdkSdqGfC3qMCIvN2xng3l6ucybwHULqKZb0tR56eGpsW1SI+zWPypNtZt0sn93U+G L4kez92ft/g6Xuk8f4syZY+urTZvYzw= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=qZ6LTcj4; spf=pass (imf18.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=1714045116; a=rsa-sha256; cv=none; b=KSX6LftnhRHAfEGRs9Zv0JM02t0rR4j9nuqsF1cw0g/qlCcM7asi3YZl5mVccDxukyywab dSjHXuV7I1moS4KNpy25V64ZFTQJyTsStyBaO7ETlB8sXOiPIL9bHiRtQ1HFluQg0Jx8M7 VuoZOudcjpmGdoKyA7t02RyKOXHbE4M= 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 4VQDQ12C01z9sWy; Thu, 25 Apr 2024 13:38:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pankajraghav.com; s=MBO0001; t=1714045113; 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=Xr9yeLAhFPdiP5bQa/19/Lc9ERKBMv2dNCWngwYe54s=; b=qZ6LTcj4Mi7kgadnj1OzMKN/Iop3ThPOJ/gYL2uMPgOTLUO+rN0Br4nAhEMODvtNkEH51Z /n9ysdoccT78ZdOJBu7ME8LXFbUx0PjzDm4A2pLgbJfNABv6x462zHw2tCKwqOSjublJXy hFZs6PTWq5pKg3FQ7khiOiJ9i+CPFke5gT5AtK3+z1abZpIl4xP4K2bXY89Y1cKWXOa4dO Jk5HGQqId3wJL5tLfFrO+lXaDZuNtELeYTUf/c7vvFqTjD0fqfVF/WuHKQa6qVyIEahElu Rr9NLaI6azL9hy8cYsmi7pUBI6xkLSihpOM3vpVRsXvWKcb4XSYC6rPNnLT/sw== From: "Pankaj Raghav (Samsung)" To: willy@infradead.org, djwong@kernel.org, brauner@kernel.org, david@fromorbit.com, chandan.babu@oracle.com, akpm@linux-foundation.org Cc: linux-fsdevel@vger.kernel.org, hare@suse.de, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-xfs@vger.kernel.org, mcgrof@kernel.org, gost.dev@samsung.com, p.raghav@samsung.com Subject: [PATCH v4 11/11] xfs: enable block size larger than page size support Date: Thu, 25 Apr 2024 13:37:46 +0200 Message-Id: <20240425113746.335530-12-kernel@pankajraghav.com> In-Reply-To: <20240425113746.335530-1-kernel@pankajraghav.com> References: <20240425113746.335530-1-kernel@pankajraghav.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 48A071C0006 X-Stat-Signature: aakbf86xkuq4th5cxpz7tefzs1d99udb X-Rspam-User: X-Rspamd-Server: rspam07 X-HE-Tag: 1714045116-510786 X-HE-Meta: U2FsdGVkX1/6SYk2jmGlTg0iKQTEW0kqZOh7QAhgBuAVic+OQqZQmNYiSBcTvjBbUYxmCwEmhtd8MejeNCyrPNZ+zeqst12dBsNFhraFo+46BWluZD2VfHVQ7HNGSMgDQZB2lkMDPQe2FY+1ylCNZLZZyqaS7dATc7lL/dzNgxwANOaO2j8Il9Nde5k5wQ2hh2SptIyHdY6TNgqYQJtgWelfw/H/u18FQ8MMjoLUCxk1HA13a9jd5I+95enDt0T/o35QOjcE/gp85MpJ1JLxU3OVc411pv+rO1RB/nIy9drbR/0Jt+nX5bDG0zIYjmg3T2+mO0xpmqZ2MKe+ZEEevZkwkZOxh2E9hBITTjE1Q4pdYOuFhLXaq0foYosKK1OpvFI28/fGwQMDI+nwvz/9JLlFtUVZAsFOQEtEC/5L3nCmj56bYBUeEq28dLNThBOsNYgnSdT03bfzTuFMJHTNu40EZaoIAgfr8fgsXCpKDIRNCdzRzw4PoqPOWyK/drFWwEIN5ZrNm65oPbmWKS25l0jzSQOyZIhdacUwS0AWGMVmF6ZnePM58d7C16kmiJolGeqJaRaS/VA3nuFf1mgwa8ISRWFkBb2+eRnW23+ka2liemIHK7rv6x5CedF/nh8lLdb83p0sfj+KzkBzL8M5f1p1tqTm39d+m/lYVMf1T2tgGr/uJIo5J9UlMBImbd9USxEHUREOxIm14GOl0RnA3V2hSJtBPL1RXDUZPZiQKh+pp4GKyzuBkwZPD5U+G0fmJC8EFyg1tB+nHw0GMLtVNmm8jYB32duji6PCle348IkCIFuY+HbAqw8ca19wiG5ofndPc1Rcf1IjHkUIrFhjJRvOXn2eiZUoaacBACO5Zq6lf2G90dIePwsL7YXElImTzBCr8BLcadPddS0cdBqyuVQq0EjvLrHT+Yltkggco/kRIqZYyyBl7fPcLFLe1GwkuQt3YUItglCTaiKzLRh 1VkBkljU gAUufJHaW4OhrafLdIWabJNqgeL6MamnI8aQvVQ/WH3DcfAR3uRFk704BQ0eWo+5ZlBSxfvC2BzGqB2R+SkleuqmH4hrr5G06gv1QI9N3lvw2AJmR/Jc5coAN4XAS2z2Qe0jDYYIOP0F37qONArvozuj1yO6PKAkOiJDAvez+U3IIIc6z/u2vNhCwr1kjYOch6hJdLkPjwR9k7lgQ3Sz0hMpPnIwEs8IAGBMWVtkQO+rbz8Liul80MLV+Y+3ZDVhXXc0hATYtegya/96AjGN63iQ00lG6XYNE+3YQzNuCirEQfbA+9qF42z5GX/qrsIvk1NtjJWJBwIkT17fs6pWQ7iC60g== 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 --- 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 */