From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 899B4317709; Wed, 3 Dec 2025 15:43:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764776614; cv=none; b=Gro6rU51wCYsSzIUoxpV+V2E8OgSyrVAhYYEZpi6uhyP48VjHhZ+uJReaQDATqh9xvF+UpAOgojxfLp4mCXY9o519629lEpasCefqukH2ceHWq5957k/u+Gl9Icfu84ufKiyQCNtn/1/YzdudZ1Hd2twXHubgpFbRfXEvCTMFv8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764776614; c=relaxed/simple; bh=ksUVP5uuyk3sHAZnaDZ9K1wVswMTrrvDqLejI16MdVM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dpC4IZIjeVCgxmXBplCIqUSYKDAG+Wd94NhGnvj1YtEGt7X9OBYmURa2lETIHl9k7ySMvhI9XOGaYBmCi4CvmAcnWZVH+znXXDLUEtrmrO9/9LyyzwWniEKxucVhZCoW/N7E1Jn7VmNyork3XhlRZR3AtqKi5Vi+fschjwjk0BU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=y1vduXCC; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="y1vduXCC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D2CF1C4CEF5; Wed, 3 Dec 2025 15:43:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1764776614; bh=ksUVP5uuyk3sHAZnaDZ9K1wVswMTrrvDqLejI16MdVM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=y1vduXCCLtjrzUreBwefecA/ZHdaAaf44exUGYbpPeW64pzSuTButQPLy8Uf2HQkS 7RW3fH9iFjEr3EZmdxOWfwU+S/NhMS5MmFnG8/RC8hyvZui+07UvXmunx2S0hSSX3p E9scU+d4YC9DlK13AUZtzbb4gNaLdZN47bzxTDzw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "Isaac J. Manjarres" , "Mike Rapoport (Microsoft)" , David Hildenbrand , Andrew Morton , Sasha Levin Subject: [PATCH 5.10 234/300] mm/mm_init: fix hash table order logging in alloc_large_system_hash() Date: Wed, 3 Dec 2025 16:27:18 +0100 Message-ID: <20251203152409.296140866@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251203152400.447697997@linuxfoundation.org> References: <20251203152400.447697997@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Isaac J. Manjarres [ Upstream commit 0d6c356dd6547adac2b06b461528e3573f52d953 ] When emitting the order of the allocation for a hash table, alloc_large_system_hash() unconditionally subtracts PAGE_SHIFT from log base 2 of the allocation size. This is not correct if the allocation size is smaller than a page, and yields a negative value for the order as seen below: TCP established hash table entries: 32 (order: -4, 256 bytes, linear) TCP bind hash table entries: 32 (order: -2, 1024 bytes, linear) Use get_order() to compute the order when emitting the hash table information to correctly handle cases where the allocation size is smaller than a page: TCP established hash table entries: 32 (order: 0, 256 bytes, linear) TCP bind hash table entries: 32 (order: 0, 1024 bytes, linear) Link: https://lkml.kernel.org/r/20251028191020.413002-1-isaacmanjarres@google.com Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Isaac J. Manjarres Reviewed-by: Mike Rapoport (Microsoft) Reviewed-by: David Hildenbrand Cc: Signed-off-by: Andrew Morton (cherry picked from commit 0d6c356dd6547adac2b06b461528e3573f52d953) Signed-off-by: Mike Rapoport (Microsoft) Signed-off-by: Sasha Levin --- mm/page_alloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index d906c6b961815..495a350c90a52 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -8372,7 +8372,7 @@ void *__init alloc_large_system_hash(const char *tablename, panic("Failed to allocate %s hash table\n", tablename); pr_info("%s hash table entries: %ld (order: %d, %lu bytes, %s)\n", - tablename, 1UL << log2qty, ilog2(size) - PAGE_SHIFT, size, + tablename, 1UL << log2qty, get_order(size), size, virt ? "vmalloc" : "linear"); if (_hash_shift) -- 2.51.0