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 1711CC3064D for ; Mon, 1 Jul 2024 02:34:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A4E9E6B0095; Sun, 30 Jun 2024 22:34:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9FDEE6B0098; Sun, 30 Jun 2024 22:34:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8EDF66B0099; Sun, 30 Jun 2024 22:34:21 -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 6C3936B0095 for ; Sun, 30 Jun 2024 22:34:21 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id F0792A1D44 for ; Mon, 1 Jul 2024 02:34:20 +0000 (UTC) X-FDA: 82289614680.27.7B236C7 Received: from mail-oi1-f179.google.com (mail-oi1-f179.google.com [209.85.167.179]) by imf17.hostedemail.com (Postfix) with ESMTP id 0D85D40009 for ; Mon, 1 Jul 2024 02:34:18 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=fromorbit-com.20230601.gappssmtp.com header.s=20230601 header.b=AgXuelzp; spf=pass (imf17.hostedemail.com: domain of david@fromorbit.com designates 209.85.167.179 as permitted sender) smtp.mailfrom=david@fromorbit.com; dmarc=pass (policy=quarantine) header.from=fromorbit.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1719801237; 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=QA3WiA5BkOYuP93eXhly5M9069HlqMUx74jdW74bq/w=; b=cyh+HM8OAP7RJYI5cc3ufHFidLx8X58j06tKbt6IPgTkSV8FZAivjDD62D9Q0BCyIyyIR/ uu01nc/xBC8QqgAg040/9bJUExumquQgFGSROJ5rSKcI5uAnnH0+KPJNQNVeDrFCh8FQ7E vcrS/wS6qTdVCaLkC58QD+MPdQsscGY= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1719801237; a=rsa-sha256; cv=none; b=sskFlaaCbrWwFRPBPTPsS5J29UZIJOw7DZ252M0KI3W8UbhZOBXO/HBHfGqhH95+IO6vwI JSasWUDNnLF2budwBstr1nby6MvOuM8x326gc323XVWDu8opRNx/97LeHmb/Es7LEfVxM0 1GfaZlijkXhMPlr8/NzCjIT9z/QuJhs= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=fromorbit-com.20230601.gappssmtp.com header.s=20230601 header.b=AgXuelzp; spf=pass (imf17.hostedemail.com: domain of david@fromorbit.com designates 209.85.167.179 as permitted sender) smtp.mailfrom=david@fromorbit.com; dmarc=pass (policy=quarantine) header.from=fromorbit.com Received: by mail-oi1-f179.google.com with SMTP id 5614622812f47-3d562b35fb6so1610371b6e.3 for ; Sun, 30 Jun 2024 19:34:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fromorbit-com.20230601.gappssmtp.com; s=20230601; t=1719801258; x=1720406058; darn=kvack.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=QA3WiA5BkOYuP93eXhly5M9069HlqMUx74jdW74bq/w=; b=AgXuelzpGC1ZPI9vcmZ+IMRE2bHL2MeQsoj50MHGxcANdX7MKvlS542OWPZpKiUoI2 +QgCvr9VHpM8K6zApZx6PfffQlSFtG/3AtKqg9MhDyLtzwmQ2v/HYWZ/A/mLUQuwxYNK AhxI3IuVxVh0FkKJRw038XBiNdMXvi09JcxXlFGiySywHHQxoJYJ1qF4FKy1WbU5ZdX7 gfVzLjiNDDNmrBq3N8dpqzkhjj5mZRqsPYy2a5ySFskCLAjPvEDmz1QJlyZFVJPOTqz9 uidiqTBtK1WaanAIfuDVylAWJbsnl6tJAZ6zxtM+blvduhG8Bvy8R0GG+tLk1m917Lhg OPDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719801258; x=1720406058; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=QA3WiA5BkOYuP93eXhly5M9069HlqMUx74jdW74bq/w=; b=t6lvY1A823LPY4YRxUmVmpFKGEMdSZlGB85eLXjQVDYGshP+Aks6NyA70oRnCn3YAW Kd5FO0IQzTnyobIAlhmrwNC53VqhTrgYogmV1Gsz2AY5N9AsCc8m/pa28bpT8pA6Dgib bnsjLJhu+Y6C4MJEX0EAgitf+CSFf4daD499hxZ28yj6vvnOHkaEzYA4F53GLO8yhTRg F2MGp2NWZglYsLDsNaZh/pXjLT0cjUiz9k5ICdhJyTcVi6l0AeE2oOIrZB8dvhZUhkc3 vbGoVFdIBk6xlY3Jb0wpXW9wYKTL2353cJifGbX7IwEF6k3FPLNXY0wcILqL8b70BiDW GDOw== X-Forwarded-Encrypted: i=1; AJvYcCX6vTN7tOUPBjnuYaM6tSRPM0RaKGR3rAycJdvyJLLxClqfFZzVu4QZVIWLIp8ccAVD3lrGj5smtIOx6CFdNOBKHVA= X-Gm-Message-State: AOJu0Yz70CRRCYGhm2UAzkKZpFtiPxiptJ6IvzhsFRrRDELTknxD4by4 w0HSVuglPxJ73H6ciiLUXMcXgxmZHoX9VW/UpnMKFaAMJAYlJ8hEWB9b1Yp69L4= X-Google-Smtp-Source: AGHT+IEhF1WaXX7e3DF7d8gDsYzeuaQr19iyJwzavDsUGQdMwQeS4CXpEwNMn23ORea7Cbyz40JGYA== X-Received: by 2002:a05:6808:1909:b0:3d5:1eba:10b5 with SMTP id 5614622812f47-3d6b2b24eb2mr7205732b6e.12.1719801257454; Sun, 30 Jun 2024 19:34:17 -0700 (PDT) Received: from dread.disaster.area (pa49-179-32-121.pa.nsw.optusnet.com.au. [49.179.32.121]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-70802664d6dsm5312897b3a.80.2024.06.30.19.34.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Jun 2024 19:34:17 -0700 (PDT) Received: from dave by dread.disaster.area with local (Exim 4.96) (envelope-from ) id 1sO6ru-00HQzW-10; Mon, 01 Jul 2024 12:34:14 +1000 Date: Mon, 1 Jul 2024 12:34:14 +1000 From: Dave Chinner To: "Pankaj Raghav (Samsung)" Cc: willy@infradead.org, chandan.babu@oracle.com, djwong@kernel.org, brauner@kernel.org, akpm@linux-foundation.org, linux-kernel@vger.kernel.org, yang@os.amperecomputing.com, linux-mm@kvack.org, john.g.garry@oracle.com, linux-fsdevel@vger.kernel.org, hare@suse.de, p.raghav@samsung.com, mcgrof@kernel.org, gost.dev@samsung.com, cl@os.amperecomputing.com, linux-xfs@vger.kernel.org, hch@lst.de, Zi Yan Subject: Re: [PATCH v8 09/10] xfs: make the calculation generic in xfs_sb_validate_fsb_count() Message-ID: References: <20240625114420.719014-1-kernel@pankajraghav.com> <20240625114420.719014-10-kernel@pankajraghav.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240625114420.719014-10-kernel@pankajraghav.com> X-Stat-Signature: wbjwcr7thhqhqrdcda5dsgmhxqimh5fh X-Rspamd-Queue-Id: 0D85D40009 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1719801258-346474 X-HE-Meta: U2FsdGVkX19PbN76GCYtev6qZ6s5qh9avKyU+Ir6JY2h8L1lphYV5rxmzFgryv0mpd7TyYfmEJPBM6YXE/LXoN9ScmVdL9kuBQ6HKNUCokHF926uBKOVnlwdf6nxHJZjRFjCTxVnJlBtYNctmk2Mazy1vwKV+6RgExk6rEiPOIHXFqYyiteT5/NI1G7EXS2aEXS0LsJhu5iPACrhfJe2LObF84aJYRPItsxcKTDAHUAwjsyY4mm2eedq6c5JDIY+PLXMF//eXKtCkwZL+3sYl1JTvFfTiKoCI6tzbMXUL7D95Hksw3TaOjjvN3SuEJ+PFMhUWCJmjsm3q6OAGczlbf088oHaigu8eIESETWMYVZhw7h2dkkwbwe7LW0z0VwJ9WChwnuopMm7s35z+TvRbkFXbr78K9pPsGR84PxyR2DRxnRU8NHq0sJywzW6IqTbP8LpPWSUVHnRmQ0Tq+rd1YSDoA9erwTHVON4JlojJA3qm0Rto/nJbvdZS6tV/AniOoLdGSqs/Yg5xNqlGZK0rwtmYFi8RosurRUszuq0iJvxmBoOxOH4lPeVSxyvUkdUWfq4v8wAXPXT6RhXaQtcdlN8GjapUAFWOI0rEsQ5s5qjO2OnT9y/pqOIXJqFAEHs6Thx0c6ddEZh37n31k2BFJDZ96tckuJj8tv4qJt97X1oApa2g39RzTGR4PW0jZp+9gspQ+q/XmU6V8gs1KpXgi2sLTS3r86I9DSSKlSq0qFjYo+2hCcyOqeA+cdwV4Kw/Wjez8/kFingn6C/D/D+PCp5QMapl0wD+TENBz0ppkH5nsnlOr1I1CmdNncuy+DZvGQX1NNbYM+dH97UF/BlPLQQmw5HCtDAuZY2PdeXjNKHKk2rhggslWXWDUst2T6Sv1UAEOYJNYhGdTLercTH8WxPkMCJGqIKnUqIdtTj2LrHsDpPiZ9LvOOF73TTMDvL68Rpn+t4hVsilDdPIgH B3BluZxF 8W696s9l7XL1M1Dh3/ZwBc3ghcwYg9Wi8jVqUQ1r0NfNIDPDxiozMH7qNEKvzDLd90+agu75lY8VQhTHlnnx7bF/3N2DDlcK7Q0aKxhvvn4npd80cQjVdVnkel1TPQ9d2D7tqyHMYB2YIVd4czfV6sbB7pf7n66XJmO62Za4AN6DOyfcikDRMDkhJxIZDKI2n1QdmmEN+1oHwtb/LsgzjDPDULsePgvP+hatAp+6ovpciOT2U7E6hnYrrUCMajGBPX34+4LdyyD9KZ+KToVKDJ7IP88wTRkKrky0MJUHAnDnIQ3nawCnzzcd05mraJvenvY6YG5hOTOxIKX30lA4kB3gMCfxcI2bOj1tyMbnpLSUGGbelPgCTW8B/s8S/gvV93HT58N7s4pOx3hnXAqZHRA+vmzmklte82tUSNrvrMc5JFN4LSiuJJsA/z5qdmkOCVDi4dMJmkCr3vVdIynx1/IfYc8OkwZm4kGE45FHxioCA630lxVUMoZfOAArcnkS8Tlj0iaLEyoIabnoGivJ/5gqw0iyGj7Azi674 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 Tue, Jun 25, 2024 at 11:44:19AM +0000, 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. > > Reviewed-by: Darrick J. Wong > Signed-off-by: Pankaj Raghav > --- > fs/xfs/xfs_mount.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c > index 09eef1721ef4..3949f720b535 100644 > --- a/fs/xfs/xfs_mount.c > +++ b/fs/xfs/xfs_mount.c > @@ -132,11 +132,16 @@ xfs_sb_validate_fsb_count( > xfs_sb_t *sbp, > uint64_t nblocks) > { > + 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) > + if (max_bytes >> PAGE_SHIFT > ULONG_MAX) > return -EFBIG; > return 0; looks fine. Reviewed-by: Dave Chinner -- Dave Chinner david@fromorbit.com