Changeset e3d534f

Timestamp:

03/16/15 14:23:51 (6 years ago)

Author:

Richard Sanger <rsangerarj@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

6c84681

Parents:

a978dec

Message:

Fix DPDK resuming

• Fix DPDK re-reserving cores on resume
• Fix DPDK single threaded so that it doesn't reserve a per-pkt core.
• Fix reset statistic counters

File:

• lib/format_dpdk.c (modified) (8 diffs)

lib/format_dpdk.c

@@ -295 +295 @@
 #endif
 } ALIGN_STRUCT(CACHE_LINE_SIZE);
+
+#if HAS_HW_TIMESTAMPS_82580
+#define DPDK_EMPTY_STREAM {-1, 0, NULL, -1, 0, 0}
+#else
+#define DPDK_EMPTY_STREAM {-1, 0, NULL, -1}
+#endif
 
 typedef struct dpdk_per_stream_t dpdk_per_stream_t;
@@ -789 +795 @@
 
 static int dpdk_init_input (libtrace_t *libtrace) {
-        dpdk_per_stream_t stream = {0};
+        dpdk_per_stream_t stream = DPDK_EMPTY_STREAM;
         char err[500];
         err[0] = 0;
@@ -1268 +1274 @@
         int ret, i;
         struct rte_eth_link link_info; /* Wait for link */
-        dpdk_per_stream_t empty_stream = {0};
+        dpdk_per_stream_t empty_stream = DPDK_EMPTY_STREAM;
 
         /* Already started */
@@ -1367 +1373 @@
                 stream->queue_id = i;
 
-                /* TODO we don't use this in the single threaded framework -
-                 * So we should not reserve this */
-                stream->lcore = dpdk_reserve_lcore(true, format_data->nic_numa_node);
+                if (stream->lcore == -1)
+                        stream->lcore = dpdk_reserve_lcore(true, format_data->nic_numa_node);
 
                 if (stream->lcore == -1) {
@@ -1409 +1414 @@
         fprintf(stderr, "Doing start device\n");
 #endif
+        rte_eth_stats_reset(format_data->port);
         /* Start device */
         ret = rte_eth_dev_start(format_data->port);
@@ -1456 +1462 @@
         err[0] = 0;
 
+        /* Make sure we don't reserve an extra thread for this */
+        FORMAT_DATA_FIRST(libtrace)->queue_id = rte_lcore_id();
+
         if (dpdk_start_streams(FORMAT(libtrace), err, sizeof(err), 1) != 0) {
                 trace_set_err(libtrace, TRACE_ERR_INIT_FAILED, "%s", err);
@@ -1483 +1492 @@
         int i=0, phys_cores=0;
         int tot = libtrace->perpkt_thread_count;
+        libtrace_list_node_t *n;
         err[0] = 0;
 
@@ -1499 +1509 @@
         for (i = 0; i < RTE_MAX_LCORE; ++i) {
                 if (lcore_config[i].detected) {
-                        if (rte_lcore_is_enabled(i))
+                        if (rte_lcore_is_enabled(i)) {
+#if DEBUG
                                 fprintf(stderr, "Found core %d already in use!\n", i);
-                        else
+#endif
+                        } else {
                                 phys_cores++;
-                }
+                        }
+                }
+        }
+        /* If we are restarting we have already allocated some threads as such
+         * we add these back to the count for this calculation */
+        for (n = FORMAT_DATA_HEAD(libtrace); n; n = n->next) {
+                dpdk_per_stream_t * stream = n->data;
+                if (stream->lcore != -1)
+                        phys_cores++;
         }