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 93886C4345F for ; Fri, 26 Apr 2024 15:16:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 230A96B009E; Fri, 26 Apr 2024 11:16:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1B9D76B009F; Fri, 26 Apr 2024 11:16:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 033496B00A0; Fri, 26 Apr 2024 11:16:22 -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 D5E1A6B009E for ; Fri, 26 Apr 2024 11:16:22 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 80E59120A46 for ; Fri, 26 Apr 2024 15:16:22 +0000 (UTC) X-FDA: 82052034204.30.756F6A4 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf27.hostedemail.com (Postfix) with ESMTP id DB73540015 for ; Fri, 26 Apr 2024 15:16:20 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=QWzOlfNd; 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=1714144580; 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=PckJ3Kl5mhdRgaos8O3xu1mkq2Ha0TAVKZa5xIeclQ8=; b=pj70cp0E6pnUA4vBQX2YJvNSZD9cw70i8VxYN3noAVuq5bkllAASrrAlDDh3g7JoJlHMO9 LAzpDegRd9KCg5pn75W7IeHpDy991zEVZ+8BUf2xTLIB6TnqQsO1XoFeJ25S2dSo+BGnTg 55eZ/tTpub0eZg2CuaemFl9F+uwzBwE= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=QWzOlfNd; 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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714144580; a=rsa-sha256; cv=none; b=NtUwQBu0XEFsecrLpu9YRr/HPUNwydwl52bacXufhpFEChDHp1m+IKJ3IVduC/INHzPOgZ 1mwi3OtMQLIqvOaj/p7wcVgg8i9Vlc+Pe9cRGvixieynKl7buqTeZr6/2s00Mv3+SivX+e nTwSAOqczJmgEkGrXBi20GYSz8yfnrE= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 07D9462042; Fri, 26 Apr 2024 15:16:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9827EC113CD; Fri, 26 Apr 2024 15:16:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1714144579; bh=6O55S30yhSxrufIxUQivUWS2HXmNr/eDu8y7coHNiko=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=QWzOlfNdDph2jErkCnqNMCbQeWTzFhb2h4H1oYGTesbJPcQh8LSQpUKKE205Jcb/h iq08eAB/2LjOYi2aO0WdTHjGqGFGM2fT+AxUqZrrA1/Vx284yxMk8O10R7990N1yzQ 0FmNOa1nA8H9RIGLGZPaz2CN9KCdUrkbPyhcVeLPKAPFbQjTxZ657KjXyJyQ+4QFeF 4BtJLDH5OkHBwrIBK9i1oOL+PzxwBiYHrvtScoa+yX4GSem3ha0AOTwy7AdnpWsnva aWlMqV6Cqmo5+cZplCJBxOCI01Vtn5pJvQFi92otmTH7uKBSbDSyh1lINOGayFfOIy UYRlMRIC/uXLA== Date: Fri, 26 Apr 2024 08:16:19 -0700 From: "Darrick J. Wong" To: "Pankaj Raghav (Samsung)" Cc: willy@infradead.org, brauner@kernel.org, david@fromorbit.com, chandan.babu@oracle.com, akpm@linux-foundation.org, 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: Re: [PATCH v4 10/11] xfs: make the calculation generic in xfs_sb_validate_fsb_count() Message-ID: <20240426151619.GF360919@frogsfrogsfrogs> References: <20240425113746.335530-1-kernel@pankajraghav.com> <20240425113746.335530-11-kernel@pankajraghav.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240425113746.335530-11-kernel@pankajraghav.com> X-Stat-Signature: 883w4uyy5s8hessamw5kodf8hzixq3jy X-Rspamd-Queue-Id: DB73540015 X-Rspamd-Server: rspam10 X-Rspam-User: X-HE-Tag: 1714144580-763694 X-HE-Meta: U2FsdGVkX19OykIMSSiV+S9kK1BAZ0DMYvXJPx6gphUsGZGNv3CslcjhZgAIt0P2GQxmieB9FppzYJLgGfj+ikb0AhH71DoDNBPiDBpfjkeZ2BTdQXDX3Dwcir57cgxiHxOp7QG+gqMZz+BoZKmvz/M8dnjJWWhBbPoETMW1DU4YWb1oTB1PHpLx/BbF1m3ZcWu0+bMPEtv7P6qzGX8wkgtTIUL1Iu2dIzSDPXqghLoMtDxMmohKLgdUN1wwCrWJcsenp5hDBGboGQa0Lz/6fLo0niBy9rhsVQWquG7MkCyhrkK4xBY5iJ8l/oNrNGp4QUmntBVR/EvV4iynnWy+gaBj2QYh0cwL8k5LLgDLGK5NuzZ/qqf6gdua+GEqHgq4jYh3lcPno5xKyhnmXAJ864I2QHzTnEdm21uVa7x25rmmT4Js7oRfNJ6FnYSr2IK5fjXK6mhJX2XDzl8rNJPEhj8kDOSoqDHQiAXdbF2UMMRK2NiO9sHINjFrIJsl85z3M3vzhZzXkq7Shu4kREDxWrkQl2B3QL3si2amKDz3MsBLRBaF+l6zYQZMwpJY0x0ADYaHvxsNuCZtM4iHFWsLWqsiPALlDlALKEmlpUXVaIXqOibwScRheqpySGFfWhCTZvc4w3LO+tS4OIppvLozAJS3DbLKHjWVcKH2UicZEcocgG0xKROcjRCSkXxlOqFbPW2ed0SSNG91xI5PB8JBv7dQseGzOkoisTrqN50J9c2jvTwcWl39ySQ2JFyM9EO/19LuGXULzF+Bz8iIoGc3NsAgBUnlAvaBeeqWhNlzHfYMvkXhs3Y0Oa4DFkE+XBw6IretUrriZC2aaze9Y2tTFAjprQ2XT9b0GxAqXekjBcvBODEH+NxfRCv+1aFr9+CXoHEQLnH4oKy1LhWzXr3Ustj9A3oQzFgZUJakg7G4ZQv0X7wmUWwUtUypjNu30KIyrPWsDP578f6FZDDPksk /QVLjCFi yT/apB2XRgCZPKRNTLqf4SnorsIop3+xa2ADBhwnaFYleAf6tTo3rFQQoIYtPA1YI/0JXIRbtC1pENlQ0/LBdT81zhp9KWJB8P2uPAmCKZLkl6Lc67Zw1QYHztSr1aGXv2wmbasJ1So5Mz20ozUPG2A7YslEbsTiuvjnWWQ+u3YB2b9RvfjFrGS7ITdQ2QhKWJvjvBgq++YzGh0BkLNS0ZyeuxoILriqonHshWsWMbeMO3oaS17j/zyT/OVuzsVgqY2euruWTMBp8HFIzyOwTsGnPPWU95Ui8GXGU2fiE8yK5iGtCNWpDpqiXEWYDOaN2FhjY 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 Thu, Apr 25, 2024 at 01:37:45PM +0200, 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 Looks ok, Reviewed-by: Darrick J. Wong --D > --- > 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; > + > + 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; > } > -- > 2.34.1 > >