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 713811B422A; Wed, 19 Mar 2025 14:34:08 +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=1742394848; cv=none; b=dZROJnQvAR6ASLJP8C7sjmM2eJhqscPlWyr/SMSS+1ob+/vyPcBF6GPQBZy0SXUMJxsmfRAdR0X/Dker8+yOnYWdRnmWTHOLKjfSwinbtJzFtWhy9MjbfAao0cB40UcCmd9nic6+4kX8FR0dFOTfF+rr2Ks1mPNv4dwGDJ6Ifyc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742394848; c=relaxed/simple; bh=8iMj4g5nUoAxyz7zd6svN16awoXiHp5d37gWXq2F6TY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UN1he2jVcTA5KlN0U9znvAEe3yCaM4A10/lovjl6/tnh954MLJm6VBxJ0wFuaNHrkFI46HyuT/hzJ/AMahnzwM70xK4BgolFa1eJrWUMxJnhg9Kx0ReKUyX40vEBpJGRSFXLbytOfmm+CaYLZjo6Q8GCQpWvSngsxLgNJoSE7EI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=IuFTNtzi; 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="IuFTNtzi" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 439C5C4CEE8; Wed, 19 Mar 2025 14:34:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1742394848; bh=8iMj4g5nUoAxyz7zd6svN16awoXiHp5d37gWXq2F6TY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IuFTNtzi61SUBb2T5s23N6HRJGI6SqIUNSp2r7r2rCiwgdTI4Okig0jEghVFmin0j rpFSzVLgSPKtV+bx7Wknj8mqpJfgs6hyAsT2Vqe69phMdPdOH8vO+s9LP0B1O2xRTb sMRS+XO0CSyosanYL5j8+x0xkp+6mfOOtOvTW17o= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Somnath Kotur , Taehee Yoo , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.13 034/241] eth: bnxt: do not use BNXT_VNIC_NTUPLE unconditionally in queue restart logic Date: Wed, 19 Mar 2025 07:28:24 -0700 Message-ID: <20250319143028.562161407@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250319143027.685727358@linuxfoundation.org> References: <20250319143027.685727358@linuxfoundation.org> User-Agent: quilt/0.68 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 6.13-stable review patch. If anyone has any objections, please let me know. ------------------ From: Taehee Yoo [ Upstream commit 661958552eda5bf64bfafb4821cbdded935f1f68 ] When a queue is restarted, it sets MRU to 0 for stopping packet flow. MRU variable is a member of vnic_info[], the first vnic_info is default and the second is ntuple. Only when ntuple is enabled(ethtool -K eth0 ntuple on), vnic_info for ntuple is allocated in init logic. The bp->nr_vnics indicates how many vnic_info are allocated. However bnxt_queue_{start | stop}() accesses vnic_info[BNXT_VNIC_NTUPLE] regardless of ntuple state. Reviewed-by: Somnath Kotur Fixes: b9d2956e869c ("bnxt_en: stop packet flow during bnxt_queue_stop/start") Signed-off-by: Taehee Yoo Link: https://patch.msgid.link/20250309134219.91670-4-ap420073@gmail.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index d5d91bbc67924..1b8ed81ef497e 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -15590,7 +15590,7 @@ static int bnxt_queue_start(struct net_device *dev, void *qmem, int idx) cpr = &rxr->bnapi->cp_ring; cpr->sw_stats->rx.rx_resets++; - for (i = 0; i <= BNXT_VNIC_NTUPLE; i++) { + for (i = 0; i <= bp->nr_vnics; i++) { vnic = &bp->vnic_info[i]; rc = bnxt_hwrm_vnic_set_rss_p5(bp, vnic, true); @@ -15618,7 +15618,7 @@ static int bnxt_queue_stop(struct net_device *dev, void *qmem, int idx) struct bnxt_vnic_info *vnic; int i; - for (i = 0; i <= BNXT_VNIC_NTUPLE; i++) { + for (i = 0; i <= bp->nr_vnics; i++) { vnic = &bp->vnic_info[i]; vnic->mru = 0; bnxt_hwrm_vnic_update(bp, vnic, -- 2.39.5