IB/sdp: Add CQ polling, weight configurable globally.

diff --git a/drivers/infiniband/ulp/sdp/sdp.h b/drivers/infiniband/ulp/sdp/sdp.h
index 606787c6952bd2cd43ad17ed2ce5fc7338d4da2b..ebe4561ac10623b13f4217d0e378abdc33cc3a64 100644 (file)
--- a/drivers/infiniband/ulp/sdp/sdp.h
+++ b/drivers/infiniband/ulp/sdp/sdp.h
@@ -171,7 +171,7 @@ void sdp_completion_handler(struct ib_cq *cq, void *cq_context);
 void sdp_work(void *);
 void sdp_post_send(struct sdp_sock *ssk, struct sk_buff *skb, u8 mid);
 void sdp_post_recvs(struct sdp_sock *ssk);
-void sdp_poll_cq(struct sdp_sock *ssk, struct ib_cq *cq);
+int sdp_poll_cq(struct sdp_sock *ssk, struct ib_cq *cq);
 void sdp_post_sends(struct sdp_sock *ssk, int nonagle);
 void sdp_destroy_work(void *data);
 void sdp_time_wait_work(void *data);

diff --git a/drivers/infiniband/ulp/sdp/sdp_bcopy.c b/drivers/infiniband/ulp/sdp/sdp_bcopy.c
index 371fc487bee82910d2ba370867014c025db89cd2..4b04eb8013b60106baf0dbc854ef2a876c2efcdf 100644 (file)
--- a/drivers/infiniband/ulp/sdp/sdp_bcopy.c
+++ b/drivers/infiniband/ulp/sdp/sdp_bcopy.c
@@ -460,15 +460,18 @@ void sdp_completion_handler(struct ib_cq *cq, void *cq_context)
        schedule_work(&ssk->work);
 }
 
-void sdp_poll_cq(struct sdp_sock *ssk, struct ib_cq *cq)
+int sdp_poll_cq(struct sdp_sock *ssk, struct ib_cq *cq)
 {
        int n, i;
+       int ret = -EAGAIN;
        do {
                n = ib_poll_cq(cq, SDP_NUM_WC, ssk->ibwc);
                for (i = 0; i < n; ++i) {
                        sdp_handle_wc(ssk, ssk->ibwc + i);
+                       ret = 0;
                }
        } while (n == SDP_NUM_WC);
+       return ret;
 }
 
 void sdp_work(void *data)

diff --git a/drivers/infiniband/ulp/sdp/sdp_main.c b/drivers/infiniband/ulp/sdp/sdp_main.c
index 241c6668cd33f89aa4069422ba0a2a3686d38edf..643af57289781eca7c194a891d184613c13f0d71 100644 (file)
--- a/drivers/infiniband/ulp/sdp/sdp_main.c
+++ b/drivers/infiniband/ulp/sdp/sdp_main.c
@@ -80,6 +80,36 @@ module_param_named(data_debug_level, sdp_data_debug_level, int, 0644);
 MODULE_PARM_DESC(data_debug_level, "Enable data path debug tracing if > 0.");
 #endif
 
+static int send_poll_hit;
+
+module_param_named(send_poll_hit, send_poll_hit, int, 0644);
+MODULE_PARM_DESC(send_poll_hit, "How many times send poll helped.");
+
+static int send_poll_miss;
+
+module_param_named(send_poll_miss, send_poll_miss, int, 0644);
+MODULE_PARM_DESC(send_poll_miss, "How many times send poll missed.");
+
+static int recv_poll_hit;
+
+module_param_named(recv_poll_hit, recv_poll_hit, int, 0644);
+MODULE_PARM_DESC(recv_poll_hit, "How many times recv poll helped.");
+
+static int recv_poll_miss;
+
+module_param_named(recv_poll_miss, recv_poll_miss, int, 0644);
+MODULE_PARM_DESC(recv_poll_miss, "How many times recv poll missed.");
+
+static int send_poll = 100;
+
+module_param_named(send_poll, send_poll, int, 0644);
+MODULE_PARM_DESC(send_poll, "How many times to poll send.");
+
+static int recv_poll = 1000;
+
+module_param_named(recv_poll, recv_poll, int, 0644);
+MODULE_PARM_DESC(recv_poll, "How many times to poll recv.");
+
 struct workqueue_struct *sdp_workqueue;
 
 static int sdp_get_port(struct sock *sk, unsigned short snum)
@@ -852,6 +882,32 @@ void sdp_push_one(struct sock *sk, unsigned int mss_now)
 {
 }
 
+static inline int poll_recv_cq(struct sock *sk)
+{
+       int i;
+       if (sdp_sk(sk)->cq) {
+               for (i = 0; i < recv_poll; ++i)
+                       if (!sdp_poll_cq(sdp_sk(sk), sdp_sk(sk)->cq)) {
+                               ++recv_poll_hit;
+                               return 0;
+                       }
+               ++recv_poll_miss;
+       }
+       return 1;
+}
+
+static inline void poll_send_cq(struct sock *sk)
+{
+       int i;
+       if (sdp_sk(sk)->cq) {
+               for (i = 0; i < send_poll; ++i)
+                       if (!sdp_poll_cq(sdp_sk(sk), sdp_sk(sk)->cq)) {
+                               ++send_poll_hit;
+                               return;
+                       }
+               ++send_poll_miss;
+       }
+}
 /* Like tcp_sendmsg */
 /* TODO: check locking */
 #define TCP_PAGE(sk)   (sk->sk_sndmsg_page)
@@ -1055,6 +1111,7 @@ wait_for_memory:
 out:
        if (copied)
                sdp_push(sk, ssk, flags, mss_now, ssk->nonagle);
+       poll_send_cq(sk);
        release_sock(sk);
        return copied;
 
@@ -1090,6 +1147,7 @@ static int sdp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
        int offset = sdp_sk(sk)->offset;
        int copied = 0;
        int urg_data = 0;
+       int rc;
 
        lock_sock(sk);
        sdp_dbg_data(sk, "%s\n", __func__);
@@ -1169,11 +1227,13 @@ static int sdp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
                        }
                }
 
-               if (copied >= target) {
+               rc = poll_recv_cq(sk);
+
+               if (copied >= target && !recv_poll) {
                        /* Do not sleep, just process backlog. */
                        release_sock(sk);
                        lock_sock(sk);
-               } else {
+               } else if (rc) {
                        sdp_dbg_data(sk, "%s: sk_wait_data %ld\n", __func__, timeo);
                        sk_wait_data(sk, &timeo);
                }