From mboxrd@z Thu Jan 1 00:00:00 1970 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 3CB8AC54E58 for ; Mon, 25 Mar 2024 19:16:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C40F96B008A; Mon, 25 Mar 2024 15:16:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BC9CF6B0093; Mon, 25 Mar 2024 15:16:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A6A436B0095; Mon, 25 Mar 2024 15:16:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 931556B008A for ; Mon, 25 Mar 2024 15:16:08 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 584A91C04B2 for ; Mon, 25 Mar 2024 19:16:08 +0000 (UTC) X-FDA: 81936516816.22.E841369 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf16.hostedemail.com (Postfix) with ESMTP id 9F246180012 for ; Mon, 25 Mar 2024 19:16:06 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=SJro86af; dmarc=none; spf=none (imf16.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1711394166; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=eTY9tWsMxZ2K3aQkEZJpivPTdRpw7VkLZH41dnj2hEQ=; b=Fl+CEsd7ADeFQWgRJqT85sQltQSsPCxUIQR6Dqbs6vnVusQyrTtdrb+FLXdzMOon4/0bXt /JrU/XO0cS4SIPaR8md/W9IMHtUBJTbpUlS/CSJNtRcWPQ+uce4lExGkyDY4qclnvSnvRp bqxrZ0GCh/PttBcLbxt9c3Uta4xUjl4= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=SJro86af; dmarc=none; spf=none (imf16.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1711394166; a=rsa-sha256; cv=none; b=re/bfXZoMNQp8a1nxT0XPE1ifuYq1B3F6F2gNgRFLh3/IJvpa3frPH31C185tdbhaeIH7K 8ZOd8/xfdpF/E4awFVVNFT6rvuRbSNnOwnA1pEoeSHjAaveYyCO2a1L3EPnmeo8LeSP1JO XC0Hqai95uvJJLjjDmbUDinN7xAgVWE= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=eTY9tWsMxZ2K3aQkEZJpivPTdRpw7VkLZH41dnj2hEQ=; b=SJro86afQ01NTvzMF0k9zFPIAC /zDtpbnYDk4Wq8eoVWQaQ+LHAzjV04+AV+k/5bl0HtvL37X6+HOgXTl4f3F+dzJCDkKas5fqqVl0D OMtxfNkM+XfKVaSeT+mrUxjjNtMrfSrzvNvUaL0TuIhy2sO6l8OwwcR+LAt6SwywwbLxtL9ewACEx uBLMVJ3hO0GN0KjqBmNMJYXQcHAf2j39ql2S9LHSNM+DRKd1SLPHiQbXabKxZGdLoqIjqUn0YTvMn BySYDpMd0Wl43aynAvcRrRb6x4Rz7tskCiTSaueKWv95Ne79I399pH+ZOXra7Hi7/7U83/uekccK3 szsgYAQA==; Received: from willy by casper.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1ropnb-0000000H9QS-2aiZ; Mon, 25 Mar 2024 19:15:59 +0000 Date: Mon, 25 Mar 2024 19:15:59 +0000 From: Matthew Wilcox To: "Pankaj Raghav (Samsung)" Cc: linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, gost.dev@samsung.com, chandan.babu@oracle.com, hare@suse.de, mcgrof@kernel.org, djwong@kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, david@fromorbit.com, akpm@linux-foundation.org, Pankaj Raghav Subject: Re: [PATCH v3 10/11] xfs: make the calculation generic in xfs_sb_validate_fsb_count() Message-ID: References: <20240313170253.2324812-1-kernel@pankajraghav.com> <20240313170253.2324812-11-kernel@pankajraghav.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240313170253.2324812-11-kernel@pankajraghav.com> X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 9F246180012 X-Stat-Signature: ky9f8jia6i6mdix3qre9mo6quyxebqsp X-HE-Tag: 1711394166-152358 X-HE-Meta: U2FsdGVkX19H3AISKWxhM5HA05wQYPxxXIIAdkpfC1soVj3FevONuzk4KqoaoCzKAhs3ODjI3MkU2ad+Kt0Q6XJGPG4TqdBeQaFpCnrIv/1eWsCy/k7BC91xh0ColcAMFWnODprcDIVj87KX7+VSQiyeAUkODLuz7zTVsRAoPnDtyj5q2ef7Y8XBQR03deijUO3/TqxU592qXfxJ+flVW56KKGaHSyrs2OXFWLIKEnxBUfWetnACnGI1DSAC4acY4e+W72eXiKU6Yki8ir98s6N1k8Cvh/Q1lGyW1o56Q0I1v+PeFyOXs5vIaroM2vPRPZRbQiDgol8UugRwRTO1MWtIgLUFP8GxeaTxHJ+5OV4ZVmMlj99Db2Joe4Ase3plHX+gYt8NO8PqXzuPAn9thL4LOTiPNxrNDkM/4JNCssIj46MnAZuwtlOHEmlOWO37ano0mKWf8ezT7nO4QbFx9QccK2wlBnec2GflMSkXK6vmFFRQ0fjSUhxXbCA888h2hys9xl7QTt4J5K8Cyz+AbKrabiQ7DrcxxR/xR7EKgGRv1DUHu3B4o9M8Y5l1zEC8NT5nWPXiEXOG0YrfK3nVWUdHBJ9IFGJEz+Ml+TmP1UO+mDOfoBJyB8/qDhaTs3YdeQky3UmH41LwQ2KJ6d/vEhGZkqFOXJF20v5LCpv1v+D6ju2w6nUq7BKnUx1JHTKm/GkcRvdhE+xJkaGUK9Qqg3g5DtcUL2N9eXNQSNSHCk/y5Z9K4RsT+h4awt4ujqef7t0oyrSkePOj46cq+jk1eJRuw1aEGIumlQlyHfmSTaGCV1z1jsp/kU7iPTQzr3fIqVgnmCSl3ZDBLw4xoVEsDgwIo4WoZ9jSx20sOOuD8FpDEK/Aq9X9KS3b99tQ5RTYNVmGJvXIbKReTHtsqQyA6OzFFZ+WiACqCpRfnfsUyKOZsOaA3+Ms3OxL7RAYJbwRCoSEf1P1ustXEOBYRTr GcvDtqJr S/jFB/nf8LtTJ4+a0lwlBFOfGNevjPNdsQ12PJMQFw+D+5HkFxp3q77OzIuB97l4OCw0X3TE6+oFsTHnj/w1Qq2S+NndFxOD5gw3oN9yVlaYqj7+nDnOLJV57qco9/UpS5V/4+wLEoen15lKklPKUg09x7i4uC/tVcpXNBEQSE0qU4O2z7HeMVOn0AR3HfjcaqZsEkZEd4yhKgp3EVKLA3OCtLA== 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: On Wed, Mar 13, 2024 at 06:02:52PM +0100, Pankaj Raghav (Samsung) wrote: > 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 > --- > fs/xfs/xfs_mount.c | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c > index aabb25dc3efa..9cf800586da7 100644 > --- a/fs/xfs/xfs_mount.c > +++ b/fs/xfs/xfs_mount.c > @@ -133,9 +133,16 @@ xfs_sb_validate_fsb_count( > { > ASSERT(PAGE_SHIFT >= sbp->sb_blocklog); but ... you're still asserting that PAGE_SHIFT is larger than blocklog. Shouldn't you delete that assertion? > ASSERT(sbp->sb_blocklog >= BBSHIFT); > + uint64_t max_index; > + uint64_t max_bytes; > + > + 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) > + max_index = max_bytes >> PAGE_SHIFT; > + > + if (max_index > ULONG_MAX) > return -EFBIG; This kind of depends on the implementation details of the page cache. We have MAX_LFS_FILESIZE to abstract that; maybe that should be used here?