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 F1DD8C25B4F for ; Fri, 3 May 2024 09:54:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8D4216B00A5; Fri, 3 May 2024 05:54:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7DF556B009F; Fri, 3 May 2024 05:54:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 45E266B009D; Fri, 3 May 2024 05:54:06 -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 100936B009E for ; Fri, 3 May 2024 05:54:06 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id B66C91A0AA3 for ; Fri, 3 May 2024 09:54:05 +0000 (UTC) X-FDA: 82076623650.27.C97A32C Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf16.hostedemail.com (Postfix) with ESMTP id EFDC5180012 for ; Fri, 3 May 2024 09:54:02 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=Z24PE1Ua; spf=none (imf16.hostedemail.com: domain of mcgrof@infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=mcgrof@infradead.org; dmarc=fail reason="No valid SPF, DKIM not aligned (relaxed)" header.from=kernel.org (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1714730043; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=GqWnKea6V0gAe+YJTg8s/r2wucoemkpF8ihTzX0zeiQ=; b=SB67QrJHQ0tGeycEMdfIje0JScH1vpdnqB0m5TA8RKuN6uJIi0lqZql4fjgN4x+5QKQRbF A1qvZ4Dh4VblFXveGJG24HVC8cQF4cHGADDCRJSMH6zkw3DZeZvKWMn/hVMl+uX4L0BuiC v/5kuAY/t47bFVgRyxiXwSs+usICyoQ= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=Z24PE1Ua; spf=none (imf16.hostedemail.com: domain of mcgrof@infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=mcgrof@infradead.org; dmarc=fail reason="No valid SPF, DKIM not aligned (relaxed)" header.from=kernel.org (policy=none) ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714730043; a=rsa-sha256; cv=none; b=CduAW0XTC/QSKOWwZruSdHaFhSOQBd5sw8f7sBCI4SE7wYQi3xbkiTA1wV9NoWjOEymwWW YkZtPklMjlNSgxRvCRbQqJ+2Em3nxxAuqnVkycNx9bjtZl0oMnnkR6pe/gSJ3A2X2E2xEM mAE2aebGkwFbwlGe0Dc+/+TOjB4Zw64= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=GqWnKea6V0gAe+YJTg8s/r2wucoemkpF8ihTzX0zeiQ=; b=Z24PE1UaSm2BVNZHztO+sfNPrc uYg0JsBNtR0fS2ERaAtyGFe5ZFhVB7uzbOZ29sCbbLaoYPU0QfPNYZRHq2xeQBAvQg+uFjksklAnh sRYEEG5OxlUp7optRBlZA+rX6zNEY2gXRyeOgRZuaszLG+Fo5M8hCGarPoZoJ2eLipVytnwdAbbAG O8zbNPjHdjom1hRDzzuz5DQHIyGXeNS0Arp353WvJWIoYBEhvf4GoVtvpnu5p6KhZV2pvgWtqAb0J 5YLrehzXKq2PaFVIwhFdWLf78DN/6lHffCnqjQVWHTBfqJ0OXCc0M5lArYSI11zkmTjV1MQCUpKOP IceeO7aQ==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1s2pc3-0000000Fw3u-2DAJ; Fri, 03 May 2024 09:53:55 +0000 From: Luis Chamberlain To: akpm@linux-foundation.org, willy@infradead.org, djwong@kernel.org, brauner@kernel.org, david@fromorbit.com, chandan.babu@oracle.com Cc: hare@suse.de, ritesh.list@gmail.com, john.g.garry@oracle.com, ziy@nvidia.com, linux-fsdevel@vger.kernel.org, linux-xfs@vger.kernel.org, linux-mm@kvack.org, linux-block@vger.kernel.org, gost.dev@samsung.com, p.raghav@samsung.com, kernel@pankajraghav.com, mcgrof@kernel.org Subject: [PATCH v5 10/11] xfs: make the calculation generic in xfs_sb_validate_fsb_count() Date: Fri, 3 May 2024 02:53:52 -0700 Message-ID: <20240503095353.3798063-11-mcgrof@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240503095353.3798063-1-mcgrof@kernel.org> References: <20240503095353.3798063-1-mcgrof@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: EFDC5180012 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: irbhrygmm9dpm5c78mtebmc9ym81qhw4 X-HE-Tag: 1714730042-440946 X-HE-Meta: U2FsdGVkX1+fuX8AVsP/GiIGTL7I2f7pVqXIooIujqHvzC4Dec22kUviXHz3pKhfV1fjde/XeoKXCKGXNF8Ui2mCk9V0WvEFzfSfHvg+3J0So5kxvJtwUaORE38lc+Yza0s9eWEn20cahRL2c/LG8pmnFULFJp2buPV4WlMLZm90s2RIioePM98w+7NdwTm8JNljnNxGf8RPXgbz22GsixTTSWrfIZrImQbhSHDEeSIeENdMtgrfGYrDDKoHEC1wa5fqI3WYYGJIbtlBZ1fJ1xrdCN54axd64OBywtazOB23LAnWu8NMISpi3Mmhl0LTsRDkNxbPRSMlJ4MghG8xdYk6qQd1/m+KxGYh7eAPEQAjSJTxNZbpJAZ50RB5rMYmophWLCg+uErKs3khgRpmSyWKbOBKCLFjOr/m8QiuB89rpdPLGgG7Oz85LkAW5VQ9TpnCiI1yDvUryo7uOy9PFryozXJv8CP4POLkoWwD9dyftR5Zm6qm17TZW2Jo4PLqmKWEcRfXBFKt+dZD7hHq5SfPdFh8GtDHtQG/pYpIdZ+hJgVoUAZRbYfpbDAmPedy/xv1dmeOSeOoghwVctFMakZd7//ediRg/HE7F3gq2JwUxvaOaLDuQpF/QBSQepPYXhELgpRHCbn4UNCE7oj20vgnyVPZI7tWzZQfg7K2g0pnB8aTdrRnOogjw3fsCO6vvbxcwhI8FoiAlEs3lkgCczFRB+q0Xb2aprNunNM2v6UY/6N1hx+EKutg3JlZoOQ4hGr+bkywRUBk8lXCvkwoElxpQM4ivcfBXoxjJQn+iJ1tpkgxPPXbHiqhvv0ejPpnfwfTqfKeqmJilQi6YrHTRIitWTHnUYqt+/X6k65YC6yGIVwCmIfnpV04QPS2E4F7Ls6Gfo1VnruaIY/OxjUcJro5CteYtK3e48/TtVwhNien6BZvXoXU5+76GHseKD1zxKZFykfPrt3XBcsIoue gJ6D1bo6 Xr6g7Dj4Y5j9uoa5TGjBvsS1J0RVP2Q/F9azqqmaABoxLCvI7XIXyP5WKOn6/tpReqHzAzkykXqfOF21I0aYTNqpkmc1C75qoTy2j26BVq8g96xqh0jVm2Cnlrv26HmghfZ0All2AaiH9IeTtPnkCfiGgbiHXwEqVvOUfuQd6zZfMk0KZaUC2MBeE0/JOYRbvIxmrUrp7cG1iTW1J0fKuN67hwcRfPTFPEqtIkC63rDgrNl6nNN9XClMjDoXBaJdr5t9CZJXMhbfzJh+AzLBWtziQ6lIiJ5v2h2vrFPi9QkXZfU4UnEP8imuXz9k120FNxtBuziknof2uZRyl6qsHi7wRioxxNmSSKP0tMBEJHnsynfbL6mjPHdkLjPcZNwZE6GU67h2mWpg18qnqMQ/CLGd84qEzXxEc4ZNzMIuEeojvbv2523cq0crJWTH2U9QGjaUAQ5+qTSnXhQpuktoPVjBns2F7RSLwR/0HqUBsKl5TgpalPF9Cl4hgbIbXl43xy3A9ZJubv1ZUbVwa6+6qxs94tWupjq1f6IRZ X-Bogosity: Ham, tests=bogofilter, spamicity=0.000032, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: 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 Reviewed-by: Darrick J. Wong --- 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.43.0