remove pci driver from vdevs
Subsystems (3)
v6 cover remove pci driver from vdevs
In reply to a message not in the archiveThere is a dummy pci driver in the vdev PMD's at present.
This patch set removes the pci driver from the vdev PMD's.
Changes have been made to librte_ether to handle vdevs and pdevs in the same way.
The following vdev PMD's have had the pci driver removed:
null
ring
bonding
pcapaf_packet
xenvirt
mpipe
All the pdev PMD's have been modified to copy the pci device info into eth_dev data.
Changes in v6:
Initialise data->drv_name with the PMD driver name in the vdevs. Remove two more branches on pci_dev from the bonding vdev.
Changes in v5:
rebase to latest code.
refactor patches to avoid potential problems with git bisect.
Changes in v4:
rebase to latest code.
add doxygen comments to rte_ethdev.h
update release notes in patch 0002.
Changes in v3:
rebase to latest code.
restructure patches 0002 and 0003 to fix compile issue in patch 0002.
Changes in V2:
rebase to latest code.
fix compile error in rte_ethdev.c when debug disabled.
remove Intel copyright from bnx2x, cxgbe, enic, mlx4, mpipe and null PMD's.
Bernard Iremonger (28):
librte_eal: add RTE_KDRV_NONE for vdevs
librte_ether: add fields from rte_pci_driver to rte_eth_dev_data
librte_ether: add function rte_eth_copy_dev_info
ixgbe: copy pci device info to eth_dev data
e1000: copy pci device info to eth_dev data
i40e: copy pci device info to eth_dev data
fm10k: copy pci device info to eth_dev data
bnx2x: copy pci device info to eth_dev data
cxgbe: copy pci device info to eth_dev data
enic: copy pci device info to eth_dev data
mlx4: copy pci device info to eth_dev data
virtio: copy pci device info to eth_dev data
vmxnet3: copy pci device info to eth_dev data
null: copy device info to eth_dev data
ring: copy device info to eth_dev data
pcap: copy device info to eth_dev data
af_packet: copy device info to eth_dev data
xenvirt: copy device info to eth_dev data
mpipe: copy device info to eth_dev data
bonding: copy device info to eth_dev data
librte_ether: remove branches on pci_dev
null: remove pci device
ring: remove pci device
pcap: remove pci device
af_packet: remove pci device
xenvirt: remove pci device
mpipe: remove pci device
bonding: remove pci device
doc/guides/rel_notes/release_2_2.rst | 3 ++ drivers/net/af_packet/rte_eth_af_packet.c | 20 ++++------ drivers/net/bnx2x/bnx2x_ethdev.c | 3 ++ drivers/net/bonding/rte_eth_bond_8023ad.c | 4 +- drivers/net/bonding/rte_eth_bond_alb.c | 2 +- drivers/net/bonding/rte_eth_bond_api.c | 60 +++++++++--------------------- drivers/net/bonding/rte_eth_bond_pmd.c | 18 ++++----- drivers/net/bonding/rte_eth_bond_private.h | 2 +- drivers/net/cxgbe/cxgbe_ethdev.c | 3 ++ drivers/net/e1000/em_ethdev.c | 3 ++ drivers/net/e1000/igb_ethdev.c | 5 +++ drivers/net/enic/enic_ethdev.c | 1 + drivers/net/fm10k/fm10k_ethdev.c | 2 + drivers/net/i40e/i40e_ethdev.c | 3 ++ drivers/net/i40e/i40e_ethdev_vf.c | 2 + drivers/net/ixgbe/ixgbe_ethdev.c | 4 ++ drivers/net/mlx4/mlx4.c | 3 ++ drivers/net/mpipe/mpipe_tilegx.c | 10 +++-- drivers/net/null/rte_eth_null.c | 29 ++++----------- drivers/net/pcap/rte_eth_pcap.c | 31 +++++---------- drivers/net/ring/rte_eth_ring.c | 37 ++++-------------- drivers/net/virtio/virtio_ethdev.c | 3 ++ drivers/net/vmxnet3/vmxnet3_ethdev.c | 2 + drivers/net/xenvirt/rte_eth_xenvirt.c | 18 ++++----- lib/librte_eal/common/include/rte_pci.h | 3 +- lib/librte_ether/rte_ethdev.c | 54 +++++++++++++++------------ lib/librte_ether/rte_ethdev.h | 29 +++++++++++++++ lib/librte_ether/rte_ether_version.map | 7 ++++ 28 files changed, 184 insertions(+), 177 deletions(-)
Signature · 1 line
1.9.1
PATCH v6 2/28 librte_ether: add fields from rte_pci_driver to rte_eth_dev_data
add dev_flags to rte_eth_dev_data, add macros for dev_flags. add kdrv to rte_eth_dev_data.
add numa_node to rte_eth_dev_data.
add drv_name to rte_eth_dev_data.
--- lib/librte_ether/rte_ethdev.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
lib/librte_ether/rte_ethdev.h +15 -0
@@ -1471,8 +1471,23 @@ struct rte_eth_dev_data { all_multicast : 1, /**< RX all multicast mode ON(1) / OFF(0). */ dev_started : 1, /**< Device state: STARTED(1) / STOPPED(0). */ lro : 1; /**< RX LRO is ON(1) / OFF(0) */ +uint32_t dev_flags;/**< Flags controlling handling of device. */ +enum rte_kernel_driver kdrv;/**< Kernel driver passthrough */ +int numa_node;/**< NUMA node connection */ +const char *drv_name;/**< Driver name */ }; +/** Device needs PCI BAR mapping (done with either IGB_UIO or VFIO) */ +#define RTE_ETH_DEV_DRV_NEED_MAPPING RTE_PCI_DRV_NEED_MAPPING +/** Device needs to be unbound even if no module is provided */ +#define RTE_ETH_DEV_DRV_FORCE_UNBIND RTE_PCI_DRV_FORCE_UNBIND +/** Device supports link state interrupt */ +#define RTE_ETH_DEV_INTR_LSC RTE_PCI_DRV_INTR_LSC +/** Device supports detaching capability */ +#define RTE_ETH_DEV_DETACHABLE RTE_PCI_DRV_DETACHABLE +/** Device is a bonded device */ +#define RTE_ETH_DEV_BONDED 0x0020 +/** * @internal * The pool of *rte_eth_dev* structures. The size of the pool
Signature · 1 line
1.9.1
PATCH v6 3/28 librte_ether: add function rte_eth_copy_dev_info
In reply to Bernard Iremonger--- lib/librte_ether/rte_ethdev.c | 14 ++++++++++++++ lib/librte_ether/rte_ethdev.h | 14 ++++++++++++++ lib/librte_ether/rte_ether_version.map | 7 +++++++ 3 files changed, 35 insertions(+)
lib/librte_ether/rte_ethdev.c +14 -0
@@ -3342,3 +3342,17 @@ rte_eth_dev_set_eeprom(uint8_t port_id, struct rte_dev_eeprom_info *info)FUNC_PTR_OR_ERR_RET (*dev->dev_ops->set_eeprom, -ENOTSUP );return (*dev->dev_ops->set_eeprom)(dev, info); } + +void +rte_eth_copy_dev_info (struct rte_eth_dev *eth_dev,struct rte_pci_device *pci_dev) +{ +if ((eth_dev ==NULL ) || (pci_dev ==NULL )) { +PMD_DEBUG_TRACE ("NULL pointer eth_dev=%p pci_dev=%p\n" , + eth_dev, pci_dev); + } + + eth_dev->data->dev_flags = pci_dev->driver->drv_flags; + eth_dev->data->kdrv = pci_dev->kdrv; + eth_dev->data->numa_node = pci_dev->numa_node; + eth_dev->data->drv_name = pci_dev->driver->name; +}
lib/librte_ether/rte_ethdev.h +14 -0
@@ -3613,6 +3613,20 @@ extern int rte_eth_timesync_read_rx_timestamp(uint8_t port_id,extern int rte_eth_timesync_read_tx_timestamp (uint8_t port_id,struct timespec *timestamp); +/** +* Copy pci device info to the Ethernet device data. +* +* @param eth_dev +* The *eth_dev* pointer is the address of the *rte_eth_dev* structure. +* @param pci_dev +* The *pci_dev* pointer is the address of the *rte_pci_device* structure. +* +* @return +* - 0 on success, negative on error +*/ +extern void rte_eth_copy_dev_info (struct rte_eth_dev *eth_dev,struct rte_pci_device *pci_dev); + + #ifdef __cplusplus }#endif
lib/librte_ether/rte_ether_version.map +7 -0
@@ -127,3 +127,10 @@ DPDK_2.1 { rte_eth_timesync_read_tx_timestamp; } DPDK_2.0; + +DPDK_2.2 { + global: + + rte_eth_copy_dev_info; + +} DPDK_2.1;
Signature · 1 line
1.9.1
PATCH v6 4/28 ixgbe: copy pci device info to eth_dev data
In reply to Bernard Iremonger--- drivers/net/ixgbe/ixgbe_ethdev.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/ixgbe/ixgbe_ethdev.c +4 -0
@@ -887,6 +887,8 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev) } pci_dev = eth_dev->pci_dev; +rte_eth_copy_dev_info (eth_dev, pci_dev); +/* Vendor and Device ID need to be set before init of shared code */ hw->device_id = pci_dev->id.device_id; hw->vendor_id = pci_dev->id.vendor_id;
@@ -1155,6 +1157,8 @@ eth_ixgbevf_dev_init(struct rte_eth_dev *eth_dev) pci_dev = eth_dev->pci_dev; +rte_eth_copy_dev_info (eth_dev, pci_dev); + hw->device_id = pci_dev->id.device_id; hw->vendor_id = pci_dev->id.vendor_id; hw->hw_addr = (void *)pci_dev->mem_resource[0 ].addr;
Signature · 1 line
1.9.1
PATCH v6 1/28 librte_eal: add RTE_KDRV_NONE for vdevs
In reply to Bernard Iremonger--- lib/librte_eal/common/include/rte_pci.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
lib/librte_eal/common/include/rte_pci.h +2 -1
@@ -1,7 +1,7 @@/*- * BSD LICENSE * -* Copyright(c) 2010-2014 Intel Corporation. All rights reserved. +* Copyright(c) 2010-2015 Intel Corporation. All rights reserved. * All rights reserved. * * Redistribution and use in source and binary forms, with or without
@@ -149,6 +149,7 @@ enum rte_kernel_driver {RTE_KDRV_VFIO ,RTE_KDRV_UIO_GENERIC ,RTE_KDRV_NIC_UIO , + RTE_KDRV_NONE, };/**
Signature · 1 line
1.9.1
PATCH v6 5/28 e1000: copy pci device info to eth_dev data
In reply to Bernard Iremonger--- drivers/net/e1000/em_ethdev.c | 3 +++ drivers/net/e1000/igb_ethdev.c | 5 +++++ 2 files changed, 8 insertions(+)
drivers/net/e1000/em_ethdev.c +3 -0
@@ -232,6 +232,9 @@ eth_em_dev_init(struct rte_eth_dev *eth_dev)E1000_DEV_PRIVATE_TO_VFTA (eth_dev->data->dev_private); pci_dev = eth_dev->pci_dev; + +rte_eth_copy_dev_info (eth_dev, pci_dev); + eth_dev->dev_ops = ð_em_ops; eth_dev->rx_pkt_burst = (eth_rx_burst_t)ð_em_recv_pkts; eth_dev->tx_pkt_burst = (eth_tx_burst_t)ð_em_xmit_pkts;
drivers/net/e1000/igb_ethdev.c +5 -0
@@ -531,6 +531,9 @@ eth_igb_dev_init(struct rte_eth_dev *eth_dev)uint32_t ctrl_ext; pci_dev = eth_dev->pci_dev; + +rte_eth_copy_dev_info (eth_dev, pci_dev); + eth_dev->dev_ops = ð_igb_ops; eth_dev->rx_pkt_burst = ð_igb_recv_pkts; eth_dev->tx_pkt_burst = ð_igb_xmit_pkts;
@@ -739,6 +742,8 @@ eth_igbvf_dev_init(struct rte_eth_dev *eth_dev) pci_dev = eth_dev->pci_dev; +rte_eth_copy_dev_info (eth_dev, pci_dev); + hw->device_id = pci_dev->id.device_id; hw->vendor_id = pci_dev->id.vendor_id; hw->hw_addr = (void *)pci_dev->mem_resource[0 ].addr;
Signature · 1 line
1.9.1
PATCH v6 6/28 i40e: copy pci device info to eth_dev data
In reply to Bernard Iremonger--- drivers/net/i40e/i40e_ethdev.c | 3 +++ drivers/net/i40e/i40e_ethdev_vf.c | 2 ++ 2 files changed, 5 insertions(+)
drivers/net/i40e/i40e_ethdev.c +3 -0
@@ -408,6 +408,9 @@ eth_i40e_dev_init(struct rte_eth_dev *dev)return 0 ; } pci_dev = dev->pci_dev; + +rte_eth_copy_dev_info (dev, pci_dev); + pf->adapter =I40E_DEV_PRIVATE_TO_ADAPTER (dev->data->dev_private); pf->adapter->eth_dev = dev; pf->dev_data = dev->data;
drivers/net/i40e/i40e_ethdev_vf.c +2 -0
@@ -1187,6 +1187,8 @@ i40evf_dev_init(struct rte_eth_dev *eth_dev)return 0 ; } +rte_eth_copy_dev_info (eth_dev, eth_dev->pci_dev); + hw->vendor_id = eth_dev->pci_dev->id.vendor_id; hw->device_id = eth_dev->pci_dev->id.device_id; hw->subsystem_vendor_id = eth_dev->pci_dev->id.subsystem_vendor_id;
Signature · 1 line
1.9.1
PATCH v6 7/28 fm10k: copy pci device info to eth_dev data
In reply to Bernard Iremonger--- drivers/net/fm10k/fm10k_ethdev.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/fm10k/fm10k_ethdev.c +2 -0
@@ -2075,6 +2075,8 @@ eth_fm10k_dev_init(struct rte_eth_dev *dev)if (rte_eal_process_type () !=RTE_PROC_PRIMARY )return 0 ; +rte_eth_copy_dev_info (dev, dev->pci_dev); + macvlan =FM10K_DEV_PRIVATE_TO_MACVLAN (dev->data->dev_private);memset (macvlan,0 ,sizeof (*macvlan));/* Vendor and Device ID need to be set before init of shared code */
Signature · 1 line
1.9.1
PATCH v6 8/28 bnx2x: copy pci device info to eth_dev data
In reply to Bernard Iremonger--- drivers/net/bnx2x/bnx2x_ethdev.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/bnx2x/bnx2x_ethdev.c +3 -0
@@ -419,6 +419,9 @@ bnx2x_common_dev_init(struct rte_eth_dev *eth_dev, int is_vf) eth_dev->dev_ops = is_vf ? &bnx2xvf_eth_dev_ops : &bnx2x_eth_dev_ops; pci_dev = eth_dev->pci_dev; + +rte_eth_copy_dev_info (eth_dev, pci_dev); + sc = eth_dev->data->dev_private; sc->pcie_bus = pci_dev->addr.bus; sc->pcie_device = pci_dev->addr.devid;
Signature · 1 line
1.9.1
PATCH v6 9/28 cxgbe: copy pci device info to eth_dev data
In reply to Bernard Iremonger--- drivers/net/cxgbe/cxgbe_ethdev.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/cxgbe/cxgbe_ethdev.c +3 -0
@@ -792,6 +792,9 @@ static int eth_cxgbe_dev_init(struct rte_eth_dev *eth_dev)return 0 ; pci_dev = eth_dev->pci_dev; + +rte_eth_copy_dev_info (eth_dev, pci_dev); +snprintf (name,sizeof (name),"cxgbeadapter%d" , eth_dev->data->port_id); adapter =rte_zmalloc (name,sizeof (*adapter),0 );if (!adapter)
Signature · 1 line
1.9.1
PATCH v6 10/28 enic: copy pci device info to eth_dev data
In reply to Bernard Iremonger--- drivers/net/enic/enic_ethdev.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/enic/enic_ethdev.c +1 -0
@@ -597,6 +597,7 @@ static int eth_enicpmd_dev_init(struct rte_eth_dev *eth_dev) eth_dev->tx_pkt_burst = &enicpmd_xmit_pkts; pdev = eth_dev->pci_dev; +rte_eth_copy_dev_info (eth_dev, pdev); enic->pdev = pdev; addr = &pdev->addr;
Signature · 1 line
1.9.1
PATCH v6 11/28 mlx4: copy pci device info to eth_dev data
In reply to Bernard Iremonger--- drivers/net/mlx4/mlx4.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/mlx4/mlx4.c +3 -0
@@ -4972,6 +4972,9 @@ mlx4_pci_devinit(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev) eth_dev->data->dev_private = priv; eth_dev->pci_dev = pci_dev; + +rte_eth_copy_dev_info (eth_dev, pci_dev); + eth_dev->driver = &mlx4_driver; eth_dev->data->rx_mbuf_alloc_failed =0 ; eth_dev->data->mtu =ETHER_MTU ;
Signature · 1 line
1.9.1
PATCH v6 13/28 vmxnet3: copy pci device info to eth_dev data
In reply to Bernard Iremonger--- drivers/net/vmxnet3/vmxnet3_ethdev.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/vmxnet3/vmxnet3_ethdev.c +2 -0
@@ -235,6 +235,8 @@ eth_vmxnet3_dev_init(struct rte_eth_dev *eth_dev)if (rte_eal_process_type () !=RTE_PROC_PRIMARY )return 0 ; +rte_eth_copy_dev_info (eth_dev, pci_dev); +/* Vendor and Device ID need to be set before init of shared code */ hw->device_id = pci_dev->id.device_id; hw->vendor_id = pci_dev->id.vendor_id;
Signature · 1 line
1.9.1
PATCH v6 14/28 null: copy device info to eth_dev data
In reply to Bernard Iremongerinitialise dev_flags, driver, drv_name, kdrv and numa_node fields in eth_dev data
--- drivers/net/null/rte_eth_null.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)
drivers/net/null/rte_eth_null.c +5 -9
@@ -340,13 +340,6 @@ eth_stats_reset(struct rte_eth_dev *dev) } } -static struct eth_driver rte_null_pmd = { - .pci_drv = { - .name ="rte_null_pmd" , - .drv_flags =RTE_PCI_DRV_DETACHABLE , - }, -}; -static void eth_queue_release (void *q) {
@@ -443,8 +436,11 @@ eth_dev_null_create(const char *name, eth_dev->data = data; eth_dev->dev_ops = &ops; - eth_dev->pci_dev = pci_dev; - eth_dev->driver = &rte_null_pmd; + eth_dev->driver =NULL ; + eth_dev->data->dev_flags =RTE_ETH_DEV_DETACHABLE ; + eth_dev->data->kdrv =RTE_KDRV_NONE ; + eth_dev->data->drv_name = drivername; + eth_dev->data->numa_node = numa_node;/* finally assign rx and tx ops */ if (packet_copy) {
Signature · 1 line
1.9.1
PATCH v6 15/28 ring: copy device info to eth_dev data
In reply to Bernard Iremongerinitialise dev_flags, driver, drv_name, kdrv and numa_node fields in eth_dev data.
--- drivers/net/ring/rte_eth_ring.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/net/ring/rte_eth_ring.c +8 -5
@@ -304,11 +304,10 @@ rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[],if (eth_dev ==NULL ) goto error; -/* now put it all together * - store queue data in internals, -* - store numa_node info in pci_driver -* - point eth_dev_data to internals and pci_driver +* - store numa_node info in eth_dev_data +* - point eth_dev_data to internals * - and point eth_dev structure to new eth_dev_data structure */ /* NOTE: we'll replace the data element, of originally allocated eth_dev
@@ -338,9 +337,13 @@ rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[], data->mac_addrs = &internals->address; eth_dev->data = data; - eth_dev->driver = &rte_ring_pmd; + eth_dev->driver =NULL ; eth_dev->dev_ops = &ops; - eth_dev->pci_dev = pci_dev; + eth_dev->data->dev_flags =RTE_ETH_DEV_DETACHABLE ; + eth_dev->data->kdrv =RTE_KDRV_NONE ; + eth_dev->data->drv_name = drivername; + eth_dev->data->numa_node = numa_node; +TAILQ_INIT (&(eth_dev->link_intr_cbs));/* finally assign rx and tx ops */
Signature · 1 line
1.9.1
PATCH v6 16/28 pcap: copy device info to eth_dev data
In reply to Bernard Iremongerinitialise dev_flags, driver, drv_name, kdrv and numa_node fields in eth_dev data
--- drivers/net/pcap/rte_eth_pcap.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/net/pcap/rte_eth_pcap.c +8 -5
@@ -1,7 +1,7 @@/*- * BSD LICENSE * -* Copyright(c) 2010-2014 Intel Corporation. All rights reserved. +* Copyright(c) 2010-2015 Intel Corporation. All rights reserved. * Copyright(c) 2014 6WIND S.A. * All rights reserved. *
@@ -845,8 +845,8 @@ rte_pmd_init_internals(const char *name, const unsigned nb_rx_queues,/* now put it all together * - store queue data in internals, -* - store numa_node info in pci_driver -* - point eth_dev_data to internals and pci_driver +* - store numa_node info in eth_dev +* - point eth_dev_data to internals * - and point eth_dev structure to new eth_dev_data structure */ /* NOTE: we'll replace the data element, of originally allocated eth_dev
@@ -874,8 +874,11 @@ rte_pmd_init_internals(const char *name, const unsigned nb_rx_queues, (*eth_dev)->data = data; (*eth_dev)->dev_ops = &ops; - (*eth_dev)->pci_dev = pci_dev; - (*eth_dev)->driver = &rte_pcap_pmd; + (*eth_dev)->data->dev_flags =RTE_ETH_DEV_DETACHABLE ; + (*eth_dev)->driver =NULL ; + (*eth_dev)->data->kdrv =RTE_KDRV_NONE ; + (*eth_dev)->data->drv_name = drivername; + (*eth_dev)->data->numa_node = numa_node;return 0 ;
Signature · 1 line
1.9.1
PATCH v6 17/28 af_packet: copy device info to eth_dev data
In reply to Bernard Iremongerinitialise dev_flags, driver, kdrv, drv_name and numa_node fields in eth_dev data.
--- drivers/net/af_packet/rte_eth_af_packet.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/net/af_packet/rte_eth_af_packet.c +8 -4
@@ -5,7 +5,7 @@* * Originally based upon librte_pmd_pcap code: * -* Copyright(c) 2010-2014 Intel Corporation. All rights reserved. +* Copyright(c) 2010-2015 Intel Corporation. All rights reserved. * Copyright(c) 2014 6WIND S.A. * All rights reserved. *
@@ -656,8 +656,8 @@ rte_pmd_init_internals(const char *name,/* * now put it all together * - store queue data in internals, -* - store numa_node info in pci_driver -* - point eth_dev_data to internals and pci_driver +* - store numa_node in eth_dev +* - point eth_dev_data to internals * - and point eth_dev structure to new eth_dev_data structure */
@@ -674,7 +674,11 @@ rte_pmd_init_internals(const char *name, (*eth_dev)->data = data; (*eth_dev)->dev_ops = &ops; - (*eth_dev)->pci_dev = pci_dev; + (*eth_dev)->driver =NULL ; + (*eth_dev)->data->dev_flags =0 ; + (*eth_dev)->data->drv_name = drivername; + (*eth_dev)->data->kdrv =RTE_KDRV_NONE ; + (*eth_dev)->data->numa_node = numa_node;return 0 ;
Signature · 1 line
1.9.1
PATCH v6 12/28 virtio: copy pci device info to eth_dev data
In reply to Bernard Iremonger--- drivers/net/virtio/virtio_ethdev.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/virtio/virtio_ethdev.c +3 -0
@@ -1185,6 +1185,9 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev) } pci_dev = eth_dev->pci_dev; + +rte_eth_copy_dev_info (eth_dev, pci_dev); +if (virtio_resource_init (pci_dev) <0 )return -1 ;
Signature · 1 line
1.9.1
PATCH v6 18/28 xenvirt: copy device info to eth_dev data
In reply to Bernard IremongerInitialise dev_flags, driver, kdrv, drv_name and numa_node in eth_dev data.
--- drivers/net/xenvirt/rte_eth_xenvirt.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/net/xenvirt/rte_eth_xenvirt.c +6 -2
@@ -67,7 +67,7 @@/* virtio_idx is increased after new device is created.*/ static int virtio_idx =0 ; -static const char *drivername ="xen dummy virtio PMD" ; +static const char *drivername ="xen virtio PMD" ;static struct rte_eth_link pmd_link = { .link_speed =10000 ,
@@ -668,7 +668,11 @@ eth_dev_xenvirt_create(const char *name, const char *params, eth_dev->data = data; eth_dev->dev_ops = &ops; - eth_dev->pci_dev = pci_dev; + eth_dev->data->dev_flags =0 ; + eth_dev->data->kdrv =RTE_KDRV_NONE ; + eth_dev->data->drv_name = drivername; + eth_dev->driver =NULL ; + eth_dev->data->numa_node = numa_node; eth_dev->rx_pkt_burst = eth_xenvirt_rx; eth_dev->tx_pkt_burst = eth_xenvirt_tx;
Signature · 1 line
1.9.1
PATCH v6 19/28 mpipe: copy device info to eth_dev data
In reply to Bernard Iremongerinitialise dev_flags, kdrv, driver, drv_name and numa_node in eth_dev data.
--- drivers/net/mpipe/mpipe_tilegx.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/net/mpipe/mpipe_tilegx.c +7 -0
@@ -80,6 +80,7 @@ struct mpipe_context {static struct mpipe_context mpipe_contexts[GXIO_MPIPE_INSTANCE_MAX ];static int mpipe_instances; +static const char *drivername ="MPIPE PMD" ;/* Per queue statistics. */ struct mpipe_queue_stats {
@@ -1594,6 +1595,12 @@ rte_pmd_mpipe_devinit(const char *ifname, eth_dev->pci_dev = &priv->pci_dev; eth_dev->data->mac_addrs = &priv->mac_addr; + eth_dev->data->dev_flags =0 ; + eth_dev->data->kdrv =RTE_KDRV_NONE ; + eth_dev->driver =NULL ; + eth_dev->data->drv_name = drivername; + eth_dev->data->numa_node = instance; + eth_dev->dev_ops = &mpipe_dev_ops; eth_dev->rx_pkt_burst = &mpipe_recv_pkts; eth_dev->tx_pkt_burst = &mpipe_xmit_pkts;
Signature · 1 line
1.9.1
PATCH v6 20/28 bonding: copy device info to eth_dev data
In reply to Bernard Iremongerinitialise dev_flags, kdrv, driver, drv_name and numa_node fields in eth_dev data.
--- drivers/net/bonding/rte_eth_bond_api.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/net/bonding/rte_eth_bond_api.c +8 -1
@@ -44,6 +44,8 @@#define DEFAULT_POLLING_INTERVAL_10_MS (10) +const char pmd_bond_driver_name[] ="rte_bond_pmd" ; +int valid_bonded_ethdev (const struct rte_eth_dev *eth_dev) {
@@ -250,7 +252,12 @@ rte_eth_bond_create(const char *name, uint8_t mode, uint8_t socket_id) eth_dev->data->all_multicast =0 ; eth_dev->dev_ops = &default_dev_ops; - eth_dev->pci_dev = pci_dev; + eth_dev->data->dev_flags =RTE_ETH_DEV_INTR_LSC | +RTE_ETH_DEV_DETACHABLE |RTE_ETH_DEV_BONDED ; + eth_dev->driver =NULL ; + eth_dev->data->kdrv =RTE_KDRV_NONE ; + eth_dev->data->drv_name = pmd_bond_driver_name; + eth_dev->data->numa_node = socket_id;rte_spinlock_init (&internals->lock);
Signature · 1 line
1.9.1
PATCH v6 21/28 librte_ether: remove branches on pci_dev
In reply to Bernard Iremongeruse dev_type to distinguish between vdev's and pdev's. remove pci_dev branches.
update release notes.
--- doc/guides/rel_notes/release_2_2.rst | 3 +++ lib/librte_ether/rte_ethdev.c | 40 +++++++++++++++--------------------- 2 files changed, 20 insertions(+), 23 deletions(-)
doc/guides/rel_notes/release_2_2.rst +3 -0
@@ -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 ---------------
lib/librte_ether/rte_ethdev.c +17 -23
@@ -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
Signature · 1 line
1.9.1
PATCH v6 22/28 null: remove pci device
In reply to Bernard Iremongerremove rte_null_pmd and pci_dev.
--- drivers/net/null/rte_eth_null.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-)
drivers/net/null/rte_eth_null.c +3 -12
@@ -379,7 +379,6 @@ eth_dev_null_create(const char *name,const unsigned nb_rx_queues =1 ;const unsigned nb_tx_queues =1 ;struct rte_eth_dev_data *data =NULL ; -struct rte_pci_device *pci_dev =NULL ;struct pmd_internals *internals =NULL ;struct rte_eth_dev *eth_dev =NULL ;
@@ -396,10 +395,6 @@ eth_dev_null_create(const char *name,if (data ==NULL ) goto error; - pci_dev =rte_zmalloc_socket (name,sizeof (*pci_dev),0 , numa_node); -if (pci_dev ==NULL ) - goto error; - internals =rte_zmalloc_socket (name,sizeof (*internals),0 , numa_node);if (internals ==NULL ) goto error;
@@ -411,8 +406,8 @@ eth_dev_null_create(const char *name,/* now put it all together * - store queue data in internals, -* - store numa_node info in pci_driver -* - point eth_dev_data to internals and pci_driver +* - store numa_node info in ethdev data +* - point eth_dev_data to internals * - and point eth_dev structure to new eth_dev_data structure */ /* NOTE: we'll replace the data element, of originally allocated eth_dev
@@ -424,8 +419,6 @@ eth_dev_null_create(const char *name, internals->packet_copy = packet_copy; internals->numa_node = numa_node; - pci_dev->numa_node = numa_node; - data->dev_private = internals; data->port_id = eth_dev->data->port_id; data->nb_rx_queues = (uint16_t )nb_rx_queues;
@@ -455,7 +448,6 @@ eth_dev_null_create(const char *name, error:rte_free (data); -rte_free (pci_dev);rte_free (internals);return -1 ;
@@ -558,14 +550,13 @@ rte_pmd_null_devuninit(const char *name)RTE_LOG (INFO ,PMD ,"Closing null ethdev on numa socket %u\n" ,rte_socket_id ()); -/* reserve an ethdev entry */ +/* find the ethdev entry */ eth_dev =rte_eth_dev_allocated (name);if (eth_dev ==NULL )return -1 ;rte_free (eth_dev->data->dev_private);rte_free (eth_dev->data); -rte_free (eth_dev->pci_dev);rte_eth_dev_release_port (eth_dev);
Signature · 1 line
1.9.1
PATCH v6 24/28 pcap: remove pci device
In reply to Bernard Iremongerremove rte_pcap_pmd and pci_dev.
--- drivers/net/pcap/rte_eth_pcap.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-)
drivers/net/pcap/rte_eth_pcap.c +1 -17
@@ -617,13 +617,6 @@ static const struct eth_dev_ops ops = { .stats_reset = eth_stats_reset, }; -static struct eth_driver rte_pcap_pmd = { - .pci_drv = { - .name ="rte_pcap_pmd" , - .drv_flags =RTE_PCI_DRV_DETACHABLE , - }, -}; -/* * Function handler that opens the pcap file for reading a stores a * reference of it for use it later on.
@@ -806,7 +799,6 @@ rte_pmd_init_internals(const char *name, const unsigned nb_rx_queues, struct rte_kvargs *kvlist) {struct rte_eth_dev_data *data =NULL ; -struct rte_pci_device *pci_dev =NULL ;unsigned k_idx;struct rte_kvargs_pair *pair =NULL ;
@@ -819,17 +811,13 @@ rte_pmd_init_internals(const char *name, const unsigned nb_rx_queues,RTE_LOG (INFO ,PMD ,"Creating pcap-backed ethdev on numa socket %u\n" , numa_node); -/* now do all data allocation - for eth_dev structure, dummy pci driver +/* now do all data allocation - for eth_dev structure * and internal (private) data */ data =rte_zmalloc_socket (name,sizeof (*data),0 , numa_node);if (data ==NULL ) goto error; - pci_dev =rte_zmalloc_socket (name,sizeof (*pci_dev),0 , numa_node); -if (pci_dev ==NULL ) - goto error; - *internals =rte_zmalloc_socket (name,sizeof (**internals),0 , numa_node);if (*internals ==NULL ) goto error;
@@ -860,8 +848,6 @@ rte_pmd_init_internals(const char *name, const unsigned nb_rx_queues,else (*internals)->if_index =if_nametoindex (pair->value); - pci_dev->numa_node = numa_node; - data->dev_private = *internals; data->port_id = (*eth_dev)->data->port_id;snprintf (data->name,sizeof (data->name),"%s" , (*eth_dev)->data->name);
@@ -884,7 +870,6 @@ rte_pmd_init_internals(const char *name, const unsigned nb_rx_queues, error:rte_free (data); -rte_free (pci_dev);rte_free (*internals);return -1 ;
@@ -1099,7 +1084,6 @@ rte_pmd_pcap_devuninit(const char *name)rte_free (eth_dev->data->dev_private);rte_free (eth_dev->data); -rte_free (eth_dev->pci_dev);rte_eth_dev_release_port (eth_dev);
Signature · 1 line
1.9.1
PATCH v6 25/28 af_packet: remove pci device
In reply to Bernard Iremonger--- drivers/net/af_packet/rte_eth_af_packet.c | 8 -------- 1 file changed, 8 deletions(-)
drivers/net/af_packet/rte_eth_af_packet.c +0 -8
@@ -432,7 +432,6 @@ rte_pmd_init_internals(const char *name, struct rte_kvargs *kvlist) {struct rte_eth_dev_data *data =NULL ; -struct rte_pci_device *pci_dev =NULL ;struct rte_kvargs_pair *pair =NULL ;struct ifreq ifr;size_t ifnamelen;
@@ -470,10 +469,6 @@ rte_pmd_init_internals(const char *name,if (data ==NULL ) goto error_early; - pci_dev =rte_zmalloc_socket (name,sizeof (*pci_dev),0 , numa_node); -if (pci_dev ==NULL ) - goto error_early; - *internals =rte_zmalloc_socket (name,sizeof (**internals),0 , numa_node);if (*internals ==NULL )
@@ -670,8 +665,6 @@ rte_pmd_init_internals(const char *name, data->dev_link = pmd_link; data->mac_addrs = &(*internals)->eth_addr; - pci_dev->numa_node = numa_node; - (*eth_dev)->data = data; (*eth_dev)->dev_ops = &ops; (*eth_dev)->driver =NULL ;
@@ -697,7 +690,6 @@ error: }rte_free (*internals); error_early: -rte_free (pci_dev);rte_free (data);return -1 ; }
Signature · 1 line
1.9.1
PATCH v6 27/28 mpipe: remove pci device
In reply to Bernard Iremonger--- drivers/net/mpipe/mpipe_tilegx.c | 3 --- 1 file changed, 3 deletions(-)
drivers/net/mpipe/mpipe_tilegx.c +0 -3
@@ -123,7 +123,6 @@ struct mpipe_dev_priv {int channel;/* Device channel. */ int port_id;/* DPDK port index. */ struct rte_eth_dev *eth_dev;/* DPDK device. */ -struct rte_pci_device pci_dev;/* PCI device data. */ struct rte_mbuf **tx_comps;/* TX completion array. */ struct rte_mempool *rx_mpool;/* mpool used by the rx queues. */ unsigned rx_offset;/* Receive head room. */
@@ -1568,7 +1567,6 @@ rte_pmd_mpipe_devinit(const char *ifname, priv->context = context; priv->instance = instance; priv->is_xaui = (strncmp (ifname,"xgbe" ,4 ) ==0 ); - priv->pci_dev.numa_node = instance; priv->channel =-1 ; mac = priv->mac_addr.addr_bytes;
@@ -1592,7 +1590,6 @@ rte_pmd_mpipe_devinit(const char *ifname, priv->eth_dev = eth_dev; priv->port_id = eth_dev->data->port_id; eth_dev->data->dev_private = priv; - eth_dev->pci_dev = &priv->pci_dev; eth_dev->data->mac_addrs = &priv->mac_addr; eth_dev->data->dev_flags =0 ;
Signature · 1 line
1.9.1
PATCH v6 23/28 ring: remove pci device
In reply to Bernard Iremongerremove rte_ring_pmd and pci_dev.
--- drivers/net/ring/rte_eth_ring.c | 24 ------------------------ 1 file changed, 24 deletions(-)
drivers/net/ring/rte_eth_ring.c +0 -24
@@ -44,8 +44,6 @@#define ETH_RING_ACTION_CREATE "CREATE"#define ETH_RING_ACTION_ATTACH "ATTACH" -static const char *ring_ethdev_driver_name ="Ring PMD" ; -static const char *valid_arguments[] = {ETH_RING_NUMA_NODE_ACTION_ARG ,NULL
@@ -252,15 +250,6 @@ static const struct eth_dev_ops ops = { .mac_addr_add = eth_mac_addr_add, }; -static struct eth_driver rte_ring_pmd = { - .pci_drv = { - .name ="rte_ring_pmd" , - .drv_flags =RTE_PCI_DRV_DETACHABLE , - }, -}; - -static struct rte_pci_id id_table; - int rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[], const unsigned nb_rx_queues,
@@ -269,7 +258,6 @@ rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[], const unsigned numa_node) {struct rte_eth_dev_data *data =NULL ; -struct rte_pci_device *pci_dev =NULL ;struct pmd_internals *internals =NULL ;struct rte_eth_dev *eth_dev =NULL ;
@@ -291,10 +279,6 @@ rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[],if (data ==NULL ) goto error; - pci_dev =rte_zmalloc_socket (name,sizeof (*pci_dev),0 , numa_node); -if (pci_dev ==NULL ) - goto error; - internals =rte_zmalloc_socket (name,sizeof (*internals),0 , numa_node);if (internals ==NULL ) goto error;
@@ -322,12 +306,6 @@ rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[], internals->tx_ring_queues[i].rng = tx_queues[i]; } - rte_ring_pmd.pci_drv.name = ring_ethdev_driver_name; - rte_ring_pmd.pci_drv.id_table = &id_table; - - pci_dev->numa_node = numa_node; - pci_dev->driver = &rte_ring_pmd.pci_drv; - data->dev_private = internals; data->port_id = eth_dev->data->port_id;memmove (data->name, eth_dev->data->name,sizeof (data->name));
@@ -354,7 +332,6 @@ rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[], error:rte_free (data); -rte_free (pci_dev);rte_free (internals);return -1 ;
@@ -564,7 +541,6 @@ rte_pmd_ring_devuninit(const char *name)eth_dev_stop (eth_dev);rte_free (eth_dev->data->dev_private);rte_free (eth_dev->data); -rte_free (eth_dev->pci_dev);rte_eth_dev_release_port (eth_dev);return 0 ;
Signature · 1 line
1.9.1
PATCH v6 26/28 xenvirt: remove pci device
In reply to Bernard Iremonger--- drivers/net/xenvirt/rte_eth_xenvirt.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)
drivers/net/xenvirt/rte_eth_xenvirt.c +1 -9
@@ -1,7 +1,7 @@/*- * BSD LICENSE * -* Copyright(c) 2010-2014 Intel Corporation. All rights reserved. +* Copyright(c) 2010-2015 Intel Corporation. All rights reserved. * All rights reserved. * * Redistribution and use in source and binary forms, with or without
@@ -617,7 +617,6 @@ eth_dev_xenvirt_create(const char *name, const char *params, enum dev_action action) {struct rte_eth_dev_data *data =NULL ; -struct rte_pci_device *pci_dev =NULL ;struct pmd_internals *internals =NULL ;struct rte_eth_dev *eth_dev =NULL ;struct xenvirt_dict dict;
@@ -639,10 +638,6 @@ eth_dev_xenvirt_create(const char *name, const char *params,if (data ==NULL ) goto err; - pci_dev =rte_zmalloc_socket (name,sizeof (*pci_dev),0 , numa_node); -if (pci_dev ==NULL ) - goto err; - internals =rte_zmalloc_socket (name,sizeof (*internals),0 , numa_node);if (internals ==NULL ) goto err;
@@ -652,8 +647,6 @@ eth_dev_xenvirt_create(const char *name, const char *params,if (eth_dev ==NULL ) goto err; - pci_dev->numa_node = numa_node; - data->dev_private = internals; data->port_id = eth_dev->data->port_id; data->nb_rx_queues = (uint16_t )1 ;
@@ -684,7 +677,6 @@ eth_dev_xenvirt_create(const char *name, const char *params, err:rte_free (data); -rte_free (pci_dev);rte_free (internals);return -1 ;
Signature · 1 line
1.9.1
PATCH v6 28/28 bonding: remove pci device
In reply to Bernard Iremongerremove pci_dev, pci_drv, rte_bond_pmd and pci_id_table. handle numa_node for vdevs
handle RTE_ETH_DEV_INTR_LSC for vdevs
rename valid_bonded_device to check_for_bonded_device remove branches on pci_dev
--- drivers/net/bonding/rte_eth_bond_8023ad.c | 4 +-- drivers/net/bonding/rte_eth_bond_alb.c | 2 +- drivers/net/bonding/rte_eth_bond_api.c | 51 ++++++------------------------ drivers/net/bonding/rte_eth_bond_pmd.c | 18 +++++------ drivers/net/bonding/rte_eth_bond_private.h | 2 +- 5 files changed, 23 insertions(+), 54 deletions(-)
drivers/net/bonding/rte_eth_bond_8023ad.c +2 -2
@@ -1,7 +1,7 @@/*- * BSD LICENSE * -* Copyright(c) 2010-2014 Intel Corporation. All rights reserved. +* Copyright(c) 2010-2015 Intel Corporation. All rights reserved. * All rights reserved. * * Redistribution and use in source and binary forms, with or without
@@ -879,7 +879,7 @@ bond_mode_8023ad_activate_slave(struct rte_eth_dev *bond_dev, uint8_t slave_id)RTE_VERIFY (port->rx_ring ==NULL );RTE_VERIFY (port->tx_ring ==NULL ); - socket_id = rte_eth_devices[slave_id].pci_dev->numa_node; + socket_id = rte_eth_devices[slave_id].data->numa_node; element_size =sizeof (struct slow_protocol_frame ) +sizeof (struct rte_mbuf ) +RTE_PKTMBUF_HEADROOM ;
drivers/net/bonding/rte_eth_bond_alb.c +1 -1
@@ -65,7 +65,7 @@ bond_mode_alb_enable(struct rte_eth_dev *bond_dev)uint16_t data_size;char mem_name[RTE_ETH_NAME_MAX_LEN ]; -int socket_id = bond_dev->pci_dev->numa_node; +int socket_id = bond_dev->data->numa_node;/* Fill hash table with initial values */ memset (hash_table,0 ,sizeof (struct client_data ) *ALB_HASH_TABLE_SIZE );
drivers/net/bonding/rte_eth_bond_api.c +10 -41
114 lines not on this page · raw message
drivers/net/bonding/rte_eth_bond_pmd.c +9 -9
@@ -1307,7 +1307,7 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev,rte_eth_dev_stop (slave_eth_dev->data->port_id);/* Enable interrupts on slave device if supported */ -if (slave_eth_dev->driver->pci_drv.drv_flags &RTE_PCI_DRV_INTR_LSC ) +if (slave_eth_dev->data->dev_flags &RTE_ETH_DEV_INTR_LSC ) slave_eth_dev->data->dev_conf.intr_conf.lsc =1 ;/* Configure device */
@@ -1362,9 +1362,9 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev, }/* If lsc interrupt is set, check initial slave's link status */ -if (slave_eth_dev->driver->pci_drv.drv_flags &RTE_PCI_DRV_INTR_LSC ) +if (slave_eth_dev->data->dev_flags &RTE_ETH_DEV_INTR_LSC )bond_ethdev_lsc_event_callback (slave_eth_dev->data->port_id, -RTE_ETH_EVENT_INTR_LSC , &bonded_eth_dev->data->port_id); +RTE_ETH_EVENT_INTR_LSC , &bonded_eth_dev->data->port_id);return 0 ; }
@@ -1403,7 +1403,7 @@ slave_add(struct bond_dev_private *internals,/* If slave device doesn't support interrupts then we need to enabled * polling to monitor link status */ -if (!(slave_eth_dev->pci_dev->driver->drv_flags &RTE_PCI_DRV_INTR_LSC )) { +if (!(slave_eth_dev->data->dev_flags &RTE_PCI_DRV_INTR_LSC )) { slave_details->link_status_poll_enabled =1 ;if (!internals->link_status_polling_enabled) {
@@ -1447,7 +1447,7 @@ bond_ethdev_start(struct rte_eth_dev *eth_dev)int i;/* slave eth dev will be started by bonded device */ -if (valid_bonded_ethdev (eth_dev)) { +if (check_for_bonded_ethdev (eth_dev)) {RTE_BOND_LOG (ERR ,"User tried to explicitly start a slave eth_dev (%d)" , eth_dev->data->port_id);return -1 ;
@@ -1592,7 +1592,7 @@ bond_ethdev_info(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) dev_info->max_tx_queues = (uint16_t )512 ; dev_info->min_rx_bufsize =0 ; - dev_info->pci_dev = dev->pci_dev; + dev_info->pci_dev =NULL ; dev_info->rx_offload_capa = internals->rx_offload_capa; dev_info->tx_offload_capa = internals->tx_offload_capa;
@@ -1605,7 +1605,7 @@ bond_ethdev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id, {struct bond_rx_queue *bd_rx_q = (struct bond_rx_queue *)rte_zmalloc_socket (NULL ,sizeof (struct bond_rx_queue ), -0 , dev->pci_dev->numa_node); +0 , dev->data->numa_node);if (bd_rx_q ==NULL )return -1 ;
@@ -1629,7 +1629,7 @@ bond_ethdev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id, {struct bond_tx_queue *bd_tx_q = (struct bond_tx_queue *)rte_zmalloc_socket (NULL ,sizeof (struct bond_tx_queue ), -0 , dev->pci_dev->numa_node); +0 , dev->data->numa_node);if (bd_tx_q ==NULL )return -1 ;
@@ -1873,7 +1873,7 @@ bond_ethdev_lsc_event_callback(uint8_t port_id, enum rte_eth_event_type type, bonded_eth_dev = &rte_eth_devices[*(uint8_t *)param]; slave_eth_dev = &rte_eth_devices[port_id]; -if (valid_bonded_ethdev (bonded_eth_dev)) +if (check_for_bonded_ethdev (bonded_eth_dev))return ; internals = bonded_eth_dev->data->dev_private;
drivers/net/bonding/rte_eth_bond_private.h +1 -1
@@ -162,7 +162,7 @@ struct bond_dev_private {extern struct eth_dev_ops default_dev_ops;int -valid_bonded_ethdev (const struct rte_eth_dev *eth_dev); +check_for_bonded_ethdev (const struct rte_eth_dev *eth_dev);/* Search given slave array to find possition of given id. * Return slave pos or slaves_count if not found. */
Signature · 1 line
1.9.1
Re: [PATCH v6 28/28] bonding: remove pci device
Quoted 14 lines
-----Original Message-----
From: dev [mailto:[email protected]] On Behalf Of Bernard Iremonger
Sent: Thursday, October 29, 2015 19:37
To: [email protected]
Subject: [dpdk-dev] [PATCH v6 28/28] bonding: remove pci deviceremove
pci_dev,pci_drv,rte_bond_pmdandpci_id_table. handlenuma_nodefor vdevs
handleRTE_ETH_DEV_INTR_LSCfor vdevs
renamevalid_bonded_devicetocheck_for_bonded_deviceremove branches onpci_devSigned-off-by Bernard Iremonger <[email protected]>
Quoted 9 lines
--- drivers/net/bonding/rte_eth_bond_8023ad.c | 4 +-- drivers/net/bonding/rte_eth_bond_alb.c | 2 +- drivers/net/bonding/rte_eth_bond_api.c | 51 ++++++----------------- ------- drivers/net/bonding/rte_eth_bond_pmd.c | 18 +++++------ drivers/net/bonding/rte_eth_bond_private.h | 2 +- 5 files changed, 23 insertions(+), 54 deletions(-)
Re: [PATCH v6 20/28] bonding: copy device info to eth_dev data
In reply to Bernard IremongerQuoted 46 lines
-----Original Message-----
From: dev [mailto:[email protected]] On Behalf Of Bernard Iremonger
Sent: Thursday, October 29, 2015 19:36
To: [email protected]
Subject: [dpdk-dev] [PATCH v6 20/28] bonding: copy device info toeth_devdatainitialise
dev_flags, kdrv, driver,drv_nameandnuma_nodefields ineth_devdata.Signed-off-by Bernard Iremonger <[email protected]>--- drivers/net/bonding/rte_eth_bond_api.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)drivers/net/bonding/rte_eth_bond_api.c +3
-0@@ -44,6 +44,8 @@#define DEFAULT_POLLING_INTERVAL_10_MS (10) +const char pmd_bond_driver_name[] ="rte_bond_pmd" ; +int valid_bonded_ethdev(const struct rte_eth_dev *eth_dev) { @@ -250,7 +252,12 @@ rte_eth_bond_create(const char *name, uint8_t mode, uint8_t
socket_id)drivers/net/bonding/rte_eth_bond_api.c +6
-2eth_dev->data->all_multicast =0 ; eth_dev->dev_ops = &default_dev_ops; - eth_dev->pci_dev = pci_dev; + eth_dev->data->dev_flags =RTE_ETH_DEV_INTR_LSC | +RTE_ETH_DEV_DETACHABLE |RTE_ETH_DEV_BONDED ; + eth_dev->driver =NULL ; + eth_dev->data->kdrv =RTE_KDRV_NONE ; + eth_dev->data->drv_name = pmd_bond_driver_name; + eth_dev->data->numa_node = socket_id;rte_spinlock_init (&internals->lock); --
Quoted 1 line
1.9.1
Hello Bernard,
Quoted 28 lines · Bernard Iremonger
There is a dummy pci driver in the vdev PMD's at present. This patch set removes the pci driver from the vdev PMD's. Changes have been made to
librte_etherto handle vdevs and pdevs in the same way.[snip]
Bernard Iremonger (28):
librte_eal: addRTE_KDRV_NONEfor vdevs
librte_ether: add fields fromrte_pci_drivertorte_eth_dev_data
librte_ether: add functionrte_eth_copy_dev_info
ixgbe: copy pci device info toeth_devdata
e1000: copy pci device info toeth_devdata
i40e: copy pci device info toeth_devdata
fm10k: copy pci device info toeth_devdata
bnx2x: copy pci device info toeth_devdata
cxgbe: copy pci device info toeth_devdata
enic: copy pci device info toeth_devdata
mlx4: copy pci device info toeth_devdata
virtio: copy pci device info toeth_devdata
vmxnet3: copy pci device info toeth_devdata
null: copy device info toeth_devdata
ring: copy device info toeth_devdata
pcap: copy device info toeth_devdata
af_packet: copy device info toeth_devdata
xenvirt: copy device info toeth_devdata
mpipe: copy device info toeth_devdata
bonding: copy device info toeth_devdata
Quoted 9 lines
librte_ether: remove branches onpci_dev
null: remove pci device
ring: remove pci device
pcap: remove pci device
af_packet: remove pci device
xenvirt: remove pci device
mpipe: remove pci device
bonding: remove pci device
We end up with kdrv none, while for virtual devices, I can't see a case where we would need it.
And these flags end up in ethdev :
+/** Device needs PCI BAR mapping (done with either IGB_UIO or VFIO) */
+#define RTE_ETH_DEV_DRV_NEED_MAPPING RTE_PCI_DRV_NEED_MAPPING
+/** Device needs to be unbound even if no module is provided */
+#define RTE_ETH_DEV_DRV_FORCE_UNBIND RTE_PCI_DRV_FORCE_UNBIND
+/** Device supports link state interrupt */
+#define RTE_ETH_DEV_INTR_LSC RTE_PCI_DRV_INTR_LSC
+/** Device supports detaching capability */
+#define RTE_ETH_DEV_DETACHABLE RTE_PCI_DRV_DETACHABLE
I can't see the point of all this, you are just moving pci specific fields to ethdev and I don't see how it would ease future cleanups or introductions of other bus types.
A real cleanup would be something like what Neil already proposed before.
Signature · 1 line
David Marchand
Quoted 56 lines · David Marchand
Hello Bernard,
Quoted 28 lines · Bernard Iremonger
There is a dummy pci driver in the vdev PMD's at present. This patch set removes the pci driver from the vdev PMD's. Changes have been made to
librte_etherto handle vdevs and pdevs in the same way.[snip]
Bernard Iremonger (28):
librte_eal: addRTE_KDRV_NONEfor vdevs
librte_ether: add fields fromrte_pci_drivertorte_eth_dev_data
librte_ether: add functionrte_eth_copy_dev_info
ixgbe: copy pci device info toeth_devdata
e1000: copy pci device info toeth_devdata
i40e: copy pci device info toeth_devdata
fm10k: copy pci device info toeth_devdata
bnx2x: copy pci device info toeth_devdata
cxgbe: copy pci device info toeth_devdata
enic: copy pci device info toeth_devdata
mlx4: copy pci device info toeth_devdata
virtio: copy pci device info toeth_devdata
vmxnet3: copy pci device info toeth_devdata
null: copy device info toeth_devdata
ring: copy device info toeth_devdata
pcap: copy device info toeth_devdata
af_packet: copy device info toeth_devdata
xenvirt: copy device info toeth_devdata
mpipe: copy device info toeth_devdata
bonding: copy device info toeth_devdataQuoted 9 lines
librte_ether: remove branches onpci_dev
null: remove pci device
ring: remove pci device
pcap: remove pci device
af_packet: remove pci device
xenvirt: remove pci device
mpipe: remove pci device
bonding: remove pci deviceWe end up with kdrv none, while for virtual devices, I can't see a case where we would need it.
And these flags end up in ethdev :
(quoted diff) +8
-0+/** Device needs PCI BAR mapping (done with either IGB_UIO or VFIO) */ +#define RTE_ETH_DEV_DRV_NEED_MAPPING RTE_PCI_DRV_NEED_MAPPING +/** Device needs to be unbound even if no module is provided */ +#define RTE_ETH_DEV_DRV_FORCE_UNBIND RTE_PCI_DRV_FORCE_UNBIND +/** Device supports link state interrupt */ +#define RTE_ETH_DEV_INTR_LSC RTE_PCI_DRV_INTR_LSC +/** Device supports detaching capability */ +#define RTE_ETH_DEV_DETACHABLE RTE_PCI_DRV_DETACHABLE
Quoted 6 lines
I can't see the point of all this, you are just moving pci specific fields to ethdev and I don't see how it would ease future cleanups or introductions of other bus types.
A real cleanup would be something like what Neil already proposed before.
Hi David,
this is perhaps not a full solution to enable other device types, but it's certainly a step along the way. The primary goals were to:
* remove all references to the pci_dev structure from ethdev, so that no checks need to be explicitly made for the underlying device type. In this, I believe it largely succeeds, as the flags above are checked for each device directly, and a number of them are completely generic across device types, e.g. whether it supports a link state interrupt or is hotpluggable. The others may be of use to other device types too, just without any non-pci devices to look at as reference in DPDK, it's hard to know for sure.
* Remove the need to have a pci_dev structure within each vdev, and again this set does that cleanup, simplifying all the vdevs.
I'm sure there is more work to do be done to get more and different device support in there, but this patch has been through 6 revisions and multiple reviews and I believe is worthwhile including in 2.2 for the reasons stated above.
Regards,
/Bruce
Quoted 89 lines · Bernard Iremonger
There is a dummy pci driver in the vdev PMD's at present.
This patch set removes the pci driver from the vdev PMD's.
Changes have been made tolibrte_etherto handle vdevs and pdevs in the same way.The following vdev PMD's have had the pci driver removed:
null
ring
bonding
pcapaf_packet
xenvirt
mpipeAll the pdev PMD's have been modified to copy the pci device info into
eth_devdata.Changes in v6:
Initialisedata->drv_namewith the PMD driver name in the vdevs. Remove two more branches onpci_devfrom the bonding vdev.Changes in v5:
rebase to latest code.
refactor patches to avoid potential problems with git bisect.Changes in v4:
rebase to latest code.
add doxygen comments torte_ethdev.h
update release notes in patch 0002.Changes in v3:
rebase to latest code.
restructure patches 0002 and 0003 to fix compile issue in patch 0002.Changes in V2:
rebase to latest code.
fix compile error inrte_ethdev.cwhen debug disabled.
remove Intel copyright from bnx2x, cxgbe, enic, mlx4, mpipe and null PMD's.Bernard Iremonger (28):
librte_eal: addRTE_KDRV_NONEfor vdevs
librte_ether: add fields fromrte_pci_drivertorte_eth_dev_data
librte_ether: add functionrte_eth_copy_dev_info
ixgbe: copy pci device info toeth_devdata
e1000: copy pci device info toeth_devdata
i40e: copy pci device info toeth_devdata
fm10k: copy pci device info toeth_devdata
bnx2x: copy pci device info toeth_devdata
cxgbe: copy pci device info toeth_devdata
enic: copy pci device info toeth_devdata
mlx4: copy pci device info toeth_devdata
virtio: copy pci device info toeth_devdata
vmxnet3: copy pci device info toeth_devdata
null: copy device info toeth_devdata
ring: copy device info toeth_devdata
pcap: copy device info toeth_devdata
af_packet: copy device info toeth_devdata
xenvirt: copy device info toeth_devdata
mpipe: copy device info toeth_devdata
bonding: copy device info toeth_devdata
librte_ether: remove branches onpci_dev
null: remove pci device
ring: remove pci device
pcap: remove pci device
af_packet: remove pci device
xenvirt: remove pci device
mpipe: remove pci device
bonding: remove pci devicedoc/guides/rel_notes/release_2_2.rst | 3 ++ drivers/net/af_packet/rte_eth_af_packet.c | 20 ++++------ drivers/net/bnx2x/bnx2x_ethdev.c | 3 ++ drivers/net/bonding/rte_eth_bond_8023ad.c | 4 +- drivers/net/bonding/rte_eth_bond_alb.c | 2 +- drivers/net/bonding/rte_eth_bond_api.c | 60 +++++++++--------------------- drivers/net/bonding/rte_eth_bond_pmd.c | 18 ++++----- drivers/net/bonding/rte_eth_bond_private.h | 2 +- drivers/net/cxgbe/cxgbe_ethdev.c | 3 ++ drivers/net/e1000/em_ethdev.c | 3 ++ drivers/net/e1000/igb_ethdev.c | 5 +++ drivers/net/enic/enic_ethdev.c | 1 + drivers/net/fm10k/fm10k_ethdev.c | 2 + drivers/net/i40e/i40e_ethdev.c | 3 ++ drivers/net/i40e/i40e_ethdev_vf.c | 2 + drivers/net/ixgbe/ixgbe_ethdev.c | 4 ++ drivers/net/mlx4/mlx4.c | 3 ++ drivers/net/mpipe/mpipe_tilegx.c | 10 +++-- drivers/net/null/rte_eth_null.c | 29 ++++----------- drivers/net/pcap/rte_eth_pcap.c | 31 +++++---------- drivers/net/ring/rte_eth_ring.c | 37 ++++--------------
Quoted 9 lines
drivers/net/virtio/virtio_ethdev.c | 3 ++ drivers/net/vmxnet3/vmxnet3_ethdev.c | 2 + drivers/net/xenvirt/rte_eth_xenvirt.c | 18 ++++----- lib/librte_eal/common/include/rte_pci.h | 3 +- lib/librte_ether/rte_ethdev.c | 54 +++++++++++++++------------ lib/librte_ether/rte_ethdev.h | 29 +++++++++++++++ lib/librte_ether/rte_ether_version.map | 7 ++++ 28 files changed, 184 insertions(+), 177 deletions(-)