From 09b4978cfd8bfb3a42095b0ecdb1ac78cc448cc9 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 29 Dec 2016 13:59:30 +0800 Subject: [PATCH 1/2] msg/async: be compatible with dpdk v16.07 Signed-off-by: Kefu Chai --- src/msg/async/dpdk/DPDK.cc | 3 ++- src/msg/async/dpdk/DPDK.h | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/msg/async/dpdk/DPDK.cc b/src/msg/async/dpdk/DPDK.cc index cb907807ef6..8da12c3fd35 100644 --- a/src/msg/async/dpdk/DPDK.cc +++ b/src/msg/async/dpdk/DPDK.cc @@ -665,9 +665,10 @@ void DPDKQueuePair::handle_stats() return ; } +#if RTE_VERSION < RTE_VERSION_NUM(16,7,0,0) _dev->perf_logger->set(l_dpdk_dev_rx_mcast, rte_stats.imcasts); - _dev->perf_logger->set(l_dpdk_dev_rx_badcrc_errors, rte_stats.ibadcrc); +#endif _dev->perf_logger->set(l_dpdk_dev_rx_dropped_errors, rte_stats.imissed); _dev->perf_logger->set(l_dpdk_dev_rx_nombuf_errors, rte_stats.rx_nombuf); diff --git a/src/msg/async/dpdk/DPDK.h b/src/msg/async/dpdk/DPDK.h index 868f6fecdcd..b0c7ec78076 100644 --- a/src/msg/async/dpdk/DPDK.h +++ b/src/msg/async/dpdk/DPDK.h @@ -42,6 +42,7 @@ #include #include #include +#include #include "include/page.h" #include "common/Tub.h" @@ -834,10 +835,13 @@ class DPDKDevice { string name(std::string("port") + std::to_string(port_idx)); PerfCountersBuilder plb(cct, name, l_dpdk_dev_first, l_dpdk_dev_last); +#if RTE_VERSION < RTE_VERSION_NUM(16,7,0,0) plb.add_u64_counter(l_dpdk_dev_rx_mcast, "dpdk_device_receive_multicast_packets", "DPDK received multicast packets"); + plb.add_u64_counter(l_dpdk_dev_rx_badcrc_errors, "dpdk_device_receive_badcrc_errors", "DPDK received bad crc errors"); +#endif + plb.add_u64_counter(l_dpdk_dev_rx_total_errors, "dpdk_device_receive_total_errors", "DPDK received total_errors"); plb.add_u64_counter(l_dpdk_dev_tx_total_errors, "dpdk_device_send_total_errors", "DPDK sendd total_errors"); - plb.add_u64_counter(l_dpdk_dev_rx_badcrc_errors, "dpdk_device_receive_badcrc_errors", "DPDK received bad crc errors"); plb.add_u64_counter(l_dpdk_dev_rx_dropped_errors, "dpdk_device_receive_dropped_errors", "DPDK received dropped errors"); plb.add_u64_counter(l_dpdk_dev_rx_nombuf_errors, "dpdk_device_receive_nombuf_errors", "DPDK received RX mbuf allocation errors"); From 3e559b21943d8e4d91e5848a945386d76efffe74 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 29 Dec 2016 14:01:06 +0800 Subject: [PATCH 2/2] msg/async: bump dpdk to v16.07 as some distros include it already. so sync it up to avoid building failures on them with dpdk-dev package(s) shipped by distro. Signed-off-by: Kefu Chai --- src/dpdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dpdk b/src/dpdk index a38e5ec15e3..20e2b6eba13 160000 --- a/src/dpdk +++ b/src/dpdk @@ -1 +1 @@ -Subproject commit a38e5ec15e3fe615b94f3cc5edca5974dab325ab +Subproject commit 20e2b6eba13d9eb61b23ea75f09f2aa966fa6325