diff mbox

[dpdk-dev,v5,21/28] librte_ether: remove branches on pci_dev

Message ID 1445621793-3630-22-git-send-email-bernard.iremonger@intel.com (mailing list archive)
State Superseded, archived
Headers

Commit Message

Iremonger, Bernard Oct. 23, 2015, 5:36 p.m. UTC 
  use dev_type to distinguish between vdev's and pdev's.
remove pci_dev branches.
update release notes.

Signed-off-by: Bernard Iremonger <bernard.iremonger@intel.com>
---
 doc/guides/rel_notes/release_2_2.rst |  3 +++
 lib/librte_ether/rte_ethdev.c        | 40 +++++++++++++++---------------------
 2 files changed, 20 insertions(+), 23 deletions(-)

Comments

Bruce Richardson Oct. 29, 2015, 11:51 a.m. UTC | #1 
On Fri, Oct 23, 2015 at 06:36:26PM +0100, Bernard Iremonger wrote:
> use dev_type to distinguish between vdev's and pdev's.
> remove pci_dev branches.
> update release notes.
> 
> Signed-off-by: Bernard Iremonger <bernard.iremonger@intel.com>
> ---
>  doc/guides/rel_notes/release_2_2.rst |  3 +++
>  lib/librte_ether/rte_ethdev.c        | 40 +++++++++++++++---------------------
>  2 files changed, 20 insertions(+), 23 deletions(-)
> 
<snip>  
>  /* attach the new physical device, then store port_id of the device */
> @@ -1143,14 +1141,11 @@ rte_eth_dev_configure(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
>  	 * If link state interrupt is enabled, check that the
>  	 * device supports it.
>  	 */
> -	if (dev_conf->intr_conf.lsc == 1) {
> -		const struct rte_pci_driver *pci_drv = &dev->driver->pci_drv;
> -
> -		if (!(pci_drv->drv_flags & RTE_PCI_DRV_INTR_LSC)) {
> +	if ((dev_conf->intr_conf.lsc == 1) &&
> +		(!(dev->data->dev_flags & RTE_ETH_DEV_INTR_LSC))) {
>  			PMD_DEBUG_TRACE("driver %s does not support lsc\n",
> -					pci_drv->name);
> +					dev->data->drv_name);

Is this safe to do? From your previous patches for the vdevs, you appear to be
setting the drv_name field to NULL for those vdevs, leading to undefined
behaviour here. (printf may catch the NULL and print it as "(null)" rather
than crashing, but it's still wrong!)

/Bruce
Iremonger, Bernard Oct. 29, 2015, 2:32 p.m. UTC | #2 
Hi Bruce,

<snip>

> >  /* attach the new physical device, then store port_id of the device
> > */ @@ -1143,14 +1141,11 @@ rte_eth_dev_configure(uint8_t port_id,
> uint16_t nb_rx_q, uint16_t nb_tx_q,
> >  	 * If link state interrupt is enabled, check that the
> >  	 * device supports it.
> >  	 */
> > -	if (dev_conf->intr_conf.lsc == 1) {
> > -		const struct rte_pci_driver *pci_drv = &dev->driver-
> >pci_drv;
> > -
> > -		if (!(pci_drv->drv_flags & RTE_PCI_DRV_INTR_LSC)) {
> > +	if ((dev_conf->intr_conf.lsc == 1) &&
> > +		(!(dev->data->dev_flags & RTE_ETH_DEV_INTR_LSC))) {
> >  			PMD_DEBUG_TRACE("driver %s does not support
> lsc\n",
> > -					pci_drv->name);
> > +					dev->data->drv_name);
> 
> Is this safe to do? From your previous patches for the vdevs, you appear to
> be setting the drv_name field to NULL for those vdevs, leading to undefined
> behaviour here. (printf may catch the NULL and print it as "(null)" rather than
> crashing, but it's still wrong!)
> 
> /Bruce

It would be safer to set dev->data->drv_name to the PMD driver name.

Regards,

Bernard.
Bruce Richardson Oct. 29, 2015, 2:35 p.m. UTC | #3 
On Thu, Oct 29, 2015 at 02:32:29PM +0000, Iremonger, Bernard wrote:
> Hi Bruce,
> 
> <snip>
> 
> > >  /* attach the new physical device, then store port_id of the device
> > > */ @@ -1143,14 +1141,11 @@ rte_eth_dev_configure(uint8_t port_id,
> > uint16_t nb_rx_q, uint16_t nb_tx_q,
> > >  	 * If link state interrupt is enabled, check that the
> > >  	 * device supports it.
> > >  	 */
> > > -	if (dev_conf->intr_conf.lsc == 1) {
> > > -		const struct rte_pci_driver *pci_drv = &dev->driver-
> > >pci_drv;
> > > -
> > > -		if (!(pci_drv->drv_flags & RTE_PCI_DRV_INTR_LSC)) {
> > > +	if ((dev_conf->intr_conf.lsc == 1) &&
> > > +		(!(dev->data->dev_flags & RTE_ETH_DEV_INTR_LSC))) {
> > >  			PMD_DEBUG_TRACE("driver %s does not support
> > lsc\n",
> > > -					pci_drv->name);
> > > +					dev->data->drv_name);
> > 
> > Is this safe to do? From your previous patches for the vdevs, you appear to
> > be setting the drv_name field to NULL for those vdevs, leading to undefined
> > behaviour here. (printf may catch the NULL and print it as "(null)" rather than
> > crashing, but it's still wrong!)
> > 
> > /Bruce
> 
> It would be safer to set dev->data->drv_name to the PMD driver name.
>
Agreed. 
If you update the update the vpmds to do so, feel free to keep my ack
on the resubmitted patches.

/Bruce
diff mbox

Patch

diff --git a/doc/guides/rel_notes/release_2_2.rst b/doc/guides/rel_notes/release_2_2.rst
index 4f75cff..455b5a2 100644
--- a/doc/guides/rel_notes/release_2_2.rst
+++ b/doc/guides/rel_notes/release_2_2.rst
@@ -9,6 +9,9 @@  New Features
   *  Added support for Jumbo Frames.
   *  Optimize forwarding performance for Chelsio T5 40GbE cards.
 
+* **Removed the PCI device from vdev PMD's.**
+
+  * This change required modifications to librte_ether and all vdev and pdev PMD's.
 
 Resolved Issues
 ---------------
diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
index ce1d000..2fce370 100644
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -424,7 +424,7 @@  rte_eth_dev_socket_id(uint8_t port_id)
 {
 	if (!rte_eth_dev_is_valid_port(port_id))
 		return -1;
-	return rte_eth_devices[port_id].pci_dev->numa_node;
+	return rte_eth_devices[port_id].data->numa_node;
 }
 
 uint8_t
@@ -503,27 +503,25 @@  rte_eth_dev_get_name_by_port(uint8_t port_id, char *name)
 static int
 rte_eth_dev_is_detachable(uint8_t port_id)
 {
-	uint32_t drv_flags;
+	uint32_t dev_flags;
 
 	if (!rte_eth_dev_is_valid_port(port_id)) {
 		PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
 		return -EINVAL;
 	}
 
-	if (rte_eth_devices[port_id].dev_type == RTE_ETH_DEV_PCI) {
-		switch (rte_eth_devices[port_id].pci_dev->kdrv) {
-		case RTE_KDRV_IGB_UIO:
-		case RTE_KDRV_UIO_GENERIC:
-		case RTE_KDRV_NIC_UIO:
-			break;
-		case RTE_KDRV_VFIO:
-		default:
-			return -ENOTSUP;
-		}
+	switch (rte_eth_devices[port_id].data->kdrv) {
+	case RTE_KDRV_IGB_UIO:
+	case RTE_KDRV_UIO_GENERIC:
+	case RTE_KDRV_NIC_UIO:
+	case RTE_KDRV_NONE:
+		break;
+	case RTE_KDRV_VFIO:
+	default:
+		return -ENOTSUP;
 	}
-
-	drv_flags = rte_eth_devices[port_id].driver->pci_drv.drv_flags;
-	return !(drv_flags & RTE_PCI_DRV_DETACHABLE);
+	dev_flags = rte_eth_devices[port_id].data->dev_flags;
+	return !(dev_flags & RTE_ETH_DEV_DETACHABLE);
 }
 
 /* attach the new physical device, then store port_id of the device */
@@ -1143,14 +1141,11 @@  rte_eth_dev_configure(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
 	 * If link state interrupt is enabled, check that the
 	 * device supports it.
 	 */
-	if (dev_conf->intr_conf.lsc == 1) {
-		const struct rte_pci_driver *pci_drv = &dev->driver->pci_drv;
-
-		if (!(pci_drv->drv_flags & RTE_PCI_DRV_INTR_LSC)) {
+	if ((dev_conf->intr_conf.lsc == 1) &&
+		(!(dev->data->dev_flags & RTE_ETH_DEV_INTR_LSC))) {
 			PMD_DEBUG_TRACE("driver %s does not support lsc\n",
-					pci_drv->name);
+					dev->data->drv_name);
 			return -EINVAL;
-		}
 	}
 
 	/*
@@ -1795,8 +1790,7 @@  rte_eth_dev_info_get(uint8_t port_id, struct rte_eth_dev_info *dev_info)
 	FUNC_PTR_OR_RET(*dev->dev_ops->dev_infos_get);
 	(*dev->dev_ops->dev_infos_get)(dev, dev_info);
 	dev_info->pci_dev = dev->pci_dev;
-	if (dev->driver)
-		dev_info->driver_name = dev->driver->pci_drv.name;
+	dev_info->driver_name = dev->data->drv_name;
 }
 
 void