RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-18 17:37:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12707 from tchaikov/wip-dpdk-v16.07

Browse Source 
builds with dpdk v16.07

Reviewed-by: Haomai Wang <haomai@xsky.com>
This commit is contained in:
Haomai Wang 2016-12-29 15:02:59 +08:00 committed by GitHub
commit 020fd24d7e
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dpdk

@ -1 +1 @@
Subproject commit a38e5ec15e3fe615b94f3cc5edca5974dab325ab
Subproject commit 20e2b6eba13d9eb61b23ea75f09f2aa966fa6325

3
src/msg/async/dpdk/DPDK.cc
View File

@ -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);

6
src/msg/async/dpdk/DPDK.h
View File

@ -42,6 +42,7 @@
#include <rte_common.h>
#include <rte_ethdev.h>
#include <rte_malloc.h>
#include <rte_version.h>
#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");