patch 'net/vmxnet3: ignore Rx queue interrupt setup on FreeBSD' has been queued to stable release 23.11.1

Xueming Li xuemingl at nvidia.com
Sat Apr 13 14:49:55 CEST 2024


Hi,

FYI, your patch has been queued to stable release 23.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 04/15/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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=07fde8240d6ad3bbf6a42b515d12d8a1bec650ca

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 07fde8240d6ad3bbf6a42b515d12d8a1bec650ca Mon Sep 17 00:00:00 2001
From: Tom Jones <thj at freebsd.org>
Date: Thu, 21 Mar 2024 10:31:33 +0000
Subject: [PATCH] net/vmxnet3: ignore Rx queue interrupt setup on FreeBSD
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 19fede459e0d22f5ac891366465dce07e68196bc ]

Interrupts disabled on FreeBSD for the vmxnet3 driver as they are not
supported. Rx queue interrupts were missed by this change, don't
attempt to enable them on FreeBSD.

Without this change applications enabling interrupts encounter an
immediate abort on FreeBSD.

Fixes: 40d5676ff1ea ("net/vmxnet3: fix initialization on FreeBSD")

Signed-off-by: Tom Jones <thj at freebsd.org>
Acked-by: Ferruh Yigit <ferruh.yigit at amd.com>
---
 .mailmap                             | 1 +
 drivers/net/vmxnet3/vmxnet3_ethdev.c | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/.mailmap b/.mailmap
index 57e72894c0..69ef5145a9 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1446,6 +1446,7 @@ Tomasz Kulasek <tomaszx.kulasek at intel.com>
 Tomasz Zawadzki <tomasz.zawadzki at intel.com>
 Tom Barbette <barbette at kth.se> <tom.barbette at ulg.ac.be>
 Tom Crugnale <tcrugnale at sandvine.com>
+Tom Jones <thj at freebsd.org>
 Tom Millington <tmillington at solarflare.com>
 Tom Rix <trix at redhat.com>
 Tomer Shmilovich <tshmilovich at nvidia.com>
diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c
index 7032f0e324..70ae9c6035 100644
--- a/drivers/net/vmxnet3/vmxnet3_ethdev.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c
@@ -1932,11 +1932,13 @@ done:
 static int
 vmxnet3_dev_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id)
 {
+#ifndef RTE_EXEC_ENV_FREEBSD
 	struct vmxnet3_hw *hw = dev->data->dev_private;
 
 	vmxnet3_enable_intr(hw,
 			    rte_intr_vec_list_index_get(dev->intr_handle,
 							       queue_id));
+#endif
 
 	return 0;
 }
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-04-13 20:43:08.557236082 +0800
+++ 0115-net-vmxnet3-ignore-Rx-queue-interrupt-setup-on-FreeB.patch	2024-04-13 20:43:05.147753736 +0800
@@ -1 +1 @@
-From 19fede459e0d22f5ac891366465dce07e68196bc Mon Sep 17 00:00:00 2001
+From 07fde8240d6ad3bbf6a42b515d12d8a1bec650ca Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 19fede459e0d22f5ac891366465dce07e68196bc ]
@@ -14 +16,0 @@
-Cc: stable at dpdk.org
@@ -24 +26 @@
-index a0b19832b5..491af1f6ff 100644
+index 57e72894c0..69ef5145a9 100644
@@ -27 +29 @@
-@@ -1458,6 +1458,7 @@ Tomasz Kulasek <tomaszx.kulasek at intel.com>
+@@ -1446,6 +1446,7 @@ Tomasz Kulasek <tomaszx.kulasek at intel.com>
@@ -36 +38 @@
-index 2707b25148..ce7c347254 100644
+index 7032f0e324..70ae9c6035 100644
@@ -39 +41 @@
-@@ -1936,11 +1936,13 @@ done:
+@@ -1932,11 +1932,13 @@ done:


More information about the stable mailing list