From 8957b86380f433fb1b91338ac3dd535d11ccfe7c Mon Sep 17 00:00:00 2001 From: Ido Barnea Date: Sun, 5 Feb 2017 16:48:55 +0200 Subject: Changes to our files to make dpdk1702 work Signed-off-by: Ido Barnea --- src/main_dpdk.cpp | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) (limited to 'src/main_dpdk.cpp') diff --git a/src/main_dpdk.cpp b/src/main_dpdk.cpp index 687cf457..3eb64917 100644 --- a/src/main_dpdk.cpp +++ b/src/main_dpdk.cpp @@ -612,18 +612,18 @@ private: CTRexExtendedDriverBase * create_driver(std::string name); CTRexExtendedDriverDb(){ - register_driver(std::string("rte_ixgbe_pmd"),CTRexExtendedDriverBase10G::create); - register_driver(std::string("rte_igb_pmd"),CTRexExtendedDriverBase1G::create); - register_driver(std::string("rte_i40e_pmd"),CTRexExtendedDriverBase40G::create); - register_driver(std::string("rte_enic_pmd"),CTRexExtendedDriverBaseVIC::create); + register_driver(std::string("net_ixgbe"),CTRexExtendedDriverBase10G::create); + register_driver(std::string("net_e1000_igb"),CTRexExtendedDriverBase1G::create); + register_driver(std::string("net_i40e"),CTRexExtendedDriverBase40G::create); + register_driver(std::string("net_enic"),CTRexExtendedDriverBaseVIC::create); register_driver(std::string("net_mlx5"),CTRexExtendedDriverBaseMlnx5G::create); /* virtual devices */ - register_driver(std::string("rte_em_pmd"), CTRexExtendedDriverBaseE1000::create); - register_driver(std::string("rte_vmxnet3_pmd"), CTRexExtendedDriverVmxnet3::create); - register_driver(std::string("rte_virtio_pmd"), CTRexExtendedDriverVirtio::create); - register_driver(std::string("rte_i40evf_pmd"), CTRexExtendedDriverI40evf::create); - register_driver(std::string("rte_ixgbevf_pmd"), CTRexExtendedDriverIxgbevf::create); + register_driver(std::string("net_e1000_em"), CTRexExtendedDriverBaseE1000::create); + register_driver(std::string("net_vmxnet3"), CTRexExtendedDriverVmxnet3::create); + register_driver(std::string("net_virtio"), CTRexExtendedDriverVirtio::create); + register_driver(std::string("net_i40e_vf"), CTRexExtendedDriverI40evf::create); + register_driver(std::string("net_ixgbe_vf"), CTRexExtendedDriverIxgbevf::create); m_driver_was_set=false; m_drv=0; @@ -1700,7 +1700,7 @@ void DpdkTRexPortAttr::update_description(){ char pci[16]; char * envvar; std::string pci_envvar_name; - pci_addr = rte_eth_devices[m_port_id].pci_dev->addr; + pci_addr = rte_eth_devices[m_port_id].device->devargs->pci.addr; snprintf(pci, sizeof(pci), "%04x:%02x:%02x.%d", pci_addr.domain, pci_addr.bus, pci_addr.devid, pci_addr.function); intf_info_st.pci_addr = pci; pci_envvar_name = "pci" + intf_info_st.pci_addr; @@ -5663,12 +5663,12 @@ void dump_interfaces_info() { for (uint8_t port_id=0; port_idaddr; + pci_addr = rte_eth_devices[port_id].device->devargs->pci.addr; rte_eth_macaddr_get(port_id, &mac_addr); ether_format_addr(mac_str, sizeof mac_str, &mac_addr); printf("PCI: %04x:%02x:%02x.%d - MAC: %s - Driver: %s\n", pci_addr.domain, pci_addr.bus, pci_addr.devid, pci_addr.function, mac_str, - rte_eth_devices[port_id].pci_dev->driver->name); + rte_eth_devices[port_id].device->devargs->virt.drv_name); } } @@ -6558,10 +6558,13 @@ void CTRexExtendedDriverBase40G::add_del_rules(enum rte_filter_op op, uint8_t po } ret = rte_eth_dev_filter_ctrl(port_id, RTE_ETH_FILTER_FDIR, op, (void*)&filter); +#if 0 + //????????? fix if ( ret != 0 ) { rte_exit(EXIT_FAILURE, "rte_eth_dev_filter_ctrl: err=%d, port=%u\n", ret, port_id); } +#endif } int CTRexExtendedDriverBase40G::add_del_eth_type_rule(uint8_t port_id, enum rte_filter_op op, uint16_t eth_type) { @@ -7357,7 +7360,7 @@ TrexDpdkPlatformApi::get_interface_info(uint8_t interface_id, intf_info_st &info memcpy(info.hw_macaddr, rte_mac_addr.addr_bytes, 6); - info.numa_node = g_trex.m_ports[interface_id].m_dev_info.pci_dev->numa_node; + info.numa_node = g_trex.m_ports[interface_id].m_dev_info.pci_dev->device.numa_node; struct rte_pci_addr *loc = &g_trex.m_ports[interface_id].m_dev_info.pci_dev->addr; char pci_addr[50]; -- cgit 1.2.3-korg