Update DpdkDriver to use the new API introduced in the previous commit

- Reenable DPDK in CMakeLists.txt
- Initialize an ARP table at driver startup using the content of /proc/net/arp
- Select eth port via the symbolic name of the network interface (e.g., eno1d1)
  (the current implementation uses ioctl to obtain the IP and MAC addresses of
  a network interface)
- Add a system test for DPDK driver: test/dpdk_test.cc

Author: yilongli

CMakeLists.txt

@@ -13,7 +13,7 @@ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules)
 find_package(Doxygen OPTIONAL_COMPONENTS dot mscgen dia)
 
 # Network Interface library (https://www.dpdk.org/)
-# find_package(Dpdk REQUIRED)
+find_package(Dpdk REQUIRED)
 
 # Source control tool; needed to download external libraries.
 find_package(Git REQUIRED)
@@ -135,34 +135,34 @@ target_compile_options(FakeDriver
 )
 
 ## lib DpdkDriver ##############################################################
-#add_library(DpdkDriver
-#    src/Drivers/DPDK/DpdkDriver.cc
-#    src/Drivers/DPDK/DpdkDriverImpl.cc
-#    src/Drivers/DPDK/MacAddress.cc
-#)
-#add_library(Homa::DpdkDriver ALIAS DpdkDriver)
-#target_include_directories(DpdkDriver
-#    PUBLIC
-#        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
-#        $<INSTALL_INTERFACE:include>
-#    PRIVATE
-#        ${CMAKE_CURRENT_SOURCE_DIR}/src
-#)
-#target_link_libraries(DpdkDriver
-#    PRIVATE
-#        Dpdk::Dpdk
-#    PUBLIC
-#        Homa
-#)
-#target_compile_features(DpdkDriver
-#    PUBLIC
-#        cxx_std_11
-#)
-#target_compile_options(DpdkDriver
-#    PRIVATE
-#        -Wall
-#        -Wextra
-#)
+add_library(DpdkDriver
+    src/Drivers/DPDK/DpdkDriver.cc
+    src/Drivers/DPDK/DpdkDriverImpl.cc
+    src/Drivers/DPDK/MacAddress.cc
+)
+add_library(Homa::DpdkDriver ALIAS DpdkDriver)
+target_include_directories(DpdkDriver
+    PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
+        $<INSTALL_INTERFACE:include>
+    PRIVATE
+        ${CMAKE_CURRENT_SOURCE_DIR}/src
+)
+target_link_libraries(DpdkDriver
+    PRIVATE
+        Dpdk::Dpdk
+    PUBLIC
+        Homa
+)
+target_compile_features(DpdkDriver
+    PUBLIC
+        cxx_std_11
+)
+target_compile_options(DpdkDriver
+    PRIVATE
+        -Wall
+        -Wextra
+)
 
 ################################################################################
 ## Tests #######################################################################
@@ -195,8 +195,7 @@ endif()
 ## Install & Export ############################################################
 ################################################################################
 
-#install(TARGETS Homa DpdkDriver FakeDriver EXPORT HomaTargets
-install(TARGETS Homa FakeDriver EXPORT HomaTargets
+install(TARGETS Homa DpdkDriver FakeDriver EXPORT HomaTargets
     LIBRARY DESTINATION lib
     ARCHIVE DESTINATION lib
     RUNTIME DESTINATION bin
@@ -275,11 +274,11 @@ target_sources(unit_test
 target_link_libraries(unit_test FakeDriver)
 
 #DPDK Tests
-#target_sources(unit_test
-#    PUBLIC
-#        ${CMAKE_CURRENT_SOURCE_DIR}/src/Drivers/DPDK/MacAddressTest.cc
-#)
-#target_link_libraries(unit_test DpdkDriver)
+target_sources(unit_test
+    PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/Drivers/DPDK/MacAddressTest.cc
+)
+target_link_libraries(unit_test DpdkDriver)
 
 target_link_libraries(unit_test gmock_main)
 # -fno-access-control allows access to private members for testing

include/Homa/Drivers/DPDK/DpdkDriver.h

@@ -53,14 +53,14 @@ class DpdkDriver : public Driver {
      * has exclusive access to DPDK. Note: This call will initialize the DPDK
      * EAL with default values.
      *
-     * @param port
-     *      Selects which physical port to use for communication.
+     * @param ifname
+     *      Selects which network interface to use for communication.
      * @param config
      *      Optional configuration parameters (see Config).
      * @throw DriverInitFailure
      *      Thrown if DpdkDriver fails to initialize for any reason.
      */
-    DpdkDriver(int port, const Config* const config = nullptr);
+    DpdkDriver(const char* ifname, const Config* const config = nullptr);
 
     /**
      * Construct a DpdkDriver and initialize the DPDK EAL using the provided
@@ -75,7 +75,7 @@ class DpdkDriver : public Driver {
      * overriding the default affinity set by rte_eal_init().
      *
      * @param port
-     *      Selects which physical port to use for communication.
+     *      Selects which network interface to use for communication.
      * @param argc
      *      Parameter passed to rte_eal_init().
      * @param argv
@@ -85,7 +85,7 @@ class DpdkDriver : public Driver {
      * @throw DriverInitFailure
      *      Thrown if DpdkDriver fails to initialize for any reason.
      */
-    DpdkDriver(int port, int argc, char* argv[],
+    DpdkDriver(const char* ifname, int argc, char* argv[],
                const Config* const config = nullptr);
 
     /// Used to signal to the DpdkDriver constructor that the DPDK EAL should
@@ -101,7 +101,7 @@ class DpdkDriver : public Driver {
      * called before calling this constructor.
      *
      * @param port
-     *      Selects which physical port to use for communication.
+     *      Selects which network interface to use for communication.
      * @param _
      *      Parameter is used only to define this constructors alternate
      *      signature.
@@ -110,29 +110,20 @@ class DpdkDriver : public Driver {
      * @throw DriverInitFailure
      *      Thrown if DpdkDriver fails to initialize for any reason.
      */
-    DpdkDriver(int port, NoEalInit _, const Config* const config = nullptr);
+    DpdkDriver(const char* ifname, NoEalInit _,
+               const Config* const config = nullptr);
 
     /**
      * DpdkDriver Destructor.
      */
     virtual ~DpdkDriver();
 
-    /// See Driver::getAddress()
-    virtual Address getAddress(std::string const* const addressString);
-    virtual Address getAddress(WireFormatAddress const* const wireAddress);
-
-    /// See Driver::addressToString()
-    virtual std::string addressToString(const Address address);
-
-    /// See Driver::addressToWireFormat()
-    virtual void addressToWireFormat(const Address address,
-                                     WireFormatAddress* wireAddress);
-
     /// See Driver::allocPacket()
     virtual Packet* allocPacket();
 
     /// See Driver::sendPacket()
-    virtual void sendPacket(Packet* packet);
+    virtual void sendPacket(Packet* packet, IpAddress destination,
+                            int priority);
 
     /// See Driver::cork()
     virtual void cork();
@@ -157,7 +148,7 @@ class DpdkDriver : public Driver {
     virtual uint32_t getBandwidth();
 
     /// See Driver::getLocalAddress()
-    virtual Driver::Address getLocalAddress();
+    virtual IpAddress getLocalAddress();
 
     /// See Driver::getQueuedBytes();
     virtual uint32_t getQueuedBytes();

include/Homa/Util.h

@@ -57,6 +57,8 @@ downCast(const Large& large)
 
 std::string demangle(const char* name);
 std::string hexDump(const void* buf, uint64_t bytes);
+std::string ipToString(uint32_t ip);
+uint32_t stringToIp(const char* ip);
 
 /**
  * This class is used to temporarily release lock in a safe fashion. Creating

src/Drivers/DPDK/DpdkDriver.cc

@@ -21,50 +21,21 @@ namespace Homa {
 namespace Drivers {
 namespace DPDK {
 
-DpdkDriver::DpdkDriver(int port, const Config* const config)
-    : pImpl(new Impl(port, config))
+DpdkDriver::DpdkDriver(const char* ifname, const Config* const config)
+    : pImpl(new Impl(ifname, config))
 {}
 
-DpdkDriver::DpdkDriver(int port, int argc, char* argv[],
+DpdkDriver::DpdkDriver(const char* ifname, int argc, char* argv[],
                        const Config* const config)
-    : pImpl(new Impl(port, argc, argv, config))
+    : pImpl(new Impl(ifname, argc, argv, config))
 {}
 
-DpdkDriver::DpdkDriver(int port, NoEalInit _, const Config* const config)
-    : pImpl(new Impl(port, _, config))
+DpdkDriver::DpdkDriver(const char* ifname, NoEalInit _, const Config* const config)
+    : pImpl(new Impl(ifname, _, config))
 {}
 
 DpdkDriver::~DpdkDriver() = default;
 
-/// See Driver::getAddress()
-Driver::Address
-DpdkDriver::getAddress(std::string const* const addressString)
-{
-    return pImpl->getAddress(addressString);
-}
-
-/// See Driver::getAddress()
-Driver::Address
-DpdkDriver::getAddress(WireFormatAddress const* const wireAddress)
-{
-    return pImpl->getAddress(wireAddress);
-}
-
-/// See Driver::addressToString()
-std::string
-DpdkDriver::addressToString(const Address address)
-{
-    return pImpl->addressToString(address);
-}
-
-/// See Driver::addressToWireFormat()
-void
-DpdkDriver::addressToWireFormat(const Address address,
-                                WireFormatAddress* wireAddress)
-{
-    pImpl->addressToWireFormat(address, wireAddress);
-}
-
 /// See Driver::allocPacket()
 Driver::Packet*
 DpdkDriver::allocPacket()
@@ -74,9 +45,9 @@ DpdkDriver::allocPacket()
 
 /// See Driver::sendPacket()
 void
-DpdkDriver::sendPacket(Packet* packet)
+DpdkDriver::sendPacket(Packet* packet, IpAddress destination, int priority)
 {
-    return pImpl->sendPacket(packet);
+    return pImpl->sendPacket(packet, destination, priority);
 }
 
 /// See Driver::cork()
@@ -128,7 +99,7 @@ DpdkDriver::getBandwidth()
 }
 
 /// See Driver::getLocalAddress()
-Driver::Address
+IpAddress
 DpdkDriver::getLocalAddress()
 {
     return pImpl->getLocalAddress();