Few fixes to support DPDK 23.11 and 24.11 (#1774)

Author: seladb

Pcap++/header/DpdkDevice.h

@@ -405,7 +405,8 @@ namespace pcpp
 
 		/// Get the link status (link up/down, link speed and link duplex)
 		/// @param[out] linkStatus A reference to object the result shall be written to
-		void getLinkStatus(LinkStatus& linkStatus) const;
+		/// @return True if managed to fetch the link status and `linkStatus` was updated, false otherwise
+		bool getLinkStatus(LinkStatus& linkStatus) const;
 
 		/// @return The core ID used in this context
 		uint32_t getCurrentCoreId() const;

Pcap++/src/DpdkDevice.cpp

@@ -105,6 +105,18 @@ namespace pcpp
 		0x6D, 0x5A, 0x6D, 0x5A, 0x6D, 0x5A, 0x6D, 0x5A, 0x6D, 0x5A, 0x6D, 0x5A,
 	};
 
+	static bool getDeviceInfo(uint16_t devId, rte_eth_dev_info& devInfo)
+	{
+		auto ret = rte_eth_dev_info_get(devId, &devInfo);
+		if (ret < 0)
+		{
+			PCPP_LOG_ERROR("Couldn't get device info, error was: " << rte_strerror(ret) << " (" << ret << ")");
+			return false;
+		}
+
+		return true;
+	}
+
 	DpdkDevice::DpdkDevice(int port, uint32_t mBufPoolSize, uint16_t mBufDataSize)
 	    : m_Id(port), m_MacAddress(MacAddress::Zero),
 	      m_MBufDataSize(mBufDataSize < 1 ? RTE_MBUF_DEFAULT_BUF_SIZE : mBufDataSize)
@@ -273,6 +285,8 @@ namespace pcpp
 		{
 			PCPP_LOG_DEBUG("PMD '" << m_PMDName << "' doesn't support RSS, setting RSS hash functions to 0");
 			m_Config.rssHashFunction = RSS_NONE;
+			m_Config.rssKey = nullptr;
+			m_Config.rssKeyLength = 0;
 		}
 
 		if (!isDeviceSupportRssHashFunction(getConfiguredRssHashFunction()))
@@ -346,7 +360,11 @@ namespace pcpp
 	bool DpdkDevice::initQueues(uint8_t numOfRxQueuesToInit, uint8_t numOfTxQueuesToInit)
 	{
 		rte_eth_dev_info devInfo;
-		rte_eth_dev_info_get(m_Id, &devInfo);
+		if (!getDeviceInfo(m_Id, devInfo))
+		{
+			return false;
+		}
+
 		if (numOfRxQueuesToInit > devInfo.max_rx_queues)
 		{
 			PCPP_LOG_ERROR("Num of RX queues requested for open [" << numOfRxQueuesToInit
@@ -500,7 +518,11 @@ namespace pcpp
 	void DpdkDevice::setDeviceInfo()
 	{
 		rte_eth_dev_info portInfo;
-		rte_eth_dev_info_get(m_Id, &portInfo);
+		if (!getDeviceInfo(m_Id, portInfo))
+		{
+			return;
+		}
+
 		m_PMDName = std::string(portInfo.driver_name);
 
 		if (m_PMDName == "eth_bond")
@@ -579,14 +601,22 @@ namespace pcpp
 		}
 	}
 
-	void DpdkDevice::getLinkStatus(LinkStatus& linkStatus) const
+	bool DpdkDevice::getLinkStatus(LinkStatus& linkStatus) const
 	{
 		struct rte_eth_link link;
-		rte_eth_link_get((uint8_t)m_Id, &link);
+		auto ret = rte_eth_link_get((uint8_t)m_Id, &link);
+		if (ret < 0)
+		{
+			PCPP_LOG_ERROR("Couldn't get link info, error was: " << rte_strerror(ret) << " (" << ret << ")");
+			return false;
+		}
+
 		linkStatus.linkUp = link.link_status;
 		linkStatus.linkSpeedMbps = (unsigned)link.link_speed;
 		linkStatus.linkDuplex =
 		    (link.link_duplex == DPDK_CONFIG_ETH_LINK_FULL_DUPLEX) ? LinkStatus::FULL_DUPLEX : LinkStatus::HALF_DUPLEX;
+
+		return true;
 	}
 
 	bool DpdkDevice::initCoreConfigurationByCoreMask(CoreMask coreMask)
@@ -1054,7 +1084,7 @@ namespace pcpp
 			return 0;
 		}
 
-		rte_mbuf* mBufArr[MAX_BURST_SIZE];
+		rte_mbuf* mBufArr[MAX_BURST_SIZE] = {};
 
 		int packetIndex = 0;
 		int mBufArrIndex = 0;
@@ -1278,7 +1308,11 @@ namespace pcpp
 		if (rssHF == (uint64_t)-1)
 		{
 			rte_eth_dev_info devInfo;
-			rte_eth_dev_info_get(m_Id, &devInfo);
+			if (!getDeviceInfo(m_Id, devInfo))
+			{
+				return 0;
+			}
+
 			return devInfo.flow_type_rss_offloads;
 		}
 
@@ -1424,15 +1458,21 @@ namespace pcpp
 		uint64_t dpdkRssHF = convertRssHfToDpdkRssHf(rssHFMask);
 
 		rte_eth_dev_info devInfo;
-		rte_eth_dev_info_get(m_Id, &devInfo);
+		if (!getDeviceInfo(m_Id, devInfo))
+		{
+			return false;
+		}
 
 		return ((devInfo.flow_type_rss_offloads & dpdkRssHF) == dpdkRssHF);
 	}
 
 	uint64_t DpdkDevice::getSupportedRssHashFunctions() const
 	{
 		rte_eth_dev_info devInfo;
-		rte_eth_dev_info_get(m_Id, &devInfo);
+		if (!getDeviceInfo(m_Id, devInfo))
+		{
+			return 0;
+		}
 
 		return convertDpdkRssHfToRssHf(devInfo.flow_type_rss_offloads);
 	}

Pcap++/src/MBufRawPacket.cpp

@@ -333,9 +333,9 @@ namespace pcpp
 			return;
 		}
 
-		m_MBuf = mBuf;
 		RawPacket::setRawData(rte_pktmbuf_mtod(mBuf, const uint8_t*), rte_pktmbuf_pkt_len(mBuf), timestamp,
 		                      LINKTYPE_ETHERNET);
+		m_MBuf = mBuf;
 	}
 
 }  // namespace pcpp

Tests/Pcap++Test/Tests/DpdkTests.cpp

@@ -200,15 +200,13 @@ class DpdkTestWorkerThread : public pcpp::DpdkWorkerThread
 	{
 		if (!m_Initialized)
 		{
-			std::cout << "Error: Thread " << coreId << " was not initialized" << std::endl;
 			return false;
 		}
 
 		m_CoreId = coreId;
 
 		if (m_DpdkDevice == NULL)
 		{
-			std::cout << "Error: DpdkDevice is NULL";
 			return false;
 		}
 
@@ -225,7 +223,6 @@ class DpdkTestWorkerThread : public pcpp::DpdkWorkerThread
 			uint16_t packetsSent = m_DpdkDevice->sendPackets(mBufArr, packetReceived, m_QueueId);
 			if (packetsSent != packetReceived)
 			{
-				std::cout << "Error: Couldn't send all received packets on thread " << m_CoreId;
 				return false;
 			}
 		}
@@ -332,7 +329,7 @@ PTF_TEST_CASE(TestDpdkDevice)
 	PTF_ASSERT_EQUAL(dev->getNumOfOpenedRxQueues(), 1);
 	PTF_ASSERT_EQUAL(dev->getNumOfOpenedTxQueues(), 1);
 	pcpp::DpdkDevice::LinkStatus linkStatus;
-	dev->getLinkStatus(linkStatus);
+	PTF_ASSERT_TRUE(dev->getLinkStatus(linkStatus));
 	PTF_ASSERT_TRUE(linkStatus.linkUp);
 	PTF_ASSERT_GREATER_THAN(linkStatus.linkSpeedMbps, 0);