From patchwork Mon Dec 6 14:56:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 522104 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EAAA9C433EF for ; Mon, 6 Dec 2021 15:20:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376530AbhLFPXy (ORCPT ); Mon, 6 Dec 2021 10:23:54 -0500 Received: from dfw.source.kernel.org ([139.178.84.217]:38838 "EHLO dfw.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349618AbhLFPVw (ORCPT ); Mon, 6 Dec 2021 10:21:52 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 72C536131B; Mon, 6 Dec 2021 15:18:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 85AAAC341CD; Mon, 6 Dec 2021 15:18:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1638803902; bh=r63RlhxjpeTMJMLb08MgV27UDj5KChNCT4qVWXlS6Ck=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AGkxwUPvgl3LnT3RhUQTbIx2UbDIiCoyGRKmq20IvPU09TiCIEmCReetC1J0Uf0y7 FipAY/HSdRHfFqHq6KhtikTmTOEz5nbErxn5EWo3HaqLauxG/hpRnhfjKawcfkwbhX RA2GyPm5ol0XwR1cf33WhmRLBWDn43FfM7/n2rmA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christophe JAILLET , "David S. Miller" Subject: [PATCH 5.10 087/130] net: marvell: mvpp2: Fix the computation of shared CPUs Date: Mon, 6 Dec 2021 15:56:44 +0100 Message-Id: <20211206145602.670685616@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211206145559.607158688@linuxfoundation.org> References: <20211206145559.607158688@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Christophe JAILLET commit b83f5ac7d922e69a109261f5f940eebbd4e514c4 upstream. 'bitmap_fill()' fills a bitmap one 'long' at a time. It is likely that an exact number of bits is expected. Use 'bitmap_set()' instead in order not to set unexpected bits. Fixes: e531f76757eb ("net: mvpp2: handle cases where more CPUs are available than s/w threads") Signed-off-by: Christophe JAILLET Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c @@ -6918,7 +6918,7 @@ static int mvpp2_probe(struct platform_d shared = num_present_cpus() - priv->nthreads; if (shared > 0) - bitmap_fill(&priv->lock_map, + bitmap_set(&priv->lock_map, 0, min_t(int, shared, MVPP2_MAX_THREADS)); for (i = 0; i < MVPP2_MAX_THREADS; i++) {