On Tue, Oct 13, 2020 at 12:29 AM Timothy McDaniel <[email protected]> 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 <[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 > --- > lib/librte_eventdev/rte_eventdev_pmd_pci.h | 46 > ++++++++++++++++++++-------- > lib/librte_eventdev/rte_eventdev_version.map | 2 ++ > 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 a3f9244..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; > @@ -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. > */ > diff --git a/lib/librte_eventdev/rte_eventdev_version.map > b/lib/librte_eventdev/rte_eventdev_version.map > index 2846d04..8ae8420 100644 > --- a/lib/librte_eventdev/rte_eventdev_version.map > +++ b/lib/librte_eventdev/rte_eventdev_version.map > @@ -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 >
