eventdev: add PCI probe named convenience function
PATCH 1/1 eventdev: add PCI probe named convenience function
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.
--- lib/librte_eventdev/rte_eventdev_pmd_pci.h | 45 ++++++++++++++++++++++-------- 1 file changed, 33 insertions(+), 12 deletions(-)
lib/librte_eventdev/rte_eventdev_pmd_pci.h +33 -12
@@ -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. */ 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 ;
@@ -90,6 +87,30 @@ rte_event_pmd_pci_probe(struct rte_pci_driver *pci_drv,/** * @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, + (const char *)eventdev_name); +} + +/** +* @internal * Wrapper for use by pci drivers as a .remove function to detach a event * interface. */
Signature · 1 line
2.6.4
<snip>
Quoted 5 lines
/**
* @internal
+ * Wrapper for use by pci drivers as a .probe function to attach to a event
+ * interface.
+ */
lib/librte_eventdev/rte_eventdev_pmd_pci.h rte_event_pmd_pci_probe(struct rte_pci_driver *pci_drv, · line 101
Quoted 9 lines
lib/librte_eventdev/rte_eventdev_pmd_pci.h +9
-0+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 ]; + +
Two blank lines -- DPDK coding style doesn't forbid this as far as I know (LINE_SPACING is ignored in checkpatch), but just an FYI in case this was unintentional.
lib/librte_eventdev/rte_eventdev_pmd_pci.h rte_event_pmd_pci_probe(struct rte_pci_driver *pci_drv, · line 109
Quoted 8 lines
lib/librte_eventdev/rte_eventdev_pmd_pci.h +8
-0+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, + (const char *)eventdev_name);
Nit: the cast is unnecessary, the conversion will happen implicitly without it.
With that,
Quoted 23 lines
-----Original Message-----
From: Eads, Gage <[email protected]>
Sent: Monday, September 14, 2020 3:23 PM
To: McDaniel, Timothy <[email protected]>; Jerin Jacob <[email protected]>
Cc: [email protected]; Carrillo, Erik G <[email protected]>; Van Haaren, Harry <[email protected]>
Subject: RE: [PATCH] eventdev: add PCI probe named convenience function<snip>
Quoted 10 lines
/**
* @internal
+ * Wrapper for use by pci drivers as a .probe function to attach to a event
+ * interface.
+ */lib/librte_eventdev/rte_eventdev_pmd_pci.h +5
-0+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)
Quoted 8 lines
lib/librte_eventdev/rte_eventdev_pmd_pci.h rte_event_pmd_pci_probe(struct rte_pci_driver *pci_drv, · line 101
Quoted 4 lines
lib/librte_eventdev/rte_eventdev_pmd_pci.h +4
-0+{ +char eventdev_name[RTE_EVENTDEV_NAME_MAX_LEN ]; + +Two blank lines -- DPDK coding style doesn't forbid this as far as I know (
LINE_SPACINGis ignored in checkpatch), but just an FYI in case this was unintentional.
Fixed. Will be available in V2 patch-set.
Quoted 12 lines
lib/librte_eventdev/rte_eventdev_pmd_pci.h rte_event_pmd_pci_probe(struct rte_pci_driver *pci_drv, · line 109
Quoted 9 lines
lib/librte_eventdev/rte_eventdev_pmd_pci.h +8
-0+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, + (const char *)eventdev_name);Nit: the cast is unnecessary, the conversion will happen implicitly without it.
Fixed. Will be available in V2 patch-set.
Quoted 2 lines
With that,
Reviewed-by Gage Eads <[email protected]>
PATCH 1/1 eventdev: add PCI probe named convenience function
In reply to Timothy McDanielAdd 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.
--- lib/librte_eventdev/rte_eventdev_pmd_pci.h | 45 ++++++++++++++++++++-------- lib/librte_eventdev/rte_eventdev_version.map | 1 + 2 files changed, 33 insertions(+), 13 deletions(-)
lib/librte_eventdev/rte_eventdev_pmd_pci.h +32 -13
@@ -32,28 +32,24 @@ 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. */ 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 ;
@@ -90,6 +86,29 @@ rte_event_pmd_pci_probe(struct rte_pci_driver *pci_drv,/** * @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 * Wrapper for use by pci drivers as a .remove function to detach a event * interface. */
lib/librte_eventdev/rte_eventdev_version.map +1 -0
@@ -57,6 +57,7 @@ DPDK_21 { rte_event_eth_tx_adapter_stop; rte_event_pmd_allocate; rte_event_pmd_pci_probe; + rte_event_pmd_pci_probe_named; rte_event_pmd_pci_remove; rte_event_pmd_release; rte_event_pmd_vdev_init;
Signature · 1 line
2.6.4
Quoted 6 lines · Timothy McDaniel
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_probeso as to not duplicate code.
Any reason why this couldn't be __rte_internal then ?
Quoted 92 lines
Signed-off-by Timothy McDaniel <[email protected]>--- lib/librte_eventdev/rte_eventdev_pmd_pci.h | 45 ++++++++++++++++++++-------- lib/librte_eventdev/rte_eventdev_version.map | 1 + 2 files changed, 33 insertions(+), 13 deletions(-)lib/librte_eventdev/rte_eventdev_pmd_pci.h +32
-13@@ -32,28 +32,24 @@ 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. */ 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 ;@@ -90,6 +86,29 @@ rte_event_pmd_pci_probe(struct rte_pci_driver *pci_drv,/** * @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 * Wrapper for use by pci drivers as a .remove function to detach a event * interface. */ lib/librte_eventdev/rte_eventdev_version.map +1
-0@@ -57,6 +57,7 @@ DPDK_21 { rte_event_eth_tx_adapter_stop; rte_event_pmd_allocate; rte_event_pmd_pci_probe; + rte_event_pmd_pci_probe_named; rte_event_pmd_pci_remove; rte_event_pmd_release; rte_event_pmd_vdev_init;
Quoted 14 lines
-----Original Message-----
From: Kinsella, Ray <[email protected]>
Sent: Wednesday, October 14, 2020 4:31 AM
To: McDaniel, Timothy <[email protected]>; Jerin Jacob <[email protected]>; Neil Horman <[email protected]>
Cc: [email protected]; Carrillo, Erik G <[email protected]>; Eads, Gage <[email protected]>; Van Haaren, Harry <[email protected]>
Subject: Re: [PATCH] eventdev: add PCI probe named convenience functionOn 12/10/2020 19:42, Timothy McDaniel wrote:
Quoted 8 lines
Quoted 6 lines
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_probeso as to not duplicate code.Any reason why this couldn't be
__rte_internalthen ?
On a related note...should a static function defined in an internal header file be included the version.map file? Doesn't that only pertain to symbols in the .so? Probably harmless if so, but now may be a good time to correct it.
Thanks,
Gage
Quoted 18 lines · Gage
Quoted 18 lines
-----Original Message-----
From: Kinsella, Ray <[email protected]>
Sent: Wednesday, October 14, 2020 4:31 AM
To: McDaniel, Timothy <[email protected]>; Jerin Jacob <[email protected]>; Neil Horman <[email protected]>
Cc: [email protected]; Carrillo, Erik G <[email protected]>; Eads, Gage <[email protected]>; Van Haaren, Harry <[email protected]>
Subject: Re: [PATCH] eventdev: add PCI probe named convenience functionQuoted 4 lines · Timothy McDaniel
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.
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
Updated
rte_event_pmd_pci_probeso as to not duplicate code.Any reason why this couldn't be
__rte_internalthen ?On a related note...should a static function defined in an internal header file be included the version.map file? Doesn't that only pertain to symbols in the .so? Probably harmless if so, but now may be a good time to correct it.
Good catch.
Quoted 3 lines
Thanks,
Gage
PATCH 1/1 eventdev: add PCI probe named convenience function
In reply to Timothy McDanielAdd 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.
--- lib/librte_eventdev/rte_eventdev_pmd_pci.h | 46 ++++++++++++++++++++-------- lib/librte_eventdev/rte_eventdev_version.map | 2 ++ 2 files changed, 35 insertions(+), 13 deletions(-)
lib/librte_eventdev/rte_eventdev_pmd_pci.h +33 -13
@@ -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 ;
@@ -90,6 +87,29 @@ rte_event_pmd_pci_probe(struct rte_pci_driver *pci_drv,/** * @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 * Wrapper for use by pci drivers as a .remove function to detach a event * interface. */
lib/librte_eventdev/rte_eventdev_version.map +2 -0
@@ -136,4 +136,6 @@ EXPERIMENTAL { # changed in 20.11 __rte_eventdev_trace_port_setup; + # added in 20.11 + rte_event_pmd_pci_probe_named; };
Signature · 1 line
2.6.4
Quoted 9 lines · Timothy McDaniel
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_probeso as to not duplicate code.Signed-off-by Timothy McDaniel <[email protected]>
Latest patch is missing the updated version(v3) in patch commit[1]
[1]
http://patches.dpdk.org/patch/80394/
Also, it has apply issue[2] and builds issue in CI[3]. Please send the v4 for fix.
[2]
[for-main]dell[dpdk-next-eventdev] $ git am -3 /tmp/r/eventdev-add-PCI-probe-named-convenience-function
Applying: eventdev: add PCI probe named convenience function
error: sha1 information is lacking or useless (lib/librte_eventdev/rte_eventdev_pmd_pci.h).
error: could not build fake ancestor
Patch failed at 0001 eventdev: add PCI probe named convenience function
hint: Use 'git am --show-current-patch=diff' to see the failed patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". [for-main]dell[dpdk-next-eventdev] $
[3]
http://mails.dpdk.org/archives/test-report/2020-October/158330.html
Quoted 92 lines
--- lib/librte_eventdev/rte_eventdev_pmd_pci.h | 46 ++++++++++++++++++++-------- lib/librte_eventdev/rte_eventdev_version.map | 2 ++ 2 files changed, 35 insertions(+), 13 deletions(-)lib/librte_eventdev/rte_eventdev_pmd_pci.h +33
-13@@ -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 ;@@ -90,6 +87,29 @@ rte_event_pmd_pci_probe(struct rte_pci_driver *pci_drv,/** * @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 * Wrapper for use by pci drivers as a .remove function to detach a event * interface. */ lib/librte_eventdev/rte_eventdev_version.map +2
-1@@ -136,4 +136,6 @@ EXPERIMENTAL { # changed in 20.11 __rte_eventdev_trace_port_setup; + # added in 20.11 + rte_event_pmd_pci_probe_named; }; --2.6.4
PATCH v4 1/1 eventdev: add PCI probe named convenience function
In reply to Timothy McDanielAdd 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.
--- lib/librte_eventdev/rte_eventdev_pmd_pci.h | 46 ++++++++++++++++++++-------- lib/librte_eventdev/rte_eventdev_version.map | 2 ++ 2 files changed, 35 insertions(+), 13 deletions(-)
lib/librte_eventdev/rte_eventdev_pmd_pci.h +33 -13
@@ -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 ;
@@ -90,6 +87,29 @@ rte_event_pmd_pci_probe(struct rte_pci_driver *pci_drv,/** * @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 * Wrapper for use by pci drivers as a .remove function to detach a event * interface. */
lib/librte_eventdev/rte_eventdev_version.map +2 -0
@@ -136,4 +136,6 @@ EXPERIMENTAL { # changed in 20.11 __rte_eventdev_trace_port_setup; + # added in 20.11 + rte_event_pmd_pci_probe_named; };
Signature · 1 line
2.6.4
PATCH v5 1/1 eventdev: add PCI probe named convenience function
In reply to Timothy McDanielAdd 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.
--- lib/librte_eventdev/rte_eventdev_pmd_pci.h | 46 ++++++++++++++++++++-------- lib/librte_eventdev/rte_eventdev_version.map | 2 ++ 2 files changed, 35 insertions(+), 13 deletions(-)
lib/librte_eventdev/rte_eventdev_pmd_pci.h +33 -13
@@ -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 ;
@@ -90,6 +87,29 @@ rte_event_pmd_pci_probe(struct rte_pci_driver *pci_drv,/** * @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 * Wrapper for use by pci drivers as a .remove function to detach a event * interface. */
lib/librte_eventdev/rte_eventdev_version.map +2 -0
@@ -136,4 +136,6 @@ EXPERIMENTAL { # changed in 20.11 __rte_eventdev_trace_port_setup; + # added in 20.11 + rte_event_pmd_pci_probe_named; };
Signature · 1 line
2.6.4
PATCH v6 1/1 eventdev: add PCI probe named convenience function
In reply to Timothy McDanielAdd 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.
--- lib/librte_eventdev/rte_eventdev_pmd_pci.h | 45 ++++++++++++++++++++-------- lib/librte_eventdev/rte_eventdev_version.map | 3 ++ 2 files changed, 35 insertions(+), 13 deletions(-)
lib/librte_eventdev/rte_eventdev_pmd_pci.h +32 -13
@@ -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
lib/librte_eventdev/rte_eventdev_version.map +3 -0
@@ -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; };
Signature · 1 line
2.6.4
Jerin Jacob
AppliedQuoted 10 lines · Timothy McDaniel
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_probeso as to not duplicate code.Signed-off-by Timothy McDaniel <[email protected]>Reviewed-by Gage Eads <[email protected]>
Applied to dpdk-next-eventdev/for-main. Thanks.
Quoted 92 lines
--- lib/librte_eventdev/rte_eventdev_pmd_pci.h | 45 ++++++++++++++++++++-------- lib/librte_eventdev/rte_eventdev_version.map | 3 ++ 2 files changed, 35 insertions(+), 13 deletions(-)lib/librte_eventdev/rte_eventdev_pmd_pci.h +32
-13@@ -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 lib/librte_eventdev/rte_eventdev_version.map +3
-1@@ -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