1 files changed, 32 insertions, 15 deletions

diff --git a/net/rds/iw_recv.c b/net/rds/iw_recv.c
index 8683f5f66c4b..54af7d6b92da 100644
--- a/net/rds/iw_recv.c
+++ b/net/rds/iw_recv.c
@@ -143,15 +143,16 @@ static int rds_iw_recv_refill_one(struct rds_connection *conn,
         int ret = -ENOMEM;
 
         if (recv->r_iwinc == NULL) {
-                if (atomic_read(&rds_iw_allocation) >= rds_iw_sysctl_max_recv_allocation) {
+                if (!atomic_add_unless(&rds_iw_allocation, 1, rds_iw_sysctl_max_recv_allocation)) {
                         rds_iw_stats_inc(s_iw_rx_alloc_limit);
                         goto out;
                 }
                 recv->r_iwinc = kmem_cache_alloc(rds_iw_incoming_slab,
                                                  kptr_gfp);
-                if (recv->r_iwinc == NULL)
+                if (recv->r_iwinc == NULL) {
+                        atomic_dec(&rds_iw_allocation);
                         goto out;
-                atomic_inc(&rds_iw_allocation);
+                }
                 INIT_LIST_HEAD(&recv->r_iwinc->ii_frags);
                 rds_inc_init(&recv->r_iwinc->ii_inc, conn, conn->c_faddr);
         }
@@ -229,8 +230,8 @@ int rds_iw_recv_refill(struct rds_connection *conn, gfp_t kptr_gfp,
         int ret = 0;
         u32 pos;
 
-        while ((prefill || rds_conn_up(conn))
-                        && rds_iw_ring_alloc(&ic->i_recv_ring, 1, &pos)) {
+        while ((prefill || rds_conn_up(conn)) &&
+               rds_iw_ring_alloc(&ic->i_recv_ring, 1, &pos)) {
                 if (pos >= ic->i_recv_ring.w_nr) {
                         printk(KERN_NOTICE "Argh - ring alloc returned pos=%u\n",
                                         pos);
@@ -729,10 +730,10 @@ static void rds_iw_process_recv(struct rds_connection *conn,
                 hdr = &iwinc->ii_inc.i_hdr;
                 /* We can't just use memcmp here; fragments of a
                  * single message may carry different ACKs */
-                if (hdr->h_sequence != ihdr->h_sequence
-                 || hdr->h_len != ihdr->h_len
-                 || hdr->h_sport != ihdr->h_sport
-                 || hdr->h_dport != ihdr->h_dport) {
+                if (hdr->h_sequence != ihdr->h_sequence ||
+                    hdr->h_len != ihdr->h_len ||
+                    hdr->h_sport != ihdr->h_sport ||
+                    hdr->h_dport != ihdr->h_dport) {
                         rds_iw_conn_error(conn,
                                 "fragment header mismatch; forcing reconnect\n");
                         return;
@@ -783,17 +784,22 @@ void rds_iw_recv_cq_comp_handler(struct ib_cq *cq, void *context)
 {
         struct rds_connection *conn = context;
         struct rds_iw_connection *ic = conn->c_transport_data;
-        struct ib_wc wc;
-        struct rds_iw_ack_state state = { 0, };
-        struct rds_iw_recv_work *recv;
 
         rdsdebug("conn %p cq %p\n", conn, cq);
 
         rds_iw_stats_inc(s_iw_rx_cq_call);
 
-        ib_req_notify_cq(cq, IB_CQ_SOLICITED);
+        tasklet_schedule(&ic->i_recv_tasklet);
+}
+
+static inline void rds_poll_cq(struct rds_iw_connection *ic,
+                               struct rds_iw_ack_state *state)
+{
+        struct rds_connection *conn = ic->conn;
+        struct ib_wc wc;
+        struct rds_iw_recv_work *recv;
 
-        while (ib_poll_cq(cq, 1, &wc) > 0) {
+        while (ib_poll_cq(ic->i_recv_cq, 1, &wc) > 0) {
                 rdsdebug("wc wr_id 0x%llx status %u byte_len %u imm_data %u\n",
                          (unsigned long long)wc.wr_id, wc.status, wc.byte_len,
                          be32_to_cpu(wc.ex.imm_data));
@@ -811,7 +817,7 @@ void rds_iw_recv_cq_comp_handler(struct ib_cq *cq, void *context)
                 if (rds_conn_up(conn) || rds_conn_connecting(conn)) {
                         /* We expect errors as the qp is drained during shutdown */
                         if (wc.status == IB_WC_SUCCESS) {
-                                rds_iw_process_recv(conn, recv, wc.byte_len, &state);
+                                rds_iw_process_recv(conn, recv, wc.byte_len, state);
                         } else {
                                 rds_iw_conn_error(conn, "recv completion on "
                                        "%pI4 had status %u, disconnecting and "
@@ -822,6 +828,17 @@ void rds_iw_recv_cq_comp_handler(struct ib_cq *cq, void *context)
 
                 rds_iw_ring_free(&ic->i_recv_ring, 1);
         }
+}
+
+void rds_iw_recv_tasklet_fn(unsigned long data)
+{
+        struct rds_iw_connection *ic = (struct rds_iw_connection *) data;
+        struct rds_connection *conn = ic->conn;
+        struct rds_iw_ack_state state = { 0, };
+
+        rds_poll_cq(ic, &state);
+        ib_req_notify_cq(ic->i_recv_cq, IB_CQ_SOLICITED);
+        rds_poll_cq(ic, &state);
 
         if (state.ack_next_valid)
                 rds_iw_set_ack(ic, state.ack_next, state.ack_required);