sdp: Send SendSM from recvmsg context and not from interrupt

Signed-off-by: Amir Vadai <amirv@mellanox.co.il>

diff --git a/drivers/infiniband/ulp/sdp/sdp_main.c b/drivers/infiniband/ulp/sdp/sdp_main.c
index a7e050c07ce9c4d865acc42be6b582e6f1051fd2..04256ccce356f5b68949e23ece27c8053660fba0 100644 (file)
--- a/drivers/infiniband/ulp/sdp/sdp_main.c
+++ b/drivers/infiniband/ulp/sdp/sdp_main.c
@@ -2122,11 +2122,18 @@ static int sdp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
                        case SDP_MID_SRCAVAIL:
                                rx_sa = RX_SRCAVAIL_STATE(skb);
 
-                               if (rx_sa->mseq < ssk->srcavail_cancel_mseq) {
+                               if (rx_sa->flags & RX_SA_ABORTED) {
                                        sdp_dbg_data(sk, "Ignoring src avail "
                                                        "due to SrcAvailCancel\n");
-                                       sdp_abort_rx_srcavail(sk, skb);
-                                       goto sdp_mid_data;
+                                       sdp_post_sendsm(sk);
+                                       if (rx_sa->used < skb->len) {
+                                               sdp_abort_rx_srcavail(sk, skb);
+                                               sdp_prf(sk, skb, "Converted SA to DATA");
+                                               goto sdp_mid_data;
+                                       } else {
+                                               sdp_prf(sk, skb, "Cancelled SA with no payload left");
+                                               goto skb_cleanup;
+                                       }
                                }
 
                                /* if has payload - handle as if MID_DATA */
@@ -2174,7 +2181,11 @@ sdp_mid_data:
                        if (offset < avail_bytes_count)
                                goto found_ok_skb;
 
-                       WARN_ON(!(flags & MSG_PEEK));
+                       if (unlikely(!(flags & MSG_PEEK))) {
+                                       sdp_warn(sk, "Trying to read beyond SKB\n");
+                                       sdp_prf(sk, skb, "Aborting recv");
+                                       goto skb_cleanup;
+                       }
 
                        WARN_ON(h->mid == SDP_MID_SRCAVAIL);
 

diff --git a/drivers/infiniband/ulp/sdp/sdp_rx.c b/drivers/infiniband/ulp/sdp/sdp_rx.c
index f1b6d439770ddb2b16d8f7726aadfbe025249b72..56ccc1a6f1210bfb278daa2d84c76ba01cb56ffe 100644 (file)
--- a/drivers/infiniband/ulp/sdp/sdp_rx.c
+++ b/drivers/infiniband/ulp/sdp/sdp_rx.c
@@ -478,7 +478,6 @@ static int sdp_process_rx_ctl_skb(struct sdp_sock *ssk, struct sk_buff *skb)
                        ssk->rx_sa->flags |= RX_SA_ABORTED;
                        ssk->rx_sa = NULL; /* TODO: change it into SDP_MID_DATA and get 
                                              the dirty logic from recvmsg */
-                       sdp_post_sendsm(sk);
                } else {
                        sdp_dbg(sk, "Got SrcAvailCancel - "
                                        "but no SrcAvail in process\n");