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 6EC0145D5D for ; Thu, 21 Nov 2024 00:42:30 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 67BD043278; Thu, 21 Nov 2024 00:42:30 +0100 (CET) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mails.dpdk.org (Postfix) with ESMTP id 5D56443278 for ; Thu, 21 Nov 2024 00:42:29 +0100 (CET) Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-4315abed18aso2202695e9.2 for ; Wed, 20 Nov 2024 15:42:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1732146149; x=1732750949; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mKmtu8DOvvi6G00B+LWcnjqeehGa0XOTYCPLlwIeSNQ=; b=Y0FnK+CYq1+3TQNfyyAJFiHookTqE4VELDItAMGA8aR57tM95KRYoFo/a5L1FgjXIi 5TnrgCbgkljh7lspFn/icVTe1HxcygBgO8ln/JxKOGUdyJnYpGIFZ8QhwxquabUQuYyd ksbLxD4NJ4pMXPoUUI1Rnkys1MzEH+pfOVearcxV6Ue2zoJ2Kk22H9pgkmqNKTe8/865 maOgTUVaj+qpqGQ3TCiCxqndZGt/9o1gja/uQ6/B1i3ULyiAiwicH3Lblz0DeVuYe3mH 3h5OiuWYfLgup3vpuXeW7es/up3FQWzY1/6skXaYRejMi+N/xT3RJBdJ5GWzXlIe8T3u mheQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732146149; x=1732750949; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mKmtu8DOvvi6G00B+LWcnjqeehGa0XOTYCPLlwIeSNQ=; b=hqnXk52nGFXpW/Cjyoppd5C0mSt8+oyFLY3uOOCkdYdVu00dwWJxnRW3dKNCRcm9It Czb6XvEwwr02DjkX8wg2pQy8iCE9rcT9IB3MAd2+2sC/P58XXrcUDKUIfHDf+4E2DR5O U+JbrHAH8Nft5KmXqR3NBfrvHtmtzfc/TZX18V61z807XhPdcHsNGRaKaRezIetgaDUm rNQoRCHW9Y7DEuu9QvoAQCmv1YIFmAjOcGLXcc8qfbMB4gFJLIb01G0ejzJGSiynPp/M SZAr90sHQe+gqLi3p4+aJk95+HykxP03ynCdX/mF6TgKzVSy6FUyd7OaL+jhYJKOUOy2 s9Cw== X-Forwarded-Encrypted: i=1; AJvYcCVf0IoB59ed8rIJeucji1TGymzPXbos7UZ4P20jYIrm7uC7vdHqUf1M5O0wfDxS9ZrNtBhmcME=@dpdk.org X-Gm-Message-State: AOJu0YxVdZ2wyC4BxwdnoCLT4PMt3hNN95CVkvkBTrsULoEy0W7XrKCq ImoRBAZrebTou464x8o7xue6gfC6sC95xWtL6a1r45O/riUWB4hM8LIZu8u+ X-Google-Smtp-Source: AGHT+IFX1B5i7hNrdf4bnofueEEUvnNiCpbe50zj+KCVnJ4rVmRMZt0jHY7nNqW5qSpQ39+g3OOtxA== X-Received: by 2002:a05:600c:1908:b0:432:d82d:6a6c with SMTP id 5b1f17b1804b1-4334f02a5c9mr43613195e9.30.1732146148843; Wed, 20 Nov 2024 15:42:28 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:21cd:def0:a01d:d2aa]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-433b46339easm35727505e9.30.2024.11.20.15.42.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Nov 2024 15:42:28 -0800 (PST) From: luca.boccassi@gmail.com 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 22.11.7 Date: Wed, 20 Nov 2024 23:41:30 +0000 Message-ID: <20241120234215.233355-5-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241120234215.233355-1-luca.boccassi@gmail.com> References: <20241112220754.666489-40-luca.boccassi@gmail.com> <20241120234215.233355-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/22/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/a73ed9bb245e219ead9af9e1c7327b8180760cf0 Thanks. Luca Boccassi --- >From a73ed9bb245e219ead9af9e1c7327b8180760cf0 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 1f17d77516..7820d11cc2 100644 --- a/drivers/net/bnxt/bnxt_txr.c +++ b/drivers/net/bnxt/bnxt_txr.c @@ -255,10 +255,15 @@ 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) { uint16_t hdr_size; -- 2.45.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-20 23:41:22.924352683 +0000 +++ 0005-net-bnxt-fix-bad-action-offset-in-Tx-BD.patch 2024-11-20 23:41:22.688195466 +0000 @@ -1 +1 @@ -From b019ddf9b1de65491b4c07c25bbab3dc70c15f79 Mon Sep 17 00:00:00 2001 +From a73ed9bb245e219ead9af9e1c7327b8180760cf0 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 1f17d77516..7820d11cc2 100644 @@ -24 +25 @@ -@@ -308,10 +308,15 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt, +@@ -255,10 +255,15 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt, @@ -42,2 +43,2 @@ - if (tx_pkt->ol_flags & RTE_MBUF_F_TX_TCP_SEG || - tx_pkt->ol_flags & RTE_MBUF_F_TX_UDP_SEG) { + if (tx_pkt->ol_flags & RTE_MBUF_F_TX_TCP_SEG) { + uint16_t hdr_size;