net/bnxt: consolidate template table processing

[dpdk.git] / drivers / net / pcap / rte_eth_pcap.c

diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c
index 5186d8f..057aa9d 100644 (file)
--- a/drivers/net/pcap/rte_eth_pcap.c
+++ b/drivers/net/pcap/rte_eth_pcap.c
@@ -135,7 +135,7 @@ static struct rte_eth_link pmd_link = {
                .link_autoneg = ETH_LINK_FIXED,
 };
 
-static int eth_pcap_logtype;
+RTE_LOG_REGISTER(eth_pcap_logtype, pmd.net.pcap, NOTICE);
 
 #define PMD_LOG(level, fmt, args...) \
        rte_log(RTE_LOG_ ## level, eth_pcap_logtype, \
@@ -287,6 +287,8 @@ eth_null_rx(void *queue __rte_unused,
        return 0;
 }
 
+#define NSEC_PER_SEC   1000000000L
+
 static inline void
 calculate_timestamp(struct timeval *ts) {
        uint64_t cycles;
@@ -294,8 +296,14 @@ calculate_timestamp(struct timeval *ts) {
 
        cycles = rte_get_timer_cycles() - start_cycles;
        cur_time.tv_sec = cycles / hz;
-       cur_time.tv_usec = (cycles % hz) * 1e6 / hz;
-       timeradd(&start_time, &cur_time, ts);
+       cur_time.tv_usec = (cycles % hz) * NSEC_PER_SEC / hz;
+
+       ts->tv_sec = start_time.tv_sec + cur_time.tv_sec;
+       ts->tv_usec = start_time.tv_usec + cur_time.tv_usec;
+       if (ts->tv_usec >= NSEC_PER_SEC) {
+               ts->tv_usec -= NSEC_PER_SEC;
+               ts->tv_sec += 1;
+       }
 }
 
 /*
@@ -313,7 +321,7 @@ eth_pcap_tx_dumper(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
        struct pcap_pkthdr header;
        pcap_dumper_t *dumper;
        unsigned char temp_data[RTE_ETH_PCAP_SNAPLEN];
-       size_t len;
+       size_t len, caplen;
 
        pp = rte_eth_devices[dumper_q->port_id].process_private;
        dumper = pp->tx_dumper[dumper_q->queue_id];
@@ -325,28 +333,24 @@ eth_pcap_tx_dumper(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
         * dumper */
        for (i = 0; i < nb_pkts; i++) {
                mbuf = bufs[i];
-               len = rte_pktmbuf_pkt_len(mbuf);
+               len = caplen = rte_pktmbuf_pkt_len(mbuf);
                if (unlikely(!rte_pktmbuf_is_contiguous(mbuf) &&
                                len > sizeof(temp_data))) {
-                       PMD_LOG(ERR,
-                               "Dropping multi segment PCAP packet. Size (%zd) > max size (%zd).",
-                               len, sizeof(temp_data));
-                       rte_pktmbuf_free(mbuf);
-                       continue;
+                       caplen = sizeof(temp_data);
                }
 
                calculate_timestamp(&header.ts);
                header.len = len;
-               header.caplen = header.len;
+               header.caplen = caplen;
                /* rte_pktmbuf_read() returns a pointer to the data directly
                 * in the mbuf (when the mbuf is contiguous) or, otherwise,
                 * a pointer to temp_data after copying into it.
                 */
                pcap_dump((u_char *)dumper, &header,
-                       rte_pktmbuf_read(mbuf, 0, len, temp_data));
+                       rte_pktmbuf_read(mbuf, 0, caplen, temp_data));
 
                num_tx++;
-               tx_bytes += len;
+               tx_bytes += caplen;
                rte_pktmbuf_free(mbuf);
        }
 
@@ -479,7 +483,8 @@ open_single_tx_pcap(const char *pcap_filename, pcap_dumper_t **dumper)
         * with pcap_dump_open(). We create big enough an Ethernet
         * pcap holder.
         */
-       tx_pcap = pcap_open_dead(DLT_EN10MB, RTE_ETH_PCAP_SNAPSHOT_LEN);
+       tx_pcap = pcap_open_dead_with_tstamp_precision(DLT_EN10MB,
+                       RTE_ETH_PCAP_SNAPSHOT_LEN, PCAP_TSTAMP_PRECISION_NANO);
        if (tx_pcap == NULL) {
                PMD_LOG(ERR, "Couldn't create dead pcap");
                return -1;
@@ -723,12 +728,20 @@ eth_stats_reset(struct rte_eth_dev *dev)
        return 0;
 }
 
-static void
+static int
 eth_dev_close(struct rte_eth_dev *dev)
 {
        unsigned int i;
        struct pmd_internals *internals = dev->data->dev_private;
 
+       PMD_LOG(INFO, "Closing pcap ethdev on NUMA socket %d",
+                       rte_socket_id());
+
+       rte_free(dev->process_private);
+
+       if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+               return 0;
+
        /* Device wide flag, but cleanup must be performed per queue. */
        if (internals->infinite_rx) {
                for (i = 0; i < dev->data->nb_rx_queues; i++) {
@@ -743,6 +756,11 @@ eth_dev_close(struct rte_eth_dev *dev)
                }
        }
 
+       if (internals->phy_mac == 0)
+               /* not dynamically allocated, must not be freed */
+               dev->data->mac_addrs = NULL;
+
+       return 0;
 }
 
 static void
@@ -1240,12 +1258,6 @@ eth_from_pcaps_common(struct rte_vdev_device *vdev,
        const unsigned int nb_tx_queues = tx_queues->num_of_queue;
        unsigned int i;
 
-       /* do some parameter checking */
-       if (rx_queues == NULL && nb_rx_queues > 0)
-               return -1;
-       if (tx_queues == NULL && nb_tx_queues > 0)
-               return -1;
-
        if (pmd_init_internals(vdev, nb_rx_queues, nb_tx_queues, internals,
                        eth_dev) < 0)
                return -1;
@@ -1404,7 +1416,8 @@ pmd_pcap_probe(struct rte_vdev_device *dev)
        devargs_all.is_rx_pcap =
                rte_kvargs_count(kvlist, ETH_PCAP_RX_PCAP_ARG) ? 1 : 0;
        devargs_all.is_rx_iface =
-               rte_kvargs_count(kvlist, ETH_PCAP_RX_IFACE_ARG) ? 1 : 0;
+               (rte_kvargs_count(kvlist, ETH_PCAP_RX_IFACE_ARG) +
+                rte_kvargs_count(kvlist, ETH_PCAP_RX_IFACE_IN_ARG)) ? 1 : 0;
        pcaps.num_of_queue = 0;
 
        devargs_all.is_tx_pcap =
@@ -1544,30 +1557,16 @@ free_kvlist:
 static int
 pmd_pcap_remove(struct rte_vdev_device *dev)
 {
-       struct pmd_internals *internals = NULL;
        struct rte_eth_dev *eth_dev = NULL;
 
-       PMD_LOG(INFO, "Closing pcap ethdev on numa socket %d",
-                       rte_socket_id());
-
        if (!dev)
                return -1;
 
-       /* reserve an ethdev entry */
        eth_dev = rte_eth_dev_allocated(rte_vdev_device_name(dev));
        if (eth_dev == NULL)
-               return -1;
-
-       if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
-               internals = eth_dev->data->dev_private;
-               if (internals != NULL && internals->phy_mac == 0)
-                       /* not dynamically allocated, must not be freed */
-                       eth_dev->data->mac_addrs = NULL;
-       }
+               return 0; /* port already released */
 
        eth_dev_close(eth_dev);
-
-       rte_free(eth_dev->process_private);
        rte_eth_dev_release_port(eth_dev);
 
        return 0;
@@ -1589,10 +1588,3 @@ RTE_PMD_REGISTER_PARAM_STRING(net_pcap,
        ETH_PCAP_IFACE_ARG "=<ifc> "
        ETH_PCAP_PHY_MAC_ARG "=<int>"
        ETH_PCAP_INFINITE_RX_ARG "=<0|1>");
-
-RTE_INIT(eth_pcap_init_log)
-{
-       eth_pcap_logtype = rte_log_register("pmd.net.pcap");
-       if (eth_pcap_logtype >= 0)
-               rte_log_set_level(eth_pcap_logtype, RTE_LOG_NOTICE);
-}