From: Ursula Braun <ubraun@linux.ibm.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, linux-s390@vger.kernel.org,
schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com,
raspl@linux.ibm.com, ubraun@linux.ibm.com
Subject: [PATCH net 5/9] net/smc: recvmsg and splice_read should return 0 after shutdown
Date: Wed, 30 Jan 2019 18:51:04 +0100 [thread overview]
Message-ID: <20190130175108.103221-6-ubraun@linux.ibm.com> (raw)
In-Reply-To: <20190130175108.103221-1-ubraun@linux.ibm.com>
From: Karsten Graul <kgraul@linux.ibm.com>
When a socket was connected and is now shut down for read, return 0 to
indicate end of data in recvmsg and splice_read (like TCP) and do not
return ENOTCONN. This behavior is required by the socket api.
Signed-off-by: Karsten Graul <kgraul@linux.ibm.com>
Signed-off-by: Ursula Braun <ubraun@linux.ibm.com>
---
net/smc/af_smc.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
index c4e56602e0c6..b04a813fc865 100644
--- a/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@ -1505,6 +1505,11 @@ static int smc_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
smc = smc_sk(sk);
lock_sock(sk);
+ if (sk->sk_state == SMC_CLOSED && (sk->sk_shutdown & RCV_SHUTDOWN)) {
+ /* socket was connected before, no more data to read */
+ rc = 0;
+ goto out;
+ }
if ((sk->sk_state == SMC_INIT) ||
(sk->sk_state == SMC_LISTEN) ||
(sk->sk_state == SMC_CLOSED))
@@ -1840,7 +1845,11 @@ static ssize_t smc_splice_read(struct socket *sock, loff_t *ppos,
smc = smc_sk(sk);
lock_sock(sk);
-
+ if (sk->sk_state == SMC_CLOSED && (sk->sk_shutdown & RCV_SHUTDOWN)) {
+ /* socket was connected before, no more data to read */
+ rc = 0;
+ goto out;
+ }
if (sk->sk_state == SMC_INIT ||
sk->sk_state == SMC_LISTEN ||
sk->sk_state == SMC_CLOSED)
--
2.16.4
next prev parent reply other threads:[~2019-01-30 17:51 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-30 17:50 [PATCH net 0/9] net/smc: fixes 2019-01-30 Ursula Braun
2019-01-30 17:51 ` [PATCH net 1/9] net/smc: fix another sizeof to int comparison Ursula Braun
2019-01-30 17:51 ` [PATCH net 2/9] net/smc: allow 16 byte pnetids in netlink policy Ursula Braun
2019-01-30 17:51 ` [PATCH net 3/9] net/smc: prevent races between smc_lgr_terminate() and smc_conn_free() Ursula Braun
2019-01-30 17:51 ` [PATCH net 4/9] net/smc: don't wait for send buffer space when data was already sent Ursula Braun
2019-01-30 17:51 ` Ursula Braun [this message]
2019-01-30 17:51 ` [PATCH net 6/9] net/smc: do not wait under send_lock Ursula Braun
2019-01-30 17:51 ` [PATCH net 7/9] net/smc: call smc_cdc_msg_send() " Ursula Braun
2019-01-30 17:51 ` [PATCH net 8/9] net/smc: use device link provided in qp_context Ursula Braun
2019-01-30 17:51 ` [PATCH net 9/9] net/smc: fix use of variable in cleared area Ursula Braun
2019-02-01 22:48 ` [PATCH net 0/9] net/smc: fixes 2019-01-30 David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190130175108.103221-6-ubraun@linux.ibm.com \
--to=ubraun@linux.ibm.com \
--cc=davem@davemloft.net \
--cc=heiko.carstens@de.ibm.com \
--cc=linux-s390@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=raspl@linux.ibm.com \
--cc=schwidefsky@de.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).