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 2A687A054A for ; Tue, 25 Oct 2022 17:09:46 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2721D42C51; Tue, 25 Oct 2022 17:09:46 +0200 (CEST) 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 C338842C3C for ; Tue, 25 Oct 2022 17:09:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666710584; 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=8jeE8Zre4NvmH/KrGkg9ps7Pc9a+TkRuZlnLzwfqJa0=; b=WyrCVGNNAQ+KC3qC01uf3laIXCNlF0WjUTfThYt/UbTqHXGDM5Nfp8VeKC75c5uPBnjHFA eUsrFnIUHz5mjMwxSSrjVLTeMozcHpnKLzPoiOFuSQ+IW5fkIqz+e0KFMTtajLMcYD6nRF ms0WD/+GAw5RyjcyGFKfRO4oiC4DxXo= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-30-KgCI4ET-O1mFjI-OOIUIYw-1; Tue, 25 Oct 2022 11:09:41 -0400 X-MC-Unique: KgCI4ET-O1mFjI-OOIUIYw-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 84072101A56C; Tue, 25 Oct 2022 15:09:40 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id BE20749BB60; Tue, 25 Oct 2022 15:09:39 +0000 (UTC) From: Kevin Traynor To: Hanumanth Pothula Cc: dpdk stable Subject: patch 'net/cnxk: fix DF bit in vector mode' has been queued to stable release 21.11.3 Date: Tue, 25 Oct 2022 16:07:09 +0100 Message-Id: <20221025150734.142189-74-ktraynor@redhat.com> In-Reply-To: <20221025150734.142189-1-ktraynor@redhat.com> References: <20221025150734.142189-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 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.3 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/01/22. 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/1747e299c284bb61fb6d8ce11290285240605e4b Thanks. Kevin --- >From 1747e299c284bb61fb6d8ce11290285240605e4b Mon Sep 17 00:00:00 2001 From: Hanumanth Pothula Date: Thu, 1 Sep 2022 11:58:02 +0530 Subject: [PATCH] net/cnxk: fix DF bit in vector mode [ upstream commit 8a96c7f8a5d7a394eafc94c28a6d30a98a855118 ] In vector mode, DF bit is not programmed correctly, as the return value of vsetq_lane_u64() is ignored, which actually contains the updated value, leading HW to free mbufs though NIX_TX_OFFLOAD_MBUF_NOFF_F flag is set. Hence, save return value of vsetq_lane_u64() appropriately so that DF bit is programmed correctly. Fixes: 862e28128707 ("net/cnxk: add vector Tx for CN9K") Fixes: f71b7dbbf04b ("net/cnxk: add vector Tx for CN10K") Signed-off-by: Hanumanth Pothula --- drivers/net/cnxk/cn10k_tx.h | 8 ++++---- drivers/net/cnxk/cn9k_tx.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/cnxk/cn10k_tx.h b/drivers/net/cnxk/cn10k_tx.h index 6704d2d655..a28c9a7e22 100644 --- a/drivers/net/cnxk/cn10k_tx.h +++ b/drivers/net/cnxk/cn10k_tx.h @@ -2351,5 +2351,5 @@ again: if (cnxk_nix_prefree_seg((struct rte_mbuf *)mbuf0)) - vsetq_lane_u64(0x80000, xmask01, 0); + xmask01 = vsetq_lane_u64(0x80000, xmask01, 0); else RTE_MEMPOOL_CHECK_COOKIES( @@ -2358,5 +2358,5 @@ again: if (cnxk_nix_prefree_seg((struct rte_mbuf *)mbuf1)) - vsetq_lane_u64(0x80000, xmask01, 1); + xmask01 = vsetq_lane_u64(0x80000, xmask01, 1); else RTE_MEMPOOL_CHECK_COOKIES( @@ -2365,5 +2365,5 @@ again: if (cnxk_nix_prefree_seg((struct rte_mbuf *)mbuf2)) - vsetq_lane_u64(0x80000, xmask23, 0); + xmask23 = vsetq_lane_u64(0x80000, xmask23, 0); else RTE_MEMPOOL_CHECK_COOKIES( @@ -2372,5 +2372,5 @@ again: if (cnxk_nix_prefree_seg((struct rte_mbuf *)mbuf3)) - vsetq_lane_u64(0x80000, xmask23, 1); + xmask23 = vsetq_lane_u64(0x80000, xmask23, 1); else RTE_MEMPOOL_CHECK_COOKIES( diff --git a/drivers/net/cnxk/cn9k_tx.h b/drivers/net/cnxk/cn9k_tx.h index 8167313a15..66a59ab533 100644 --- a/drivers/net/cnxk/cn9k_tx.h +++ b/drivers/net/cnxk/cn9k_tx.h @@ -1626,5 +1626,5 @@ cn9k_nix_xmit_pkts_vector(void *tx_queue, struct rte_mbuf **tx_pkts, if (cnxk_nix_prefree_seg((struct rte_mbuf *)mbuf0)) - vsetq_lane_u64(0x80000, xmask01, 0); + xmask01 = vsetq_lane_u64(0x80000, xmask01, 0); else RTE_MEMPOOL_CHECK_COOKIES( @@ -1633,5 +1633,5 @@ cn9k_nix_xmit_pkts_vector(void *tx_queue, struct rte_mbuf **tx_pkts, if (cnxk_nix_prefree_seg((struct rte_mbuf *)mbuf1)) - vsetq_lane_u64(0x80000, xmask01, 1); + xmask01 = vsetq_lane_u64(0x80000, xmask01, 1); else RTE_MEMPOOL_CHECK_COOKIES( @@ -1640,5 +1640,5 @@ cn9k_nix_xmit_pkts_vector(void *tx_queue, struct rte_mbuf **tx_pkts, if (cnxk_nix_prefree_seg((struct rte_mbuf *)mbuf2)) - vsetq_lane_u64(0x80000, xmask23, 0); + xmask23 = vsetq_lane_u64(0x80000, xmask23, 0); else RTE_MEMPOOL_CHECK_COOKIES( @@ -1647,5 +1647,5 @@ cn9k_nix_xmit_pkts_vector(void *tx_queue, struct rte_mbuf **tx_pkts, if (cnxk_nix_prefree_seg((struct rte_mbuf *)mbuf3)) - vsetq_lane_u64(0x80000, xmask23, 1); + xmask23 = vsetq_lane_u64(0x80000, xmask23, 1); else RTE_MEMPOOL_CHECK_COOKIES( -- 2.37.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-10-25 14:19:00.228250825 +0100 +++ 0074-net-cnxk-fix-DF-bit-in-vector-mode.patch 2022-10-25 14:18:58.503798421 +0100 @@ -1 +1 @@ -From 8a96c7f8a5d7a394eafc94c28a6d30a98a855118 Mon Sep 17 00:00:00 2001 +From 1747e299c284bb61fb6d8ce11290285240605e4b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8a96c7f8a5d7a394eafc94c28a6d30a98a855118 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index b87fb29951..492942de15 100644 +index 6704d2d655..a28c9a7e22 100644 @@ -28 +29 @@ -@@ -2603,5 +2603,5 @@ again: +@@ -2351,5 +2351,5 @@ again: @@ -35 +36 @@ -@@ -2610,5 +2610,5 @@ again: +@@ -2358,5 +2358,5 @@ again: @@ -42 +43 @@ -@@ -2617,5 +2617,5 @@ again: +@@ -2365,5 +2365,5 @@ again: @@ -49 +50 @@ -@@ -2624,5 +2624,5 @@ again: +@@ -2372,5 +2372,5 @@ again: @@ -57 +58 @@ -index 6ce81f5c96..a609814dfb 100644 +index 8167313a15..66a59ab533 100644 @@ -60 +61 @@ -@@ -1706,5 +1706,5 @@ cn9k_nix_xmit_pkts_vector(void *tx_queue, struct rte_mbuf **tx_pkts, +@@ -1626,5 +1626,5 @@ cn9k_nix_xmit_pkts_vector(void *tx_queue, struct rte_mbuf **tx_pkts, @@ -67 +68 @@ -@@ -1713,5 +1713,5 @@ cn9k_nix_xmit_pkts_vector(void *tx_queue, struct rte_mbuf **tx_pkts, +@@ -1633,5 +1633,5 @@ cn9k_nix_xmit_pkts_vector(void *tx_queue, struct rte_mbuf **tx_pkts, @@ -74 +75 @@ -@@ -1720,5 +1720,5 @@ cn9k_nix_xmit_pkts_vector(void *tx_queue, struct rte_mbuf **tx_pkts, +@@ -1640,5 +1640,5 @@ cn9k_nix_xmit_pkts_vector(void *tx_queue, struct rte_mbuf **tx_pkts, @@ -81 +82 @@ -@@ -1727,5 +1727,5 @@ cn9k_nix_xmit_pkts_vector(void *tx_queue, struct rte_mbuf **tx_pkts, +@@ -1647,5 +1647,5 @@ cn9k_nix_xmit_pkts_vector(void *tx_queue, struct rte_mbuf **tx_pkts,