Merge branch 'master' of https://github.com/CESNET/ipfixprobe into rpm-dpdk

Author: SiskaPavel

ChangeLog

@@ -1,3 +1,6 @@
+2024-11-14 ipfixprobe-4.14.0
+	* dpdk: set mempool size as rx queue size
+
 2024-10-17 ipfixprobe-4.13.0
 	* usability: introduce docker/podman container to convert PCAP files to CSV
 	* IPFIX: fix order of TCP options flags

NEWS

@@ -1,3 +1,6 @@
+2024-11-12 (Jan Sobol): dpdkDevice: use mempool size as rx queue size instead of burst size
+2024-11-12 (Jan Sobol): dpdk: reduce value of DEFAULT_MBUF_POOL_SIZE to use it also as rx queue size
+
 2024-10-17 (Tomas Cejka): doc: include generated Doxyfile to create documentation
 2024-10-17 (Tomas Cejka): doc: add doxygen comment for parse_packet()
 2024-10-16 (Jan Sobol): dpdk-ring - fix checking if any packet has actually been parsed

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([ipfixprobe], [4.13.0], [[email protected]])
+AC_INIT([ipfixprobe], [4.14.0], [[email protected]])
 
 AC_CONFIG_SRCDIR([main.cpp])
 AC_CONFIG_HEADERS([config.h])

input/dpdk.h

@@ -44,7 +44,7 @@ namespace ipxp {
 class DpdkOptParser : public OptionsParser {
 private:
     static constexpr size_t DEFAULT_MBUF_BURST_SIZE = 64;
-    static constexpr size_t DEFAULT_MBUF_POOL_SIZE = 16384;
+    static constexpr size_t DEFAULT_MBUF_POOL_SIZE = 4096;
     size_t pkt_buffer_size_;
     size_t pkt_mempool_size_;
     std::vector<uint16_t> port_numbers_;

input/dpdk/dpdkDevice.cpp

@@ -54,7 +54,7 @@ DpdkDevice::DpdkDevice(
 	recognizeDriver();
 	configurePort();
 	initMemPools(memPoolSize);
-	setupRxQueues();
+	setupRxQueues(memPoolSize);
 	configureRSS();
 	enablePort();
 }
@@ -194,13 +194,13 @@ void DpdkDevice::initMemPools(uint16_t memPoolSize)
 	}
 }
 
-void DpdkDevice::setupRxQueues()
+void DpdkDevice::setupRxQueues(uint16_t memPoolSize)
 {
 	for (uint16_t rxQueueID = 0; rxQueueID < m_rxQueueCount; rxQueueID++) {
 		int ret = rte_eth_rx_queue_setup(
 			m_portID,
 			rxQueueID,
-			m_mBufsCount,
+			memPoolSize,
 			rte_eth_dev_socket_id(m_portID),
 			nullptr,
 			m_memPools[rxQueueID]);

input/dpdk/dpdkDevice.hpp

@@ -76,7 +76,7 @@ class DpdkDevice {
 	void configurePort();
 	rte_eth_conf createPortConfig();
 	void initMemPools(uint16_t memPoolSize);
-	void setupRxQueues();
+	void setupRxQueues(uint16_t memPoolSize);
 	void configureRSS();
 	void enablePort();
 	void createRteMempool(uint16_t mempoolSize);