X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Flibrte_pmd_pcap%2Frte_eth_pcap.c;h=2ff1e7721e370f2b22ee98dc7881480ce37dce00;hb=08b563ffb19d8baf59dd84200f25bc85031d18a7;hp=51a0aa49674656dcb751c1eca9a31245c9f3023c;hpb=d8e2337ac4e32132e5a26dc351604447b341366d;p=dpdk.git diff --git a/lib/librte_pmd_pcap/rte_eth_pcap.c b/lib/librte_pmd_pcap/rte_eth_pcap.c index 51a0aa4967..2ff1e7721e 100644 --- a/lib/librte_pmd_pcap/rte_eth_pcap.c +++ b/lib/librte_pmd_pcap/rte_eth_pcap.c @@ -1,14 +1,14 @@ /*- * BSD LICENSE - * + * * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. * Copyright(c) 2014 6WIND S.A. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * Redistributions in binary form must reproduce the above copyright @@ -18,7 +18,7 @@ * * Neither the name of Intel Corporation nor the names of its * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR @@ -40,19 +40,21 @@ #include #include #include +#include -#include "rte_eth_pcap.h" +#include + +#include #define RTE_ETH_PCAP_SNAPSHOT_LEN 65535 #define RTE_ETH_PCAP_SNAPLEN 4096 #define RTE_ETH_PCAP_PROMISC 1 #define RTE_ETH_PCAP_TIMEOUT -1 -#define RTE_ETH_PCAP_MBUFS 64 -#define ETH_PCAP_RX_PCAP_ARG "rx_pcap" -#define ETH_PCAP_TX_PCAP_ARG "tx_pcap" -#define ETH_PCAP_RX_IFACE_ARG "rx_iface" -#define ETH_PCAP_TX_IFACE_ARG "tx_iface" -#define ETH_PCAP_IFACE_ARG "iface" +#define ETH_PCAP_RX_PCAP_ARG "rx_pcap" +#define ETH_PCAP_TX_PCAP_ARG "tx_pcap" +#define ETH_PCAP_RX_IFACE_ARG "rx_iface" +#define ETH_PCAP_TX_IFACE_ARG "tx_iface" +#define ETH_PCAP_IFACE_ARG "iface" static char errbuf[PCAP_ERRBUF_SIZE]; static struct timeval start_time; @@ -88,6 +90,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]; }; @@ -135,7 +139,7 @@ eth_pcap_rx(void *queue, packet = pcap_next(pcap_q->pcap, &header); if (unlikely(packet == NULL)) break; - else + else mbuf = rte_pktmbuf_alloc(pcap_q->mb_pool); if (unlikely(mbuf == NULL)) break; @@ -147,14 +151,15 @@ eth_pcap_rx(void *queue, if (header.len <= buf_size) { /* pcap packet will fit in the mbuf, go ahead and copy */ - rte_memcpy(mbuf->pkt.data, packet, header.len); - mbuf->pkt.data_len = (uint16_t)header.len; - mbuf->pkt.pkt_len = mbuf->pkt.data_len; - bufs[i] = mbuf; + rte_memcpy(rte_pktmbuf_mtod(mbuf, void *), packet, + header.len); + mbuf->data_len = (uint16_t)header.len; + mbuf->pkt_len = mbuf->data_len; + bufs[num_rx] = mbuf; num_rx++; } else { /* pcap packet will not fit in the mbuf, so drop packet */ - RTE_LOG(ERR, PMD, + RTE_LOG(ERR, PMD, "PCAP packet %d bytes will not fit in mbuf (%d bytes)\n", header.len, buf_size); rte_pktmbuf_free(mbuf); @@ -196,9 +201,10 @@ eth_pcap_tx_dumper(void *queue, for (i = 0; i < nb_pkts; i++) { mbuf = bufs[i]; calculate_timestamp(&header.ts); - header.len = mbuf->pkt.data_len; + header.len = mbuf->data_len; header.caplen = header.len; - pcap_dump((u_char*) dumper_q->dumper, &header, mbuf->pkt.data); + pcap_dump((u_char *)dumper_q->dumper, &header, + rte_pktmbuf_mtod(mbuf, void*)); rte_pktmbuf_free(mbuf); num_tx++; } @@ -233,10 +239,12 @@ eth_pcap_tx(void *queue, for (i = 0; i < nb_pkts; i++) { mbuf = bufs[i]; - ret = pcap_sendpacket(tx_queue->pcap, (u_char*) mbuf->pkt.data, - mbuf->pkt.data_len); - if(likely(!ret)) - num_tx++; + ret = pcap_sendpacket(tx_queue->pcap, + rte_pktmbuf_mtod(mbuf, u_char *), + mbuf->data_len); + if (unlikely(ret != 0)) + break; + num_tx++; rte_pktmbuf_free(mbuf); } @@ -289,6 +297,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; @@ -403,7 +412,7 @@ static struct eth_dev_ops ops = { * reference of it for use it later on. */ static int -open_rx_pcap(const char *value, void *extra_args) +open_rx_pcap(const char *key __rte_unused, const char *value, void *extra_args) { unsigned i; const char *pcap_filename = value; @@ -426,7 +435,7 @@ open_rx_pcap(const char *value, void *extra_args) * for use it later on. */ static int -open_tx_pcap(const char *value, void *extra_args) +open_tx_pcap(const char *key __rte_unused, const char *value, void *extra_args) { unsigned i; const char *pcap_filename = value; @@ -476,7 +485,7 @@ open_iface_live(const char *iface, pcap_t **pcap) { * Opens an interface for reading and writing */ static inline int -open_rx_tx_iface(const char *value, void *extra_args) +open_rx_tx_iface(const char *key __rte_unused, const char *value, void *extra_args) { const char *iface = value; pcap_t **pcap = extra_args; @@ -490,7 +499,7 @@ open_rx_tx_iface(const char *value, void *extra_args) * Opens a NIC for reading packets from it */ static inline int -open_rx_iface(const char *value, void *extra_args) +open_rx_iface(const char *key __rte_unused, const char *value, void *extra_args) { unsigned i; const char *iface = value; @@ -510,7 +519,7 @@ open_rx_iface(const char *value, void *extra_args) * Opens a NIC for writing packets to it */ static inline int -open_tx_iface(const char *value, void *extra_args) +open_tx_iface(const char *key __rte_unused, const char *value, void *extra_args) { unsigned i; const char *iface = value; @@ -528,14 +537,23 @@ open_tx_iface(const char *value, void *extra_args) static int -rte_pmd_init_internals(const unsigned nb_rx_queues, +rte_pmd_init_internals(const char *name, 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 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; + + for (k_idx = 0; k_idx < kvlist->count; k_idx++) { + pair = &kvlist->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); @@ -543,20 +561,20 @@ rte_pmd_init_internals(const unsigned nb_rx_queues, /* now do all data allocation - for eth_dev structure, dummy pci driver * and internal (private) data */ - data = rte_zmalloc_socket(NULL, sizeof(*data), 0, numa_node); + data = rte_zmalloc_socket(name, sizeof(*data), 0, numa_node); if (data == NULL) goto error; - pci_dev = rte_zmalloc_socket(NULL, sizeof(*pci_dev), 0, numa_node); + pci_dev = rte_zmalloc_socket(name, sizeof(*pci_dev), 0, numa_node); if (pci_dev == NULL) goto error; - *internals = rte_zmalloc_socket(NULL, sizeof(**internals), 0, numa_node); + *internals = rte_zmalloc_socket(name, sizeof(**internals), 0, numa_node); if (*internals == NULL) goto error; /* reserve an ethdev entry */ - *eth_dev = rte_eth_dev_allocate(); + *eth_dev = rte_eth_dev_allocate(name); if (*eth_dev == NULL) goto error; @@ -572,6 +590,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; @@ -596,12 +619,13 @@ rte_pmd_init_internals(const unsigned nb_rx_queues, return -1; } -int -rte_eth_from_pcaps_n_dumpers(pcap_t * const rx_queues[], +static int +rte_eth_from_pcaps_n_dumpers(const char *name, 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 rte_kvargs *kvlist) { struct pmd_internals *internals = NULL; struct rte_eth_dev *eth_dev = NULL; @@ -613,8 +637,8 @@ rte_eth_from_pcaps_n_dumpers(pcap_t * const rx_queues[], if (tx_queues == NULL && nb_tx_queues > 0) return -1; - if (rte_pmd_init_internals(nb_rx_queues, nb_tx_queues, numa_node, - &internals, ð_dev) < 0) + if (rte_pmd_init_internals(name, nb_rx_queues, nb_tx_queues, numa_node, + &internals, ð_dev, kvlist) < 0) return -1; for (i = 0; i < nb_rx_queues; i++) { @@ -630,12 +654,13 @@ rte_eth_from_pcaps_n_dumpers(pcap_t * const rx_queues[], return 0; } -int -rte_eth_from_pcaps(pcap_t * const rx_queues[], +static int +rte_eth_from_pcaps(const char *name, 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 rte_kvargs *kvlist) { struct pmd_internals *internals = NULL; struct rte_eth_dev *eth_dev = NULL; @@ -647,8 +672,8 @@ rte_eth_from_pcaps(pcap_t * const rx_queues[], if (tx_queues == NULL && nb_tx_queues > 0) return -1; - if (rte_pmd_init_internals(nb_rx_queues, nb_tx_queues, numa_node, - &internals, ð_dev) < 0) + if (rte_pmd_init_internals(name, nb_rx_queues, nb_tx_queues, numa_node, + &internals, ð_dev, kvlist) < 0) return -1; for (i = 0; i < nb_rx_queues; i++) { @@ -665,8 +690,8 @@ rte_eth_from_pcaps(pcap_t * const rx_queues[], } -int -rte_pmd_pcap_init(const char *name, const char *params) +static int +rte_pmd_pcap_devinit(const char *name, const char *params) { unsigned numa_node, using_dumpers = 0; int ret; @@ -697,7 +722,8 @@ 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(name, pcaps.pcaps, 1, pcaps.pcaps, 1, + numa_node, kvlist); } /* @@ -737,11 +763,18 @@ rte_pmd_pcap_init(const char *name, const char *params) return -1; if (using_dumpers) - return rte_eth_from_pcaps_n_dumpers(pcaps.pcaps, pcaps.num_of_rx, - dumpers.dumpers, dumpers.num_of_tx, numa_node); + return rte_eth_from_pcaps_n_dumpers(name, pcaps.pcaps, pcaps.num_of_rx, + dumpers.dumpers, dumpers.num_of_tx, numa_node, kvlist); - return rte_eth_from_pcaps(pcaps.pcaps, pcaps.num_of_rx, dumpers.pcaps, - dumpers.num_of_tx, numa_node); + return rte_eth_from_pcaps(name, pcaps.pcaps, pcaps.num_of_rx, dumpers.pcaps, + dumpers.num_of_tx, numa_node, kvlist); } +static struct rte_driver pmd_pcap_drv = { + .name = "eth_pcap", + .type = PMD_VDEV, + .init = rte_pmd_pcap_devinit, +}; + +PMD_REGISTER_DRIVER(pmd_pcap_drv);