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

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.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 04/09/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/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/2ee1c5556735ef6f2021a5357a72f8ab23a8c227

Thanks.

Kevin

---
>From 2ee1c5556735ef6f2021a5357a72f8ab23a8c227 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

[ 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 2e60e2b813..d7ac5b5247 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1390,4 +1390,5 @@ 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>
diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c
index da9635507e..32d1036c4f 100644
--- a/drivers/net/vmxnet3/vmxnet3_ethdev.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c
@@ -1690,4 +1690,5 @@ 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;
 
@@ -1695,4 +1696,5 @@ vmxnet3_dev_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id)
 			    rte_intr_vec_list_index_get(dev->intr_handle,
 							       queue_id));
+#endif
 
 	return 0;
-- 
2.44.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-04-04 10:49:34.393440246 +0100
+++ 0015-net-vmxnet3-ignore-Rx-queue-interrupt-setup-on-FreeB.patch	2024-04-04 10:49:33.756457753 +0100
@@ -1 +1 @@
-From 19fede459e0d22f5ac891366465dce07e68196bc Mon Sep 17 00:00:00 2001
+From 2ee1c5556735ef6f2021a5357a72f8ab23a8c227 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 19fede459e0d22f5ac891366465dce07e68196bc ]
+
@@ -14 +15,0 @@
-Cc: stable at dpdk.org
@@ -24 +25 @@
-index a0b19832b5..491af1f6ff 100644
+index 2e60e2b813..d7ac5b5247 100644
@@ -27 +28 @@
-@@ -1459,4 +1459,5 @@ Tomasz Zawadzki <tomasz.zawadzki at intel.com>
+@@ -1390,4 +1390,5 @@ Tomasz Zawadzki <tomasz.zawadzki at intel.com>
@@ -34 +35 @@
-index 2707b25148..ce7c347254 100644
+index da9635507e..32d1036c4f 100644
@@ -37 +38 @@
-@@ -1937,4 +1937,5 @@ static int
+@@ -1690,4 +1690,5 @@ static int
@@ -43 +44 @@
-@@ -1942,4 +1943,5 @@ vmxnet3_dev_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id)
+@@ -1695,4 +1696,5 @@ vmxnet3_dev_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id)