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 3A60235E553 for ; Thu, 20 Nov 2025 16:12:49 +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=1763655170; cv=none; b=SYIkDP0XBXvQ9d0Ykd86rqh2oYdNU0t2wRg6neJXCXEWGC82pxfMGmwnkG0o9ngN4RWIhHa0TbgXHzjuD+1EKmAUwRT2DolUrMIXeOmSXMhzt+07bgUBP1Y8ptIM2etck9RpLVHdlUtPNqgppbYw0KIRDR/pDG8KxZN6/uG29ng= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763655170; c=relaxed/simple; bh=25K+nic0V91Q9J/YMFRlwxT07mK98R01xjO3y0/1Icg=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=t289gHuLICaDOoZP20EHDJWVHixPwMZhGDvLo51pQQYwjhlHaKU1B3FHQ3rKr4AfysJzoQw5I6KhJO3D3pr2GRf6fXK5Iji7NghhbR8gTJrj5rPPG0vpnYBq+O3GiPEOToVTFyjHfi6hZe+a5KBXl+2lx2Nb+uTKlvB1YWRQBds= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=wU+WaXVD; 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="wU+WaXVD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 66638C4CEF1; Thu, 20 Nov 2025 16:12:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1763655169; bh=25K+nic0V91Q9J/YMFRlwxT07mK98R01xjO3y0/1Icg=; h=Subject:To:Cc:From:Date:From; b=wU+WaXVDOSHW+RVuvO/Hj8kKCVyapLZSP11tU4KrxZSa3DlajjDNBdyNQTgHzvaZ6 ZP4PBY+BeGPbuV0kSYIjnC4GgG8CKEWz9TSYsflsCXvZzPDntbTJmMFA88oMnDl8PJ qsdWO8MaqLlzn5e9kQMgRznStr4CrN2tBk8gwNJw= Subject: FAILED: patch "[PATCH] mm/mm_init: fix hash table order logging in" failed to apply to 5.4-stable tree To: isaacmanjarres@google.com,akpm@linux-foundation.org,david@redhat.com,rppt@kernel.org,stable@vger.kernel.org Cc: From: Date: Thu, 20 Nov 2025 17:12:34 +0100 Message-ID: <2025112034-decrease-sardine-8989@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y git checkout FETCH_HEAD git cherry-pick -x 0d6c356dd6547adac2b06b461528e3573f52d953 # git commit -s git send-email --to '' --in-reply-to '2025112034-decrease-sardine-8989@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 0d6c356dd6547adac2b06b461528e3573f52d953 Mon Sep 17 00:00:00 2001 From: "Isaac J. Manjarres" Date: Tue, 28 Oct 2025 12:10:12 -0700 Subject: [PATCH] mm/mm_init: fix hash table order logging in alloc_large_system_hash() 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 diff --git a/mm/mm_init.c b/mm/mm_init.c index 3db2dea7db4c..7712d887b696 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -2469,7 +2469,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 ? (huge ? "vmalloc hugepage" : "vmalloc") : "linear"); if (_hash_shift)