mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-12-05 12:24:47 +00:00
c0113ed91e
Upstream commit 598881800825 ("vsock: Fix blocking ops call in
prepare_to_wait") was subsequently reverted in 6f57e56a1527, which said:
The commit reverted with this patch caused us to potentially miss wakeups.
Since the condition is not checked between the prepare_to_wait and the
schedule(), if a wakeup happens after the condition is checked but before
the sleep happens, we will miss it. ( A description of the problem can be
found here: http://www.makelinux.net/ldd3/chp-6-sect-2 ).
The underlying issue has been fixed instead with f7f9b5e7f8ec ("AF_VSOCK:
Shrink the area influenced by prepare_to_wait").
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
59 lines
1.9 KiB
Diff
59 lines
1.9 KiB
Diff
From a3f136168f164f66de1de277a08b76f54b289d5a Mon Sep 17 00:00:00 2001
|
|
From: Stefan Hajnoczi <stefanha@redhat.com>
|
|
Date: Thu, 17 Dec 2015 11:10:21 +0800
|
|
Subject: [PATCH 4/9] VSOCK: transport-specific vsock_transport functions
|
|
|
|
struct vsock_transport contains function pointers called by AF_VSOCK
|
|
core code. The transport may want its own transport-specific function
|
|
pointers and they can be added after struct vsock_transport.
|
|
|
|
Allow the transport to fetch vsock_transport. It can downcast it to
|
|
access transport-specific function pointers.
|
|
|
|
The virtio transport will use this.
|
|
|
|
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
(cherry picked from commit 7740f7aafc9e6f415e8b6d5e8421deae63033b8d)
|
|
---
|
|
include/net/af_vsock.h | 3 +++
|
|
net/vmw_vsock/af_vsock.c | 9 +++++++++
|
|
2 files changed, 12 insertions(+)
|
|
|
|
diff --git a/include/net/af_vsock.h b/include/net/af_vsock.h
|
|
index e9eb2d6..23f5525 100644
|
|
--- a/include/net/af_vsock.h
|
|
+++ b/include/net/af_vsock.h
|
|
@@ -165,6 +165,9 @@ static inline int vsock_core_init(const struct vsock_transport *t)
|
|
}
|
|
void vsock_core_exit(void);
|
|
|
|
+/* The transport may downcast this to access transport-specific functions */
|
|
+const struct vsock_transport *vsock_core_get_transport(void);
|
|
+
|
|
/**** UTILS ****/
|
|
|
|
void vsock_release_pending(struct sock *pending);
|
|
diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
|
|
index 3dce53e..112fa8b 100644
|
|
--- a/net/vmw_vsock/af_vsock.c
|
|
+++ b/net/vmw_vsock/af_vsock.c
|
|
@@ -2006,6 +2006,15 @@ void vsock_core_exit(void)
|
|
}
|
|
EXPORT_SYMBOL_GPL(vsock_core_exit);
|
|
|
|
+const struct vsock_transport *vsock_core_get_transport(void)
|
|
+{
|
|
+ /* vsock_register_mutex not taken since only the transport uses this
|
|
+ * function and only while registered.
|
|
+ */
|
|
+ return transport;
|
|
+}
|
|
+EXPORT_SYMBOL_GPL(vsock_core_get_transport);
|
|
+
|
|
MODULE_AUTHOR("VMware, Inc.");
|
|
MODULE_DESCRIPTION("VMware Virtual Socket Family");
|
|
MODULE_VERSION("1.0.1.0-k");
|
|
--
|
|
2.8.0.rc3
|
|
|