Changeset e47ab4d

Timestamp:

12/16/16 18:40:53 (4 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

d31b952

Parents:

47c4490

git-author:

EaseTheWorld <easetheworld@…> (12/16/16 18:40:53)

git-committer:

GitHub <noreply@…> (12/16/16 18:40:53)

Message:

Support uni/bi directional hasher for dpdk

For HASHER_BALLANCE, use default non-symmetric rss key in driver.
For HASHER_BIDIRECTIONAL, use 2-bytes-repeated rss key.

File:

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

lib/format_dpdk.c

@@ -364 +364 @@
 #endif
         char mempool_name[MEMPOOL_NAME_LEN]; /* The name of the mempool that we are using */
-        uint8_t rss_key[40]; // This is the RSS KEY
+        enum hasher_types hasher_type;
         /* To improve single-threaded performance we always batch reading
          * packets, in a burst, otherwise the parallel library does this for us */
@@ -856 +856 @@
         FORMAT(libtrace)->burst_size = 0;
         FORMAT(libtrace)->burst_offset = 0;
+        FORMAT(libtrace)->hasher_type = HASHER_BALANCE;
 
         /* Make our first stream */
@@ -929 +930 @@
                 return 0;
         case TRACE_OPTION_HASHER:
-                switch (*((enum hasher_types *) data))
-                {
-                case HASHER_BALANCE:
-                case HASHER_UNIDIRECTIONAL:
-                        toeplitz_create_unikey(FORMAT(libtrace)->rss_key);
-                        return 0;
-                case HASHER_BIDIRECTIONAL:
-                        toeplitz_create_bikey(FORMAT(libtrace)->rss_key);
-                        return 0;
-                case HASHER_CUSTOM:
-                        // We don't support these
-                        return -1;
-                }
-                break;
+                FORMAT(libtrace)->hasher_type=*(enum hasher_types*)data;
+                return 0;
         case TRACE_OPTION_FILTER:
                 /* TODO filtering */
@@ -992 +981 @@
         .rx_adv_conf = {
                 .rss_conf = {
-                        // .rss_key = &rss_key, // We set this per format
                         .rss_hf = RX_RSS_FLAGS,
                 },
@@ -1350 +1338 @@
                         return -1;
                 }
+        }
+
+        // for symmetric rss, repeat 2 bytes
+        // otherwise, use default rss key in drivers
+        uint8_t rss_key[52]; // 52 for i40e, 40 for others
+        if (format_data->hasher_type == HASHER_BIDIRECTIONAL) {
+#if RTE_VERSION >= RTE_VERSION_NUM(2, 1, 0, 0)
+                struct rte_eth_dev_info dev_info;
+                rte_eth_dev_info_get(format_data->port, &dev_info);
+                port_conf.rx_adv_conf.rss_conf.rss_key_len = dev_info.hash_key_size;
+#else
+                port_conf.rx_adv_conf.rss_conf.rss_key_len = sizeof(rss_key);
+#endif
+                // first 2 bytes of rss_intel_key from drivers/net/e1000/igb_rxtx.c
+                static uint8_t rss_key_2bytes[] = {0x6D, 0x5A};
+                int i;
+                for (i=0; i<port_conf.rx_adv_conf.rss_conf.rss_key_len; i += sizeof(rss_key_2bytes))
+                        memcpy(rss_key + i, rss_key_2bytes, sizeof(rss_key_2bytes));
+                port_conf.rx_adv_conf.rss_conf.rss_key = rss_key;
         }