msg/async/rdma: make rdma dispatcher can sleep if inactive enough

Signed-off-by: Haomai Wang <haomai@xsky.com>

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index 98621a3b25faf2b7378a8368bfa4bcfecfb7d1bc..9dd0af30d84e0c8cdb7b088e4f849d0fdb6e7970 100644 (file)
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -222,6 +222,7 @@ OPTION(ms_async_rdma_buffer_size, OPT_INT, 8192)
 OPTION(ms_async_rdma_send_buffers, OPT_U32, 10240)
 OPTION(ms_async_rdma_receive_buffers, OPT_U32, 10240)
 OPTION(ms_async_rdma_port_num, OPT_U32, 1)
+OPTION(ms_async_rdma_polling_us, OPT_U32, 1000)
 
 OPTION(ms_dpdk_port_id, OPT_INT, 0)
 OPTION(ms_dpdk_coremask, OPT_STR, "1")

diff --git a/src/msg/async/rdma/RDMAStack.cc b/src/msg/async/rdma/RDMAStack.cc
index 3fdb1fc5591d321880d550e02e7c8cf15d266e9a..b8bf11fbe7b045d8ca1fec30753073a98dbef8d9 100644 (file)
--- a/src/msg/async/rdma/RDMAStack.cc
+++ b/src/msg/async/rdma/RDMAStack.cc
@@ -14,6 +14,8 @@
  *
  */
 
+#include <poll.h>
+
 #include "include/str_list.h"
 #include "RDMAStack.h"
 
@@ -250,6 +252,8 @@ void RDMADispatcher::polling()
   RDMAWorker* worker;
   ldout(cct, 20) << __func__ << " going to poll rx cq:" << rx_cq << dendl;
   RDMAConnectedSocketImpl *conn = nullptr;
+  utime_t last_inactive = ceph_clock_now(cct);
+  bool rearmed = false;
 
   while (true) {
     int n = rx_cq->poll_cq(MAX_COMPLETIONS, wc);
@@ -268,8 +272,36 @@ void RDMADispatcher::polling()
         }
       }
       // handle_async_event();
-      if (done && !inflight)
+      if (done)
         break;
+
+      if ((ceph_clock_now(cct) - last_inactive).to_nsec() / 1000 > cct->_conf->ms_async_rdma_polling_us) {
+        if (!rearmed) {
+          // Clean up cq events after rearm notify ensure no new incoming event
+          // arrived between polling and rearm
+          rx_cq->rearm_notify();
+          rearmed = true;
+          continue;
+        }
+
+        struct pollfd channel_poll;
+        channel_poll.fd = rx_cc->get_fd();
+        channel_poll.events = POLLIN | POLLERR | POLLNVAL | POLLHUP;
+        channel_poll.revents = 0;
+        int r = 0;
+        while (!done && r == 0) {
+          r = poll(&channel_poll, 1, 1);
+          if (r < 0) {
+            r = -errno;
+            lderr(cct) << __func__ << " poll failed " << r << dendl;
+            assert(0);
+          }
+        }
+        if (r > 0 && rx_cc->get_cq_event())
+          ldout(cct, 20) << __func__ << " got cq event." << dendl;
+        last_inactive = ceph_clock_now(cct);
+        rearmed = false;
+      }
       continue;
     }