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 A7312C48BF6 for ; Mon, 26 Feb 2024 12:47:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 289B1440155; Mon, 26 Feb 2024 07:47:37 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1EB78440147; Mon, 26 Feb 2024 07:47:37 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 01636440155; Mon, 26 Feb 2024 07:47:36 -0500 (EST) 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 E2BB1440147 for ; Mon, 26 Feb 2024 07:47:36 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 8F4A412084E for ; Mon, 26 Feb 2024 12:47:36 +0000 (UTC) X-FDA: 81833931312.20.285E296 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by imf21.hostedemail.com (Postfix) with ESMTP id E38181C0019 for ; Mon, 26 Feb 2024 12:47:34 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=fromorbit-com.20230601.gappssmtp.com header.s=20230601 header.b=v3LzvC0p; spf=pass (imf21.hostedemail.com: domain of david@fromorbit.com designates 209.85.210.170 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=1708951654; 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=nyrubZrd+iQQ9LRdmGo0pLnE0GnOJFu8Ms2d6zdohTc=; b=PeiMjYlCCGpSlHystv1v2RaaPCXt1Npvu+Yr6Sewun+ha9+mubIbWzPd4gnUIUpabWr5e5 /engT7CslxdWH8vD69kSejhJG9YppySGccwN0rrwFQw4LdzxjxuFqu6QxvPlqFusf7LfV1 2dBKafdtxGe2myn2E+sBsGqMnP6d3r8= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1708951654; a=rsa-sha256; cv=none; b=nDE6orOsiOYD4V5N9x07jtkM+KZYYCjP7Ghq0NmYtqKHILkPP4Bu7YtEbshyk5bXhWVFis Kk6dvpgZ1s4RlbffUORKMH2Rw+4BUN073whlk/CbrZnEqHt/FxLE+cR65h9jY1gvk/Zea9 T1s0P3NqYlzvwiFMfFmOrapNLVyAhTE= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=fromorbit-com.20230601.gappssmtp.com header.s=20230601 header.b=v3LzvC0p; spf=pass (imf21.hostedemail.com: domain of david@fromorbit.com designates 209.85.210.170 as permitted sender) smtp.mailfrom=david@fromorbit.com; dmarc=pass (policy=quarantine) header.from=fromorbit.com Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-6e457fab0e2so1802568b3a.0 for ; Mon, 26 Feb 2024 04:47:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fromorbit-com.20230601.gappssmtp.com; s=20230601; t=1708951654; x=1709556454; 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=nyrubZrd+iQQ9LRdmGo0pLnE0GnOJFu8Ms2d6zdohTc=; b=v3LzvC0pFsZTZQw3/CQ9UujWaL567UpXwdTZPuzs/gtobK09gEmHivcek4DvKiBeWr AHp+YwxVIRrsVCVZ/NG8wW9yv+R98HMIV9aLzg/mbpCmo99izi0jbh/gpLlsb1yTkWHg 20F08GhT5twZvcd7VGao2JImZhV/eVtskFaVOKR0LpDS/lcrxTZrXi7hbrl+i4XcCFB8 2n5/UWzWRb0tnrePz8XsAv0vYmI1o87VsupYJel7dAmXw5DsuKve3osZN6aRYu7AwQXL bpIPbj5MIlOkX6CCpyQwxOAqfMXZB8r3Qn2twhBua1928NbUgc2+znxrEB+Q2GnbOR6S 9QNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708951654; x=1709556454; 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=nyrubZrd+iQQ9LRdmGo0pLnE0GnOJFu8Ms2d6zdohTc=; b=vNymHnyA0MdxuI2tfZ29hJEmsrK9wIq2leoOwafTHROj+jMt5vq6fDlyebNr7DLG0I IRy6M92a36McLTKW0qSM7klp3Uy6S1A/+hEQI0ORcuIWGbjI6GUztUndaHbgTOmVquZH oZ7pH3LKPhl62GUfnuDSMuNh3tpQn9U21Qt8mr9Aczg1qqNxTNCrgLQvNzZ4Xddu2OQh XgBFq1cEsDl0aYs5bJ1hMIc3TiVW+74uuI3ZV+ft5BrDITr473xc/Kd9dW2xD3K3YPTK zaHQc+CpUkdpOg8GGuvrsW7AeJ8DW0NlXzm5cNYg/l8pE9dvKdIkNNub1U4cX/UqDPyW mFxg== X-Forwarded-Encrypted: i=1; AJvYcCUJV7Hc5uCJeCjLdeySYN6NXeEpA35Ibl2YvN77hm09GD7eQOM1hzHEnQKWQFpD3HFEWxxvg+2HyiXUnyXZfurfHJY= X-Gm-Message-State: AOJu0YyP1ULBw+CAXwISNJ2RmydfuwQr7s7yHUTJTjpYESyB22LoQkAe I3PvrzkXmAL9WVqdSCKH2YHGdaPellK2lFWzJjkINXXmPzNMu8rA0TH2VMtPUIY= X-Google-Smtp-Source: AGHT+IFX/dKtzGRqrmOKHZtigWLQqswOK9f44At5pPNmVA4fazaZ6Tbtk13iEH+Bwie50vdjALOU8A== X-Received: by 2002:a05:6a21:1584:b0:1a1:5ad:4129 with SMTP id nr4-20020a056a21158400b001a105ad4129mr1274023pzb.15.1708951653839; Mon, 26 Feb 2024 04:47:33 -0800 (PST) Received: from dread.disaster.area (pa49-181-247-196.pa.nsw.optusnet.com.au. [49.181.247.196]) by smtp.gmail.com with ESMTPSA id l3-20020a62be03000000b006e4432027d1sm4030530pff.142.2024.02.26.04.47.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Feb 2024 04:47:33 -0800 (PST) Received: from dave by dread.disaster.area with local (Exim 4.96) (envelope-from ) id 1reaOI-00BkxF-2y; Mon, 26 Feb 2024 23:47:30 +1100 Date: Mon, 26 Feb 2024 23:47:30 +1100 From: Dave Chinner To: "Pankaj Raghav (Samsung)" Cc: linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, chandan.babu@oracle.com, akpm@linux-foundation.org, mcgrof@kernel.org, ziy@nvidia.com, hare@suse.de, djwong@kernel.org, gost.dev@samsung.com, linux-mm@kvack.org, willy@infradead.org, Pankaj Raghav Subject: Re: [PATCH 12/13] xfs: make the calculation generic in xfs_sb_validate_fsb_count() Message-ID: References: <20240226094936.2677493-1-kernel@pankajraghav.com> <20240226094936.2677493-13-kernel@pankajraghav.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240226094936.2677493-13-kernel@pankajraghav.com> X-Rspamd-Queue-Id: E38181C0019 X-Rspam-User: X-Stat-Signature: rgihkhxqp9sguc9grhjqew1f8b4t1h8q X-Rspamd-Server: rspam03 X-HE-Tag: 1708951654-376954 X-HE-Meta: U2FsdGVkX1/FRXkluElKSQjwPxlLgHsYLtnUYuABbPa0W099xkjKc+IgrVHRQqD6tuUsvaODt9PgREuqWhPeZD+APpgPO/cx+BTYtHqsVvCofM8uSxpLvWyorCSy25X0rMFWxOE6x6+OPkGA8Qe2FQ/XwYeS/19Ay658Heq7cboURdzdx3fmJAOe4ET83weOawtmPrD3YupuoKqm3bCyOl49hMsanPJIbKadRLosPLB2EBJ9BkCd/m7D12v46Du45kAvOgP6OdWFkqAiBvUR/TUwDOtrTKVqYPJ00hszqjW11ghOdRj+LqLgKP8xAC4SS3/5Ge/yVQ8WmFe0V9e8atn6vdI+TVMa9DTSoQeFaJcmzHYZijFO8jz9Vb0GF+nElDfwCOgyT3oQyt96nqghJg0KI08tdo/zTGse+z9akIkTBi9379WnDQqEq9vHdrSTiLRK1Zvh17biqZcsF+mOhAQAMrCTLXqHSHi7zu2KDBEkVLwIa9INeRu9moBdmiyMSZh4EwIMYouYOcgWEMo0+uAEitFwwhU+2wUqKgxkgibQpJLxr7lxuUrbDw5B6ac2h/AFdHNxYMtlynfFd/C2XJ2eB6hFxb5QRBydmy+QWUVJpGjPJ6TschbNIwIzgK2sfNKRtZQvw7E1tuUfCEl879La7zf+kvzlc0rTk56CGs2+FSVgy202hTEOzzFy3Y5alCvNlnKIBOOloAP33igxa4402my8exlfcY7M0VtG+Smv8kUL6H1sK+asqJ/ao1yBDbNXAbLYORjQtstPTR3dg61fNaqe0i7o2aiWTp0guzXJr07A/q1H14Ps+wOP93Vggr8Srt3BJv8maG9/xAs7K2MugE0lnygDLTBe7u6UsqyWUZYoCMZL81rNaDB17/riUpbKvCTKAyWuqwc3k0TeS1Kaqsy68W9lTjbsBo22QkdtjT8xt8xY/S2IJwnLvHobTcKLUjxbkBoSHANelpx 4BwKCMAT zAluw6fWUBauHEN2hLFOuypoMoPkricxauEkhvxwGOiC/TXMdw2T/mP8PB3jG0asLRZpkzUmeXTOBMmHmtLbLJaIKYdvr9D/dTVit9RWA6lku9F6Fv+rJc1wpxmCfGHLzEd5Xq4d3w5M2MltvHhnHYMKC283RQ66rEyu2 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000129, 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 Mon, Feb 26, 2024 at 10:49:35AM +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 | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c > index aabb25dc3efa..69af3b06be99 100644 > --- a/fs/xfs/xfs_mount.c > +++ b/fs/xfs/xfs_mount.c > @@ -133,9 +133,15 @@ xfs_sb_validate_fsb_count( > { > ASSERT(PAGE_SHIFT >= sbp->sb_blocklog); > ASSERT(sbp->sb_blocklog >= BBSHIFT); > + uint64_t mapping_count; > + uint64_t bytes; > > + if (check_mul_overflow(nblocks, (1 << sbp->sb_blocklog), &bytes)) > + return -EFBIG; > + > + mapping_count = bytes >> PAGE_SHIFT; max_index, not a "mapping count". Also, put this after this comment: > /* Limited by ULONG_MAX of page cache index */ So it is obvious what the max_index we are calculating belongs to. -Dave. -- Dave Chinner david@fromorbit.com