X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fpcap%2Frte_eth_pcap.c;h=f9230eb2edda4955535269cd9d3403a193220de5;hb=6069d815bc4dd73e82396a607882fe8395e592ed;hp=ff9b53444bbd7dacd5230f50f9b03ac10af02a7c;hpb=232771c793dd8e1c4401975b6ad558604d20286a;p=dpdk.git diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c index ff9b53444b..f9230eb2ed 100644 --- a/drivers/net/pcap/rte_eth_pcap.c +++ b/drivers/net/pcap/rte_eth_pcap.c @@ -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. * @@ -47,7 +47,7 @@ #include #define RTE_ETH_PCAP_SNAPSHOT_LEN 65535 -#define RTE_ETH_PCAP_SNAPLEN 4096 +#define RTE_ETH_PCAP_SNAPLEN ETHER_MAX_JUMBO_FRAME_LEN #define RTE_ETH_PCAP_PROMISC 1 #define RTE_ETH_PCAP_TIMEOUT -1 #define ETH_PCAP_RX_PCAP_ARG "rx_pcap" @@ -59,6 +59,7 @@ #define ETH_PCAP_ARG_MAXLEN 64 static char errbuf[PCAP_ERRBUF_SIZE]; +static unsigned char tx_pcap_data[RTE_ETH_PCAP_SNAPLEN]; static struct timeval start_time; static uint64_t start_cycles; static uint64_t hz; @@ -68,6 +69,7 @@ struct pcap_rx_queue { uint8_t in_port; struct rte_mempool *mb_pool; volatile unsigned long rx_pkts; + volatile unsigned long rx_bytes; volatile unsigned long err_pkts; char name[PATH_MAX]; char type[ETH_PCAP_ARG_MAXLEN]; @@ -77,6 +79,7 @@ struct pcap_tx_queue { pcap_dumper_t *dumper; pcap_t *pcap; volatile unsigned long tx_pkts; + volatile unsigned long tx_bytes; volatile unsigned long err_pkts; char name[PATH_MAX]; char type[ETH_PCAP_ARG_MAXLEN]; @@ -127,6 +130,61 @@ static struct rte_eth_link pmd_link = { .link_status = 0 }; +static int +eth_pcap_rx_jumbo(struct rte_mempool *mb_pool, + struct rte_mbuf *mbuf, + const u_char *data, + uint16_t data_len) +{ + struct rte_mbuf *m = mbuf; + + /* Copy the first segment. */ + uint16_t len = rte_pktmbuf_tailroom(mbuf); + + rte_memcpy(rte_pktmbuf_append(mbuf, len), data, len); + data_len -= len; + data += len; + + while (data_len > 0) { + /* Allocate next mbuf and point to that. */ + m->next = rte_pktmbuf_alloc(mb_pool); + + if (unlikely(!m->next)) + return -1; + + m = m->next; + + /* Headroom is not needed in chained mbufs. */ + rte_pktmbuf_prepend(m, rte_pktmbuf_headroom(m)); + m->pkt_len = 0; + m->data_len = 0; + + /* Copy next segment. */ + len = RTE_MIN(rte_pktmbuf_tailroom(m), data_len); + rte_memcpy(rte_pktmbuf_append(m, len), data, len); + + mbuf->nb_segs++; + data_len -= len; + data += len; + } + + return mbuf->nb_segs; +} + +/* Copy data from mbuf chain to a buffer suitable for writing to a PCAP file. */ +static void +eth_pcap_gather_data(unsigned char *data, struct rte_mbuf *mbuf) +{ + uint16_t data_len = 0; + + while (mbuf) { + rte_memcpy(data + data_len, rte_pktmbuf_mtod(mbuf, void *), + mbuf->data_len); + + data_len += mbuf->data_len; + mbuf = mbuf->next; + } +} static uint16_t eth_pcap_rx(void *queue, @@ -140,6 +198,7 @@ eth_pcap_rx(void *queue, struct pcap_rx_queue *pcap_q = queue; uint16_t num_rx = 0; uint16_t buf_size; + uint32_t rx_bytes = 0; if (unlikely(pcap_q->pcap == NULL || nb_pkts == 0)) return 0; @@ -166,19 +225,23 @@ eth_pcap_rx(void *queue, rte_memcpy(rte_pktmbuf_mtod(mbuf, void *), packet, header.len); mbuf->data_len = (uint16_t)header.len; - mbuf->pkt_len = mbuf->data_len; - mbuf->port = pcap_q->in_port; - bufs[num_rx] = mbuf; - num_rx++; } else { - /* pcap packet will not fit in the mbuf, so drop packet */ - RTE_LOG(ERR, PMD, - "PCAP packet %d bytes will not fit in mbuf (%d bytes)\n", - header.len, buf_size); - rte_pktmbuf_free(mbuf); + /* Try read jumbo frame into multi mbufs. */ + if (unlikely(eth_pcap_rx_jumbo(pcap_q->mb_pool, + mbuf, + packet, + header.len) == -1)) + break; } + + mbuf->pkt_len = (uint16_t)header.len; + mbuf->port = pcap_q->in_port; + bufs[num_rx] = mbuf; + num_rx++; + rx_bytes += header.len; } pcap_q->rx_pkts += num_rx; + pcap_q->rx_bytes += rx_bytes; return num_rx; } @@ -205,6 +268,7 @@ eth_pcap_tx_dumper(void *queue, struct rte_mbuf *mbuf; struct pcap_tx_queue *dumper_q = queue; uint16_t num_tx = 0; + uint32_t tx_bytes = 0; struct pcap_pkthdr header; if (dumper_q->dumper == NULL || nb_pkts == 0) @@ -214,12 +278,32 @@ eth_pcap_tx_dumper(void *queue, for (i = 0; i < nb_pkts; i++) { mbuf = bufs[i]; calculate_timestamp(&header.ts); - header.len = mbuf->data_len; + header.len = mbuf->pkt_len; header.caplen = header.len; - pcap_dump((u_char *)dumper_q->dumper, &header, - rte_pktmbuf_mtod(mbuf, void*)); + + if (likely(mbuf->nb_segs == 1)) { + pcap_dump((u_char *)dumper_q->dumper, &header, + rte_pktmbuf_mtod(mbuf, void*)); + } else { + if (mbuf->pkt_len <= ETHER_MAX_JUMBO_FRAME_LEN) { + eth_pcap_gather_data(tx_pcap_data, mbuf); + pcap_dump((u_char *)dumper_q->dumper, &header, + tx_pcap_data); + } else { + RTE_LOG(ERR, PMD, + "Dropping PCAP packet. " + "Size (%d) > max jumbo size (%d).\n", + mbuf->pkt_len, + ETHER_MAX_JUMBO_FRAME_LEN); + + rte_pktmbuf_free(mbuf); + break; + } + } + rte_pktmbuf_free(mbuf); num_tx++; + tx_bytes += mbuf->pkt_len; } /* @@ -229,6 +313,7 @@ eth_pcap_tx_dumper(void *queue, */ pcap_dump_flush(dumper_q->dumper); dumper_q->tx_pkts += num_tx; + dumper_q->tx_bytes += tx_bytes; dumper_q->err_pkts += nb_pkts - num_tx; return num_tx; } @@ -246,22 +331,45 @@ eth_pcap_tx(void *queue, struct rte_mbuf *mbuf; struct pcap_tx_queue *tx_queue = queue; uint16_t num_tx = 0; + uint32_t tx_bytes = 0; if (unlikely(nb_pkts == 0 || tx_queue->pcap == NULL)) return 0; for (i = 0; i < nb_pkts; i++) { mbuf = bufs[i]; - ret = pcap_sendpacket(tx_queue->pcap, - rte_pktmbuf_mtod(mbuf, u_char *), - mbuf->data_len); + + if (likely(mbuf->nb_segs == 1)) { + ret = pcap_sendpacket(tx_queue->pcap, + rte_pktmbuf_mtod(mbuf, u_char *), + mbuf->pkt_len); + } else { + if (mbuf->pkt_len <= ETHER_MAX_JUMBO_FRAME_LEN) { + eth_pcap_gather_data(tx_pcap_data, mbuf); + ret = pcap_sendpacket(tx_queue->pcap, + tx_pcap_data, + mbuf->pkt_len); + } else { + RTE_LOG(ERR, PMD, + "Dropping PCAP packet. " + "Size (%d) > max jumbo size (%d).\n", + mbuf->pkt_len, + ETHER_MAX_JUMBO_FRAME_LEN); + + rte_pktmbuf_free(mbuf); + break; + } + } + if (unlikely(ret != 0)) break; num_tx++; + tx_bytes += mbuf->pkt_len; rte_pktmbuf_free(mbuf); } tx_queue->tx_pkts += num_tx; + tx_queue->tx_bytes += tx_bytes; tx_queue->err_pkts += nb_pkts - num_tx; return num_tx; } @@ -402,26 +510,34 @@ eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *igb_stats) { unsigned i; - unsigned long rx_total = 0, tx_total = 0, tx_err_total = 0; + unsigned long rx_packets_total = 0, rx_bytes_total = 0; + unsigned long tx_packets_total = 0, tx_bytes_total = 0; + unsigned long tx_packets_err_total = 0; const struct pmd_internals *internal = dev->data->dev_private; for (i = 0; i < RTE_ETHDEV_QUEUE_STAT_CNTRS && i < internal->nb_rx_queues; i++) { igb_stats->q_ipackets[i] = internal->rx_queue[i].rx_pkts; - rx_total += igb_stats->q_ipackets[i]; + igb_stats->q_ibytes[i] = internal->rx_queue[i].rx_bytes; + rx_packets_total += igb_stats->q_ipackets[i]; + rx_bytes_total += igb_stats->q_ibytes[i]; } for (i = 0; i < RTE_ETHDEV_QUEUE_STAT_CNTRS && i < internal->nb_tx_queues; i++) { igb_stats->q_opackets[i] = internal->tx_queue[i].tx_pkts; + igb_stats->q_obytes[i] = internal->tx_queue[i].tx_bytes; igb_stats->q_errors[i] = internal->tx_queue[i].err_pkts; - tx_total += igb_stats->q_opackets[i]; - tx_err_total += igb_stats->q_errors[i]; + tx_packets_total += igb_stats->q_opackets[i]; + tx_bytes_total += igb_stats->q_obytes[i]; + tx_packets_err_total += igb_stats->q_errors[i]; } - igb_stats->ipackets = rx_total; - igb_stats->opackets = tx_total; - igb_stats->oerrors = tx_err_total; + igb_stats->ipackets = rx_packets_total; + igb_stats->ibytes = rx_bytes_total; + igb_stats->opackets = tx_packets_total; + igb_stats->obytes = tx_bytes_total; + igb_stats->oerrors = tx_packets_err_total; } static void @@ -429,10 +545,13 @@ eth_stats_reset(struct rte_eth_dev *dev) { unsigned i; struct pmd_internals *internal = dev->data->dev_private; - for (i = 0; i < internal->nb_rx_queues; i++) + for (i = 0; i < internal->nb_rx_queues; i++) { internal->rx_queue[i].rx_pkts = 0; + internal->rx_queue[i].rx_bytes = 0; + } for (i = 0; i < internal->nb_tx_queues; i++) { internal->tx_queue[i].tx_pkts = 0; + internal->tx_queue[i].tx_bytes = 0; internal->tx_queue[i].err_pkts = 0; } } @@ -498,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. @@ -687,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; @@ -700,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; @@ -726,8 +833,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 @@ -741,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); @@ -755,14 +860,16 @@ 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; -error: +error: rte_free(data); - rte_free(pci_dev); rte_free(*internals); return -1; @@ -977,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);