Merge pull request #148 from CESNET/dpdk-version

Dpdk - support nfb driver hw timestamp, update dpdk constants

Author: SiskaPavel

input/dpdk.cpp

@@ -178,7 +178,11 @@ struct rte_eth_conf DpdkCore::createPortConfig()
 #endif
 
     if (m_supportedRSS) {
+#if RTE_VERSION >= RTE_VERSION_NUM(21, 11, 0, 0)
+        portConfig.rxmode.mq_mode = RTE_ETH_MQ_RX_RSS;
+#else
         portConfig.rxmode.mq_mode = ETH_MQ_RX_RSS;
+#endif	
     } else {
         portConfig.rxmode.mq_mode = RTE_ETH_MQ_RX_NONE;
     }
@@ -215,7 +219,11 @@ void DpdkCore::configureRSS()
     struct rte_eth_rss_conf rssConfig = {
         .rss_key = rssKey,
         .rss_key_len = RSS_KEY_LEN,
+#if RTE_VERSION >= RTE_VERSION_NUM(21, 11, 0, 0)
+        .rss_hf = RTE_ETH_RSS_IP,
+#else
         .rss_hf = ETH_RSS_IP,
+#endif
     };
 
     if (rte_eth_dev_rss_hash_update(m_portId, &rssConfig)) {
@@ -344,6 +352,11 @@ int DpdkCore::getRxTimestampOffset()
     return m_rxTimestampOffset;
 }
 
+int DpdkCore::getRxTimestampDynflag()
+{
+    return RTE_BIT64(rte_mbuf_dynflag_lookup(RTE_MBUF_DYNFLAG_RX_TIMESTAMP_NAME, NULL));
+}
+
 DpdkReader::DpdkReader()
     : m_dpdkCore(DpdkCore::getInstance())
 {
@@ -362,6 +375,7 @@ void DpdkReader::init(const char* params)
     m_rxQueueId = m_dpdkCore.getRxQueueId();
     m_portId = m_dpdkCore.parser.port_num();
     m_rxTimestampOffset = m_dpdkCore.getRxTimestampOffset();
+    m_rxTimestampDynflag = m_dpdkCore.getRxTimestampDynflag();
     m_useHwRxTimestamp = m_dpdkCore.isNfbDpdkDriver();
 
     createRteMempool(m_dpdkCore.parser.pkt_mempool_size());
@@ -412,7 +426,7 @@ void DpdkReader::setupRxQueue()
 struct timeval DpdkReader::getTimestamp(rte_mbuf* mbuf)
 {
 	struct timeval tv;
-    if (m_useHwRxTimestamp) {
+    if (m_useHwRxTimestamp && (mbuf->ol_flags & m_rxTimestampDynflag)) {
         static constexpr time_t nanosecInSec = 1000000000;
         static constexpr time_t nsecInUsec = 1000;
 

input/dpdk.h

@@ -136,6 +136,13 @@ class DpdkCore {
 
     int getRxTimestampOffset();
 
+    /**
+     * @brief Get the Rx Timestamp mbuf Dynflag for RTE_MBUF_DYNFLAG_RX_TIMESTAMP_NAME
+     * 
+     * @return int RTE_BIT64 value
+     */
+    int getRxTimestampDynflag();
+
     bool isNfbDpdkDriver();
 
     /**
@@ -214,6 +221,7 @@ class DpdkReader : public InputPlugin {
     uint16_t m_rxQueueId;
     uint16_t m_portId;
     int m_rxTimestampOffset;
+    uint64_t m_rxTimestampDynflag;
 
     bool m_useHwRxTimestamp;