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 5891BC10F1A for ; Tue, 7 May 2024 21:13:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4812E6B007B; Tue, 7 May 2024 17:13:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 430F06B0082; Tue, 7 May 2024 17:13:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2F9436B0083; Tue, 7 May 2024 17:13:20 -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 115436B007B for ; Tue, 7 May 2024 17:13:20 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 2AFA0C07A8 for ; Tue, 7 May 2024 21:13:19 +0000 (UTC) X-FDA: 82092850518.30.D403BDB Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf23.hostedemail.com (Postfix) with ESMTP id 1D9EB14000C for ; Tue, 7 May 2024 21:13:15 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=C5MvJLhy; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf23.hostedemail.com: domain of djwong@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=djwong@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1715116396; 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=jUeQcfAcxl2IkdUB8nzk/nYfa0sqDLfc8tizcvdJLoc=; b=OHlpyi5xSPJVvurW5tmMcljkdUtQJUa+qNcK7BRhvHNzXMVFdm2V/8XMi0kAoiCnF0coQ7 4EJFb47b885LTVImiN26sQ47FKGhjRxgcToYq8Cqq43z4x+pHezzmH1oaNsNjE/CgJV/QS qvF8m1wE4YTRe1ojP3c3ZfACd5qjBvs= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=C5MvJLhy; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf23.hostedemail.com: domain of djwong@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=djwong@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1715116396; a=rsa-sha256; cv=none; b=ZDeDocKliepUUAjdl3q32wVT5yp/foOiJagSWaLB2H8C1IKU5g9iarH/uog+L3hRFK3G+6 xY1tlcZYuiX2uEU9FhyZj0KJkMyULR3XCgLR7rvHorlgc4WlFP0uRyjRM7HjMIn8ZaWwFG eNAA5Xk6mDaAFTsWqc0FeFFrhkOoUBg= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id D659DCE170D; Tue, 7 May 2024 21:13:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 16510C2BBFC; Tue, 7 May 2024 21:13:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1715116391; bh=TrK/HQl6cRzmC2myzYV+mRcGrE69UCP6jKEvenXWgnw=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=C5MvJLhyKfV8u/qyAsvf2tSznMLAqpQHln891YiqiPBldbclCZO1XL1eXx2jpD0Rn Ji16VjrUx9yyjmFN25KCetsvxb+165k7+rG7VfxV+q6pdtfq0iBZM/XPIbWIjdVTyW vJfTwYXK1+BkPzSepiOF0qCAYfJanyStbFUteGbLBnezH6dj4CajsC0mv0gVnyGUqu y4t7AtOfWyAkMLv0Gc4K2dh5GBk5j97unEIGpMI8VR6IitKp1EAzH9I38e2UAZLY09 ctCXei+OdYArXRug+Usmau5Dk7tFwNl83w/d8VHO2QbZvU9xm1508Fru7LMxUup7fx 7xCre+ouriTYA== Date: Tue, 7 May 2024 14:13:10 -0700 From: "Darrick J. Wong" To: John Garry Cc: 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, kernel@pankajraghav.com Subject: Re: [PATCH v5 10/11] xfs: make the calculation generic in xfs_sb_validate_fsb_count() Message-ID: <20240507211310.GW360919@frogsfrogsfrogs> References: <20240503095353.3798063-1-mcgrof@kernel.org> <20240503095353.3798063-11-mcgrof@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 1D9EB14000C X-Stat-Signature: b8aj9swjhpd9c1kja8w86htfarfttsrc X-HE-Tag: 1715116395-998832 X-HE-Meta: U2FsdGVkX19SBwH04NMA4X1DjCM13VVgMGefwHTrcuJiqIR6wPT8Z1TpHPhwqftKLaCFw+4UHXZWyHukhMDuAnUgK26R0DuIbujGHaXY77U/z3vy0MOouQyaowY+zQwLJc1knn3ZrmwJWDFkT5cwPFiBFVl+ZLMDcHj0ayHsXkgwY1faJj+MF2jAIo7mMmWOndfKR10Zd868zjn1Tqmib+Z2mXOcvQTuIzQZTXMPxsJ4LkFdSIdKzC5YGMpg/SqCwQtfUQuOC7CQ+MSwpfsfOJ4GFxh9xBtDWJfdqif8duvIQFKVBY0wRmzvKGixKTJQJ1JYwmksHcP0yQRCLEi9xuOJfRc5PIDpuF4qvUrVovpQBk79PDJbfP8ZH2YLDQKrV1IR0OLBbJJO3tycqpuFiJvCPl0DBq5UWDnYQN0rXTNDOaNyRnPgcv6XMS/x/OGo8RSSHBy+GDgQ4UFaPYk78UY0mNZl6xOk1wVEpCRlteeqRaj2voY9Vo07lsT6Mm6WhuUB4yLaYFYeOPtXiJezCa7IIGNNXCyZo45a5wQFlowyxCSORw/EDDK4VTyLJyiPzbghDV/mfNnBLoikVKPKoQVKmO3m/V2vjsKietv3B4XeLvz/0dPcb+2t4nJKLKqOeNaP76s1XdWH8W98XBeG70asHknmcufv+90Vzi2WEYoZghr/1v3NqwyTILIYVnp9Ys1mb01EJILSR/1XihYeqVhIozqaT/MLtvdyOG9cSPir+6scWhKyVnL4ZTldVXIJPxugc86w+3fGG5BaId32VUiSP6vQ3OhGNNM6UUhK6hWcHq/n7vWhBlz/RjfSReYEzNURRdTUSCbraF6WlRZaYo18WLuvy30Wr3yj5fQsYXin2gwGSH7uYcppMZ+q8CAR8I69Gm6WVCvukwyhmxZp2/NSNghvC6/fAmkGD82qmxnKy/RdaCAYBkACg0DWn66EmBPG5A1ZHDwyi9Ptf8R dselNsD6 xdvteNMis+VPDX/t7nDp9O6LCf2FphgWKPW3FaSjMG7EjOR3NCkalUlXAlmszZv3O8vOsb8v5ZVk7ps+nICW1uMJyC0azddThhTqoD1XeZ2uetoFklKFXTNedX0KAgKJOTSAkyEz8Lkt9qrRz7dlwPIjegDLaufelRHaBra006bAfhBhWdzT7PEZJpLatJzEEKtjybJW4d8O1sd2OSpfNlHlhMRYFWF6r5qwo0Yy7X7zYNzxRKYVONImnuO3HWmWv9BljDLl57lfUY4LVcwFutShQ2EFkcupdLci+O4VUWejDxLiOmr6+I6Y90n0gkPYMQ01h8/TASG62qtRNYy8B9PEVpZzR0lQG3Y4FtkFoOVYMSXN6rQ/ka0s5hE0OGFzy9LCU 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 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. --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; > > } > >