[v6] eventdev: add PCI probe named convenience function
Checks
Commit Message
Add new internal wrapper function for use by pci drivers as a
.probe function to attach to an event interface. Same as
rte_event_pmd_pci_probe, except the caller can specify the name.
Updated rte_event_pmd_pci_probe so as to not duplicate
code.
Signed-off-by: Timothy McDaniel <timothy.mcdaniel@intel.com>
Reviewed-by: Gage Eads <gage.eads@intel.com>
---
lib/librte_eventdev/rte_eventdev_pmd_pci.h | 45 ++++++++++++++++++++--------
lib/librte_eventdev/rte_eventdev_version.map | 3 ++
2 files changed, 35 insertions(+), 13 deletions(-)
Comments
On Thu, Oct 15, 2020 at 7:45 PM Timothy McDaniel
<timothy.mcdaniel@intel.com> wrote:
>
> Add new internal wrapper function for use by pci drivers as a
> .probe function to attach to an event interface. Same as
> rte_event_pmd_pci_probe, except the caller can specify the name.
>
> Updated rte_event_pmd_pci_probe so as to not duplicate
> code.
>
> Signed-off-by: Timothy McDaniel <timothy.mcdaniel@intel.com>
> Reviewed-by: Gage Eads <gage.eads@intel.com>
Applied to dpdk-next-eventdev/for-main. Thanks.
> ---
> lib/librte_eventdev/rte_eventdev_pmd_pci.h | 45 ++++++++++++++++++++--------
> lib/librte_eventdev/rte_eventdev_version.map | 3 ++
> 2 files changed, 35 insertions(+), 13 deletions(-)
>
> diff --git a/lib/librte_eventdev/rte_eventdev_pmd_pci.h b/lib/librte_eventdev/rte_eventdev_pmd_pci.h
> index 443cd38..5f238bf 100644
> --- a/lib/librte_eventdev/rte_eventdev_pmd_pci.h
> +++ b/lib/librte_eventdev/rte_eventdev_pmd_pci.h
> @@ -32,28 +32,25 @@ typedef int (*eventdev_pmd_pci_callback_t)(struct rte_eventdev *dev);
>
> /**
> * @internal
> - * Wrapper for use by pci drivers as a .probe function to attach to a event
> - * interface.
> + * Wrapper for use by pci drivers as a .probe function to attach to an event
> + * interface. Same as rte_event_pmd_pci_probe, except caller can specify
> + * the name.
> */
> +__rte_experimental
> static inline int
> -rte_event_pmd_pci_probe(struct rte_pci_driver *pci_drv,
> - struct rte_pci_device *pci_dev,
> - size_t private_data_size,
> - eventdev_pmd_pci_callback_t devinit)
> +rte_event_pmd_pci_probe_named(struct rte_pci_driver *pci_drv,
> + struct rte_pci_device *pci_dev,
> + size_t private_data_size,
> + eventdev_pmd_pci_callback_t devinit,
> + const char *name)
> {
> struct rte_eventdev *eventdev;
> -
> - char eventdev_name[RTE_EVENTDEV_NAME_MAX_LEN];
> -
> int retval;
>
> if (devinit == NULL)
> return -EINVAL;
>
> - rte_pci_device_name(&pci_dev->addr, eventdev_name,
> - sizeof(eventdev_name));
> -
> - eventdev = rte_event_pmd_allocate(eventdev_name,
> + eventdev = rte_event_pmd_allocate(name,
> pci_dev->device.numa_node);
> if (eventdev == NULL)
> return -ENOMEM;
> @@ -88,6 +85,28 @@ rte_event_pmd_pci_probe(struct rte_pci_driver *pci_drv,
> return -ENXIO;
> }
>
> +/**
> + * @internal
> + * Wrapper for use by pci drivers as a .probe function to attach to a event
> + * interface.
> + */
> +static inline int
> +rte_event_pmd_pci_probe(struct rte_pci_driver *pci_drv,
> + struct rte_pci_device *pci_dev,
> + size_t private_data_size,
> + eventdev_pmd_pci_callback_t devinit)
> +{
> + char eventdev_name[RTE_EVENTDEV_NAME_MAX_LEN];
> +
> + rte_pci_device_name(&pci_dev->addr, eventdev_name,
> + sizeof(eventdev_name));
> +
> + return rte_event_pmd_pci_probe_named(pci_drv,
> + pci_dev,
> + private_data_size,
> + devinit,
> + eventdev_name);
> +}
>
> /**
> * @internal
> diff --git a/lib/librte_eventdev/rte_eventdev_version.map b/lib/librte_eventdev/rte_eventdev_version.map
> index 3d9d0ca..88a3b6c 100644
> --- a/lib/librte_eventdev/rte_eventdev_version.map
> +++ b/lib/librte_eventdev/rte_eventdev_version.map
> @@ -134,4 +134,7 @@ EXPERIMENTAL {
> __rte_eventdev_trace_crypto_adapter_queue_pair_del;
> __rte_eventdev_trace_crypto_adapter_start;
> __rte_eventdev_trace_crypto_adapter_stop;
> +
> + # added in 20.11
> + rte_event_pmd_pci_probe_named;
> };
> --
> 2.6.4
>
@@ -32,28 +32,25 @@ typedef int (*eventdev_pmd_pci_callback_t)(struct rte_eventdev *dev);
/**
* @internal
- * Wrapper for use by pci drivers as a .probe function to attach to a event
- * interface.
+ * Wrapper for use by pci drivers as a .probe function to attach to an event
+ * interface. Same as rte_event_pmd_pci_probe, except caller can specify
+ * the name.
*/
+__rte_experimental
static inline int
-rte_event_pmd_pci_probe(struct rte_pci_driver *pci_drv,
- struct rte_pci_device *pci_dev,
- size_t private_data_size,
- eventdev_pmd_pci_callback_t devinit)
+rte_event_pmd_pci_probe_named(struct rte_pci_driver *pci_drv,
+ struct rte_pci_device *pci_dev,
+ size_t private_data_size,
+ eventdev_pmd_pci_callback_t devinit,
+ const char *name)
{
struct rte_eventdev *eventdev;
-
- char eventdev_name[RTE_EVENTDEV_NAME_MAX_LEN];
-
int retval;
if (devinit == NULL)
return -EINVAL;
- rte_pci_device_name(&pci_dev->addr, eventdev_name,
- sizeof(eventdev_name));
-
- eventdev = rte_event_pmd_allocate(eventdev_name,
+ eventdev = rte_event_pmd_allocate(name,
pci_dev->device.numa_node);
if (eventdev == NULL)
return -ENOMEM;
@@ -88,6 +85,28 @@ rte_event_pmd_pci_probe(struct rte_pci_driver *pci_drv,
return -ENXIO;
}
+/**
+ * @internal
+ * Wrapper for use by pci drivers as a .probe function to attach to a event
+ * interface.
+ */
+static inline int
+rte_event_pmd_pci_probe(struct rte_pci_driver *pci_drv,
+ struct rte_pci_device *pci_dev,
+ size_t private_data_size,
+ eventdev_pmd_pci_callback_t devinit)
+{
+ char eventdev_name[RTE_EVENTDEV_NAME_MAX_LEN];
+
+ rte_pci_device_name(&pci_dev->addr, eventdev_name,
+ sizeof(eventdev_name));
+
+ return rte_event_pmd_pci_probe_named(pci_drv,
+ pci_dev,
+ private_data_size,
+ devinit,
+ eventdev_name);
+}
/**
* @internal
@@ -134,4 +134,7 @@ EXPERIMENTAL {
__rte_eventdev_trace_crypto_adapter_queue_pair_del;
__rte_eventdev_trace_crypto_adapter_start;
__rte_eventdev_trace_crypto_adapter_stop;
+
+ # added in 20.11
+ rte_event_pmd_pci_probe_named;
};