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 71A3BC4829F for ; Tue, 13 Feb 2024 16:26:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EB5AB8D0012; Tue, 13 Feb 2024 11:26:15 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E65C18D000E; Tue, 13 Feb 2024 11:26:15 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D2E068D0012; Tue, 13 Feb 2024 11:26:15 -0500 (EST) 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 C41068D000E for ; Tue, 13 Feb 2024 11:26:15 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 4E808A0BA1 for ; Tue, 13 Feb 2024 16:26:15 +0000 (UTC) X-FDA: 81787307910.13.0DBAF89 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf27.hostedemail.com (Postfix) with ESMTP id 9DA3F40012 for ; Tue, 13 Feb 2024 16:26:13 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=UXuj59mV; spf=pass (imf27.hostedemail.com: domain of djwong@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=djwong@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1707841573; 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=/s8nMTT7XykFu/Txkdc8w0NHPR3pD1X3cIkM7ju0okY=; b=u9g8iB/rdiuAlRBYLkK5x7jxSocHGwaHYVagOAQYvszncM/dYx9ZXZbxt7XOOUsTi/5Cf7 0sp9UiTr3Z1FAND6jxOopiyQ7nILLryJrwdhTiJf2VMqfCNrVlemlVEOgFjSvH0CfjqMbz w7CDfDBdoqJ8i1zGCpoxv65lKfZXKFI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707841573; a=rsa-sha256; cv=none; b=5J0jYlqqukg8HFUHoGsTbmwLlBoZaEhFy1BmGTrxxor8UAFZLJphWGrlcQfn7ZkThjJt4O gPf+nXkOJv/ehmTV+hsS6qjrmhKyV/jHhxemoIsPFR3JITKoH4lWBxThH2esiSTInoaLz4 GeCLkIgUMR5NOGVcWDdAomdXBqPtWk4= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=UXuj59mV; spf=pass (imf27.hostedemail.com: domain of djwong@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=djwong@kernel.org; dmarc=pass (policy=none) header.from=kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 928EF61587; Tue, 13 Feb 2024 16:26:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 261F3C433F1; Tue, 13 Feb 2024 16:26:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707841572; bh=TBfQpsjoMY7jrNA/FeZM1dUOfhL8fb7O2OuwjJxxz9A=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=UXuj59mVbe41ruT+hc23UrwHz5GEpU9LaQu6usf8oy6UrO5tR3wXQWP9DsYDqcp/p f4yvbjgZEZwZCtk0v9CnaFBG2TKsI/XHd2ozlArf53ihmaBW0DiEMVSjkzolA/O1gf 7G1wO74ukiATY7yiOnKLKZ5iCSi4EILVAmDGR8Q+hG6J3ZJmyqA2Vd0XItpTDC1oIL HnVKdhX5cjj220+j/3l2QmflzrmgrV5FBGUGdc64RFXLGYVDluv8VVEmwswirF/+AI v5Kx6M8NurqK/NrHOJwpsrw5MCnmHoFmmsHr/7eTYP7pYSoKl/9NxRf4XRs9vyTpkQ 0kV+bynbFJMbQ== Date: Tue, 13 Feb 2024 08:26:11 -0800 From: "Darrick J. Wong" To: "Pankaj Raghav (Samsung)" Cc: linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, mcgrof@kernel.org, gost.dev@samsung.com, akpm@linux-foundation.org, kbusch@kernel.org, chandan.babu@oracle.com, p.raghav@samsung.com, linux-kernel@vger.kernel.org, hare@suse.de, willy@infradead.org, linux-mm@kvack.org, david@fromorbit.com Subject: Re: [RFC v2 12/14] xfs: make the calculation generic in xfs_sb_validate_fsb_count() Message-ID: <20240213162611.GP6184@frogsfrogsfrogs> References: <20240213093713.1753368-1-kernel@pankajraghav.com> <20240213093713.1753368-13-kernel@pankajraghav.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240213093713.1753368-13-kernel@pankajraghav.com> X-Rspamd-Queue-Id: 9DA3F40012 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: umb45kwwoqhb14jdo1iazmzz76pzm7mx X-HE-Tag: 1707841573-288234 X-HE-Meta: U2FsdGVkX19wMqSOMj691OtQdL+XuRT0dKZu7cQOoBbDgSZvSCb+1e5iVkK1Yk+MpV5pEVyuJyaABfmgcU/AOdaaNnzujBINJwj0RSHSldbhzWzVNJjJOmmiped3JzRNymSkYoFM6i7D4ZhiX7cFTg0qJ5H2rfuSb9NS7moNw+LUo+24Muuqdl+kfBICd0lg7RvT+K//5KdaKw93uNJZPO9madiZz0sLpJMRYdVOosXD9e+Q2rg/yl/pp2bYX7nzH1rnWKeMBj5PPqmdPXXgMZ244EHcXC7Malpi7curVElAVrn+UfGZEeJ1QIL2t4NuUVSx5QbI4dsO1b5iaqv/hPzwA5v0BDyD9+NQCv3b8RWuR7UoYOia5EHviPx+1jIb560bZOaslYdo03NNXPqAMPzLxDtqdynB39eVPoaVl3j77Qao70NIFDWAGZkJ/TqAX271pG82pKODrDMVpTFzZSwJs6x4LMP6j3j/p7FIt/ZYlWWAmtZsBOAjrnkKHjw0Fho98s8asjjkKz8Z9V/ZeoUyTQ4znUEjrUIdeiAib1fcTGyGEEtBpTPSP1lEeVfwivi3ZS3T2Q+6ZO2bVfrD4C/uSPyjtPEyZAySisohunBbj3TlGfcwbcGUaTB7jLJUJ4stq2QDeX/RvEothGFEmvbq1RzS6IVQnN5dUP/bZEQ67354wDqOndnBKhN2sYfKz33M9WFQ9CKV1ZsQQeOtcWOOBmxgLP1+qU0WbJrZTczHfFCQafIn5FQwhtZ1NdWX5CUcE93NHIWwY2v/iZ+14u00s7Neaf9WXD5oRzo++SBE44LdN5FkmECKyI+UpKeI88wMNYfH5D88VqQ8mZNAjcbzMsfdEd5HWYBtf27zaev02As2Q3BlX4fTXBGtP3ubwBIVMhz/9sTudUdeYsZc+OkFJRPkEwWzVn7Wf0MJgz/PQg29NHlfUkmEsTkt+Cj09QG1Zx1NvGEswu454dw U5P88L0Q 8HWAWYJBPxPLzAwZjYUPZWuxdZofAU+wLch4vsU4bPeBnfkiOIGEZfW9A62xmV9botL+qW+kcyuMF77Mzp3Ge/99PwgPmuqMwrycAU3WfVvbhFCep3lgT680WpYBwFI4/1T10N7b41INRDE1SK9G4fkU6iAljwupJaOE5vQUp5L+mcHoobhzhHU5Wtaf8znxgJLzDXUPzbTeAv4TMjEoASyw1oHvTNb11G29v6SNuKGkC51JlLmK8b1yK1PPUVSq/eJXZ 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, Feb 13, 2024 at 10:37:11AM +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 | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c > index aabb25dc3efa..bfbaaecaf668 100644 > --- a/fs/xfs/xfs_mount.c > +++ b/fs/xfs/xfs_mount.c > @@ -133,9 +133,13 @@ xfs_sb_validate_fsb_count( > { > ASSERT(PAGE_SHIFT >= sbp->sb_blocklog); > ASSERT(sbp->sb_blocklog >= BBSHIFT); > + unsigned long mapping_count; Nit: indenting unsigned long mapping_count; > + uint64_t bytes = nblocks << sbp->sb_blocklog; What happens if someone feeds us a garbage fs with sb_blocklog > 64? Or did we check that previously, so an overflow isn't possible? > + > + mapping_count = bytes >> PAGE_SHIFT; Does this result in truncation when unsigned long is 32 bits? --D > > /* Limited by ULONG_MAX of page cache index */ > - if (nblocks >> (PAGE_SHIFT - sbp->sb_blocklog) > ULONG_MAX) > + if (mapping_count > ULONG_MAX) > return -EFBIG; > return 0; > } > -- > 2.43.0 > >