From: Eldad Zinger <eldadz@mellanox.co.il>
Date: Tue, 19 Oct 2010 15:26:34 +0000 (+0200)
Subject: sdp: treat unfinished RDMA operation as a fatal error
X-Git-Tag: v4.1.12-92~264^2~5^2~81
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0a7a23d04e2e4d22f1a82aabd4812035f1507fb5;p=users%2Fjedix%2Flinux-maple.git

sdp: treat unfinished RDMA operation as a fatal error

mark socket with EIO error code.

Signed-off-by: Eldad Zinger <eldadz@mellanox.co.il>
---

diff --git a/drivers/infiniband/ulp/sdp/sdp.h b/drivers/infiniband/ulp/sdp/sdp.h
index 84f112478c4e..b19997bcfb5e 100644
--- a/drivers/infiniband/ulp/sdp/sdp.h
+++ b/drivers/infiniband/ulp/sdp/sdp.h
@@ -19,7 +19,7 @@
 #define SDP_NAGLE_TIMEOUT (HZ / 10)
 
 #define SDP_RX_ARMING_DELAY	(msecs_to_jiffies(10))
-#define SDP_RDMA_READ_TIMEOUT	(5 * HZ)
+#define SDP_RDMA_READ_TIMEOUT	(60 * HZ) /* timeout - fatal hw error */
 
 #define SDP_SRCAVAIL_CANCEL_TIMEOUT (HZ * 5)
 #define SDP_SRCAVAIL_ADV_TIMEOUT (1 * HZ)
diff --git a/drivers/infiniband/ulp/sdp/sdp_zcopy.c b/drivers/infiniband/ulp/sdp/sdp_zcopy.c
index bae837c31d24..438d3b105bfb 100644
--- a/drivers/infiniband/ulp/sdp/sdp_zcopy.c
+++ b/drivers/infiniband/ulp/sdp/sdp_zcopy.c
@@ -241,8 +241,9 @@ static int sdp_wait_rdma_wr_finished(struct sdp_sock *ssk)
 		}
 
 		if (!timeo) {
-			sdp_warn(sk, "Timed out waiting for RDMA read\n");
-			rc = -ETIME;
+			sdp_warn(sk, "Fatal: no RDMA read completion\n");
+			rc = -EIO;
+			sdp_set_error(sk, rc);
 			break;
 		}