Merge pull request #205 from CESNET/dpdk-mtu

Setting MTU size in dpdk input plugin

Author: cejkato2

.github/workflows/c-cpp.yml

@@ -35,10 +35,11 @@ jobs:
       run: ./configure --with-raw --with-pcap --with-nemea --with-gtest --enable-debug CXXFLAGS=-coverage CFLAGS=-coverage LDFLAGS=-lgcov
     - name: rebuild and check
       run: make clean; make check
-    - uses: codecov/codecov-action@v3
+    - uses: codecov/codecov-action@v4
       with:
         flags: tests # optional
         name: ipfixprobe # optional
         fail_ci_if_error: true # optional (default = false)
+        token: ${{ secrets.CODECOV_TOKEN }}
         verbose: true
         gcov: true

input/dpdk.cpp

@@ -155,12 +155,13 @@ void DpdkCore::configure(const char* params)
     uint16_t mempoolSize = parser.pkt_mempool_size();
     uint16_t rxQueueCount = parser.rx_queues();
     m_mBufsCount = parser.pkt_buffer_size();
+    uint16_t mtuSize = parser.mtu_size();
 
     configureEal(parser.eal_params());
 
     m_dpdkDevices.reserve(parser.port_numbers().size());
     for (auto portID :  parser.port_numbers()) {
-        m_dpdkDevices.emplace_back(portID, rxQueueCount, mempoolSize, m_mBufsCount);
+        m_dpdkDevices.emplace_back(portID, rxQueueCount, mempoolSize, m_mBufsCount, mtuSize);
     }
 
     isConfigured = true;

input/dpdk.h

@@ -50,6 +50,7 @@ class DpdkOptParser : public OptionsParser {
     std::vector<uint16_t> port_numbers_;
     uint16_t rx_queues_ = 1;
     std::string eal_;
+    uint16_t mtu_;
 
     std::vector<uint16_t> parsePortNumbers(std::string arg)
     {
@@ -80,6 +81,7 @@ class DpdkOptParser : public OptionsParser {
         : OptionsParser("dpdk", "Input plugin for reading packets using DPDK interface")
         , pkt_buffer_size_(DEFAULT_MBUF_BURST_SIZE)
         , pkt_mempool_size_(DEFAULT_MBUF_POOL_SIZE)
+        , mtu_(RTE_ETHER_MAX_LEN)
     {
         register_option(
             "b",
@@ -116,6 +118,13 @@ class DpdkOptParser : public OptionsParser {
             "DPDK eal", 
             [this](const char *arg){eal_ = arg; return true;}, 
             OptionFlags::RequiredArgument);
+        register_option(
+            "M",
+            "mtu",
+            "MTU",
+            "Input interface MTU. Default: " + std::to_string(RTE_ETHER_MAX_LEN),
+            [this](const char *arg) {try{mtu_ = str2num<decltype(mtu_)>(arg);} catch (std::invalid_argument&){return false;} return true; },
+            RequiredArgument);
     }
 
     size_t pkt_buffer_size() const { return pkt_buffer_size_; }
@@ -127,6 +136,8 @@ class DpdkOptParser : public OptionsParser {
     std::string eal_params() const { return eal_; }
 
     uint16_t rx_queues() const { return rx_queues_; }
+
+    uint16_t mtu_size() const { return mtu_; }
 };
 
 class DpdkCore {

input/dpdk/dpdkDevice.cpp

@@ -39,14 +39,16 @@ DpdkDevice::DpdkDevice(
 	uint16_t portID,
 	uint16_t rxQueueCount,
 	uint16_t memPoolSize,
-	uint16_t mbufsCount)
+	uint16_t mbufsCount,
+	uint16_t mtuSize)
 	: m_portID(portID)
 	, m_rxQueueCount(rxQueueCount)
 	, m_txQueueCount(0)
 	, m_mBufsCount(mbufsCount)
 	, m_isNfbDpdkDriver(false)
 	, m_supportedRSS(false)
 	, m_supportedHWTimestamp(false)
+	, m_mtuSize(mtuSize)
 {
 	validatePort();
 	recognizeDriver();
@@ -137,9 +139,9 @@ rte_eth_conf DpdkDevice::createPortConfig()
 	}
 
 #if RTE_VERSION >= RTE_VERSION_NUM(21, 11, 0, 0)
-	rte_eth_conf portConfig {.rxmode = {.mtu = RTE_ETHER_MAX_LEN}};
+	rte_eth_conf portConfig {.rxmode = {.mtu = m_mtuSize}};
 #else
-	rte_eth_conf portConfig {.rxmode = {.max_rx_pkt_len = RTE_ETHER_MAX_LEN}};
+	rte_eth_conf portConfig {.rxmode = {.max_rx_pkt_len = m_mtuSize}};
 #endif
 
 	if (m_supportedRSS) {
@@ -172,7 +174,7 @@ void DpdkDevice::initMemPools(uint16_t memPoolSize)
 			memPoolSize,
 			MEMPOOL_CACHE_SIZE,
 			0,
-			RTE_MBUF_DEFAULT_BUF_SIZE,
+			std::max(m_mtuSize, (uint16_t)RTE_MBUF_DEFAULT_DATAROOM) + RTE_PKTMBUF_HEADROOM,
 			rte_eth_dev_socket_id(m_portID));
 		if (!memPool) {
 			throw PluginError(

input/dpdk/dpdkDevice.hpp

@@ -45,8 +45,9 @@ class DpdkDevice {
 	 * @param rxQueueCount The number of receive queues to be configured.
 	 * @param memPoolSize The size of the memory pool for packet buffers.
 	 * @param mbufsCount The number of mbufs (packet buffers) to be allocated.
+	 * @param mtuSize Maximum transmission unit of input interface.
 	 */
-	DpdkDevice(uint16_t portID, uint16_t rxQueueCount, uint16_t memPoolSize, uint16_t mbufsCount);
+	DpdkDevice(uint16_t portID, uint16_t rxQueueCount, uint16_t memPoolSize, uint16_t mbufsCount, uint16_t mtuSize);
 
 	/**
 	 * @brief Receives packets from the specified receive queue of the DPDK device.
@@ -92,6 +93,7 @@ class DpdkDevice {
 	bool m_supportedHWTimestamp;
 	int m_rxTimestampOffset;
 	int m_rxTimestampDynflag;
+	uint16_t m_mtuSize;
 
 };