[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH v2 08/35] multi-process: add functions to synchr
From: |
elena . ufimtseva |
Subject: |
[Qemu-devel] [RFC PATCH v2 08/35] multi-process: add functions to synchronize proxy and remote endpoints |
Date: |
Mon, 17 Jun 2019 11:15:29 -0700 |
From: Jagannathan Raman <address@hidden>
In some cases, for example MMIO read, QEMU has to wait for the remote to
complete a command before proceeding. An eventfd based mechanism is
added to synchronize QEMU & remote process.
Signed-off-by: John G Johnson <address@hidden>
Signed-off-by: Jagannathan Raman <address@hidden>
Signed-off-by: Elena Ufimtseva <address@hidden>
---
Changes in v2:
- Added timeout to communication channel.
---
include/io/proxy-link.h | 9 +++++++++
io/proxy-link.c | 42 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 51 insertions(+)
diff --git a/include/io/proxy-link.h b/include/io/proxy-link.h
index fb266ca2a8..2f1584e87d 100644
--- a/include/io/proxy-link.h
+++ b/include/io/proxy-link.h
@@ -28,7 +28,9 @@
#include <stddef.h>
#include <stdint.h>
#include <glib.h>
+#include <unistd.h>
#include <pthread.h>
+#include <sys/eventfd.h>
#include "qemu/osdep.h"
#include "qom/object.h"
@@ -124,11 +126,18 @@ struct ProxyLinkState {
proxy_link_callback callback;
};
+#define GET_REMOTE_WAIT eventfd(0, 0)
+#define PUT_REMOTE_WAIT(wait) close(wait)
+#define PROXY_LINK_WAIT_DONE 1
+
ProxyLinkState *proxy_link_create(void);
void proxy_link_finalize(ProxyLinkState *s);
void proxy_proc_send(ProxyLinkState *s, ProcMsg *msg);
int proxy_proc_recv(ProxyLinkState *s, ProcMsg *msg);
+uint64_t wait_for_remote(int efd);
+void notify_proxy(int fd, uint64_t val);
+
void proxy_link_set_sock(ProxyLinkState *s, int fd);
void proxy_link_set_callback(ProxyLinkState *s, proxy_link_callback callback);
void start_handler(ProxyLinkState *s);
diff --git a/io/proxy-link.c b/io/proxy-link.c
index 75e0bb5e27..9bda646f39 100644
--- a/io/proxy-link.c
+++ b/io/proxy-link.c
@@ -31,6 +31,8 @@
#include <sys/socket.h>
#include <sys/un.h>
#include <unistd.h>
+#include <limits.h>
+#include <poll.h>
#include "qemu/module.h"
#include "io/proxy-link.h"
@@ -210,6 +212,46 @@ int proxy_proc_recv(ProxyLinkState *s, ProcMsg *msg)
return rc;
}
+uint64_t wait_for_remote(int efd)
+{
+ struct pollfd pfd = { .fd = efd, .events = POLLIN };
+ uint64_t val;
+ int ret;
+
+ ret = poll(&pfd, 1, 1000);
+
+ switch (ret) {
+ case 0:
+ qemu_log_mask(LOG_REMOTE_DEBUG, "Error wait_for_remote: Timed out\n");
+ /* TODO: Kick-off error recovery */
+ return ULLONG_MAX;
+ case -1:
+ qemu_log_mask(LOG_REMOTE_DEBUG, "Poll error wait_for_remote: %s\n",
+ strerror(errno));
+ return ULLONG_MAX;
+ default:
+ if (read(efd, &val, sizeof(val)) == -1) {
+ qemu_log_mask(LOG_REMOTE_DEBUG, "Error wait_for_remote: %s\n",
+ strerror(errno));
+ return ULLONG_MAX;
+ }
+ }
+
+ val = (val == ULLONG_MAX) ? val : (val - 1);
+
+ return val;
+}
+
+void notify_proxy(int efd, uint64_t val)
+{
+ val = (val == ULLONG_MAX) ? val : (val + 1);
+
+ if (write(efd, &val, sizeof(val)) == -1) {
+ qemu_log_mask(LOG_REMOTE_DEBUG, "Error notify_proxy: %s\n",
+ strerror(errno));
+ }
+}
+
static gboolean proxy_link_handler_prepare(GSource *gsrc, gint *timeout)
{
g_assert(timeout);
--
2.17.1
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [RFC PATCH v2 08/35] multi-process: add functions to synchronize proxy and remote endpoints,
elena . ufimtseva <=