[dpdk-stable] patch 'rawdev: allow getting info for unknown device' has been queued to stable release 19.11.4

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.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 07/26/20. 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.

Thanks.

Luca Boccassi

---
>From 2e4b38d8f9ad20fa84486315ae9e117cb037a8c1 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
Date: Mon, 6 Jul 2020 11:31:30 +0100
Subject: [PATCH] rawdev: allow getting info for unknown device

[ upstream commit 201a68c67839b879b39aa897b6bdb024a49ae436 ]

To call the rte_rawdev_info_get() function, the user currently has to know
the underlying type of the device in order to pass an appropriate structure
or buffer as the dev_private pointer in the info structure. By allowing a
NULL value for this field, we can skip getting the device-specific info and
just return the generic info - including the device name and driver, which
can be used to determine the device type - to the user.

This ensures that basic info can be get for all rawdevs, without knowing
the type, and even if the info driver API call has not been implemented for
the device.

Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: Hemant Agrawal <hemant.agrawal at nxp.com>
---
 lib/librte_rawdev/rte_rawdev.c | 6 ++++--
 lib/librte_rawdev/rte_rawdev.h | 8 +++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/lib/librte_rawdev/rte_rawdev.c b/lib/librte_rawdev/rte_rawdev.c
index b6f1e1c77..f6efa6b67 100644
--- a/lib/librte_rawdev/rte_rawdev.c
+++ b/lib/librte_rawdev/rte_rawdev.c
@@ -89,8 +89,10 @@ rte_rawdev_info_get(uint16_t dev_id, struct rte_rawdev_info *dev_info)
 
 	rawdev = &rte_rawdevs[dev_id];
 
-	RTE_FUNC_PTR_OR_ERR_RET(*rawdev->dev_ops->dev_info_get, -ENOTSUP);
-	(*rawdev->dev_ops->dev_info_get)(rawdev, dev_info->dev_private);
+	if (dev_info->dev_private != NULL) {
+		RTE_FUNC_PTR_OR_ERR_RET(*rawdev->dev_ops->dev_info_get, -ENOTSUP);
+		(*rawdev->dev_ops->dev_info_get)(rawdev, dev_info->dev_private);
+	}
 
 	if (dev_info) {
 
diff --git a/lib/librte_rawdev/rte_rawdev.h b/lib/librte_rawdev/rte_rawdev.h
index 7a1f3213e..32f6b8bb0 100644
--- a/lib/librte_rawdev/rte_rawdev.h
+++ b/lib/librte_rawdev/rte_rawdev.h
@@ -74,7 +74,13 @@ struct rte_rawdev_info;
  *
  * @param[out] dev_info
  *   A pointer to a structure of type *rte_rawdev_info* to be filled with the
- *   contextual information of the device.
+ *   contextual information of the device. The dev_info->dev_private field
+ *   should point to an appropriate buffer space for holding the device-
+ *   specific info for that hardware.
+ *   If the dev_private field is set to NULL, then the device-specific info
+ *   function will not be called and only basic information about the device
+ *   will be returned. This can be used to safely query the type of a rawdev
+ *   instance without needing to know the size of the private data to return.
  *
  * @return
  *   - 0: Success, driver updates the contextual information of the raw device
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-07-24 12:53:51.872395908 +0100
+++ 0086-rawdev-allow-getting-info-for-unknown-device.patch	2020-07-24 12:53:48.311006907 +0100
@@ -1,8 +1,10 @@
-From 201a68c67839b879b39aa897b6bdb024a49ae436 Mon Sep 17 00:00:00 2001
+From 2e4b38d8f9ad20fa84486315ae9e117cb037a8c1 Mon Sep 17 00:00:00 2001
 From: Bruce Richardson <bruce.richardson at intel.com>
 Date: Mon, 6 Jul 2020 11:31:30 +0100
 Subject: [PATCH] rawdev: allow getting info for unknown device
 
+[ upstream commit 201a68c67839b879b39aa897b6bdb024a49ae436 ]
+
 To call the rte_rawdev_info_get() function, the user currently has to know
 the underlying type of the device in order to pass an appropriate structure
 or buffer as the dev_private pointer in the info structure. By allowing a
@@ -14,8 +16,6 @@
 the type, and even if the info driver API call has not been implemented for
 the device.
 
-Cc: stable at dpdk.org
-
 Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
 Acked-by: Hemant Agrawal <hemant.agrawal at nxp.com>
 ---
@@ -24,10 +24,10 @@
  2 files changed, 11 insertions(+), 3 deletions(-)
 
 diff --git a/lib/librte_rawdev/rte_rawdev.c b/lib/librte_rawdev/rte_rawdev.c
-index 2eb7b3bc3..e634a567f 100644
+index b6f1e1c77..f6efa6b67 100644
 --- a/lib/librte_rawdev/rte_rawdev.c
 +++ b/lib/librte_rawdev/rte_rawdev.c
-@@ -87,8 +87,10 @@ rte_rawdev_info_get(uint16_t dev_id, struct rte_rawdev_info *dev_info)
+@@ -89,8 +89,10 @@ rte_rawdev_info_get(uint16_t dev_id, struct rte_rawdev_info *dev_info)
  
  	rawdev = &rte_rawdevs[dev_id];