From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 216F445DB9 for ; Wed, 27 Nov 2024 18:23:07 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1C2D8402DE; Wed, 27 Nov 2024 18:23:07 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 9A313402DE for ; Wed, 27 Nov 2024 18:23:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732728185; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cIp44KompPW0AGy5QMqZwZ22iolCoEZjeuZawzujRAs=; b=LOyb/J+9SLmrU8Y1Tav+3Iy8pmSInps2iYYBXFuJR65bTEn09XZZzMK/9wfPNXKNSl0H2r ULSVXed0hze3vIIJtnnhazlNJFhqzJa3JQPyaG3IL6QYGxLKJxBdvY266NAHJ5GKtDE1Sg Z212pBsIUhj0rB8Lanm4HTZJQfM+5NI= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-354-545hMoYJPGeiJg_zyehugQ-1; Wed, 27 Nov 2024 12:23:01 -0500 X-MC-Unique: 545hMoYJPGeiJg_zyehugQ-1 X-Mimecast-MFC-AGG-ID: 545hMoYJPGeiJg_zyehugQ Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 617A119560BD; Wed, 27 Nov 2024 17:23:00 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.52]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B3290300019E; Wed, 27 Nov 2024 17:22:58 +0000 (UTC) From: Kevin Traynor To: Peter Spreadborough Cc: Kishore Padmanabha , Ajit Khaparde , dpdk stable Subject: patch 'net/bnxt: fix bad action offset in Tx BD' has been queued to stable release 21.11.9 Date: Wed, 27 Nov 2024 17:18:47 +0000 Message-ID: <20241127171916.690404-100-ktraynor@redhat.com> In-Reply-To: <20241127171916.690404-1-ktraynor@redhat.com> References: <20241127171916.690404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: UEYEVmx-zGNS1rC31xGQVtUDwTdOLOOT56qned5Vk2k_1732728180 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/02/24. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/24aedec98e4ec42274a223eb41ffd85c56f95e8e Thanks. Kevin --- >From 24aedec98e4ec42274a223eb41ffd85c56f95e8e Mon Sep 17 00:00:00 2001 From: Peter Spreadborough Date: Tue, 16 Apr 2024 14:15:56 -0400 Subject: [PATCH] net/bnxt: fix bad action offset in Tx BD [ upstream commit b019ddf9b1de65491b4c07c25bbab3dc70c15f79 ] This change ensures that the high part of an action table entry offset stored in the Tx BD is set correctly. A bad value will cause the PDCU to abort a fetch an may stall the pipeline. Fixes: 527b10089cc5 ("net/bnxt: optimize Tx completion handling") Signed-off-by: Peter Spreadborough Reviewed-by: Kishore Padmanabha Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_txr.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/net/bnxt/bnxt_txr.c b/drivers/net/bnxt/bnxt_txr.c index 14d0862548..955d7eb13c 100644 --- a/drivers/net/bnxt/bnxt_txr.c +++ b/drivers/net/bnxt/bnxt_txr.c @@ -235,8 +235,13 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt, txbd1->kid_or_ts_high_mss = 0; - if (txq->vfr_tx_cfa_action) - txbd1->cfa_action = txq->vfr_tx_cfa_action; - else - txbd1->cfa_action = txq->bp->tx_cfa_action; + if (txq->vfr_tx_cfa_action) { + txbd1->cfa_action = txq->vfr_tx_cfa_action & 0xffff; + txbd1->cfa_action_high = (txq->vfr_tx_cfa_action >> 16) & + TX_BD_LONG_CFA_ACTION_HIGH_MASK; + } else { + txbd1->cfa_action = txq->bp->tx_cfa_action & 0xffff; + txbd1->cfa_action_high = (txq->bp->tx_cfa_action >> 16) & + TX_BD_LONG_CFA_ACTION_HIGH_MASK; + } if (tx_pkt->ol_flags & RTE_MBUF_F_TX_TCP_SEG) { -- 2.47.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-27 17:17:41.403877248 +0000 +++ 0100-net-bnxt-fix-bad-action-offset-in-Tx-BD.patch 2024-11-27 17:17:38.312269824 +0000 @@ -1 +1 @@ -From b019ddf9b1de65491b4c07c25bbab3dc70c15f79 Mon Sep 17 00:00:00 2001 +From 24aedec98e4ec42274a223eb41ffd85c56f95e8e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b019ddf9b1de65491b4c07c25bbab3dc70c15f79 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 38f858f27f..c82b11e733 100644 +index 14d0862548..955d7eb13c 100644 @@ -24 +25 @@ -@@ -309,8 +309,13 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt, +@@ -235,8 +235,13 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt, @@ -41 +42 @@ - if (tx_pkt->ol_flags & RTE_MBUF_F_TX_TCP_SEG || + if (tx_pkt->ol_flags & RTE_MBUF_F_TX_TCP_SEG) {