RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-02 17:12:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13810 from yuyuyu101/wip-rdma-inflight

Browse Source 
msg/async/rdma: destroy QueuePair if needed

Reviewed-by: Adir lev <adirl@mellanox.com>
This commit is contained in:
Haomai Wang 2017-03-07 15:25:55 +08:00 committed by GitHub
commit d124e6f669
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/msg/async/rdma/RDMAStack.cc
View File

@ -37,6 +37,7 @@ RDMADispatcher::~RDMADispatcher()
assert(qp_conns.empty());
assert(dead_queue_pairs.empty());
assert(num_dead_queue_pair == 0);
tx_cc->ack_events();
rx_cc->ack_events();
@ -202,13 +203,14 @@ void RDMADispatcher::polling()
// Additionally, don't delete qp while outstanding_buffers isn't empty,
// because we need to check qp's state before sending
perf_logger->set(l_msgr_rdma_inflight_tx_chunks, inflight);
if (!inflight.load()) {
if (num_dead_queue_pair) {
Mutex::Locker l(lock); // FIXME reuse dead qp because creating one qp costs 1 ms
while (!dead_queue_pairs.empty()) {
ldout(cct, 10) << __func__ << " finally delete qp=" << dead_queue_pairs.back() << dendl;
delete dead_queue_pairs.back();
perf_logger->dec(l_msgr_rdma_active_queue_pair);
dead_queue_pairs.pop_back();
--num_dead_queue_pair;
}
}
if (done)
@ -296,6 +298,7 @@ void RDMADispatcher::erase_qpn(uint32_t qpn)
auto it = qp_conns.find(qpn);
if (it == qp_conns.end())
return ;
++num_dead_queue_pair;
dead_queue_pairs.push_back(it->second.first);
qp_conns.erase(it);
}

1
src/msg/async/rdma/RDMAStack.h
View File

@ -72,6 +72,7 @@ class RDMADispatcher : public CephContext::ForkWatcher {
Infiniband::CompletionChannel *tx_cc, *rx_cc;
EventCallbackRef async_handler;
bool done = false;
std::atomic<uint64_t> num_dead_queue_pair = {0};
Mutex lock; // protect `qp_conns`, `dead_queue_pairs`
// qp_num -> InfRcConnection
// The main usage of `qp_conns` is looking up connection by qp_num,