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 3CF25C27C79 for ; Mon, 17 Jun 2024 16:09:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A05E76B0209; Mon, 17 Jun 2024 12:09:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9B5E66B020A; Mon, 17 Jun 2024 12:09:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8CB116B020B; Mon, 17 Jun 2024 12:09:51 -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 6EE926B0209 for ; Mon, 17 Jun 2024 12:09:51 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 1D7A9A1989 for ; Mon, 17 Jun 2024 16:09:51 +0000 (UTC) X-FDA: 82240866582.14.6C5F4DC Received: from mout-p-103.mailbox.org (mout-p-103.mailbox.org [80.241.56.161]) by imf09.hostedemail.com (Postfix) with ESMTP id C245114001C for ; Mon, 17 Jun 2024 16:09:48 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=iAQnuvoL; spf=pass (imf09.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=1718640586; a=rsa-sha256; cv=none; b=Db5zihho8ydNYHW65zCcxEoUP/685boQMNcbpqh4gGEZWNpbtlSB3mQVsHa+rQMi8l+Di5 7iyBl5iwqs2taPa7sjt9la1s5C5wr1ICO3yF28b4t8nSBqzOUnJ39lMIhRNY/PE88s3tY1 mHTkoBwqPkYqDpLqq1Z52GllAMVWpXM= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=iAQnuvoL; spf=pass (imf09.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=1718640586; 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=REOd4xGqWzBzFhAFswjKmpm8iEKvSL4/tKnq1vydLTA=; b=ymQt5JTTrX4Q2XGcbGQRoda4KEfxC6/5J2tFQ4VY/Ats89/h+d8EkeFpaM1WAxeWBHGHW9 L/0atuVzLp6hIHtZyfOLq6vWEJtnt6sTDbRhvXxk/2bObI9FmkCNWVPG7QLAZ5VZcrj6tr rYUDUIOEBxXbAc6qKxf5AiqzWRfMT6c= Received: from smtp1.mailbox.org (smtp1.mailbox.org [10.196.197.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 4W2vwR4pMXz9sTr; Mon, 17 Jun 2024 18:09:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pankajraghav.com; s=MBO0001; t=1718640583; 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=REOd4xGqWzBzFhAFswjKmpm8iEKvSL4/tKnq1vydLTA=; b=iAQnuvoLmSElAeAjhjfiIaHZexRTvjZegkZcSJ9eYDpr05M5HTEWGMlmm7r9KvsaN6cvya dvm7Nqg2opfsECU6ySm5+pRyuCzW3Vie4s7JVMy0PWEczowRhmNDdi9eHsbPRbyAlnfZhp m7cviQDmpB/IaU4VAdiPRzvhqlu9EJ/0Mnds+X5ESMzQ0C71pp1sJ+EuMjSNYJSl599a9C jkonE4yjDlceYx77FOHI1U+dTIFyc+NPl/QmuuAEpepMzewjh4bvAXlBHgvIf+ocGuYbip l40pGiq3z+wZE8QoV+C0H+tTCJwT3HrMxZBiSQwjYUYteO1j7V+gs3N8clsrRw== Date: Mon, 17 Jun 2024 16:09:37 +0000 From: "Pankaj Raghav (Samsung)" To: Christoph Hellwig Cc: david@fromorbit.com, djwong@kernel.org, chandan.babu@oracle.com, brauner@kernel.org, akpm@linux-foundation.org, willy@infradead.org, mcgrof@kernel.org, linux-mm@kvack.org, hare@suse.de, linux-kernel@vger.kernel.org, yang@os.amperecomputing.com, Zi Yan , linux-xfs@vger.kernel.org, p.raghav@samsung.com, linux-fsdevel@vger.kernel.org, gost.dev@samsung.com, cl@os.amperecomputing.com, john.g.garry@oracle.com Subject: Re: [PATCH v7 10/11] xfs: make the calculation generic in xfs_sb_validate_fsb_count() Message-ID: <20240617160937.o65vhvtzr5u5iy2o@quentin> References: <20240607145902.1137853-1-kernel@pankajraghav.com> <20240607145902.1137853-11-kernel@pankajraghav.com> <20240613084545.GB23371@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240613084545.GB23371@lst.de> X-Stat-Signature: gwcyztis66se38hf86zyk3u9cs6a65z4 X-Rspamd-Queue-Id: C245114001C X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1718640588-597313 X-HE-Meta: U2FsdGVkX18c7aPXTIvp32GUksL2UfkDpOqnPCyH2eCo6kVnkg5Il+NUio5F/UHQsfDeETFT6wtShYOWVgbuTf1El7K7yQOBv8TiWT2wwtHYXdAnM+EyVtpQvN5gKprkWesN39+Ag73oPDNi/rFe87KFBJQJElgESA+foJFE94Fp/ITJA8DhlysCoRbdBF25b2yvpytXq1iWFQYlEz9hzmJ/9wsVBtAckmQg4hE9q+dqi+oIomdWpr30yBx61sFhhCVKUZZdBzQjtNth8yVcATpn6GIcPoPmBKTSLFBFyBA3x6S2ifDP8ATcoP6QtcWV7dkiZR36FJESnMYsFMk4M0YY7xIkEjdTbx9M0faGQ2UM6kPtdzwFqknjd/AjdNu09NcpnQUJkyIlecRwHn+znTHVecg08RwfiiauTh84XPzr0BpvoH5uyLPYRYZTjaY/tn7yaEZ5c/pNMxyh51scygCf0Sn50+CM8s79zQt02g28vYUQqkOTEJNfJZbih6FIvCn4wGB7nttxOQPblH6UFghLby5A778qsUshM9R1ERZDT4bOKyTEcvPANxC4MHvzmGD31dD4hhbVxnvbe8hikOEPv8PHlRz8xtnnPVQlA7YIKIEqR3muVeVnnH6DMn77LZ8YtxgY3eOo13drLimdzQYTpNTf+U7t1FPnezEnIm6aiRrrd/a/4G1O2bNNcqS1FiCBAVy6i1kXkKkE87GSsTpbtG3i03ESJXxKJ9z8VdXK8+7tyNhrx9Li/THSh7WNwgAjTIz0OuDuQQVqqhsqnbLJ5+/Sm9zkJ6ArdOfN6oX++VyQf7B1MWiqPmSkDqDL9G3pGrefp+4yvZM8HL/bATWvZVT7xP/ZWN/1tUkktsx11G6aeEPaerdZZ54VScaz7SOngFDgnLQRRICIyqYW+ahWT3Rwky1BmxUbKxatkeSJnM2vkm9WA03iHNTieN1cuncK7CCy6iaaiGi017W /dJJeSQc 5qNqqmAiEPFezZ6i27RP91bkiLxMZXXi61sM2Bq7zRGoOHeLb2lmo39j4BGW39THAhCCg96aIRih3+UY3uvzWH73Ugd/kod5dZf7F/4RfE+2BlXSaP57O5VR3aaXPua1CIAyzfoFVP7tjn75ZDR0x6sDVjlWv0iySY3E6sVutevKfi7OGdzAJAOo6l5HQImV7puga4RuuJlt7jmfJCVVUDgFMJ8GYKYCDjvPe1HiYLnN9iMAO4SBwBiujz/0M3B/LKHYQ1WZB06tUsESLvVeexW5wDw== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000001, 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, Jun 13, 2024 at 10:45:45AM +0200, Christoph Hellwig wrote: > > + uint64_t max_index; > > + uint64_t max_bytes; > > + > > ASSERT(PAGE_SHIFT >= sbp->sb_blocklog); > > ASSERT(sbp->sb_blocklog >= BBSHIFT); > > > > + 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) > > Do we really need the max_index variable for a single user here? > Or do you plan to add more uses of it later (can't really think of one > though)? Yeah, we could just inline it: diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c index a99454208807..c6933440f806 100644 --- a/fs/xfs/xfs_mount.c +++ b/fs/xfs/xfs_mount.c @@ -132,7 +132,6 @@ xfs_sb_validate_fsb_count( xfs_sb_t *sbp, uint64_t nblocks) { - uint64_t max_index; uint64_t max_bytes; ASSERT(sbp->sb_blocklog >= BBSHIFT); @@ -141,9 +140,7 @@ xfs_sb_validate_fsb_count( return -EFBIG; /* Limited by ULONG_MAX of page cache index */ - max_index = max_bytes >> PAGE_SHIFT; - - if (max_index > ULONG_MAX) + if (max_bytes >> PAGE_SHIFT > ULONG_MAX) return -EFBIG; return 0; } >