github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-25 11:44:44 +00:00
Code Issues Projects Releases Wiki Activity

Update vsock patch to version accepted upstream

Browse Source 
No practical change, but adds the "cherry-picked from" to aid tracking. This
has also been queued for stable so will eventually show up in a 4.4.x and can
be dropped from here.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
This commit is contained in:
Ian Campbell 2016-05-06 10:57:04 +01:00
parent c50683509c
commit a806c5cc8d
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
alpine/kernel/patches/0026-VSOCK-do-not-disconnect-socket-when-peer-has-shutdow.patch
View File

@ -1,19 +1,19 @@
From 40d8c4e56035f5c46d888b7f73cd3c99a6750c17 Mon Sep 17 00:00:00 2001 From a0ae608df96d0059ffa2e0561ff0a53aa298adca Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@docker.com> From: Ian Campbell <ian.campbell@docker.com>
Date: Tue, 3 May 2016 16:11:03 +0100 Date: Wed, 4 May 2016 14:21:53 +0100
Subject: [PATCH 26/26] VSOCK: do not disconnect socket when peer has shutdown Subject: [PATCH 26/26] VSOCK: do not disconnect socket when peer has shutdown
SEND only SEND only
The peer may be expecting a reply having sent a request and then done a 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 shutdown(SHUT_WR), so tearing down the whole socket at this point seems
and breaks for me with a client which does a SHUT_WR. 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 Looking at other socket family's stream_recvmsg callbacks doing a shutdown
does not seem to be the norm and removing it does not seem to have had any here does not seem to be the norm and removing it does not seem to have
adverse effects that I can see. had any adverse effects that I can see.
I'm using Stefan's RFC virtio transport patches, I'm unsure of the impact on I'm using Stefan's RFC virtio transport patches, I'm unsure of the impact
the vmci transport. on the vmci transport.
Signed-off-by: Ian Campbell <ian.campbell@docker.com> Signed-off-by: Ian Campbell <ian.campbell@docker.com>
Cc: "David S. Miller" <davem@davemloft.net> Cc: "David S. Miller" <davem@davemloft.net>
@ -24,6 +24,8 @@ Cc: Dmitry Torokhov <dtor@vmware.com>
Cc: Jorgen Hansen <jhansen@vmware.com> Cc: Jorgen Hansen <jhansen@vmware.com>
Cc: Adit Ranadive <aditr@vmware.com> Cc: Adit Ranadive <aditr@vmware.com>
Cc: netdev@vger.kernel.org Cc: netdev@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit dedc58e067d8c379a15a8a183c5db318201295bb)
--- ---
net/vmw_vsock/af_vsock.c | 21 +-------------------- net/vmw_vsock/af_vsock.c | 21 +--------------------
1 file changed, 1 insertion(+), 20 deletions(-) 1 file changed, 1 insertion(+), 20 deletions(-)