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 256BB12D776; Tue, 30 Apr 2024 11:15:30 +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=1714475730; cv=none; b=ZZZGfsIj+FTZtVUq4V8ewMg9wWNSkRENjgI8MXjpBD6yhGXT8eiABBi/UPh1FqWHHlb0PuqPtm6sfOXIW6QLSkriRjOgBraYQDSV1SqSgi1XeOdm9vcg2kiToLdh+d+3VFs/GoyKlDt6DfMq/zP8D3TXVsk1KNgukWil+T9bkkw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714475730; c=relaxed/simple; bh=cZcyCJYZaHx9qUifVohoEXxZNbZn+WzDYY1lHCiqxH8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=N8dUI9amy3nLYvCQDp2vN0i63ObgzoANmmMS69rtHdj63/z024aKX2mbz9ojAIRY/LCRwTFg4LZ6keAjacyiq98k57AOM+cD91HIMsU+t6QRvMAqlX6KVE6jmKOi4eXVYoLiC1OT1oEv6a8HryaNT29FCfhycyOgqUKTcEZ67BE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=FIiMu84+; 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="FIiMu84+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9D81DC2BBFC; Tue, 30 Apr 2024 11:15:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1714475730; bh=cZcyCJYZaHx9qUifVohoEXxZNbZn+WzDYY1lHCiqxH8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FIiMu84+qT4QRaPGjCzSimt0XuFTosdG2hp0nKjiIs0blbWs5EeCxoHgDHmnvmMSn UMvBKPiZgfA7V5e66GFXfVSaAQtmv8NHM55pfaheFrLnK8vXc8oNJxl8+QosAouQqD ug/CoXmAxAvYBtGeMjasGJnGZQlQrQLhdjfGnqeg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?=D0=9C=D0=B8=D1=85=D0=B0=D0=B8=D0=BB=20=D0=9D=D0=BE=D0=B2=D0=BE=D1=81=D0=B5=D0=BB=D0=BE=D0=B2?= , =?UTF-8?q?=D0=98=D0=BB=D1=8C=D1=84=D0=B0=D1=82=20=D0=93=D0=B0=D0=BF=D1=82=D1=80=D0=B0=D1=85=D0=BC=D0=B0=D0=BD=D0=BE=D0=B2?= , "Matthew Wilcox (Oracle)" , Rik van Riel , Mel Gorman , Peter Zijlstra , Ingo Molnar , Andrew Morton , Linus Torvalds Subject: [PATCH 6.6 186/186] bounds: Use the right number of bits for power-of-two CONFIG_NR_CPUS Date: Tue, 30 Apr 2024 12:40:38 +0200 Message-ID: <20240430103103.430898146@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240430103058.010791820@linuxfoundation.org> References: <20240430103058.010791820@linuxfoundation.org> User-Agent: quilt/0.67 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-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Matthew Wilcox (Oracle) commit 5af385f5f4cddf908f663974847a4083b2ff2c79 upstream. bits_per() rounds up to the next power of two when passed a power of two. This causes crashes on some machines and configurations. Reported-by: Михаил Новоселов Tested-by: Ильфат Гаптрахманов Link: https://gitlab.freedesktop.org/drm/amd/-/issues/3347 Link: https://lore.kernel.org/all/1c978cf1-2934-4e66-e4b3-e81b04cb3571@rosalinux.ru/ Fixes: f2d5dcb48f7b (bounds: support non-power-of-two CONFIG_NR_CPUS) Cc: Signed-off-by: Matthew Wilcox (Oracle) Cc: Rik van Riel Cc: Mel Gorman Cc: Peter Zijlstra Cc: Ingo Molnar Cc: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- kernel/bounds.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/kernel/bounds.c +++ b/kernel/bounds.c @@ -19,7 +19,7 @@ int main(void) DEFINE(NR_PAGEFLAGS, __NR_PAGEFLAGS); DEFINE(MAX_NR_ZONES, __MAX_NR_ZONES); #ifdef CONFIG_SMP - DEFINE(NR_CPUS_BITS, bits_per(CONFIG_NR_CPUS)); + DEFINE(NR_CPUS_BITS, order_base_2(CONFIG_NR_CPUS)); #endif DEFINE(SPINLOCK_SIZE, sizeof(spinlock_t)); #ifdef CONFIG_LRU_GEN