From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sreedhar Kodali Subject: Re: [PATCH] rsocket: Return ECONNRESET when socket in recv is disconnected Date: Thu, 09 Oct 2014 16:39:56 +0530 Message-ID: <56553bcab94dc48bde61d36ae9eb5eaa@imap.linux.ibm.com> References: <1412806773-23776-1-git-send-email-sean.hefty@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1412806773-23776-1-git-send-email-sean.hefty-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> Sender: linux-rdma-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: sean.hefty-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org Cc: linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-rdma-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: linux-rdma@vger.kernel.org Hi Sean, Thanks for the fix. Now, we are able to see the similar behavior between tcp/ip and rsockets when the other end is suddenly closed while waiting on data. Thank You. - Sreedhar On 2014-10-09 03:49, sean.hefty-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org wrote: > From: Sean Hefty > > The following behavior difference was reported between rsockets and > sockets: > > when remote end is suddenly closed, recv() waiting on it receives > tcp/ip => ECONNRESET error > rsockets => 0 value > > Update rrecv() to return ECONNRESET if no data is available and > the connection is no longer readable. > > Problem reported by: srkodali-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org > > Signed-off-by: Sean Hefty > --- > src/rsocket.c | 10 ++++++---- > 1 files changed, 6 insertions(+), 4 deletions(-) > > diff --git a/src/rsocket.c b/src/rsocket.c > index 074fb18..7c7af52 100644 > --- a/src/rsocket.c > +++ b/src/rsocket.c > @@ -1,5 +1,5 @@ > /* > - * Copyright (c) 2008-2013 Intel Corporation. All rights reserved. > + * Copyright (c) 2008-2014 Intel Corporation. All rights reserved. > * > * This software is available to you under a choice of one of two > * licenses. You may choose to be licensed under the terms of the GNU > @@ -2394,7 +2394,7 @@ ssize_t rrecv(int socket, void *buf, size_t len, > int flags) > struct rsocket *rs; > size_t left = len; > uint32_t end_size, rsize; > - int ret; > + int ret = 0; > > rs = idm_at(&idm, socket); > if (rs->type == SOCK_DGRAM) { > @@ -2419,9 +2419,11 @@ ssize_t rrecv(int socket, void *buf, size_t > len, int flags) > rs_conn_have_rdata); > if (ret) > break; > + > + if (!(rs->state & rs_readable)) > + ret = ERR(ECONNRESET); > } > > - ret = 0; > if (flags & MSG_PEEK) { > left = len - rs_peek(rs, buf, left); > break; > @@ -2456,7 +2458,7 @@ ssize_t rrecv(int socket, void *buf, size_t len, > int flags) > } while (left && (flags & MSG_WAITALL) && (rs->state & rs_readable)); > > fastlock_release(&rs->rlock); > - return ret ? ret : len - left; > + return (ret && left == len) ? ret : len - left; > } > > ssize_t rrecvfrom(int socket, void *buf, size_t len, int flags, -- 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