From ad2720d7188aece35e8aa4c65118a33b8b9ae690 Mon Sep 17 00:00:00 2001
From: Alex Williams <alex.williams@ni.com>
Date: Tue, 25 Sep 2018 14:49:45 -0700
Subject: mpmd,transport,prefs: Add xport_mgr for dpdk_zero_copy

Add configuration sections to the UHD config file for NIC entries. Keys
are based on MAC addresses, and the entries beneath the section describe
which CPU and I/O thread to use for the NIC and its IPv4 address.

Make ring sizes configurable for uhd-dpdk. Ring size is now an argument
for packet buffers. Note that the maximum number of available buffers
is still determined at init!

Add ability to receive broadcasts to uhd-dpdk. This is controllable by
a boolean in the sockarg during socket creation. dpdk_zero_copy will
filter broadcast packets out.

Add dpdk_simple transport (to mirror udp_simple). This transport allows
receiving from broadcast addresses, but it only permits one outstanding
buffer at a time.

Fix IP checksum handling in UHD-DPDK.
TX checksums were not being calculated in the NIC, and in RX, the check
for IP checksums allowed values of zero (reported as none). Now packets
with bad IP checksums will be dropped.
---
 host/lib/utils/prefs.cpp | 45 ++++++++++++++++++++++++++++++++++-----------
 1 file changed, 34 insertions(+), 11 deletions(-)

(limited to 'host/lib/utils')

diff --git a/host/lib/utils/prefs.cpp b/host/lib/utils/prefs.cpp
index 2ccc538fc..88be300cb 100644
--- a/host/lib/utils/prefs.cpp
+++ b/host/lib/utils/prefs.cpp
@@ -48,6 +48,23 @@ namespace {
                 uhd::prefs::get_uhd_config().get<std::string>(key_str, key);
         }
     }
+
+    device_addr_t get_args(
+        const uhd::device_addr_t& user_args,
+        const std::vector<std::string>& keys_to_update_from
+    ) {
+        device_addr_t args;
+        for (const auto& key : keys_to_update_from) {
+            update_from_key(key, user_args.get(key, ""), args);
+        }
+
+        // Finally, copy over the original user args:
+        for (const auto& user_key : user_args.keys()) {
+            args[user_key] = user_args[user_key];
+        }
+
+        return args;
+    }
 }
 
 config_parser& uhd::prefs::get_uhd_config()
@@ -81,22 +98,28 @@ config_parser& uhd::prefs::get_uhd_config()
 device_addr_t uhd::prefs::get_usrp_args(
     const uhd::device_addr_t &user_args
 ) {
-    device_addr_t usrp_args;
     const std::vector<std::string> keys_to_update_from = {
         "type",
         "product",
         "serial"
     };
+    return get_args(user_args, keys_to_update_from);
+}
 
-    for (const auto& key : keys_to_update_from) {
-        update_from_key(key, user_args.get(key, ""), usrp_args);
-    }
-
-    // Finally, copy over the original user args:
-    for (const auto &user_key : user_args.keys()) {
-        usrp_args[user_key] = user_args[user_key];
-    }
-
-    return usrp_args;
+device_addr_t uhd::prefs::get_dpdk_args(
+    const uhd::device_addr_t &user_args
+) {
+    const std::vector<std::string> keys_to_update_from = {
+        "use_dpdk"
+    };
+    return get_args(user_args, keys_to_update_from);
 }
 
+device_addr_t uhd::prefs::get_dpdk_nic_args(
+    const uhd::device_addr_t &user_args
+) {
+    const std::vector<std::string> keys_to_update_from = {
+        "dpdk-mac"
+    };
+    return get_args(user_args, keys_to_update_from);
+}
-- 
cgit v1.2.3