[dpdk-dev] [PATCH v1] Change rte_eal_vdev_init to update port_id

[Tetsuya Mukawa]

On 2015/08/08 7:06, Ravi Kerur wrote:
> Hi Tetsuya,
>
> On Thu, Aug 6, 2015 at 7:25 PM, Tetsuya Mukawa  > wrote:
>
> On 2015/08/07 3:04, Ravi Kerur wrote:
> > diff --git a/drivers/net/enic/enic_ethdev.c
> b/drivers/net/enic/enic_ethdev.c
> > index 8280cea..472ef5a 100644
> > --- a/drivers/net/enic/enic_ethdev.c
> > +++ b/drivers/net/enic/enic_ethdev.c
> > @@ -36,8 +36,8 @@
> >  #include 
> >  #include 
> >
> > -#include 
> >  #include 
> > +#include 
> >  #include 
> >  #include 
>
> Hi Ravi,
>
> Do we need this fixing?
>
> >
> > diff --git a/drivers/net/mpipe/mpipe_tilegx.c
> b/drivers/net/mpipe/mpipe_tilegx.c
> > index 743feef..6e3e304 100644
> > --- a/drivers/net/mpipe/mpipe_tilegx.c
> > +++ b/drivers/net/mpipe/mpipe_tilegx.c
> > @@ -1582,6 +1582,7 @@ rte_pmd_mpipe_devinit(const char *ifname,
> >   if (!eth_dev) {
> >   RTE_LOG(ERR, PMD, "%s: Failed to allocate
> device.\n", ifname);
> >   rte_free(priv);
> > + return -ENOMEM;
>
> How about separating this fixing from the patch, and put it as an
> one of
> cleanup patch series?
>
>
> rte_pmd_mpipe_devinit is the init func pointer called via
> rte_eal_vdev_init. Since we were fixing rte_eal_vdev_init thought of
> taking care of mpipe issue. If you think it's unrelated to this patch
> I will send a separate one.
>

Hi Ravi,

To avoid segmentation fault like above has a point, even if rest of this
patch won't be applied.
So I guess it's nice to separate the patch.


Thanks,
Tetsuya

[dpdk-dev] [PATCH v1] Change rte_eal_vdev_init to update port_id

[Thomas Monjalon]

2015-08-07 15:06, Ravi Kerur:
> On Thu, Aug 6, 2015 at 7:25 PM, Tetsuya Mukawa  wrote:
> > On 2015/08/07 3:04, Ravi Kerur wrote:
> > Hi Thomas,
> >
> > Could you please make sure API consistency?
> > Is it ok to add above functions to DPDK_2.1 even though we are in RC
> > phase, or need to add to DPDK_2.2?
> >
> Same question. If it's targeted for 2.2 then I will modify this.

Why should it be in 2.1?
Is there something I missed which makes it an important fix?
If no, please stop sending this kind of patch until the end of the 2.1 release.
Thanks

[dpdk-dev] [PATCH v1] Change rte_eal_vdev_init to update port_id

[Ravi Kerur]

Hi Tetsuya,

On Thu, Aug 6, 2015 at 7:25 PM, Tetsuya Mukawa  wrote:

> On 2015/08/07 3:04, Ravi Kerur wrote:
> > diff --git a/drivers/net/enic/enic_ethdev.c
> b/drivers/net/enic/enic_ethdev.c
> > index 8280cea..472ef5a 100644
> > --- a/drivers/net/enic/enic_ethdev.c
> > +++ b/drivers/net/enic/enic_ethdev.c
> > @@ -36,8 +36,8 @@
> >  #include 
> >  #include 
> >
> > -#include 
> >  #include 
> > +#include 
> >  #include 
> >  #include 
>
> Hi Ravi,
>
> Do we need this fixing?
>
> >
> > diff --git a/drivers/net/mpipe/mpipe_tilegx.c
> b/drivers/net/mpipe/mpipe_tilegx.c
> > index 743feef..6e3e304 100644
> > --- a/drivers/net/mpipe/mpipe_tilegx.c
> > +++ b/drivers/net/mpipe/mpipe_tilegx.c
> > @@ -1582,6 +1582,7 @@ rte_pmd_mpipe_devinit(const char *ifname,
> >   if (!eth_dev) {
> >   RTE_LOG(ERR, PMD, "%s: Failed to allocate device.\n",
> ifname);
> >   rte_free(priv);
> > + return -ENOMEM;
>
> How about separating this fixing from the patch, and put it as an one of
> cleanup patch series?
>
>
rte_pmd_mpipe_devinit is the init func pointer called via
rte_eal_vdev_init. Since we were fixing rte_eal_vdev_init thought of taking
care of mpipe issue. If you think it's unrelated to this patch I will send
a separate one.

>   }
> >
> >   RTE_LOG(INFO, PMD, "%s: Initialized mpipe device"
> > diff --git a/lib/librte_eal/common/eal_common_dev.c
> b/lib/librte_eal/common/eal_common_dev.c
> > index 4089d66..82d5693 100644
> > --- a/lib/librte_eal/common/eal_common_dev.c
> > +++ b/lib/librte_eal/common/eal_common_dev.c
> >
> >   RTE_LOG(ERR, EAL, "no driver found for %s\n", name);
> > @@ -94,6 +99,7 @@ rte_eal_dev_init(void)
> >  {
> >   struct rte_devargs *devargs;
> >   struct rte_driver *driver;
> > + uint8_t port_id;
> >
> >   /*
> >* Note that the dev_driver_list is populated here
> > @@ -108,7 +114,7 @@ rte_eal_dev_init(void)
> >   continue;
> >
> >   if (rte_eal_vdev_init(devargs->virtual.drv_name,
> > - devargs->args)) {
> > + devargs->args, _id)) {
>
> After this line, 'port_id' is actually not used by anywhere in this
> function.
> Also, I guess we will not use port_id in this function in the future.
> How about fixing rte_eal_vdev_init() to handle NULL value correctly to
> remove port_id from this function?
> But I agree your current implementation is also one of choice.
>
> > diff --git a/lib/librte_ether/rte_ethdev.c
> b/lib/librte_ether/rte_ethdev.c
> > index 5fe1906..355d709 100644
> > --- a/lib/librte_ether/rte_ethdev.c
> > +++ b/lib/librte_ether/rte_ethdev.c
> > +int
> > +rte_eth_dev_get_port_by_addr(const struct rte_pci_addr *addr, uint8_t
> *port_id)
> > +{
> > + int i;
> > + struct rte_pci_device *pci_dev = NULL;
> > +
> > + if (addr == NULL || port_id == NULL) {
> > + PMD_DEBUG_TRACE("Null pointer is specified\n");
> > + return -EINVAL;
> > + }
> > +
> > + *port_id = RTE_MAX_ETHPORTS;
> > +
> > + for (i = 0; i < RTE_MAX_ETHPORTS; i++) {
> > +
> > + pci_dev = rte_eth_devices[i].pci_dev;
> > +
> > + if (pci_dev != NULL &&
> > + pci_dev->addr.domain == addr->domain &&
> > + pci_dev->addr.bus == addr->bus &&
> > + pci_dev->addr.devid == addr->devid &&
> > + pci_dev->addr.function == addr->function) {
>
> You can use rte_eal_compare_pci_addr() here.
>

Will fix this.

>
> > +
> > + *port_id = i;
> > + return 0;
> > + }
> > + }
> > + return -ENODEV;
> > +}
> > diff --git a/lib/librte_ether/rte_ether_version.map
> b/lib/librte_ether/rte_ether_version.map
> > index 8345a6c..3d5cb23 100644
> > --- a/lib/librte_ether/rte_ether_version.map
> > +++ b/lib/librte_ether/rte_ether_version.map
> > @@ -125,5 +125,7 @@ DPDK_2.1 {
> >   rte_eth_timesync_enable;
> >   rte_eth_timesync_read_rx_timestamp;
> >   rte_eth_timesync_read_tx_timestamp;
> > + rte_eth_dev_get_port_by_name;
> > + rte_eth_dev_get_port_by_addr;
> >
> >  } DPDK_2.0;
>
> Hi Thomas,
>
> Could you please make sure API consistency?
> Is it ok to add above functions to DPDK_2.1 even though we are in RC
> phase, or need to add to DPDK_2.2?
>
>
Same question. If it's targeted for 2.2 then I will modify this.

Thanks,
Ravi


> Thanks,
> Tetsuya
>
>
>

[dpdk-dev] [PATCH v1] Change rte_eal_vdev_init to update port_id

[Tetsuya Mukawa]

On 2015/08/07 3:04, Ravi Kerur wrote:
> diff --git a/drivers/net/enic/enic_ethdev.c b/drivers/net/enic/enic_ethdev.c
> index 8280cea..472ef5a 100644
> --- a/drivers/net/enic/enic_ethdev.c
> +++ b/drivers/net/enic/enic_ethdev.c
> @@ -36,8 +36,8 @@
>  #include 
>  #include 
>  
> -#include 
>  #include 
> +#include 
>  #include 
>  #include 

Hi Ravi,

Do we need this fixing?

>  
> diff --git a/drivers/net/mpipe/mpipe_tilegx.c 
> b/drivers/net/mpipe/mpipe_tilegx.c
> index 743feef..6e3e304 100644
> --- a/drivers/net/mpipe/mpipe_tilegx.c
> +++ b/drivers/net/mpipe/mpipe_tilegx.c
> @@ -1582,6 +1582,7 @@ rte_pmd_mpipe_devinit(const char *ifname,
>   if (!eth_dev) {
>   RTE_LOG(ERR, PMD, "%s: Failed to allocate device.\n", ifname);
>   rte_free(priv);
> + return -ENOMEM;

How about separating this fixing from the patch, and put it as an one of
cleanup patch series?

>   }
>  
>   RTE_LOG(INFO, PMD, "%s: Initialized mpipe device"
> diff --git a/lib/librte_eal/common/eal_common_dev.c 
> b/lib/librte_eal/common/eal_common_dev.c
> index 4089d66..82d5693 100644
> --- a/lib/librte_eal/common/eal_common_dev.c
> +++ b/lib/librte_eal/common/eal_common_dev.c
>
>   RTE_LOG(ERR, EAL, "no driver found for %s\n", name);
> @@ -94,6 +99,7 @@ rte_eal_dev_init(void)
>  {
>   struct rte_devargs *devargs;
>   struct rte_driver *driver;
> + uint8_t port_id;
>  
>   /*
>* Note that the dev_driver_list is populated here
> @@ -108,7 +114,7 @@ rte_eal_dev_init(void)
>   continue;
>  
>   if (rte_eal_vdev_init(devargs->virtual.drv_name,
> - devargs->args)) {
> + devargs->args, _id)) {

After this line, 'port_id' is actually not used by anywhere in this
function.
Also, I guess we will not use port_id in this function in the future.
How about fixing rte_eal_vdev_init() to handle NULL value correctly to
remove port_id from this function?
But I agree your current implementation is also one of choice.

> diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
> index 5fe1906..355d709 100644
> --- a/lib/librte_ether/rte_ethdev.c
> +++ b/lib/librte_ether/rte_ethdev.c
> +int
> +rte_eth_dev_get_port_by_addr(const struct rte_pci_addr *addr, uint8_t 
> *port_id)
> +{
> + int i;
> + struct rte_pci_device *pci_dev = NULL;
> +
> + if (addr == NULL || port_id == NULL) {
> + PMD_DEBUG_TRACE("Null pointer is specified\n");
> + return -EINVAL;
> + }
> +
> + *port_id = RTE_MAX_ETHPORTS;
> +
> + for (i = 0; i < RTE_MAX_ETHPORTS; i++) {
> +
> + pci_dev = rte_eth_devices[i].pci_dev;
> +
> + if (pci_dev != NULL &&
> + pci_dev->addr.domain == addr->domain &&
> + pci_dev->addr.bus == addr->bus &&
> + pci_dev->addr.devid == addr->devid &&
> + pci_dev->addr.function == addr->function) {

You can use rte_eal_compare_pci_addr() here.

> +
> + *port_id = i;
> + return 0;
> + }
> + }
> + return -ENODEV;
> +}
> diff --git a/lib/librte_ether/rte_ether_version.map 
> b/lib/librte_ether/rte_ether_version.map
> index 8345a6c..3d5cb23 100644
> --- a/lib/librte_ether/rte_ether_version.map
> +++ b/lib/librte_ether/rte_ether_version.map
> @@ -125,5 +125,7 @@ DPDK_2.1 {
>   rte_eth_timesync_enable;
>   rte_eth_timesync_read_rx_timestamp;
>   rte_eth_timesync_read_tx_timestamp;
> + rte_eth_dev_get_port_by_name;
> + rte_eth_dev_get_port_by_addr;
>  
>  } DPDK_2.0;

Hi Thomas,

Could you please make sure API consistency?
Is it ok to add above functions to DPDK_2.1 even though we are in RC
phase, or need to add to DPDK_2.2?

Thanks,
Tetsuya

[dpdk-dev] [PATCH v1] Change rte_eal_vdev_init to update port_id

[Ravi Kerur]

Changes include
   > Modify rte_eal_vdev_init to return allocated port_id
   > Modify rte_eal_probe_one to return allocated port_id

2. Removed following functions
   > rte_eth_dev_save and
   > rte_eth_dev_get_changed_port

3. Added 2 new functions
   > rte_eth_dev_get_port_by_name
   > rte_eth_dev_get_port_by_addr

4. Fix return error(ENOMEM) in function rte_pmd_mpipe_devinit

Compiled on Linux for following targets
   > x86_64-native-linuxapp-gcc
   > x86_64-native-linuxapp-clang
   > x86_x32-native-linuxapp-gcc

Compiled on FreeBSD for following targets
   > x86_64-native-bsdapp-clang
   > x86_64-native-bsdapp-gcc

Tested on Linux/FreeBSD:
   > port attach eth_null
   > port start all
   > port stop all
   > port close all
   > port detach 0
   > port attach eth_null
   > port start all
   > port stop all
   > port close all
   > port detach 0

Successful run of checkpatch.pl on the diffs

Successful validate_abi on Linux for following targets

   > x86_64-native-linuxapp-gcc
   > x86_64-native-linuxapp-clang

Signed-off-by: Ravi Kerur 
---
 drivers/net/enic/enic_ethdev.c  |   2 +-
 drivers/net/mpipe/mpipe_tilegx.c|   1 +
 lib/librte_eal/common/eal_common_dev.c  |  14 ++--
 lib/librte_eal/common/eal_common_pci.c  |   6 +-
 lib/librte_eal/common/include/rte_dev.h |  36 +-
 lib/librte_eal/common/include/rte_pci.h |   4 +-
 lib/librte_ether/rte_ethdev.c   | 119 +---
 lib/librte_ether/rte_ether_version.map  |   2 +
 8 files changed, 118 insertions(+), 66 deletions(-)

diff --git a/drivers/net/enic/enic_ethdev.c b/drivers/net/enic/enic_ethdev.c
index 8280cea..472ef5a 100644
--- a/drivers/net/enic/enic_ethdev.c
+++ b/drivers/net/enic/enic_ethdev.c
@@ -36,8 +36,8 @@
 #include 
 #include 

-#include 
 #include 
+#include 
 #include 
 #include 

diff --git a/drivers/net/mpipe/mpipe_tilegx.c b/drivers/net/mpipe/mpipe_tilegx.c
index 743feef..6e3e304 100644
--- a/drivers/net/mpipe/mpipe_tilegx.c
+++ b/drivers/net/mpipe/mpipe_tilegx.c
@@ -1582,6 +1582,7 @@ rte_pmd_mpipe_devinit(const char *ifname,
if (!eth_dev) {
RTE_LOG(ERR, PMD, "%s: Failed to allocate device.\n", ifname);
rte_free(priv);
+   return -ENOMEM;
}

RTE_LOG(INFO, PMD, "%s: Initialized mpipe device"
diff --git a/lib/librte_eal/common/eal_common_dev.c 
b/lib/librte_eal/common/eal_common_dev.c
index 4089d66..82d5693 100644
--- a/lib/librte_eal/common/eal_common_dev.c
+++ b/lib/librte_eal/common/eal_common_dev.c
@@ -37,6 +37,7 @@
 #include 
 #include 

+#include 
 #include 
 #include 
 #include 
@@ -64,7 +65,7 @@ rte_eal_driver_unregister(struct rte_driver *driver)
 }

 int
-rte_eal_vdev_init(const char *name, const char *args)
+rte_eal_vdev_init(const char *name, const char *args, uint8_t *port_id)
 {
struct rte_driver *driver;

@@ -81,8 +82,12 @@ rte_eal_vdev_init(const char *name, const char *args)
 * will be "eth_pcap", but "name" will be "eth_pcapN".
 * So use strncmp to compare.
 */
-   if (!strncmp(driver->name, name, strlen(driver->name)))
-   return driver->init(name, args);
+   if (!strncmp(driver->name, name, strlen(driver->name))) {
+   if (!driver->init(name, args))
+   return rte_eth_dev_get_port_by_name(
+   name, port_id);
+   }
+
}

RTE_LOG(ERR, EAL, "no driver found for %s\n", name);
@@ -94,6 +99,7 @@ rte_eal_dev_init(void)
 {
struct rte_devargs *devargs;
struct rte_driver *driver;
+   uint8_t port_id;

/*
 * Note that the dev_driver_list is populated here
@@ -108,7 +114,7 @@ rte_eal_dev_init(void)
continue;

if (rte_eal_vdev_init(devargs->virtual.drv_name,
-   devargs->args)) {
+   devargs->args, _id)) {
RTE_LOG(ERR, EAL, "failed to initialize %s device\n",
devargs->virtual.drv_name);
return -1;
diff --git a/lib/librte_eal/common/eal_common_pci.c 
b/lib/librte_eal/common/eal_common_pci.c
index 16e8629..3d97892 100644
--- a/lib/librte_eal/common/eal_common_pci.c
+++ b/lib/librte_eal/common/eal_common_pci.c
@@ -79,6 +79,7 @@
 #include 
 #include 
 #include 
+#include 

 #include "eal_private.h"

@@ -322,7 +323,7 @@ pci_detach_all_drivers(struct rte_pci_device *dev)
  * the driver of the devive.
  */
 int
-rte_eal_pci_probe_one(const struct rte_pci_addr *addr)
+rte_eal_pci_probe_one(const struct rte_pci_addr *addr, uint8_t *port_id)
 {
struct rte_pci_device *dev = NULL;
int ret = 0;
@@ -337,7 +338,8 @@ rte_eal_pci_probe_one(const struct rte_pci_addr *addr)
ret = pci_probe_all_drivers(dev);
if (ret < 0)