patch 'net/sfc: account for data offset on Tx' has been queued to stable release 22.11.4

Xueming Li xuemingl at nvidia.com
Sun Oct 22 16:20:36 CEST 2023


Hi,

FYI, your patch has been queued to stable release 22.11.4

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/15/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=563e7c87dfb4b29b7e39b3851989b0a106f98a29

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 563e7c87dfb4b29b7e39b3851989b0a106f98a29 Mon Sep 17 00:00:00 2001
From: Viacheslav Galaktionov <viacheslav.galaktionov at arknetworks.am>
Date: Mon, 11 Sep 2023 14:47:41 +0400
Subject: [PATCH] net/sfc: account for data offset on Tx
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit e7694b080de025fbc4bb31fbe7eb149f20a10373 ]

Memory buffers passed by the application may contain private data,
which must not be sent to the NIC. Omit this private data by using
the actual data address instead of the default one.

Fixes: 3037e6cf3dde ("net/sfc: support regioned NIC DMA memory mapping type")

Signed-off-by: Viacheslav Galaktionov <viacheslav.galaktionov at arknetworks.am>
Reviewed-by: Ivan Malov <ivan.malov at arknetworks.am>
Reviewed-by: Andy Moreton <amoreton at xilinx.com>
Acked-by: Andrew Rybchenko <andrew.rybchenko at oktetlabs.ru>
---
 drivers/net/sfc/sfc_ef100_tx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/sfc/sfc_ef100_tx.c b/drivers/net/sfc/sfc_ef100_tx.c
index 4c2205f7a4..1b6374775f 100644
--- a/drivers/net/sfc/sfc_ef100_tx.c
+++ b/drivers/net/sfc/sfc_ef100_tx.c
@@ -405,7 +405,7 @@ sfc_ef100_tx_qdesc_send_create(const struct sfc_ef100_txq *txq,
 				m->l2_len + m->l3_len) >> 1;
 	}

-	rc = sfc_ef100_tx_map(txq, rte_mbuf_data_iova_default(m),
+	rc = sfc_ef100_tx_map(txq, rte_mbuf_data_iova(m),
 			      rte_pktmbuf_data_len(m), &dma_addr);
 	if (unlikely(rc != 0))
 		return rc;
--
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-10-22 22:17:34.738905000 +0800
+++ 0007-net-sfc-account-for-data-offset-on-Tx.patch	2023-10-22 22:17:34.126723700 +0800
@@ -1 +1 @@
-From e7694b080de025fbc4bb31fbe7eb149f20a10373 Mon Sep 17 00:00:00 2001
+From 563e7c87dfb4b29b7e39b3851989b0a106f98a29 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit e7694b080de025fbc4bb31fbe7eb149f20a10373 ]
@@ -11 +13,0 @@
-Cc: stable at dpdk.org


More information about the stable mailing list