Fix overwriting of dev_flags in rte_eth_dev after initialization
Subsystems (2)
PATCH 1/1 Fix overwriting of dev_flags in rte_eth_dev after initialization
rte_eth_copy_pci_info no longer sets RTE_ETH_DEV_DETACHABLE as per my previous patch, but it still does initialize the dev_flags. In a number of cases, a later assignment to dev_flags to set RTE_ETH_DEV_DETACHABLE was overwriting the previously initialized value.
Pointed out by Michael Larsen.
--- drivers/net/bnxt/bnxt_ethdev.c | 2 +- drivers/net/e1000/em_ethdev.c | 2 +- drivers/net/e1000/igb_ethdev.c | 4 ++-- drivers/net/fm10k/fm10k_ethdev.c | 2 +- drivers/net/i40e/i40e_ethdev.c | 2 +- drivers/net/i40e/i40e_ethdev_vf.c | 2 +- drivers/net/ixgbe/ixgbe_ethdev.c | 4 ++-- drivers/net/nfp/nfp_net.c | 2 +- drivers/net/vmxnet3/vmxnet3_ethdev.c | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-)
drivers/net/bnxt/bnxt_ethdev.c +1 -1
@@ -1087,7 +1087,7 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev)RTE_LOG (INFO ,PMD ,"%s" , bnxt_version);rte_eth_copy_pci_info (eth_dev, pci_dev); - eth_dev->data->dev_flags =RTE_ETH_DEV_DETACHABLE ; + eth_dev->data->dev_flags |=RTE_ETH_DEV_DETACHABLE ; bp = eth_dev->data->dev_private;if (bnxt_vf_pciid (pci_dev->id.device_id))
drivers/net/e1000/em_ethdev.c +1 -1
@@ -339,7 +339,7 @@ eth_em_dev_init(struct rte_eth_dev *eth_dev) }rte_eth_copy_pci_info (eth_dev, pci_dev); - eth_dev->data->dev_flags =RTE_ETH_DEV_DETACHABLE ; + eth_dev->data->dev_flags |=RTE_ETH_DEV_DETACHABLE ; hw->hw_addr = (void *)pci_dev->mem_resource[0 ].addr; hw->device_id = pci_dev->id.device_id;
drivers/net/e1000/igb_ethdev.c +2 -2
@@ -777,7 +777,7 @@ eth_igb_dev_init(struct rte_eth_dev *eth_dev) }rte_eth_copy_pci_info (eth_dev, pci_dev); - eth_dev->data->dev_flags =RTE_ETH_DEV_DETACHABLE ; + eth_dev->data->dev_flags |=RTE_ETH_DEV_DETACHABLE ; hw->hw_addr= (void *)pci_dev->mem_resource[0 ].addr;
@@ -986,7 +986,7 @@ eth_igbvf_dev_init(struct rte_eth_dev *eth_dev) pci_dev =E1000_DEV_TO_PCI (eth_dev);rte_eth_copy_pci_info (eth_dev, pci_dev); - eth_dev->data->dev_flags =RTE_ETH_DEV_DETACHABLE ; + eth_dev->data->dev_flags |=RTE_ETH_DEV_DETACHABLE ; hw->device_id = pci_dev->id.device_id; hw->vendor_id = pci_dev->id.vendor_id;
drivers/net/fm10k/fm10k_ethdev.c +1 -1
@@ -2858,7 +2858,7 @@ eth_fm10k_dev_init(struct rte_eth_dev *dev)return 0 ;rte_eth_copy_pci_info (dev, pdev); - dev->data->dev_flags =RTE_ETH_DEV_DETACHABLE ; + dev->data->dev_flags |=RTE_ETH_DEV_DETACHABLE ; macvlan =FM10K_DEV_PRIVATE_TO_MACVLAN (dev->data->dev_private);memset (macvlan,0 ,sizeof (*macvlan));
drivers/net/i40e/i40e_ethdev.c +1 -1
@@ -1045,7 +1045,7 @@ eth_i40e_dev_init(struct rte_eth_dev *dev) intr_handle = &pci_dev->intr_handle;rte_eth_copy_pci_info (dev, pci_dev); - dev->data->dev_flags =RTE_ETH_DEV_DETACHABLE ; + dev->data->dev_flags |=RTE_ETH_DEV_DETACHABLE ; pf->adapter =I40E_DEV_PRIVATE_TO_ADAPTER (dev->data->dev_private); pf->adapter->eth_dev = dev;
drivers/net/i40e/i40e_ethdev_vf.c +1 -1
@@ -1478,7 +1478,7 @@ i40evf_dev_init(struct rte_eth_dev *eth_dev) }rte_eth_copy_pci_info (eth_dev, pci_dev); - eth_dev->data->dev_flags =RTE_ETH_DEV_DETACHABLE ; + eth_dev->data->dev_flags |=RTE_ETH_DEV_DETACHABLE ; hw->vendor_id = pci_dev->id.vendor_id; hw->device_id = pci_dev->id.device_id;
drivers/net/ixgbe/ixgbe_ethdev.c +2 -2
@@ -1172,7 +1172,7 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev) }rte_eth_copy_pci_info (eth_dev, pci_dev); - eth_dev->data->dev_flags =RTE_ETH_DEV_DETACHABLE ; + eth_dev->data->dev_flags |=RTE_ETH_DEV_DETACHABLE ;/* Vendor and Device ID need to be set before init of shared code */ hw->device_id = pci_dev->id.device_id;
@@ -1626,7 +1626,7 @@ eth_ixgbevf_dev_init(struct rte_eth_dev *eth_dev) }rte_eth_copy_pci_info (eth_dev, pci_dev); - eth_dev->data->dev_flags =RTE_ETH_DEV_DETACHABLE ; + eth_dev->data->dev_flags |=RTE_ETH_DEV_DETACHABLE ; hw->device_id = pci_dev->id.device_id; hw->vendor_id = pci_dev->id.vendor_id;
drivers/net/nfp/nfp_net.c +1 -1
@@ -2465,7 +2465,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev) pci_dev =RTE_DEV_TO_PCI (eth_dev->device);rte_eth_copy_pci_info (eth_dev, pci_dev); - eth_dev->data->dev_flags =RTE_ETH_DEV_DETACHABLE ; + eth_dev->data->dev_flags |=RTE_ETH_DEV_DETACHABLE ; hw->device_id = pci_dev->id.device_id; hw->vendor_id = pci_dev->id.vendor_id;
drivers/net/vmxnet3/vmxnet3_ethdev.c +1 -1
@@ -250,7 +250,7 @@ eth_vmxnet3_dev_init(struct rte_eth_dev *eth_dev)return 0 ;rte_eth_copy_pci_info (eth_dev, pci_dev); - eth_dev->data->dev_flags =RTE_ETH_DEV_DETACHABLE ; + eth_dev->data->dev_flags |=RTE_ETH_DEV_DETACHABLE ;/* Vendor and Device ID need to be set before init of shared code */ hw->device_id = pci_dev->id.device_id;
Signature · 1 line
2.9.3
Quoted 9 lines · Ben Walker
rte_eth_copy_pci_infono longer setsRTE_ETH_DEV_DETACHABLEas per my previous patch, but it still does initialize thedev_flags. In a number of cases, a later assignment todev_flagsto setRTE_ETH_DEV_DETACHABLEwas overwriting the previously initialized value.Pointed out by Michael Larsen.
Signed-off-by Ben Walker <[email protected]>
Thanks Ben,
A patch already sent for this:
http://dpdk.org/dev/patchwork/patch/20248/
(indeed two: http://dpdk.org/dev/patchwork/patch/20163/)
and applied to next-net:
http://dpdk.org/browse/next/dpdk-next-net/commit/?id=ae94e2a23b5
Thanks,
ferruh