From 17d58dba43eeae9f1519248c1fd62e9e4d2dc302 Mon Sep 17 00:00:00 2001 From: imarom Date: Wed, 15 Feb 2017 18:26:41 +0200 Subject: TX packet capture - zero impact on fast path (using wrapper when service mode is active) Signed-off-by: imarom --- src/stateless/rx/trex_stateless_capture.cpp | 61 +++++++++++++++++++++++------ src/stateless/rx/trex_stateless_capture.h | 52 +++++++++++++++++++----- 2 files changed, 92 insertions(+), 21 deletions(-) (limited to 'src/stateless/rx') diff --git a/src/stateless/rx/trex_stateless_capture.cpp b/src/stateless/rx/trex_stateless_capture.cpp index d9813cac..3b0273a4 100644 --- a/src/stateless/rx/trex_stateless_capture.cpp +++ b/src/stateless/rx/trex_stateless_capture.cpp @@ -46,7 +46,7 @@ TrexStatelessCapture::~TrexStatelessCapture() { void TrexStatelessCapture::handle_pkt(const rte_mbuf_t *m, int port, TrexPkt::origin_e origin) { - + if (m_state != STATE_ACTIVE) { return; } @@ -127,7 +127,7 @@ TrexStatelessCaptureMngr::update_global_filter() { for (TrexStatelessCapture *capture : m_captures) { new_filter += capture->get_filter(); } - + m_global_filter = new_filter; } @@ -136,7 +136,7 @@ TrexStatelessCaptureMngr::update_global_filter() { * lookup a specific capture by ID */ TrexStatelessCapture * -TrexStatelessCaptureMngr::lookup(capture_id_t capture_id) { +TrexStatelessCaptureMngr::lookup(capture_id_t capture_id) const { for (int i = 0; i < m_captures.size(); i++) { if (m_captures[i]->get_id() == capture_id) { @@ -150,7 +150,7 @@ TrexStatelessCaptureMngr::lookup(capture_id_t capture_id) { int -TrexStatelessCaptureMngr::lookup_index(capture_id_t capture_id) { +TrexStatelessCaptureMngr::lookup_index(capture_id_t capture_id) const { for (int i = 0; i < m_captures.size(); i++) { if (m_captures[i]->get_id() == capture_id) { return i; @@ -179,11 +179,20 @@ TrexStatelessCaptureMngr::start(const CaptureFilter &filter, /* create a new capture*/ int new_id = m_id_counter++; TrexStatelessCapture *new_capture = new TrexStatelessCapture(new_id, limit, filter, mode); + + /** + * add the new capture in a safe mode + * (TX might be active) + */ + std::unique_lock ulock(m_lock); m_captures.push_back(new_capture); - + /* update global filter */ update_global_filter(); + /* done with critical section */ + ulock.unlock(); + /* result */ rc.set_rc(new_id, new_capture->get_start_ts()); } @@ -196,7 +205,9 @@ TrexStatelessCaptureMngr::stop(capture_id_t capture_id, TrexCaptureRCStop &rc) { return; } + std::unique_lock ulock(m_lock); capture->stop(); + rc.set_rc(capture->get_pkt_count()); } @@ -210,7 +221,11 @@ TrexStatelessCaptureMngr::fetch(capture_id_t capture_id, uint32_t pkt_limit, Tre } uint32_t pending = 0; + + /* take a lock before fetching all the packets */ + std::unique_lock ulock(m_lock); TrexPktBuffer *pkt_buffer = capture->fetch(pkt_limit, pending); + ulock.unlock(); rc.set_rc(pkt_buffer, pending, capture->get_start_ts()); } @@ -226,14 +241,21 @@ TrexStatelessCaptureMngr::remove(capture_id_t capture_id, TrexCaptureRCRemove &r } TrexStatelessCapture *capture = m_captures[index]; - m_captures.erase(m_captures.begin() + index); - /* free memory */ - delete capture; + /* remove from list under lock */ + std::unique_lock ulock(m_lock); - /* update global filter */ + m_captures.erase(m_captures.begin() + index); + + /* update global filter under lock (for barrier) */ update_global_filter(); + /* done with critical section */ + ulock.unlock(); + + /* free memory */ + delete capture; + rc.set_rc(); } @@ -247,24 +269,39 @@ TrexStatelessCaptureMngr::reset() { } } +//#define STRESS_TEST void TrexStatelessCaptureMngr::handle_pkt_slow_path(const rte_mbuf_t *m, int port, TrexPkt::origin_e origin) { - std::unique_lock lock(m_lock); + + #ifdef STRESS_TEST + static int sanity = 0; + assert(__sync_fetch_and_add(&sanity, 1) == 0); + #endif for (TrexStatelessCapture *capture : m_captures) { capture->handle_pkt(m, port, origin); } + + #ifdef STRESS_TEST + assert(__sync_fetch_and_sub(&sanity, 1) == 1); + #endif } + Json::Value -TrexStatelessCaptureMngr::to_json() const { +TrexStatelessCaptureMngr::to_json() { Json::Value lst = Json::arrayValue; - + + std::unique_lock ulock(m_lock); + for (TrexStatelessCapture *capture : m_captures) { lst.append(capture->to_json()); } + ulock.unlock(); + return lst; } TrexStatelessCaptureMngr TrexStatelessCaptureMngr::g_instance; + diff --git a/src/stateless/rx/trex_stateless_capture.h b/src/stateless/rx/trex_stateless_capture.h index 6288ac56..8af2510e 100644 --- a/src/stateless/rx/trex_stateless_capture.h +++ b/src/stateless/rx/trex_stateless_capture.h @@ -101,6 +101,14 @@ public: return output; } + uint64_t get_tx_active_map() const { + return m_tx_active; + } + + uint64_t get_rx_active_map() const { + return m_rx_active; + } + private: uint64_t m_tx_active; @@ -247,30 +255,56 @@ public: } /** - * handle packet on TX side + * handle packet on TX side + * always with a lock */ inline void handle_pkt_tx(const rte_mbuf_t *m, int port) { + + /* fast path */ + if (likely(!m_global_filter.in_tx(port))) { + return; + } - /* fast bail out IF */ - if (unlikely(m_global_filter.in_tx(port))) { + /* TX core always locks */ + std::unique_lock ulock(m_lock); + + /* check again the global filter (because of RX fast path might not lock) */ + if (m_global_filter.in_tx(port)) { handle_pkt_slow_path(m, port, TrexPkt::ORIGIN_TX); } + ulock.unlock(); + } /** - * handle packet on RX side + * handle packet on RX side + * RX side might or might not use a lock - depends if there are + * other TX cores being captured */ inline void handle_pkt_rx(const rte_mbuf_t *m, int port) { + /* fast path */ + if (likely(!m_global_filter.in_rx(port))) { + return; + } + + /* create a RAII object lock but do not lock yet */ + std::unique_lock ulock(m_lock, std::defer_lock); + + /* if we are not alone - lock */ + if (m_global_filter.get_tx_active_map() != 0) { + ulock.lock(); + } + /* fast bail out IF */ - if (unlikely(m_global_filter.in_rx(port))) { + if (m_global_filter.in_rx(port)) { handle_pkt_slow_path(m, port, TrexPkt::ORIGIN_RX); } } - Json::Value to_json() const; + Json::Value to_json(); private: @@ -280,10 +314,10 @@ private: } - TrexStatelessCapture * lookup(capture_id_t capture_id); - int lookup_index(capture_id_t capture_id); + TrexStatelessCapture * lookup(capture_id_t capture_id) const; + int lookup_index(capture_id_t capture_id) const; - void handle_pkt_slow_path(const rte_mbuf_t *m, int port, TrexPkt::origin_e origin) __attribute__ ((noinline)); + void handle_pkt_slow_path(const rte_mbuf_t *m, int port, TrexPkt::origin_e origin); void update_global_filter(); -- cgit 1.2.3-korg