- sync_sysmem_msg_t message format is defined. It is used to send
file descriptors of the RAM regions to remote device
- RAM on the remote device is configured with a set of file descriptors.
Old RAM regions are deleted and new regions, each with an fd, is
added to the RAM.
Signed-off-by: Jagannathan Raman <jag.ra...@oracle.com>
---
include/io/proxy-link.h | 9 +++++
include/remote/memory.h | 34 ++++++++++++++++++
remote/Makefile.objs | 1 +
remote/memory.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 137 insertions(+)
create mode 100644 include/remote/memory.h
create mode 100644 remote/memory.c
diff --git a/include/io/proxy-link.h b/include/io/proxy-link.h
index 6ce6c10..1eeabae 100644
--- a/include/io/proxy-link.h
+++ b/include/io/proxy-link.h
@@ -39,6 +39,8 @@ typedef struct ProxyLinkState ProxyLinkState;
#define PROXY_LINK(obj) \
OBJECT_CHECK(ProxyLinkState, (obj), TYPE_PROXY_LINK)
+#include "exec/hwaddr.h"
+
#define MAX_FDS 8
#define PROC_HDR_SIZE offsetof(ProcMsg, data1.u64)
@@ -47,16 +49,23 @@ typedef enum {
INIT = 0,
CONF_READ,
CONF_WRITE,
+ SYNC_SYSMEM,
MAX,
} proc_cmd_t;
typedef struct {
+ hwaddr gpas[MAX_FDS];
+ uint64_t sizes[MAX_FDS];
+} sync_sysmem_msg_t;
+
+typedef struct {
proc_cmd_t cmd;
int bytestream;
size_t size;
union {
uint64_t u64;
+ sync_sysmem_msg_t sync_sysmem;
} data1;
int fds[MAX_FDS];
diff --git a/include/remote/memory.h b/include/remote/memory.h
new file mode 100644
index 0000000..4500192
--- /dev/null
+++ b/include/remote/memory.h
@@ -0,0 +1,34 @@
+/*
+ * Memory manager for remote device
+ *
+ * Copyright 2018, Oracle and/or its affiliates. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef REMOTE_MEMORY_H
+#define REMOTE_MEMORY_H
+
+#include "qemu/osdep.h"
+#include "exec/hwaddr.h"
+#include "io/proxy-link.h"
+
+void remote_sysmem_reconfig(ProcMsg *msg, Error **errp);
+
+#endif
diff --git a/remote/Makefile.objs b/remote/Makefile.objs
index e90ae20..c52d500 100644
--- a/remote/Makefile.objs
+++ b/remote/Makefile.objs
@@ -1,2 +1,3 @@
remote-obj-y += pcihost.o
remote-obj-y += machine.o
+remote-obj-y += memory.o
diff --git a/remote/memory.c b/remote/memory.c
new file mode 100644
index 0000000..f4cf2d2
--- /dev/null
+++ b/remote/memory.c
@@ -0,0 +1,93 @@
+/*
+ * Memory manager for remote device
+ *
+ * Copyright 2018, Oracle and/or its affiliates. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdint.h>
+#include <sys/types.h>
+
+#include "qemu/osdep.h"
+#include "qemu/queue.h"
+#include "qemu-common.h"
+#include "remote/memory.h"
+#include "exec/memory.h"
+#include "exec/address-spaces.h"
+#include "cpu.h"
+#include "exec/ram_addr.h"
+#include "io/proxy-link.h"
+#include "qemu/main-loop.h"
+
+static void remote_ram_destructor(MemoryRegion *mr)
+{
+ qemu_ram_free(mr->ram_block);
+}
+
+static void remote_ram_init_from_fd(MemoryRegion *mr, int fd, uint64_t size,
+ Error **errp)
+{
+ char *name;
+
+ name = g_malloc(sizeof(int) + 1);
+ snprintf(name, sizeof(int) + 1, "%x", fd);
+
+ memory_region_init(mr, NULL, name, size);
+ mr->ram = true;
+ mr->terminates = true;
+ mr->destructor = remote_ram_destructor;
+ mr->align = 0;
+ mr->ram_block = qemu_ram_alloc_from_fd(size, mr, false, fd, errp);
+ mr->dirty_log_mask = tcg_enabled() ? (1 << DIRTY_MEMORY_CODE) : 0;
+
+ g_free(name);
+}
+
+void remote_sysmem_reconfig(ProcMsg *msg, Error **errp)
+{
+ MemoryRegion *sysmem, *subregion, *next;
+ int region;
+ sync_sysmem_msg_t *sysmem_info = &msg->data1.sync_sysmem;
+
+ sysmem = get_system_memory();
+
+ qemu_mutex_lock_iothread();
+
+ memory_region_transaction_begin();
+
+ QTAILQ_FOREACH_SAFE(subregion, &sysmem->subregions, subregions_link, next)
{
+ if (subregion->ram) {
+ memory_region_del_subregion(sysmem, subregion);
+ /* TODO: should subregion be finalized separately? */
+ }
+ }
+
+ for (region = 0; region < msg->num_fds; region++) {
+ subregion = g_new(MemoryRegion, 1);
+ remote_ram_init_from_fd(subregion, msg->fds[region],
+ sysmem_info->sizes[region], errp);
+ memory_region_add_subregion(sysmem, sysmem_info->gpas[region],
+ subregion);
+ }
+
+ memory_region_transaction_commit();
+
+ qemu_mutex_unlock_iothread();
+}
--
1.8.3.1
