mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-12-05 21:53:04 +00:00
67 lines
2.1 KiB
Diff
67 lines
2.1 KiB
Diff
From 40d8c4e56035f5c46d888b7f73cd3c99a6750c17 Mon Sep 17 00:00:00 2001
|
|
From: Ian Campbell <ian.campbell@docker.com>
|
|
Date: Tue, 3 May 2016 16:11:03 +0100
|
|
Subject: [PATCH 26/26] VSOCK: do not disconnect socket when peer has shutdown
|
|
SEND only
|
|
|
|
The peer may be expecting a reply having sent a request and then done a
|
|
shutdown(SHUT_WR), so tearing down the whole socket at this point seems wrong
|
|
and breaks for me with a client which does a SHUT_WR.
|
|
|
|
Looking at other socket family's stream_recvmsg callbacks doing a shutdown here
|
|
does not seem to be the norm and removing it does not seem to have had any
|
|
adverse effects that I can see.
|
|
|
|
I'm using Stefan's RFC virtio transport patches, I'm unsure of the impact on
|
|
the vmci transport.
|
|
|
|
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
|
|
Cc: "David S. Miller" <davem@davemloft.net>
|
|
Cc: Stefan Hajnoczi <stefanha@redhat.com>
|
|
Cc: Claudio Imbrenda <imbrenda@linux.vnet.ibm.com>
|
|
Cc: Andy King <acking@vmware.com>
|
|
Cc: Dmitry Torokhov <dtor@vmware.com>
|
|
Cc: Jorgen Hansen <jhansen@vmware.com>
|
|
Cc: Adit Ranadive <aditr@vmware.com>
|
|
Cc: netdev@vger.kernel.org
|
|
---
|
|
net/vmw_vsock/af_vsock.c | 21 +--------------------
|
|
1 file changed, 1 insertion(+), 20 deletions(-)
|
|
|
|
diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
|
|
index ead5127..8373709 100644
|
|
--- a/net/vmw_vsock/af_vsock.c
|
|
+++ b/net/vmw_vsock/af_vsock.c
|
|
@@ -1808,27 +1808,8 @@ vsock_stream_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
|
|
else if (sk->sk_shutdown & RCV_SHUTDOWN)
|
|
err = 0;
|
|
|
|
- if (copied > 0) {
|
|
- /* We only do these additional bookkeeping/notification steps
|
|
- * if we actually copied something out of the queue pair
|
|
- * instead of just peeking ahead.
|
|
- */
|
|
-
|
|
- if (!(flags & MSG_PEEK)) {
|
|
- /* If the other side has shutdown for sending and there
|
|
- * is nothing more to read, then modify the socket
|
|
- * state.
|
|
- */
|
|
- if (vsk->peer_shutdown & SEND_SHUTDOWN) {
|
|
- if (vsock_stream_has_data(vsk) <= 0) {
|
|
- sk->sk_state = SS_UNCONNECTED;
|
|
- sock_set_flag(sk, SOCK_DONE);
|
|
- sk->sk_state_change(sk);
|
|
- }
|
|
- }
|
|
- }
|
|
+ if (copied > 0)
|
|
err = copied;
|
|
- }
|
|
|
|
out:
|
|
release_sock(sk);
|
|
--
|
|
2.8.0.rc3
|
|
|