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 2CCC8C04FFE for ; Wed, 8 May 2024 11:28:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B61B06B013C; Wed, 8 May 2024 07:28:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B117C6B0147; Wed, 8 May 2024 07:28:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9D97D6B0148; Wed, 8 May 2024 07:28:22 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 7F3DE6B013C for ; Wed, 8 May 2024 07:28:22 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 433EF1C1BA1 for ; Wed, 8 May 2024 11:28:22 +0000 (UTC) X-FDA: 82095005244.17.A828247 Received: from mout-p-103.mailbox.org (mout-p-103.mailbox.org [80.241.56.161]) by imf06.hostedemail.com (Postfix) with ESMTP id 76247180005 for ; Wed, 8 May 2024 11:28:20 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=sBAyeqeU; spf=pass (imf06.hostedemail.com: domain of kernel@pankajraghav.com designates 80.241.56.161 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=1715167700; 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=GmBxRb8dEBcO7WysWH5PMmHhfDBaYYsSfX6W/AbeUX4=; b=yMlB37Xfj/eGtOjaFrmcjUwOaRjlqPRyXH5Uc2eKHPQ583yL9clicS9xL60TmLTRE+7k5y wor8fZHfw6sr7h9hQ2C8lFFGtVvRpYQy3sn7nkeQcYq/pnN7pCS+BG1PCSIhsoX2mZhTc+ b4xCQ5OqCDPi6xBQASRZ2m5X+s27IXM= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=sBAyeqeU; spf=pass (imf06.hostedemail.com: domain of kernel@pankajraghav.com designates 80.241.56.161 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=1715167700; a=rsa-sha256; cv=none; b=gJ4Gr78rvMPpxTOMmyUlv3TmfkkTZBMIRpR+awnivDvjPRWWnHyBTgWP4sRHOgh8Ne8kE+ a8hAG70mStG2Jqpp+hEf/YdYT1wpgyyYGz1Q2OJX8BuZTYEp0Ku+2JChChGdqvIcc4rbP+ d8wrcW4nLJ71IOUta6YED58VXfq5gG4= 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-103.mailbox.org (Postfix) with ESMTPS id 4VZCZ82xbQz9sQj; Wed, 8 May 2024 13:28:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pankajraghav.com; s=MBO0001; t=1715167696; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=GmBxRb8dEBcO7WysWH5PMmHhfDBaYYsSfX6W/AbeUX4=; b=sBAyeqeUlFS4QzwYGuKS+yNEungmnNd5/z2vu87H1euUwSdm+GZvtR8x5mv5GcQ6Gmt4RK YiGy/9ezRQVznGYXBXRcrdyzIUHoJ0dpc8SNdsjrCMRZbDkuIp/uBHrWlX97IvLh6XN4oQ ud4mPP7Yq89sg38zIJ694p9nvdcwAR3lJmHNfVDowuS6JGahGgfhblNadmgLOWi7bn2T+v QJEArdbRHEdQr6dvc1NnC4MM3MloY3qJot7Bui0hu/BQ/+X1PPkRDdXjFulyygJIP8SD8T EpQf9xGujtM7HvPyPPLufcounzLAEB237NcoTsipuzQFh1QO+3twDhpBfUXRzQ== Date: Wed, 8 May 2024 11:28:11 +0000 From: "Pankaj Raghav (Samsung)" To: "Darrick J. Wong" Cc: John Garry , Luis Chamberlain , akpm@linux-foundation.org, willy@infradead.org, brauner@kernel.org, david@fromorbit.com, chandan.babu@oracle.com, hare@suse.de, ritesh.list@gmail.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 Subject: Re: [PATCH v5 10/11] xfs: make the calculation generic in xfs_sb_validate_fsb_count() Message-ID: <20240508112811.lkmlfauztegncj6t@quentin> References: <20240503095353.3798063-1-mcgrof@kernel.org> <20240503095353.3798063-11-mcgrof@kernel.org> <20240507211310.GW360919@frogsfrogsfrogs> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240507211310.GW360919@frogsfrogsfrogs> X-Stat-Signature: 5hnrs8ywuwka5c55w8tnzdibenych7oz X-Rspamd-Queue-Id: 76247180005 X-Rspamd-Server: rspam10 X-Rspam-User: X-HE-Tag: 1715167700-558182 X-HE-Meta: U2FsdGVkX1/k9Ttv/NejH2a7y/UzVUmLbVcbgazY3NSQ8niebfj3hsa1DIgymOrFx0JjpDjsgV3soTUqEFrF3ZMj9h52kBAwG0kFh8dDeo58FGWO389/Ro3SpHKjNno9A/IP8hTYy0cunSHX5RHtwKMGOeYXfh57eENrF+3VWAtbHJ9biNgBuqEb+YPGTN5AnemzR0xOQeRTANYTqR2hey/E92rSwQw8dmN8cseiY7FvePSEfmTdfbMGgMahjF5poHUDhmiKCH3yhoD5ocq9wk9cLpJqipmpyG2s0/fgSsrScenYG+n18RGm9a/ZoPmvW79o0EcZP6JJpSc6pPsyMhzaAAScst6ArBnEaw0bUa5A+dXR1YSz4i2+Gyeb0RhPxt+dVCBLGJhdCkGumOnNBauhxE4BoRbCS96cprv8IyxAK9uZUphee/kszqTDtWE+yoC69vRz873A2DKDylOZeqM60RDHEiC+HYeqMvyLB+elwHKjdvABXs4XftPnOn8L5T3t02H5Q1hXIrGlRArdHUKfks4NwTPFLBUF8g3+f6ol1a38jDxPneGyGwC5Dbb41n/q+WcZMiIIUuBFG0sD11SY1lGpZJYBGaa8DRJJMkWwQdVzIlcoSqYjFh3KaL1B+uqGcngUkuntU9fDF0CuBPV0Vsez9MNE0OGej7n4KIXhNHdK63/S2Ye/bL58wvo3m5lgJBBGGxXSZBUQrtX0jHy601IpRXhW5413xL/VXK/ensydfKaTSY5dfRv+F4xwBK717b8Om57EJrcNn5oFLg3HAq+iwgo6RnmrivEErX5pdVHjzpaFvF28NAbi/iAKpdzY+N6Z5kX2PT4mBb6zUM9El/av0BxhSzzUnraKHH3nhXHx4yCohaKCJ/d+L3bjLeguDNSU1yoHekfSqPAMs7UKvekPx6+dULRpBMeOE4bJF4ZIjYNcz19HXVRoQ6xt4DR/nU8t87MNkpnooPl hb1sMX/R dnAo8PnUqOTITVDruBQIvjiKZRRrOb3d9k8j9VpnAMkcysgKKlhLMByusTSEMRKQmDyWBX5kjZhKgAwS2215bvCXTSDFaA9FC1Xq12R+THNYeEOhj5WsKLzdegauEd4BcrfbPcksLCW+DOijZx7GEGvGOx9UTmWpSD4/JykI7MLIo/USlvJ57jlKBOqA7p1BiJdb7L+AAunoMYyC0CNmI2E/SZM5S1OiSbXuRUBzGc5ARarsqpbcJ4HNFsD36je28mA2JUvz7qOzH0VTCduy3+1KxgG56QROGHtQ5iReyHJDPYVWVLW7LAebbNqmp2TDsJY+s1QfwoZk/y2eRE2YIPokAfAs0oI1uyprhpH1FSRRjJ75RFw++8o5Z2IpJU/uCaQP7O9HQbkFIQH9YWL3I+3AELQ== 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 Tue, May 07, 2024 at 02:13:10PM -0700, Darrick J. Wong wrote: > On Tue, May 07, 2024 at 09:40:58AM +0100, John Garry wrote: > > On 03/05/2024 10:53, Luis Chamberlain 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 > > > Reviewed-by: Darrick J. Wong > > > --- > > > 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 df370eb5dc15..56d71282972a 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); > > > ASSERT(sbp->sb_blocklog >= BBSHIFT); > > > + uint64_t max_index; > > > + uint64_t max_bytes; > > Extra nit: the ^ indentation of the names should have tabs, like the > other xfs functions. Thanks John and Darrick, I will fold it in the next series. > > --D > > > nit: any other XFS code which I have seen puts the declarations before any > > ASSERT() calls > > > > > + > > > + 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; > > > return 0; > > > } > > > > -- Pankaj Raghav