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 5E38A43CAD for ; Thu, 14 Mar 2024 01:11:48 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5625242E5D; Thu, 14 Mar 2024 01:11:48 +0100 (CET) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mails.dpdk.org (Postfix) with ESMTP id 1F08042E5D for ; Thu, 14 Mar 2024 01:11:45 +0100 (CET) Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-413ef6985bfso2519715e9.3 for ; Wed, 13 Mar 2024 17:11:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710375105; x=1710979905; 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=n7DXExMWNBShYk3aXv7JPvU6eBXKVv0iyLE3irN5hvM=; b=WxGN8iXFQhifmndW00GuvNjrsDB5VGzWWNjoIGhPgfjRJDgTj9Vk5mighHbTW7k8KV eh/EYeVGH8UASXTCGavtnGnndb6jTSNwFoMEhbTcHBk88P2Wb+0EZbUoFUVILQRIzTxJ 7DoHvBYKfqaLS4jJOsVc1r6kf73LzyGEBMeQczWC4Sgx/rmJ0y/7wNtfPe3W/VjhIRja MePoQuTKWAY8ZMEkw/rAlQnJ1BdLy68kLsHI4T9nC2prbi0fnKAMHhzyq7CYHbh4qByi z0tn6+0YSCUHPobAKdwIYwQwjzOar6GStdQVG/KIUze+f1GnQKC62dg1GCZcNnZ4r4x2 VMOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710375105; x=1710979905; 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=n7DXExMWNBShYk3aXv7JPvU6eBXKVv0iyLE3irN5hvM=; b=aO4PfxG95SbO8YLlcsGFzh0QDfsbf7bT5zWwM5rag/t+4N1vq16LK5SRCdfjnho16E MuR9bWG6FWTLqC54jnHdFQoEs8L4tw0kpBvwkY7VRYZi7SCUpeD7CeHMmN22JSirk/YX qE/0pbKhOQza8d4BhJONJ35Z/DdktZSHb//xdBXfj8r/D+jNc1Th81nHO+/b5hVs5B7A vn4H1UsAjGcrwbstvK3xWgFETQVpeqmctmRcjf3Y/wF8vv2kACCuwtm0PCBr2wMcB1OD XlFlKWrnhyrgrjPDUfOkzWCqfz86dbQHpB3P5NIdcaxH8tkSBA+jOEIOU1Q5sv0ExLte UHwg== X-Gm-Message-State: AOJu0YxU/8qKfeqKN7e9F0a34j6T0mE1KvuMgKeWTNYOlWdQFHDQh47s XAaWEgzL4s6lDD8fuM47HKZIpbTHF5bU+HtpW1b1WPfxOmlymJPIhuN3Vh1q X-Google-Smtp-Source: AGHT+IEsM80yoO8uhh9JV4KRM0yZIZFGOCe/TG2by+wLrG8vT6m9Qmv5V82OM2dgPCv38wi/2gzviw== X-Received: by 2002:a05:600c:4588:b0:413:f1c0:789 with SMTP id r8-20020a05600c458800b00413f1c00789mr197063wmo.41.1710375104735; Wed, 13 Mar 2024 17:11:44 -0700 (PDT) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id s9-20020a05600c45c900b00413e79344b7sm604210wmo.19.2024.03.13.17.11.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 17:11:44 -0700 (PDT) From: luca.boccassi@gmail.com To: Rahul Bhansali Cc: dpdk stable Subject: patch 'net/cnxk: fix mbuf fields in multi-segment Tx' has been queued to stable release 22.11.5 Date: Thu, 14 Mar 2024 00:09:30 +0000 Message-Id: <20240314000957.2810803-34-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240314000957.2810803-1-luca.boccassi@gmail.com> References: <20240307013159.1735343-102-luca.boccassi@gmail.com> <20240314000957.2810803-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.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/16/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/ba9eb97868d388f29899a6a612ff4cfd393c6a37 Thanks. Luca Boccassi --- >From ba9eb97868d388f29899a6a612ff4cfd393c6a37 Mon Sep 17 00:00:00 2001 From: Rahul Bhansali Date: Mon, 26 Feb 2024 19:05:36 +0530 Subject: [PATCH] net/cnxk: fix mbuf fields in multi-segment Tx [ upstream commit 8ed5ca4dda858c991b27ad6ce5a5525e26a960c0 ] Currently in debug mode when a buffer is allocated in SW, nb_segs will have invalid values as it didn't come from driver Rx path. Hence reset mbuf next and nb_segs fields in multi-seg Tx path. Fixes: 3626d5195d49 ("net/cnxk: add multi-segment Tx for CN10K") Signed-off-by: Rahul Bhansali --- drivers/net/cnxk/cn10k_tx.h | 2 ++ drivers/net/cnxk/cn9k_tx.h | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/drivers/net/cnxk/cn10k_tx.h b/drivers/net/cnxk/cn10k_tx.h index 0e7280bd56..254ddf0536 100644 --- a/drivers/net/cnxk/cn10k_tx.h +++ b/drivers/net/cnxk/cn10k_tx.h @@ -943,6 +943,7 @@ cn10k_nix_prepare_mseg(struct rte_mbuf *m, uint64_t *cmd, const uint16_t flags) len -= sg_u & 0xFFFF; nb_segs = m->nb_segs - 1; m_next = m->next; + m->nb_segs = 1; slist = &cmd[3 + off + 1]; /* Set invert df if buffer is not to be freed by H/W */ @@ -1404,6 +1405,7 @@ cn10k_nix_prepare_mseg_vec_list(struct rte_mbuf *m, uint64_t *cmd, #endif m->next = NULL; + m->nb_segs = 1; m = m_next; /* Fill mbuf segments */ do { diff --git a/drivers/net/cnxk/cn9k_tx.h b/drivers/net/cnxk/cn9k_tx.h index 7362025a34..257f1ce1aa 100644 --- a/drivers/net/cnxk/cn9k_tx.h +++ b/drivers/net/cnxk/cn9k_tx.h @@ -448,6 +448,10 @@ cn9k_nix_prepare_mseg(struct rte_mbuf *m, uint64_t *cmd, const uint16_t flags) if (!(sg_u & (1ULL << 55))) RTE_MEMPOOL_CHECK_COOKIES(m->pool, (void **)&m, 1, 0); rte_io_wmb(); +#endif +#ifdef RTE_ENABLE_ASSERT + m->next = NULL; + m->nb_segs = 1; #endif m = m_next; if (!m) @@ -483,6 +487,9 @@ cn9k_nix_prepare_mseg(struct rte_mbuf *m, uint64_t *cmd, const uint16_t flags) sg_u = sg->u; slist++; } +#ifdef RTE_ENABLE_ASSERT + m->next = NULL; +#endif m = m_next; } while (nb_segs); @@ -496,6 +503,9 @@ done: segdw += (off >> 1) + 1 + !!(flags & NIX_TX_OFFLOAD_TSTAMP_F); send_hdr->w0.sizem1 = segdw - 1; +#ifdef RTE_ENABLE_ASSERT + rte_io_wmb(); +#endif return segdw; } @@ -699,6 +709,10 @@ cn9k_nix_prepare_mseg_vec_list(struct rte_mbuf *m, uint64_t *cmd, rte_io_wmb(); #endif +#ifdef RTE_ENABLE_ASSERT + m->next = NULL; + m->nb_segs = 1; +#endif m = m_next; /* Fill mbuf segments */ do { @@ -728,6 +742,9 @@ cn9k_nix_prepare_mseg_vec_list(struct rte_mbuf *m, uint64_t *cmd, sg_u = sg->u; slist++; } +#ifdef RTE_ENABLE_ASSERT + m->next = NULL; +#endif m = m_next; } while (nb_segs); @@ -743,6 +760,9 @@ cn9k_nix_prepare_mseg_vec_list(struct rte_mbuf *m, uint64_t *cmd, !!(flags & NIX_TX_OFFLOAD_TSTAMP_F); sh->sizem1 = segdw - 1; +#ifdef RTE_ENABLE_ASSERT + rte_io_wmb(); +#endif return segdw; } -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-14 00:09:22.269809144 +0000 +++ 0034-net-cnxk-fix-mbuf-fields-in-multi-segment-Tx.patch 2024-03-14 00:09:20.621615380 +0000 @@ -1 +1 @@ -From 8ed5ca4dda858c991b27ad6ce5a5525e26a960c0 Mon Sep 17 00:00:00 2001 +From ba9eb97868d388f29899a6a612ff4cfd393c6a37 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8ed5ca4dda858c991b27ad6ce5a5525e26a960c0 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 91b7f15c02..266c899a05 100644 +index 0e7280bd56..254ddf0536 100644 @@ -23 +24,2 @@ -@@ -1277,6 +1277,7 @@ cn10k_nix_prepare_mseg(struct cn10k_eth_txq *txq, +@@ -943,6 +943,7 @@ cn10k_nix_prepare_mseg(struct rte_mbuf *m, uint64_t *cmd, const uint16_t flags) + len -= sg_u & 0xFFFF; @@ -26 +27,0 @@ - m->next = NULL; @@ -30,4 +31,4 @@ - cookie = RTE_MBUF_DIRECT(m) ? m : rte_mbuf_from_indirect(m); -@@ -1822,6 +1823,7 @@ cn10k_nix_prepare_mseg_vec_list(struct rte_mbuf *m, uint64_t *cmd, - nb_segs = m->nb_segs - 1; - m_next = m->next; + /* Set invert df if buffer is not to be freed by H/W */ +@@ -1404,6 +1405,7 @@ cn10k_nix_prepare_mseg_vec_list(struct rte_mbuf *m, uint64_t *cmd, + #endif + @@ -40 +41 @@ -index 3596651cc2..94acbe64fa 100644 +index 7362025a34..257f1ce1aa 100644 @@ -43 +44,3 @@ -@@ -647,6 +647,10 @@ cn9k_nix_prepare_mseg(struct cn9k_eth_txq *txq, +@@ -448,6 +448,10 @@ cn9k_nix_prepare_mseg(struct rte_mbuf *m, uint64_t *cmd, const uint16_t flags) + if (!(sg_u & (1ULL << 55))) + RTE_MEMPOOL_CHECK_COOKIES(m->pool, (void **)&m, 1, 0); @@ -45,2 +47,0 @@ - #else - RTE_SET_USED(cookie); @@ -54 +55 @@ -@@ -683,6 +687,9 @@ cn9k_nix_prepare_mseg(struct cn9k_eth_txq *txq, +@@ -483,6 +487,9 @@ cn9k_nix_prepare_mseg(struct rte_mbuf *m, uint64_t *cmd, const uint16_t flags) @@ -64 +65 @@ -@@ -696,6 +703,9 @@ done: +@@ -496,6 +503,9 @@ done: @@ -74,2 +75,2 @@ -@@ -912,6 +922,10 @@ cn9k_nix_prepare_mseg_vec_list(struct cn9k_eth_txq *txq, - RTE_SET_USED(cookie); +@@ -699,6 +709,10 @@ cn9k_nix_prepare_mseg_vec_list(struct rte_mbuf *m, uint64_t *cmd, + rte_io_wmb(); @@ -85 +86 @@ -@@ -942,6 +956,9 @@ cn9k_nix_prepare_mseg_vec_list(struct cn9k_eth_txq *txq, +@@ -728,6 +742,9 @@ cn9k_nix_prepare_mseg_vec_list(struct rte_mbuf *m, uint64_t *cmd, @@ -95 +96 @@ -@@ -957,6 +974,9 @@ cn9k_nix_prepare_mseg_vec_list(struct cn9k_eth_txq *txq, +@@ -743,6 +760,9 @@ cn9k_nix_prepare_mseg_vec_list(struct rte_mbuf *m, uint64_t *cmd, @@ -97 +98 @@ - send_hdr->w0.sizem1 = segdw - 1; + sh->sizem1 = segdw - 1;