[PATCH v5 3/4] rsockets: fix rsocket state when interrupted waiting for events

[PATCH v5 3/4] rsockets: fix rsocket state when interrupted waiting for events

[Sreedhar Kodali]

[-- Attachment #1: Type: text/plain, Size: 1197 bytes --]

Note: This patch is reworked based on suggestions from Sean and Jason
       Also attached the patch file for convenience

 From: Sreedhar Kodali <srkodali-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
Date:   Thu Sep 18 14:35:42 2014 +0530

     While waiting for a completion event, rsocket state is incorrectly
     set to error when interrupted.  Instead, the caller of get
     completion event should decide what to do with it based on
     errno.  The fix is do not change the state to rs_error when
     errno is EINTR inside get completion event.

     Signed-off-by: Sreedhar Kodali <srkodali-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
     Reviewed-by: Pradeep Satyanarayana <pradeeps-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
     ---

diff --git a/src/rsocket.c b/src/rsocket.c
index 39c35cf..16792cf 100644
--- a/src/rsocket.c
+++ b/src/rsocket.c
@@ -1976,7 +1976,7 @@ static int rs_get_cq_event(struct rsocket *rs)
                         rs->unack_cqe = 0;
                 }
                 rs->cq_armed = 0;
-       } else if (errno != EAGAIN) {
+       } else if (!(errno == EAGAIN || errno == EINTR)) {
                 rs->state = rs_error;
         }

[-- Attachment #2: librdmacm_src_rsocket_fix_state_20140918.patch3 --]
[-- Type: text/plain, Size: 946 bytes --]

commit 3cd51b727b58f2e3aa03d77e9c410a5488a09112
Author: Sreedhar Kodali <srkodali@linux.vnet.ibm.com>
Date:   Thu Sep 18 14:35:42 2014 +0530

    While waiting for a completion event, rsocket state is incorrectly
    set to error when interrupted.  Instead, the caller of get
    completion event should decide what to do with it based on
    errno.  The fix is do not change the state to rs_error when
    errno is EINTR inside get completion event.
    
    Signed-off-by: Sreedhar Kodali <srkodali@linux.vnet.ibm.com>
    Reviewed-by: Pradeep Satyanarayana <pradeeps@linux.vnet.ibm.com>
    ---

diff --git a/src/rsocket.c b/src/rsocket.c
index 39c35cf..16792cf 100644
--- a/src/rsocket.c
+++ b/src/rsocket.c
@@ -1976,7 +1976,7 @@ static int rs_get_cq_event(struct rsocket *rs)
 			rs->unack_cqe = 0;
 		}
 		rs->cq_armed = 0;
-	} else if (errno != EAGAIN) {
+	} else if (!(errno == EAGAIN || errno == EINTR)) {
 		rs->state = rs_error;
 	}
 

RE: [PATCH v5 3/4] rsockets: fix rsocket state when interrupted waiting for events

[Hefty, Sean]

Thanks - applied
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html