patch 'bus/auxiliary: prevent device from being probed again' has been queued to stable release 21.11.3

Kevin Traynor ktraynor at redhat.com
Wed Nov 23 19:03:24 CET 2022


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/28/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/4468cce76b42c4030f3e32aa15f9d8745a54ee2f

Thanks.

Kevin

---
>From 4468cce76b42c4030f3e32aa15f9d8745a54ee2f Mon Sep 17 00:00:00 2001
From: Bing Zhao <bingz at nvidia.com>
Date: Wed, 9 Nov 2022 16:53:56 +0200
Subject: [PATCH] bus/auxiliary: prevent device from being probed again

[ upstream commit bc967149967fdf504249c3cc13d307a9c16193cc ]

The device on auxiliary bus doesn't support being probed again
without being removed firstly. The PMD will detect and return error
for this unsupported operation. Some of the resources would be
cleared wrongly. When quitting, there will be unexpected error like
crash.

To prevent this, the device driver will be checked before probing a
device.

Fixes: 1afce3086cf4 ("bus/auxiliary: introduce auxiliary bus")

Signed-off-by: Bing Zhao <bingz at nvidia.com>
Reviewed-by: Gregory Etelson <getelson at nvidia.com>
Reviewed-by: Matan Azrad <matan at nvidia.com>
---
 drivers/bus/auxiliary/auxiliary_common.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/bus/auxiliary/auxiliary_common.c b/drivers/bus/auxiliary/auxiliary_common.c
index 2cf8fe672d..a6b4b3de84 100644
--- a/drivers/bus/auxiliary/auxiliary_common.c
+++ b/drivers/bus/auxiliary/auxiliary_common.c
@@ -114,4 +114,10 @@ rte_auxiliary_probe_one_driver(struct rte_auxiliary_driver *drv,
 	}
 
+	if (rte_dev_is_probed(&dev->device)) {
+		RTE_LOG(DEBUG, EAL, "Device %s is already probed on auxiliary bus\n",
+			dev->device.name);
+		return -EEXIST;
+	}
+
 	iova_mode = rte_eal_iova_mode();
 	if ((drv->drv_flags & RTE_AUXILIARY_DRV_NEED_IOVA_AS_VA) > 0 &&
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:57.371796227 +0000
+++ 0011-bus-auxiliary-prevent-device-from-being-probed-again.patch	2022-11-23 09:55:57.016149173 +0000
@@ -1 +1 @@
-From bc967149967fdf504249c3cc13d307a9c16193cc Mon Sep 17 00:00:00 2001
+From 4468cce76b42c4030f3e32aa15f9d8745a54ee2f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit bc967149967fdf504249c3cc13d307a9c16193cc ]
+
@@ -16 +17,0 @@
-CC: stable at dpdk.org
@@ -26 +27 @@
-index 6bb1fe7c96..ff1369353a 100644
+index 2cf8fe672d..a6b4b3de84 100644
@@ -29,2 +30,2 @@
-@@ -109,4 +109,10 @@ rte_auxiliary_probe_one_driver(struct rte_auxiliary_driver *drv,
- 		RTE_LOG(INFO, EAL, "Device %s is not NUMA-aware\n", dev->name);
+@@ -114,4 +114,10 @@ rte_auxiliary_probe_one_driver(struct rte_auxiliary_driver *drv,
+ 	}



More information about the stable mailing list