patch 'common/mlx5: fix probing failure code' has been queued to stable release 21.11.1

Kevin Traynor ktraynor at redhat.com
Mon Feb 21 16:35:04 CET 2022


Hi,

FYI, your patch has been queued to stable release 21.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 02/26/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/bc3452d45d9e24820763ee0c16781b0ef2fa09ba

Thanks.

Kevin

---
>From bc3452d45d9e24820763ee0c16781b0ef2fa09ba Mon Sep 17 00:00:00 2001
From: Bing Zhao <bingz at nvidia.com>
Date: Mon, 17 Jan 2022 19:49:14 +0200
Subject: [PATCH] common/mlx5: fix probing failure code

[ upstream commit b4a4159d4e6323dd9ccd31d11cfe42bbc1e897f6 ]

While probing the device with unsupported class, the process should
fail because no appropriate driver was found. After traversing all
the drivers, an error value should be returned for the case.

In the previous implementation, zero value indicating probing success
was wrongly returned.

Fixes: ad435d320473 ("common/mlx5: add bus-agnostic layer")

Signed-off-by: Bing Zhao <bingz at nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo at nvidia.com>
---
 drivers/common/mlx5/mlx5_common.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/common/mlx5/mlx5_common.c b/drivers/common/mlx5/mlx5_common.c
index 185db4d004..47a541f5ef 100644
--- a/drivers/common/mlx5/mlx5_common.c
+++ b/drivers/common/mlx5/mlx5_common.c
@@ -645,5 +645,5 @@ drivers_probe(struct mlx5_common_device *cdev, uint32_t user_classes)
 	uint32_t enabled_classes = 0;
 	bool already_loaded;
-	int ret;
+	int ret = -EINVAL;
 
 	TAILQ_FOREACH(driver, &drivers_list, next) {
@@ -667,6 +667,8 @@ drivers_probe(struct mlx5_common_device *cdev, uint32_t user_classes)
 		enabled_classes |= driver->drv_class;
 	}
-	cdev->classes_loaded |= enabled_classes;
-	return 0;
+	if (!ret) {
+		cdev->classes_loaded |= enabled_classes;
+		return 0;
+	}
 probe_err:
 	/*
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-02-21 15:22:47.107665265 +0000
+++ 0115-common-mlx5-fix-probing-failure-code.patch	2022-02-21 15:22:44.237704455 +0000
@@ -1 +1 @@
-From b4a4159d4e6323dd9ccd31d11cfe42bbc1e897f6 Mon Sep 17 00:00:00 2001
+From bc3452d45d9e24820763ee0c16781b0ef2fa09ba Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b4a4159d4e6323dd9ccd31d11cfe42bbc1e897f6 ]
+
@@ -14 +15,0 @@
-Cc: stable at dpdk.org



More information about the stable mailing list