From a02aa29dec026741a6a2d500823a3bfdf344c3fe Mon Sep 17 00:00:00 2001 From: Mats Liljegren Date: Fri, 24 Jan 2014 14:24:15 +0100 Subject: [PATCH] pcap: save if_index of the bound device Use command line parameters to get the name of the interface. This name is converted into if_index, which is provided as device info. Signed-off-by: Mats Liljegren Acked-by: Thomas Monjalon --- lib/librte_pmd_pcap/rte_eth_pcap.c | 37 +++++++++++++++++++++++------- lib/librte_pmd_pcap/rte_eth_pcap.h | 9 ++++++-- 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/lib/librte_pmd_pcap/rte_eth_pcap.c b/lib/librte_pmd_pcap/rte_eth_pcap.c index 30d444ff25..03e6e6cf32 100644 --- a/lib/librte_pmd_pcap/rte_eth_pcap.c +++ b/lib/librte_pmd_pcap/rte_eth_pcap.c @@ -41,6 +41,8 @@ #include #include +#include + #include "rte_eth_pcap.h" #define RTE_ETH_PCAP_SNAPSHOT_LEN 65535 @@ -87,6 +89,8 @@ struct pmd_internals { unsigned nb_rx_queues; unsigned nb_tx_queues; + int if_index; + struct pcap_rx_queue rx_queue[RTE_PMD_RING_MAX_RX_RINGS]; struct pcap_tx_queue tx_queue[RTE_PMD_RING_MAX_TX_RINGS]; }; @@ -300,6 +304,7 @@ eth_dev_info(struct rte_eth_dev *dev, { struct pmd_internals *internals = dev->data->dev_private; dev_info->driver_name = drivername; + dev_info->if_index = internals->if_index; dev_info->max_mac_addrs = 1; dev_info->max_rx_pktlen = (uint32_t) -1; dev_info->max_rx_queues = (uint16_t)internals->nb_rx_queues; @@ -543,10 +548,19 @@ rte_pmd_init_internals(const unsigned nb_rx_queues, const unsigned nb_tx_queues, const unsigned numa_node, struct pmd_internals **internals, - struct rte_eth_dev **eth_dev) + struct rte_eth_dev **eth_dev, + struct args_dict *dict) { struct rte_eth_dev_data *data = NULL; struct rte_pci_device *pci_dev = NULL; + unsigned k_idx; + struct key_value *pair = NULL; + + for (k_idx = 0; k_idx < dict->index; k_idx++) { + pair = &dict->pairs[k_idx]; + if (strstr(pair->key, ETH_PCAP_IFACE_ARG) != NULL) + break; + } RTE_LOG(INFO, PMD, "Creating pcap-backed ethdev on numa socket %u\n", numa_node); @@ -583,6 +597,11 @@ rte_pmd_init_internals(const unsigned nb_rx_queues, (*internals)->nb_rx_queues = nb_rx_queues; (*internals)->nb_tx_queues = nb_tx_queues; + if (pair == NULL) + (*internals)->if_index = 0; + else + (*internals)->if_index = if_nametoindex(pair->value); + pci_dev->numa_node = numa_node; data->dev_private = *internals; @@ -612,7 +631,8 @@ rte_eth_from_pcaps_n_dumpers(pcap_t * const rx_queues[], const unsigned nb_rx_queues, pcap_dumper_t * const tx_queues[], const unsigned nb_tx_queues, - const unsigned numa_node) + const unsigned numa_node, + struct args_dict *dict) { struct pmd_internals *internals = NULL; struct rte_eth_dev *eth_dev = NULL; @@ -625,7 +645,7 @@ rte_eth_from_pcaps_n_dumpers(pcap_t * const rx_queues[], return -1; if (rte_pmd_init_internals(nb_rx_queues, nb_tx_queues, numa_node, - &internals, ð_dev) < 0) + &internals, ð_dev, dict) < 0) return -1; for (i = 0; i < nb_rx_queues; i++) { @@ -646,7 +666,8 @@ rte_eth_from_pcaps(pcap_t * const rx_queues[], const unsigned nb_rx_queues, pcap_t * const tx_queues[], const unsigned nb_tx_queues, - const unsigned numa_node) + const unsigned numa_node, + struct args_dict *dict) { struct pmd_internals *internals = NULL; struct rte_eth_dev *eth_dev = NULL; @@ -659,7 +680,7 @@ rte_eth_from_pcaps(pcap_t * const rx_queues[], return -1; if (rte_pmd_init_internals(nb_rx_queues, nb_tx_queues, numa_node, - &internals, ð_dev) < 0) + &internals, ð_dev, dict) < 0) return -1; for (i = 0; i < nb_rx_queues; i++) { @@ -708,7 +729,7 @@ rte_pmd_pcap_init(const char *name, const char *params) if (ret < 0) return -1; - return rte_eth_from_pcaps(pcaps.pcaps, 1, pcaps.pcaps, 1, numa_node); + return rte_eth_from_pcaps(pcaps.pcaps, 1, pcaps.pcaps, 1, numa_node, &dict); } /* @@ -749,10 +770,10 @@ rte_pmd_pcap_init(const char *name, const char *params) if (using_dumpers) return rte_eth_from_pcaps_n_dumpers(pcaps.pcaps, pcaps.num_of_rx, - dumpers.dumpers, dumpers.num_of_tx, numa_node); + dumpers.dumpers, dumpers.num_of_tx, numa_node, &dict); return rte_eth_from_pcaps(pcaps.pcaps, pcaps.num_of_rx, dumpers.pcaps, - dumpers.num_of_tx, numa_node); + dumpers.num_of_tx, numa_node, &dict); } diff --git a/lib/librte_pmd_pcap/rte_eth_pcap.h b/lib/librte_pmd_pcap/rte_eth_pcap.h index c45f4a1736..c0bc5d86f1 100644 --- a/lib/librte_pmd_pcap/rte_eth_pcap.h +++ b/lib/librte_pmd_pcap/rte_eth_pcap.h @@ -47,17 +47,22 @@ extern "C" { #define RTE_ETH_PCAP_PARAM_NAME "eth_pcap" +/* struct args_dict is declared in rte_eth_pcap_args_parser.h */ +struct args_dict; + int rte_eth_from_pcaps(pcap_t * const rx_queues[], const unsigned nb_rx_queues, pcap_t * const tx_queues[], const unsigned nb_tx_queues, - const unsigned numa_node); + const unsigned numa_node, + struct args_dict *dict); int rte_eth_from_pcaps_n_dumpers(pcap_t * const rx_queues[], const unsigned nb_rx_queues, pcap_dumper_t * const tx_queues[], const unsigned nb_tx_queues, - const unsigned numa_node); + const unsigned numa_node, + struct args_dict *dict); /** * For use by the EAL only. Called as part of EAL init to set up any dummy NICs -- 2.20.1