Initial support of multi-process qemu
Subsystems (3)
v3 cover Initial support of multi-process qemu
Started with the presentation in October 2017 made by Marc-Andre (Red Hat) and Konrad Wilk (Oracle) [1], and continued by Jag's BoF at KVM Forum 2018, the multi-process project is now a prototype and presented in this patchset.
This first series enables the emulation of lsi53c895a in a separate process.
We posted the Proof Of Concept patches [2] before the BoF session in 2018. Subsequently, we posted RFC v1 [3] & RFC v2 [4] of this series.
Thanks to the v1 & v2 review, we were able to incorporate the feedback into our goals.
In the summer of 2019, we participated in a conference with folks at RedHat, who provided us with feedback to improve the design of this project.
We want to present version 3 of this series which incorporates the feedback we received for v2 & the enhancements suggested in the conference. Following are the improvements made in this series:
- The command-line arguments are Orchestrator friendly. A new option named "-remote" carries the command-line of the emulation process. Added "rid" suboption to the "-device" option and moved "-drive" option to the emulation process's command-line.
- Redesigned Monitor interface allows direct access to the remote process, thereby making it more scalable, maintainable & Orchestrator friendly. We also enabled more monitor commands for the remote process.
- Enabled the remote process to run multiple LSI controllers
- Redesigned the communication link to support multiple channels. MMIO transactions are carried out in a separate channel.
- Fixed the bugs discovered during testing. Individual patches provide the details of these fixes.
Following people contributed to this patchset:
John G Johnson <[email protected]>
Jagannathan Raman <[email protected]>
Elena Ufimtseva <[email protected]>
Kanth Ghatraju <[email protected]>
For full concept writeup about QEMU disaggregation refer to docs/devel/qemu-multiprocess.txt. Please refer to docs/qemu-multiprocess.txt for usage information.
We are planning on making the following improvements in the future:
- Live migration
- Performance improvements
- Libvirt support
- Enforcement of security policies
- blockdev support
We welcome all your ideas, concerns, and questions for this patchset.
Thank you!
[1]: http://events17.linuxfoundation.org/sites/events/files/slides/KVM%20FORUM%20multi-process.pdf
[1]: https://www.youtube.com/watch?v=Kq1-coHh7lg
[2]: https://www.mail-archive.com/[email protected]/msg566538.html
[3]: https://www.mail-archive.com/[email protected]/msg602285.html
[4]: https://www.mail-archive.com/[email protected]/msg624877.html
Elena Ufimtseva (20):
multi-process: add a command line option for debug file
multi-process: introduce proxy object
mutli-process: build remote command line args
multi-process: add support of device id to communication channel
multi-process: modify BARs read/write to support dev_id
multi-process: support dev id in config read/write
multi-process: configure remote side devices
multi-process: add qdev_proxy_add to create proxy devices
multi-process: remote: add setup_devices and setup_drive msg
processing
multi-process: remote: use fd for socket from parent process
multi-process: remote: add create_done condition
multi-process: add processing of remote drive and device command line
multi-process: refractor vl.c code to re-use in remote
multi-process: add remote option
multi-process: add remote options parser
multi-process: add parse_cmdline in remote process
multi-process: add support for multiple devices
multi-process: add heartbeat timer and signal handler
multi-process: handle heartbeat messages in remote process
multi-process: add configure and usage information
Jagannathan Raman (24):
multi-process: memory: alloc RAM from file at offset
multi-process: util: Add qemu_thread_cancel() to cancel running thread
multi-process: Add stub functions to facilate build of multi-process
multi-process: Add config option for multi-process QEMU
multi-process: build system for remote device process
multi-process: define proxy-link object
multi-process: add functions to synchronize proxy and remote endpoints
multi-process: setup PCI host bridge for remote device
multi-process: setup a machine object for remote device process
multi-process: setup memory manager for remote device
multi-process: remote process initialization
multi-process: PCI BAR read/write handling for proxy & remote
endpoints
multi-process: Add LSI device proxy object
multi-process: Synchronize remote memory
multi-process: create IOHUB object to handle irq
multi-process: Introduce build flags to separate remote process code
multi-process: Use separate MMIO communication channel
multi-process: perform device reset in the remote process multi-process/mon: stub functions to enable QMP module for remote
process
multi-process/mon: build system for QMP module in remote process multi-process/mon: Refactor monitor/chardev functions out of vl.c multi-process/mon: trim HMP command set for remote storage processes multi-process/mon: Initialize QMP module for remote processes
multi-process: prevent duplicate memory initialization in remote
John G Johnson (1):
multi-process: add the concept description to
docs/devel/qemu-multiprocess
Makefile | 2 + Makefile.objs | 33 ++ Makefile.target | 91 +++++- accel/stubs/kvm-stub.c | 5 + accel/stubs/tcg-stub.c | 95 ++++++ backends/Makefile.objs | 2 + block/Makefile.objs | 2 + configure | 15 + docs/devel/qemu-multiprocess.txt | 627 ++++++++++++++++++++++++++++++++++++ docs/qemu-multiprocess.txt | 86 +++++ exec.c | 14 +- hmp-scsi-commands-info.hx | 167 ++++++++++ hmp-scsi-commands.hx | 384 ++++++++++++++++++++++ hw/Makefile.objs | 9 + hw/block/Makefile.objs | 2 + hw/core/Makefile.objs | 16 + hw/nvram/Makefile.objs | 2 + hw/pci/Makefile.objs | 4 + hw/proxy/Makefile.objs | 1 + hw/proxy/memory-sync.c | 226 +++++++++++++ hw/proxy/proxy-lsi53c895a.c | 168 ++++++++++ hw/proxy/qemu-proxy.c | 615 +++++++++++++++++++++++++++++++++++ hw/scsi/Makefile.objs | 2 + include/exec/address-spaces.h | 2 + include/exec/ram_addr.h | 2 +- include/glib-compat.h | 4 + include/hw/pci/pci_ids.h | 3 + include/hw/proxy/memory-sync.h | 51 +++ include/hw/proxy/proxy-lsi53c895a.h | 42 +++ include/hw/proxy/qemu-proxy.h | 106 ++++++ include/hw/qdev-core.h | 2 + include/io/proxy-link.h | 202 ++++++++++++ include/monitor/qdev.h | 24 ++ include/qemu-common.h | 8 + include/qemu/log.h | 1 + include/qemu/mmap-alloc.h | 3 +- include/qemu/thread.h | 1 + include/remote/iohub.h | 63 ++++ include/remote/machine.h | 48 +++ include/remote/memory.h | 34 ++ include/remote/pcihost.h | 59 ++++ io/Makefile.objs | 2 + io/proxy-link.c | 363 +++++++++++++++++++++ memory.c | 2 +- migration/Makefile.objs | 2 + monitor/Makefile.objs | 3 + monitor/misc.c | 84 ++--- monitor/monitor-internal.h | 38 +++ qapi/Makefile.objs | 2 + qdev-monitor.c | 257 ++++++++++++++- qemu-options.hx | 21 ++ qom/Makefile.objs | 5 + remote/Makefile.objs | 6 + remote/iohub.c | 159 +++++++++ remote/machine.c | 133 ++++++++ remote/memory.c | 99 ++++++ remote/pcihost.c | 84 +++++ remote/remote-main.c | 626 +++++++++++++++++++++++++++++++++++ remote/remote-opts.c | 123 +++++++ remote/remote-opts.h | 31 ++ rules.mak | 2 +- stubs/gdbstub.c | 21 ++ stubs/machine-init-done.c | 4 + stubs/migration.c | 162 ++++++++++ stubs/monitor.c | 65 ++++ stubs/net-stub.c | 100 ++++++ stubs/qapi-misc.c | 41 +++ stubs/qapi-target.c | 49 +++ stubs/replay.c | 18 ++ stubs/ui-stub.c | 130 ++++++++ stubs/vl-stub.c | 169 ++++++++++ stubs/vmstate.c | 20 ++ stubs/xen-mapcache.c | 22 ++ ui/Makefile.objs | 2 + util/log.c | 2 + util/mmap-alloc.c | 7 +- util/oslib-posix.c | 2 +- util/qemu-thread-posix.c | 10 + vl-parse.c | 249 ++++++++++++++ vl.c | 298 ++++++++--------- vl.h | 58 ++++ 81 files changed, 6466 insertions(+), 228 deletions(-) create mode 100644 docs/devel/qemu-multiprocess.txt create mode 100644 docs/qemu-multiprocess.txt create mode 100644 hmp-scsi-commands-info.hx create mode 100644 hmp-scsi-commands.hx create mode 100644 hw/proxy/Makefile.objs create mode 100644 hw/proxy/memory-sync.c create mode 100644 hw/proxy/proxy-lsi53c895a.c create mode 100644 hw/proxy/qemu-proxy.c create mode 100644 include/hw/proxy/memory-sync.h create mode 100644 include/hw/proxy/proxy-lsi53c895a.h create mode 100644 include/hw/proxy/qemu-proxy.h create mode 100644 include/io/proxy-link.h create mode 100644 include/remote/iohub.h create mode 100644 include/remote/machine.h create mode 100644 include/remote/memory.h create mode 100644 include/remote/pcihost.h create mode 100644 io/proxy-link.c create mode 100644 remote/Makefile.objs create mode 100644 remote/iohub.c create mode 100644 remote/machine.c create mode 100644 remote/memory.c create mode 100644 remote/pcihost.c create mode 100644 remote/remote-main.c create mode 100644 remote/remote-opts.c create mode 100644 remote/remote-opts.h create mode 100644 stubs/migration.c create mode 100644 stubs/net-stub.c create mode 100644 stubs/qapi-misc.c create mode 100644 stubs/qapi-target.c create mode 100644 stubs/ui-stub.c create mode 100644 stubs/vl-stub.c create mode 100644 stubs/xen-mapcache.c create mode 100644 vl-parse.c create mode 100644 vl.h
Signature · 1 line
1.8.3.1
RFC PATCH v3 1/45 multi-process: memory: alloc RAM from file at offset
Allow RAM MemoryRegion to be created from an offset in a file, instead of allocating at offset of 0 by default. This is needed to synchronize RAM between QEMU & remote process.
This will be needed for the following patches.
--- exec.c | 11 +++++++---- include/exec/ram_addr.h | 2 +- include/qemu/mmap-alloc.h | 3 ++- memory.c | 2 +- util/mmap-alloc.c | 7 ++++--- util/oslib-posix.c | 2 +- 6 files changed, 16 insertions(+), 11 deletions(-)
exec.c +7 -4
@@ -1885,6 +1885,7 @@ static void *file_ram_alloc(RAMBlock *block,ram_addr_t memory, int fd, bool truncate, + off_t offset, Error **errp) { MachineState *ms = MACHINE(qdev_get_machine());
@@ -1936,7 +1937,8 @@ static void *file_ram_alloc(RAMBlock *block, } area =qemu_ram_mmap (fd, memory, block->mr->align, - block->flags &RAM_SHARED , block->flags &RAM_PMEM ); + block->flags &RAM_SHARED , block->flags &RAM_PMEM , + offset);if (area ==MAP_FAILED ) {error_setg_errno (errp, errno,"unable to map backing store for guest RAM" );
@@ -2325,7 +2327,7 @@ static void ram_block_add(RAMBlock *new_block, Error **errp, bool shared)#ifdef CONFIG_POSIX RAMBlock *qemu_ram_alloc_from_fd (ram_addr_t size,MemoryRegion *mr,uint32_t ram_flags,int fd, -Error **errp) +off_t offset,Error **errp) {RAMBlock *new_block;Error *local_err =NULL ;
@@ -2370,7 +2372,8 @@ RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr, new_block->used_length = size; new_block->max_length = size; new_block->flags = ram_flags; - new_block->host =file_ram_alloc (new_block, size, fd, !file_size, errp); + new_block->host =file_ram_alloc (new_block, size, fd, !file_size, offset, + errp);if (!new_block->host) {g_free (new_block);return NULL ;
@@ -2400,7 +2403,7 @@ RAMBlock *qemu_ram_alloc_from_file(ram_addr_t size, MemoryRegion *mr,return NULL ; } - block =qemu_ram_alloc_from_fd (size, mr, ram_flags, fd, errp); + block =qemu_ram_alloc_from_fd (size, mr, ram_flags, fd,0 , errp);if (!block) {if (created) {unlink (mem_path);
include/exec/ram_addr.h +1 -1
@@ -164,7 +164,7 @@ RAMBlock *qemu_ram_alloc_from_file(ram_addr_t size, MemoryRegion *mr, Error **errp);RAMBlock *qemu_ram_alloc_from_fd (ram_addr_t size,MemoryRegion *mr,uint32_t ram_flags,int fd, -Error **errp); +off_t offset,Error **errp);RAMBlock *qemu_ram_alloc_from_ptr (ram_addr_t size,void *host,MemoryRegion *mr,Error **errp);
include/qemu/mmap-alloc.h +2 -1
@@ -25,7 +25,8 @@ void *qemu_ram_mmap(int fd,size_t size, size_t align, bool shared, - bool is_pmem); + bool is_pmem, + off_t start);void qemu_ram_munmap (int fd,void *ptr,size_t size);
memory.c +1 -1
@@ -1622,7 +1622,7 @@ void memory_region_init_ram_from_fd(MemoryRegion *mr, mr->destructor = memory_region_destructor_ram; mr->ram_block =qemu_ram_alloc_from_fd (size, mr, share ?RAM_SHARED :0 , - fd, &err); + fd,0 , &err); mr->dirty_log_mask =tcg_enabled () ? (1 <<DIRTY_MEMORY_CODE ) :0 ;if (err) { mr->size =int128_zero ();
util/mmap-alloc.c +4 -3
@@ -86,7 +86,8 @@ void *qemu_ram_mmap(int fd,size_t size, size_t align, bool shared, - bool is_pmem) + bool is_pmem, + off_t start) { int flags;int map_sync_flags =0 ;
@@ -147,7 +148,7 @@ void *qemu_ram_mmap(int fd, offset =QEMU_ALIGN_UP ((uintptr_t )guardptr, align) - (uintptr_t )guardptr; ptr =mmap (guardptr + offset, size,PROT_READ |PROT_WRITE , - flags | map_sync_flags, fd,0 ); + flags | map_sync_flags, fd, start);if (ptr ==MAP_FAILED && map_sync_flags) {if (errno ==ENOTSUP ) {
@@ -172,7 +173,7 @@ void *qemu_ram_mmap(int fd,* we will remove these flags to handle compatibility. */ ptr =mmap (guardptr + offset, size,PROT_READ |PROT_WRITE , - flags, fd,0 ); + flags, fd, start); }if (ptr ==MAP_FAILED ) {
util/oslib-posix.c +1 -1
@@ -204,7 +204,7 @@ void *qemu_memalign(size_t alignment, size_t size)void *qemu_anon_ram_alloc (size_t size,uint64_t *alignment,bool shared) {size_t align =QEMU_VMALLOC_ALIGN ; -void *ptr =qemu_ram_mmap (-1 , size, align, shared, false); +void *ptr =qemu_ram_mmap (-1 , size, align, shared, false,0 );if (ptr ==MAP_FAILED ) {return NULL ;
Signature · 1 line
1.8.3.1
Re: [Qemu-devel] [RFC v3 PATCH 01/45] multi-process: memory: alloc RAM from file at offset
Quoted 8 lines · * Jagannathan Raman ([email protected]) wrote:
Allow RAM MemoryRegion to be created from an offset in a file, instead of allocating at offset of 0 by default. This is needed to synchronize RAM between QEMU & remote process.
This will be needed for the following patches.Signed-off-by Jagannathan Raman <[email protected]>Signed-off-by John G Johnson <[email protected]>Signed-off-by Elena Ufimtseva <[email protected]>
Quoted 8 lines
--- exec.c | 11 +++++++---- include/exec/ram_addr.h | 2 +- include/qemu/mmap-alloc.h | 3 ++- memory.c | 2 +- util/mmap-alloc.c | 7 ++++--- util/oslib-posix.c | 2 +- 6 files changed, 16 insertions(+), 11 deletions(-)
I'm surprised this doesn't change something in vhost-user.c:vhost_user_set_mem_table so that the vhost-user client knows what it's mapping?
Dave
Quoted 138 lines
exec.c +7
-4@@ -1885,6 +1885,7 @@ static void *file_ram_alloc(RAMBlock *block,ram_addr_t memory, int fd, bool truncate, + off_t offset, Error **errp) { MachineState *ms = MACHINE(qdev_get_machine());@@ -1936,7 +1937,8 @@ static void *file_ram_alloc(RAMBlock *block, } area =qemu_ram_mmap (fd, memory, block->mr->align, - block->flags &RAM_SHARED , block->flags &RAM_PMEM ); + block->flags &RAM_SHARED , block->flags &RAM_PMEM , + offset);if (area ==MAP_FAILED ) {error_setg_errno (errp, errno,"unable to map backing store for guest RAM" );@@ -2325,7 +2327,7 @@ static void ram_block_add(RAMBlock *new_block, Error **errp, bool shared)#ifdef CONFIG_POSIX RAMBlock *qemu_ram_alloc_from_fd (ram_addr_t size,MemoryRegion *mr,uint32_t ram_flags,int fd, -Error **errp) +off_t offset,Error **errp) {RAMBlock *new_block;Error *local_err =NULL ;@@ -2370,7 +2372,8 @@ RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr, new_block->used_length = size; new_block->max_length = size; new_block->flags = ram_flags; - new_block->host =file_ram_alloc (new_block, size, fd, !file_size, errp); + new_block->host =file_ram_alloc (new_block, size, fd, !file_size, offset, + errp);if (!new_block->host) {g_free (new_block);return NULL ;@@ -2400,7 +2403,7 @@ RAMBlock *qemu_ram_alloc_from_file(ram_addr_t size, MemoryRegion *mr,return NULL ; } - block =qemu_ram_alloc_from_fd (size, mr, ram_flags, fd, errp); + block =qemu_ram_alloc_from_fd (size, mr, ram_flags, fd,0 , errp);if (!block) {if (created) {unlink (mem_path);include/exec/ram_addr.h +1
-1@@ -164,7 +164,7 @@ RAMBlock *qemu_ram_alloc_from_file(ram_addr_t size, MemoryRegion *mr, Error **errp);RAMBlock *qemu_ram_alloc_from_fd (ram_addr_t size,MemoryRegion *mr,uint32_t ram_flags,int fd, -Error **errp); +off_t offset,Error **errp);RAMBlock *qemu_ram_alloc_from_ptr (ram_addr_t size,void *host,MemoryRegion *mr,Error **errp);include/qemu/mmap-alloc.h +2
-1@@ -25,7 +25,8 @@ void *qemu_ram_mmap(int fd,size_t size, size_t align, bool shared, - bool is_pmem); + bool is_pmem, + off_t start);void qemu_ram_munmap (int fd,void *ptr,size_t size);memory.c +1
-1@@ -1622,7 +1622,7 @@ void memory_region_init_ram_from_fd(MemoryRegion *mr, mr->destructor = memory_region_destructor_ram; mr->ram_block =qemu_ram_alloc_from_fd (size, mr, share ?RAM_SHARED :0 , - fd, &err); + fd,0 , &err); mr->dirty_log_mask =tcg_enabled () ? (1 <<DIRTY_MEMORY_CODE ) :0 ;if (err) { mr->size =int128_zero ();util/mmap-alloc.c +4
-3@@ -86,7 +86,8 @@ void *qemu_ram_mmap(int fd,size_t size, size_t align, bool shared, - bool is_pmem) + bool is_pmem, + off_t start) { int flags;int map_sync_flags =0 ;@@ -147,7 +148,7 @@ void *qemu_ram_mmap(int fd, offset =QEMU_ALIGN_UP ((uintptr_t )guardptr, align) - (uintptr_t )guardptr; ptr =mmap (guardptr + offset, size,PROT_READ |PROT_WRITE , - flags | map_sync_flags, fd,0 ); + flags | map_sync_flags, fd, start);if (ptr ==MAP_FAILED && map_sync_flags) {if (errno ==ENOTSUP ) {@@ -172,7 +173,7 @@ void *qemu_ram_mmap(int fd,* we will remove these flags to handle compatibility. */ ptr =mmap (guardptr + offset, size,PROT_READ |PROT_WRITE , - flags, fd,0 ); + flags, fd, start); }if (ptr ==MAP_FAILED ) {util/oslib-posix.c +1
-1@@ -204,7 +204,7 @@ void *qemu_memalign(size_t alignment, size_t size)void *qemu_anon_ram_alloc (size_t size,uint64_t *alignment,bool shared) {size_t align =QEMU_VMALLOC_ALIGN ; -void *ptr =qemu_ram_mmap (-1 , size, align, shared, false); +void *ptr =qemu_ram_mmap (-1 , size, align, shared, false,0 );if (ptr ==MAP_FAILED ) {return NULL ;Signature · 1 line
1.8.3.1
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Re: [Qemu-devel] [RFC v3 PATCH 01/45] multi-process: memory: alloc RAM from file at offset
Quoted 18 lines · Dr. David Alan Gilbert
Quoted 8 lines · * Jagannathan Raman ([email protected]) wrote:
Allow RAM MemoryRegion to be created from an offset in a file, instead of allocating at offset of 0 by default. This is needed to synchronize RAM between QEMU & remote process.
This will be needed for the following patches.Signed-off-by Jagannathan Raman <[email protected]>Signed-off-by John G Johnson <[email protected]>Signed-off-by Elena Ufimtseva <[email protected]>Quoted 8 lines
--- exec.c | 11 +++++++---- include/exec/ram_addr.h | 2 +- include/qemu/mmap-alloc.h | 3 ++- memory.c | 2 +- util/mmap-alloc.c | 7 ++++--- util/oslib-posix.c | 2 +- 6 files changed, 16 insertions(+), 11 deletions(-)
Quoted 3 lines
I'm surprised this doesn't change something in vhost-user.c:vhost_user_set_mem_table so that the vhost-user client knows what it's mapping?
Hi Dave,
vhost-user does not use the functions addressed in this patch for mapping the RAM onto the remote process. It calls mmap() for this purpose (vu_set_mem_table_exec()).
Thanks!
--
Jag
Quoted 144 lines
Dave
Quoted 138 lines
exec.c +7
-4@@ -1885,6 +1885,7 @@ static void *file_ram_alloc(RAMBlock *block,ram_addr_t memory, int fd, bool truncate, + off_t offset, Error **errp) { MachineState *ms = MACHINE(qdev_get_machine());@@ -1936,7 +1937,8 @@ static void *file_ram_alloc(RAMBlock *block, } area =qemu_ram_mmap (fd, memory, block->mr->align, - block->flags &RAM_SHARED , block->flags &RAM_PMEM ); + block->flags &RAM_SHARED , block->flags &RAM_PMEM , + offset);if (area ==MAP_FAILED ) {error_setg_errno (errp, errno,"unable to map backing store for guest RAM" );@@ -2325,7 +2327,7 @@ static void ram_block_add(RAMBlock *new_block, Error **errp, bool shared)#ifdef CONFIG_POSIX RAMBlock *qemu_ram_alloc_from_fd (ram_addr_t size,MemoryRegion *mr,uint32_t ram_flags,int fd, -Error **errp) +off_t offset,Error **errp) {RAMBlock *new_block;Error *local_err =NULL ;@@ -2370,7 +2372,8 @@ RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr, new_block->used_length = size; new_block->max_length = size; new_block->flags = ram_flags; - new_block->host =file_ram_alloc (new_block, size, fd, !file_size, errp); + new_block->host =file_ram_alloc (new_block, size, fd, !file_size, offset, + errp);if (!new_block->host) {g_free (new_block);return NULL ;@@ -2400,7 +2403,7 @@ RAMBlock *qemu_ram_alloc_from_file(ram_addr_t size, MemoryRegion *mr,return NULL ; } - block =qemu_ram_alloc_from_fd (size, mr, ram_flags, fd, errp); + block =qemu_ram_alloc_from_fd (size, mr, ram_flags, fd,0 , errp);if (!block) {if (created) {unlink (mem_path);include/exec/ram_addr.h +1
-1@@ -164,7 +164,7 @@ RAMBlock *qemu_ram_alloc_from_file(ram_addr_t size, MemoryRegion *mr, Error **errp);RAMBlock *qemu_ram_alloc_from_fd (ram_addr_t size,MemoryRegion *mr,uint32_t ram_flags,int fd, -Error **errp); +off_t offset,Error **errp);RAMBlock *qemu_ram_alloc_from_ptr (ram_addr_t size,void *host,MemoryRegion *mr,Error **errp);include/qemu/mmap-alloc.h +2
-1@@ -25,7 +25,8 @@ void *qemu_ram_mmap(int fd,size_t size, size_t align, bool shared, - bool is_pmem); + bool is_pmem, + off_t start);void qemu_ram_munmap (int fd,void *ptr,size_t size);memory.c +1
-1@@ -1622,7 +1622,7 @@ void memory_region_init_ram_from_fd(MemoryRegion *mr, mr->destructor = memory_region_destructor_ram; mr->ram_block =qemu_ram_alloc_from_fd (size, mr, share ?RAM_SHARED :0 , - fd, &err); + fd,0 , &err); mr->dirty_log_mask =tcg_enabled () ? (1 <<DIRTY_MEMORY_CODE ) :0 ;if (err) { mr->size =int128_zero ();util/mmap-alloc.c +4
-3@@ -86,7 +86,8 @@ void *qemu_ram_mmap(int fd,size_t size, size_t align, bool shared, - bool is_pmem) + bool is_pmem, + off_t start) { int flags;int map_sync_flags =0 ;@@ -147,7 +148,7 @@ void *qemu_ram_mmap(int fd, offset =QEMU_ALIGN_UP ((uintptr_t )guardptr, align) - (uintptr_t )guardptr; ptr =mmap (guardptr + offset, size,PROT_READ |PROT_WRITE , - flags | map_sync_flags, fd,0 ); + flags | map_sync_flags, fd, start);if (ptr ==MAP_FAILED && map_sync_flags) {if (errno ==ENOTSUP ) {@@ -172,7 +173,7 @@ void *qemu_ram_mmap(int fd,* we will remove these flags to handle compatibility. */ ptr =mmap (guardptr + offset, size,PROT_READ |PROT_WRITE , - flags, fd,0 ); + flags, fd, start); }if (ptr ==MAP_FAILED ) {util/oslib-posix.c +1
-1@@ -204,7 +204,7 @@ void *qemu_memalign(size_t alignment, size_t size)void *qemu_anon_ram_alloc (size_t size,uint64_t *alignment,bool shared) {size_t align =QEMU_VMALLOC_ALIGN ; -void *ptr =qemu_ram_mmap (-1 , size, align, shared, false); +void *ptr =qemu_ram_mmap (-1 , size, align, shared, false,0 );if (ptr ==MAP_FAILED ) {return NULL ;Signature · 1 line
1.8.3.1--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Re: [Qemu-devel] [RFC v3 PATCH 01/45] multi-process: memory: alloc RAM from file at offset
Quoted 25 lines · * Jag Raman ([email protected]) wrote:
Quoted 18 lines · Dr. David Alan Gilbert
Quoted 8 lines · * Jagannathan Raman ([email protected]) wrote:
Allow RAM MemoryRegion to be created from an offset in a file, instead of allocating at offset of 0 by default. This is needed to synchronize RAM between QEMU & remote process.
This will be needed for the following patches.Signed-off-by Jagannathan Raman <[email protected]>Signed-off-by John G Johnson <[email protected]>Signed-off-by Elena Ufimtseva <[email protected]>Quoted 8 lines
--- exec.c | 11 +++++++---- include/exec/ram_addr.h | 2 +- include/qemu/mmap-alloc.h | 3 ++- memory.c | 2 +- util/mmap-alloc.c | 7 ++++--- util/oslib-posix.c | 2 +- 6 files changed, 16 insertions(+), 11 deletions(-)Quoted 3 lines
I'm surprised this doesn't change something in vhost-user.c:vhost_user_set_mem_table so that the vhost-user client knows what it's mapping?
Quoted 5 lines
Hi Dave,
vhost-user does not use the functions addressed in this patch for mapping the RAM onto the remote process. It calls
mmap()for this purpose (vu_set_mem_table_exec()).
It should at least check that the file it's sending over set-mem-table has a 0 offset, otherwise things could get confused if someone tries to run a vhost-user device on a system that's also running multi-process (which should be a whole world of fun!)
dave
Quoted 139 lines
Thanks!
--
JagQuoted 135 lines
Dave
Quoted 129 lines
exec.c +7
-4@@ -1885,6 +1885,7 @@ static void *file_ram_alloc(RAMBlock *block,ram_addr_t memory, int fd, bool truncate, + off_t offset, Error **errp) { MachineState *ms = MACHINE(qdev_get_machine());@@ -1936,7 +1937,8 @@ static void *file_ram_alloc(RAMBlock *block, } area =qemu_ram_mmap (fd, memory, block->mr->align, - block->flags &RAM_SHARED , block->flags &RAM_PMEM ); + block->flags &RAM_SHARED , block->flags &RAM_PMEM , + offset);if (area ==MAP_FAILED ) {error_setg_errno (errp, errno,"unable to map backing store for guest RAM" );@@ -2325,7 +2327,7 @@ static void ram_block_add(RAMBlock *new_block, Error **errp, bool shared)#ifdef CONFIG_POSIX RAMBlock *qemu_ram_alloc_from_fd (ram_addr_t size,MemoryRegion *mr,uint32_t ram_flags,int fd, -Error **errp) +off_t offset,Error **errp) {RAMBlock *new_block;Error *local_err =NULL ;@@ -2370,7 +2372,8 @@ RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr, new_block->used_length = size; new_block->max_length = size; new_block->flags = ram_flags; - new_block->host =file_ram_alloc (new_block, size, fd, !file_size, errp); + new_block->host =file_ram_alloc (new_block, size, fd, !file_size, offset, + errp);if (!new_block->host) {g_free (new_block);return NULL ;@@ -2400,7 +2403,7 @@ RAMBlock *qemu_ram_alloc_from_file(ram_addr_t size, MemoryRegion *mr,return NULL ; } - block =qemu_ram_alloc_from_fd (size, mr, ram_flags, fd, errp); + block =qemu_ram_alloc_from_fd (size, mr, ram_flags, fd,0 , errp);if (!block) {if (created) {unlink (mem_path);include/exec/ram_addr.h +1
-1@@ -164,7 +164,7 @@ RAMBlock *qemu_ram_alloc_from_file(ram_addr_t size, MemoryRegion *mr, Error **errp);RAMBlock *qemu_ram_alloc_from_fd (ram_addr_t size,MemoryRegion *mr,uint32_t ram_flags,int fd, -Error **errp); +off_t offset,Error **errp);RAMBlock *qemu_ram_alloc_from_ptr (ram_addr_t size,void *host,MemoryRegion *mr,Error **errp);include/qemu/mmap-alloc.h +2
-1@@ -25,7 +25,8 @@ void *qemu_ram_mmap(int fd,size_t size, size_t align, bool shared, - bool is_pmem); + bool is_pmem, + off_t start);void qemu_ram_munmap (int fd,void *ptr,size_t size);memory.c +1
-1@@ -1622,7 +1622,7 @@ void memory_region_init_ram_from_fd(MemoryRegion *mr, mr->destructor = memory_region_destructor_ram; mr->ram_block =qemu_ram_alloc_from_fd (size, mr, share ?RAM_SHARED :0 , - fd, &err); + fd,0 , &err); mr->dirty_log_mask =tcg_enabled () ? (1 <<DIRTY_MEMORY_CODE ) :0 ;if (err) { mr->size =int128_zero ();util/mmap-alloc.c +4
-3@@ -86,7 +86,8 @@ void *qemu_ram_mmap(int fd,size_t size, size_t align, bool shared, - bool is_pmem) + bool is_pmem, + off_t start) { int flags;int map_sync_flags =0 ;@@ -147,7 +148,7 @@ void *qemu_ram_mmap(int fd, offset =QEMU_ALIGN_UP ((uintptr_t )guardptr, align) - (uintptr_t )guardptr; ptr =mmap (guardptr + offset, size,PROT_READ |PROT_WRITE , - flags | map_sync_flags, fd,0 ); + flags | map_sync_flags, fd, start);if (ptr ==MAP_FAILED && map_sync_flags) {if (errno ==ENOTSUP ) {@@ -172,7 +173,7 @@ void *qemu_ram_mmap(int fd,* we will remove these flags to handle compatibility. */ ptr =mmap (guardptr + offset, size,PROT_READ |PROT_WRITE , - flags, fd,0 ); + flags, fd, start); }if (ptr ==MAP_FAILED ) {util/oslib-posix.c +1
-1@@ -204,7 +204,7 @@ void *qemu_memalign(size_t alignment, size_t size)void *qemu_anon_ram_alloc (size_t size,uint64_t *alignment,bool shared) {size_t align =QEMU_VMALLOC_ALIGN ; -void *ptr =qemu_ram_mmap (-1 , size, align, shared, false); +void *ptr =qemu_ram_mmap (-1 , size, align, shared, false,0 );if (ptr ==MAP_FAILED ) {return NULL ;Signature · 1 line
1.8.3.1--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
RFC PATCH v3 2/45 multi-process: util: Add qemu_thread_cancel() to cancel running thread
In reply to Jagannathan Ramanqemu_thread_cancel() added to destroy a given running thread. This will be needed in the following patches.
--- include/qemu/thread.h | 1 + util/qemu-thread-posix.c | 10 ++++++++++ 2 files changed, 11 insertions(+)
include/qemu/thread.h +1 -0
@@ -156,6 +156,7 @@ void qemu_thread_create(QemuThread *thread, const char *name,void *(*start_routine)(void *), void *arg, int mode);void *qemu_thread_join (QemuThread *thread); +void qemu_thread_cancel (QemuThread *thread);void qemu_thread_get_self (QemuThread *thread);bool qemu_thread_is_self (QemuThread *thread);void qemu_thread_exit (void *retval);
util/qemu-thread-posix.c +10 -0
@@ -573,3 +573,13 @@ void *qemu_thread_join(QemuThread *thread) }return ret; } + +void qemu_thread_cancel (QemuThread *thread) +{ +int err; + + err =pthread_cancel (thread->thread); +if (err) { +error_exit (err, __func__); + } +}
Signature · 1 line
1.8.3.1
Re: [Qemu-devel] [RFC v3 PATCH 02/45] multi-process: util: Add qemu_thread_cancel() to cancel running thread
Quoted 2 lines · Jagannathan Raman
qemu_thread_cancel()added to destroy a given running thread. This will be needed in the following patches.
I don't see anything in the following patches that actually uses this new function.
That is good though, because it is incredibly difficult to correctly use pthread_cancel() in such a way that you correctly release all memory and other resources (file descriptors) owned by the thread being cancelled.
So this looks like it can thankfully be dropped.
Quoted 8 lines
Signed-off-by John G Johnson <[email protected]>Signed-off-by Jagannathan Raman <[email protected]>Signed-off-by Elena Ufimtseva <[email protected]>--- include/qemu/thread.h | 1 + util/qemu-thread-posix.c | 10 ++++++++++ 2 files changed, 11 insertions(+)
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Re: [Qemu-devel] [RFC v3 PATCH 02/45] multi-process: util: Add qemu_thread_cancel() to cancel running thread
Quoted 7 lines · Daniel P. Berrangé
Quoted 2 lines · Jagannathan Raman
qemu_thread_cancel()added to destroy a given running thread. This will be needed in the following patches.I don't see anything in the following patches that actually uses this new function.
Quoted 6 lines
That is good though, because it is incredibly difficult to correctly use
pthread_cancel()in such a way that you correctly release all memory and other resources (file descriptors) owned by the thread being cancelled.So this looks like it can thankfully be dropped.
Thanks Daniel. Will drop this in the next revision. --
Jag
Quoted 13 lines
Quoted 9 lines
Signed-off-by John G Johnson <[email protected]>Signed-off-by Jagannathan Raman <[email protected]>Signed-off-by Elena Ufimtseva <[email protected]>--- include/qemu/thread.h | 1 + util/qemu-thread-posix.c | 10 ++++++++++ 2 files changed, 11 insertions(+)Regards,
Daniel
RFC PATCH v3 3/45 multi-process: add a command line option for debug file
In reply to Jagannathan RamanFrom: Elena Ufimtseva <[email protected]>
Can be used with -d rdebug command options when starting qemu.
--- include/qemu/log.h | 1 + util/log.c | 2 ++ 2 files changed, 3 insertions(+)
include/qemu/log.h +1 -0
@@ -45,6 +45,7 @@ static inline bool qemu_log_separate(void)/* LOG_TRACE (1 << 15) is defined in log-for-trace.h */ #define CPU_LOG_TB_OP_IND (1 << 16)#define CPU_LOG_TB_FPU (1 << 17) +#define LOG_REMOTE_DEBUG (1 << 18)/* Lock output for a series of related logs. Since this is not needed * for a single qemu_log / qemu_log_mask / qemu_log_mask_and_addr, we
util/log.c +2 -0
@@ -273,6 +273,8 @@ const QEMULogItem qemu_log_items[] = { {CPU_LOG_TB_NOCHAIN ,"nochain" ,"do not chain compiled TBs so that \"exec\" and \"cpu\" show\n" "complete traces" }, + { LOG_REMOTE_DEBUG, "rdebug", + "log remote debug" }, { 0, NULL, NULL }, };
Signature · 1 line
1.8.3.1
RFC PATCH v3 4/45 multi-process: Add stub functions to facilate build of multi-process
In reply to Jagannathan RamanAdd stub functions that are needed during compile time but not in runtime.
--- accel/stubs/kvm-stub.c | 5 +++ accel/stubs/tcg-stub.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++ stubs/machine-init-done.c | 4 +++ stubs/monitor.c | 33 ++++++++++++++++++ stubs/net-stub.c | 31 +++++++++++++++++ stubs/replay.c | 14 ++++++++ stubs/vl-stub.c | 77 ++++++++++++++++++++++++++++++++++++++++++ stubs/vmstate.c | 20 +++++++++++ stubs/xen-mapcache.c | 22 ++++++++++++ 9 files changed, 291 insertions(+) create mode 100644 stubs/net-stub.c create mode 100644 stubs/vl-stub.c create mode 100644 stubs/xen-mapcache.c
accel/stubs/kvm-stub.c +5 -0
@@ -31,6 +31,7 @@ bool kvm_allowed;bool kvm_readonly_mem_allowed;bool kvm_ioeventfd_any_length_allowed;bool kvm_msi_use_devid; +bool kvm_halt_in_kernel_allowed;int kvm_destroy_vcpu (CPUState *cpu) {
@@ -58,6 +59,10 @@ void kvm_cpu_synchronize_post_init(CPUState *cpu) { } +void kvm_cpu_synchronize_pre_loadvm (CPUState *cpu) +{ +} +int kvm_cpu_exec (CPUState *cpu) {abort ();
accel/stubs/tcg-stub.c +85 -0
96 lines not on this page · raw message
stubs/machine-init-done.c +4 -0
@@ -6,3 +6,7 @@ bool machine_init_done = true;void qemu_add_machine_init_done_notifier (Notifier *notify) { } + +void qemu_remove_machine_init_done_notifier (Notifier *notify) +{ +}
stubs/monitor.c +33 -0
@@ -2,6 +2,12 @@#include "qapi/error.h" #include "qapi/qapi-emit-events.h" #include "monitor/monitor.h" +#include "qapi/qapi-types-misc.h" +#include "qapi/qapi-commands-misc.h" +#include "qapi/qapi-types-qom.h" +#include "qapi/qapi-commands-qdev.h" +#include "hw/qdev-core.h" +#include "sysemu/sysemu.h" __threadMonitor *cur_mon;
@@ -27,3 +33,30 @@ void monitor_init_hmp(Chardev *chr, bool use_readline)void qapi_event_emit (QAPIEvent event,QDict *qdict) { } + +int monitor_get_cpu_index (void ) +{ +return -ENOSYS ; +} +int monitor_printf (Monitor *mon,const char *fmt, ...) +{ +return -ENOSYS ; +} + +bool monitor_cur_is_qmp (void ) +{ +return false; +} + +ObjectPropertyInfoList *qmp_device_list_properties (const char *typename, +Error **errp) +{ +return NULL ; +} + +VMChangeStateEntry *qdev_add_vm_change_state_handler (DeviceState *dev, +VMChangeStateHandler *cb, +void *opaque) +{ +return NULL ; +}
stubs/net-stub.c new file +31 -0
@@ -0,0 +1,31 @@ +#include "qemu/osdep.h" +#include "qemu-common.h" +#include "net/net.h" + +int qemu_find_net_clients_except (const char *id,NetClientState **ncs, +NetClientDriver type,int max) +{ +return -ENOSYS ; +} + +NetClientState *net_hub_port_find (int hub_id) +{ +return NULL ; +} + +int net_hub_id_for_client (NetClientState *nc,int *id) +{ +return -ENOSYS ; +} + +int qemu_show_nic_models (const char *arg,const char *const *models) +{ +return -ENOSYS ; +} + +int qemu_find_nic_model (NICInfo *nd,const char *const *models, +const char *default_model) +{ +return -ENOSYS ; +} +
stubs/replay.c +14 -0
@@ -80,3 +80,17 @@ void replay_mutex_lock(void)void replay_mutex_unlock (void ) { } + +bool replay_has_checkpoint (void ) +{ +return false; +} + +int replay_get_instructions (void ) +{ +return 0 ; +} + +void replay_account_executed_instructions (void ) +{ +}
stubs/vl-stub.c new file +77 -0
77 lines not on this page · raw message
stubs/vmstate.c +20 -0
@@ -1,8 +1,11 @@#include "qemu/osdep.h" #include "migration/vmstate.h" +#include "migration/misc.h" const VMStateDescription vmstate_dummy = {}; +const VMStateInfo vmstate_info_timer; + int vmstate_register_with_alias_id(DeviceState *dev, int instance_id, const VMStateDescription *vmsd,
@@ -23,3 +26,20 @@ bool vmstate_check_only_migratable(const VMStateDescription *vmsd) {return true; } + +void vmstate_register_ram (MemoryRegion *mr,DeviceState *dev) +{ +} + +void vmstate_unregister_ram (MemoryRegion *mr,DeviceState *dev) +{ +} + +void vmstate_register_ram_global (MemoryRegion *mr) +{ +} + +bool migration_is_idle (void ) +{ +return true; +}
stubs/xen-mapcache.c new file +22 -0
@@ -0,0 +1,22 @@ +#include "qemu/osdep.h" +#include "exec/hwaddr.h" +#include "exec/cpu-common.h" +#include "sysemu/xen-mapcache.h" + +#ifdef CONFIG_XEN + +void xen_invalidate_map_cache_entry (uint8_t *buffer) +{ +} + +uint8_t *xen_map_cache (hwaddr phys_addr,hwaddr size,uint8_t lock,bool dma) +{ +return NULL ; +} + +ram_addr_t xen_ram_addr_from_mapcache (void *ptr) +{ +return 0 ; +} + +#endif
Signature · 1 line
1.8.3.1
RFC PATCH v3 5/45 multi-process: Add config option for multi-process QEMU
In reply to Jagannathan RamanAdd a configuration option to separate multi-process code
--- configure | 11 +++++++++++ 1 file changed, 11 insertions(+)
configure +11 -0
@@ -499,6 +499,7 @@ docker="no" debug_mutex="no" libpmem="" default_devices="yes" +mpqemu="no" # cross compilers defaults, can be overridden with --cross-cc-ARCH cross_cc_aarch64="aarch64-linux-gnu-gcc"
@@ -1543,6 +1544,10 @@ for opt do ;; --disable-libpmem) libpmem=no ;; + --enable-mpqemu) mpqemu=yes + ;; + --disable-mpqemu) mpqemu=no + ;; *) echo "ERROR: unknown option $opt" echo "Try '$0 --help' for more information"
@@ -1842,6 +1847,7 @@ disabled with --disable-FEATURE, default is enabled if available: capstone capstone disassembler support debug-mutex mutex debugging support libpmem libpmem support + mpqemu multi-process QEMU support NOTE: The object files are built at the place where configure is launched EOF
@@ -6481,6 +6487,7 @@ echo "docker $docker" echo "libpmem support $libpmem" echo "libudev $libudev" echo "default devices $default_devices" +echo "multiprocess QEMU $mpqemu" if test "$supported_cpu" = "no"; then echo
@@ -7279,6 +7286,10 @@ if test "$libpmem" = "yes" ; then echo "CONFIG_LIBPMEM=y" >> $config_host_mak fi +if test "$mpqemu" = "yes" ; then + echo "CONFIG_MPQEMU=y" >> $config_host_mak +fi + if test "$bochs" = "yes" ; then echo "CONFIG_BOCHS=y" >> $config_host_mak fi
Signature · 1 line
1.8.3.1
Re: [Qemu-devel] [RFC v3 PATCH 05/45] multi-process: Add config option for multi-process QEMU
configure for opt do · line 1549
Quoted 7 lines · Jagannathan Raman
configure +3
-0@@ -1543,6 +1544,10 @@ for opt do ;; --disable-libpmem) libpmem=no ;; + --enable-mpqemu) mpqemu=yes + ;; + --disable-mpqemu) mpqemu=no
A previous patch used "remote" instead of "mpqemu", which is confusing.
"mpqemu" seems reasonable. "remote" is too generic. Can you use "mpqemu" everywhere?
Quoted 13 lines
configure +2
-0+ ;; *) echo "ERROR: unknown option $opt" echo "Try '$0 --help' for more information"@@ -1842,6 +1847,7 @@ disabled with --disable-FEATURE, default is enabled if available: capstone capstone disassembler support debug-mutex mutex debugging support libpmem libpmem support + mpqemu multi-process QEMU support NOTE: The object files are built at the place where configure is launched EOF
configure echo "docker $docker" · line 6490
Quoted 4 lines
configure +1
-0@@ -6481,6 +6487,7 @@ echo "docker $docker" echo "libpmem support $libpmem" echo "libudev $libudev" echo "default devices $default_devices" +echo "multiprocess QEMU $mpqemu"
multi-process (see above) or multiprocess? :-)
RFC PATCH v3 6/45 multi-process: build system for remote device process
In reply to Jagannathan RamanModify Makefile to support the building of the remote device process. Implements main() function of remote device process.
--- Makefile | 2 ++ Makefile.objs | 22 +++++++++++++++++++++ Makefile.target | 51 +++++++++++++++++++++++++++++++++++++++++++++++-- backends/Makefile.objs | 2 ++ block/Makefile.objs | 2 ++ hw/Makefile.objs | 7 +++++++ hw/block/Makefile.objs | 2 ++ hw/core/Makefile.objs | 15 +++++++++++++++ hw/nvram/Makefile.objs | 2 ++ hw/pci/Makefile.objs | 4 ++++ hw/scsi/Makefile.objs | 2 ++ migration/Makefile.objs | 2 ++ qom/Makefile.objs | 4 ++++ remote/Makefile.objs | 1 + remote/remote-main.c | 35 +++++++++++++++++++++++++++++++++ stubs/replay.c | 4 ++++ 16 files changed, 155 insertions(+), 2 deletions(-) create mode 100644 remote/Makefile.objs create mode 100644 remote/remote-main.c
Makefile +2 -0
@@ -427,6 +427,8 @@ dummy := $(call unnest-vars,, \ qom-obj-y \ io-obj-y \ common-obj-y \ + remote-pci-obj-y \ + remote-lsi-obj-y \ common-obj-m \ ui-obj-y \ ui-obj-m \
Makefile.objs +22 -0
@@ -21,6 +21,28 @@ block-obj-$(CONFIG_REPLICATION) += replication.o block-obj-m = block/ +######################################################### +# remote-pci-obj-y is common code used by remote devices + +remote-pci-obj-$(CONFIG_MPQEMU) += hw/ +remote-pci-obj-$(CONFIG_MPQEMU) += qom/ +remote-pci-obj-$(CONFIG_MPQEMU) += backends/ +remote-pci-obj-$(CONFIG_MPQEMU) += block/ +remote-pci-obj-$(CONFIG_MPQEMU) += migration/ +remote-pci-obj-$(CONFIG_MPQEMU) += remote/ + +remote-pci-obj-$(CONFIG_MPQEMU) += cpus-common.o +remote-pci-obj-$(CONFIG_MPQEMU) += dma-helpers.o +remote-pci-obj-$(CONFIG_MPQEMU) += blockdev.o +remote-pci-obj-$(CONFIG_MPQEMU) += qdev-monitor.o +remote-pci-obj-$(CONFIG_MPQEMU) += bootdevice.o +remote-pci-obj-$(CONFIG_MPQEMU) += iothread.o + +############################################################## +# remote-lsi-obj-y is code used to implement remote LSI device + +remote-lsi-obj-$(CONFIG_MPQEMU) += hw/ + ####################################################################### # crypto-obj-y is code used by both qemu system emulation and qemu-img
Makefile.target +49 -2
89 lines not on this page · raw message
backends/Makefile.objs +2 -0
@@ -17,3 +17,5 @@ endif common-obj-$(call land,$(CONFIG_VHOST_USER),$(CONFIG_VIRTIO)) += vhost-user.o common-obj-$(CONFIG_LINUX) += hostmem-memfd.o + +remote-pci-obj-$(CONFIG_MPQEMU) += hostmem.o
block/Makefile.objs +2 -0
@@ -63,3 +63,5 @@ qcow.o-libs := -lz linux-aio.o-libs := -laio parallels.o-cflags := $(LIBXML2_CFLAGS) parallels.o-libs := $(LIBXML2_LIBS) + +remote-pci-obj-$(CONFIG_MPQEMU) += stream.o
hw/Makefile.objs +7 -0
@@ -43,3 +43,10 @@ endif common-obj-y += $(devices-dirs-y) obj-y += $(devices-dirs-y) + +remote-pci-obj-$(CONFIG_MPQEMU) += core/ +remote-pci-obj-$(CONFIG_MPQEMU) += block/ +remote-pci-obj-$(CONFIG_MPQEMU) += pci/ +remote-pci-obj-$(CONFIG_MPQEMU) += nvram/ + +remote-lsi-obj-$(CONFIG_MPQEMU) += scsi/
hw/block/Makefile.objs +2 -0
@@ -15,3 +15,5 @@ obj-$(CONFIG_VIRTIO_BLK) += virtio-blk.o obj-$(CONFIG_VHOST_USER_BLK) += vhost-user-blk.o obj-y += dataplane/ + +remote-pci-obj-$(CONFIG_MPQEMU) += block.o cdrom.o hd-geometry.o
hw/core/Makefile.objs +15 -0
@@ -27,3 +27,18 @@ common-obj-$(CONFIG_SOFTMMU) += null-machine.o obj-$(CONFIG_SOFTMMU) += machine-qmp-cmds.o obj-$(CONFIG_SOFTMMU) += numa.o common-obj-$(CONFIG_SOFTMMU) += machine-hmp-cmds.o + +remote-pci-obj-$(CONFIG_MPQEMU) += qdev-properties.o +remote-pci-obj-$(CONFIG_MPQEMU) += qdev.o +remote-pci-obj-$(CONFIG_MPQEMU) += bus.o +remote-pci-obj-$(CONFIG_MPQEMU) += irq.o +remote-pci-obj-$(CONFIG_MPQEMU) += hotplug.o +remote-pci-obj-$(CONFIG_MPQEMU) += machine.o +remote-pci-obj-$(CONFIG_MPQEMU) += fw-path-provider.o +remote-pci-obj-$(CONFIG_MPQEMU) += reset.o +remote-pci-obj-$(CONFIG_MPQEMU) += sysbus.o +remote-pci-obj-$(CONFIG_MPQEMU) += loader.o +remote-pci-obj-$(CONFIG_MPQEMU) += nmi.o +remote-pci-obj-$(CONFIG_MPQEMU) += qdev-properties-system.o +remote-pci-obj-$(CONFIG_MPQEMU) += qdev-fw.o +remote-pci-obj-$(CONFIG_MPQEMU) += numa.o
hw/nvram/Makefile.objs +2 -0
@@ -6,3 +6,5 @@ common-obj-y += chrp_nvram.o common-obj-$(CONFIG_MAC_NVRAM) += mac_nvram.o obj-$(CONFIG_PSERIES) += spapr_nvram.o obj-$(CONFIG_NRF51_SOC) += nrf51_nvm.o + +remote-pci-obj-$(CONFIG_MPQEMU) += fw_cfg.o
hw/pci/Makefile.objs +4 -0
@@ -12,3 +12,7 @@ common-obj-$(CONFIG_PCI_EXPRESS) += pcie_port.o pcie_host.o common-obj-$(call lnot,$(CONFIG_PCI)) += pci-stub.o common-obj-$(CONFIG_ALL) += pci-stub.o + +remote-pci-obj-$(CONFIG_MPQEMU) += pci.o pci_bridge.o +remote-pci-obj-$(CONFIG_MPQEMU) += msi.o msix.o +remote-pci-obj-$(CONFIG_MPQEMU) += pcie.o
hw/scsi/Makefile.objs +2 -0
@@ -13,3 +13,5 @@ obj-y += virtio-scsi.o virtio-scsi-dataplane.o obj-$(CONFIG_VHOST_SCSI) += vhost-scsi-common.o vhost-scsi.o obj-$(CONFIG_VHOST_USER_SCSI) += vhost-scsi-common.o vhost-user-scsi.o endif + +remote-lsi-obj-$(CONFIG_MPQEMU) += scsi-generic.o scsi-bus.o lsi53c895a.o scsi-disk.o emulation.o
migration/Makefile.objs +2 -0
@@ -13,3 +13,5 @@ common-obj-$(CONFIG_RDMA) += rdma.o common-obj-$(CONFIG_LIVE_BLOCK_MIGRATION) += block.o rdma.o-libs := $(RDMA_LIBS) + +remote-pci-obj-$(CONFIG_MPQEMU) += qemu-file.o vmstate.o qjson.o vmstate-types.o
qom/Makefile.objs +4 -0
@@ -3,3 +3,7 @@ qom-obj-y += object_interfaces.o common-obj-y = cpu.o common-obj-$(CONFIG_SOFTMMU) += qom-hmp-cmds.o qom-qmp-cmds.o + +remote-pci-obj-$(CONFIG_MPQEMU) += object.o qom-qobject.o container.o +remote-pci-obj-$(CONFIG_MPQEMU) += object_interfaces.o +remote-pci-obj-$(CONFIG_MPQEMU) += cpu.o
remote/Makefile.objs new file +1 -0
@@ -0,0 +1 @@ +remote-pci-obj-$(CONFIG_MPQEMU) += remote-main.o
remote/remote-main.c new file +35 -0
@@ -0,0 +1,35 @@ +/* +* Remote device initialization +* +* Copyright 2019, Oracle and/or its affiliates. +* +* 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 <stdio.h> + +#include "qemu/osdep.h" +#include "qemu/module.h" + +int main (int argc,char *argv[]) +{ +module_call_init (MODULE_INIT_QOM ); + +return 0 ; +}
stubs/replay.c +4 -0
@@ -94,3 +94,7 @@ int replay_get_instructions(void)void replay_account_executed_instructions (void ) { } + +void replay_add_blocker (Error *reason) +{ +}
Signature · 1 line
1.8.3.1
RFC PATCH v3 7/45 multi-process: define proxy-link object
In reply to Jagannathan RamanDefines proxy-link object which forms the communication link between QEMU & emulation program.
Adds functions to configure members of proxy-link object instance. Adds functions to send and receive messages over the communication channel.
Adds GMainLoop to handle events received on the communication channel.
---
v1 -> v2:
- Use default context for main loop instead of a new context
v2 -> v3:
- Enabled multi-channel support in the communication link
include/glib-compat.h | 4 + include/io/proxy-link.h | 147 ++++++++++++++++++++++++ io/Makefile.objs | 2 + io/proxy-link.c | 292 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 445 insertions(+) create mode 100644 include/io/proxy-link.h create mode 100644 io/proxy-link.c
include/glib-compat.h +4 -0
@@ -19,12 +19,16 @@/* Ask for warnings for anything that was marked deprecated in * the defined version, or before. It is a candidate for rewrite. */ +#ifndef GLIB_VERSION_MIN_REQUIRED #define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_40 +#endif /* Ask for warnings if code tries to use function that did not * exist in the defined version. These risk breaking builds */ +#ifndef GLIB_VERSION_MAX_ALLOWED #define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_40 +#endif #pragma GCC diagnostic push#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
include/io/proxy-link.h new file +147 -0
147 lines not on this page · raw message
io/Makefile.objs +2 -0
@@ -10,3 +10,5 @@ io-obj-y += channel-util.o io-obj-y += dns-resolver.o io-obj-y += net-listener.o io-obj-y += task.o + +io-obj-$(CONFIG_MPQEMU) += proxy-link.o
io/proxy-link.c new file +292 -0
292 lines not on this page · raw message
Signature · 1 line
1.8.3.1
Re: [Qemu-devel] [RFC v3 PATCH 07/45] multi-process: define proxy-link object
Quoted 33 lines · Jagannathan Raman
Defines proxy-link object which forms the communication link between QEMU & emulation program.
Adds functions to configure members of proxy-link object instance. Adds functions to send and receive messages over the communication channel.
Adds GMainLoop to handle events received on the communication channel.Signed-off-by Jagannathan Raman <[email protected]>Signed-off-by John G Johnson <[email protected]>Signed-off-by Elena Ufimtseva <[email protected]>---
v1 -> v2:
- Use default context for main loop instead of a new contextv2 -> v3:
- Enabled multi-channel support in the communication linkinclude/glib-compat.h | 4 + include/io/proxy-link.h | 147 ++++++++++++++++++++++++ io/Makefile.objs | 2 + io/proxy-link.c | 292 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 445 insertions(+) create mode 100644 include/io/proxy-link.h create mode 100644 io/proxy-link.cinclude/glib-compat.h +0
-0@@ -19,12 +19,16 @@/* Ask for warnings for anything that was marked deprecated in * the defined version, or before. It is a candidate for rewrite. */
include/glib-compat.h line 31
Quoted 10 lines
include/glib-compat.h +4
-0+#ifndef GLIB_VERSION_MIN_REQUIRED #define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_40 +#endif /* Ask for warnings if code tries to use function that did not * exist in the defined version. These risk breaking builds */ +#ifndef GLIB_VERSION_MAX_ALLOWED #define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_40 +#endif
This does not look good. This header can only be included once thanks to the #ifndef QEMU_GLIB_COMPAT_H. So the fact that you need these conditionals is a hint of a bug elsewhere in the code related to glib usage.
Quoted 26 lines
include/io/proxy-link.h new file +20
-0@@ -0,0 +1,147 @@ +/* +* Communication channel between QEMU and remote device process +* +* Copyright 2019, Oracle and/or its affiliates. +* +* 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,
include/io/proxy-link.h line 30
Quoted 10 lines
include/io/proxy-link.h new file +10
-0+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +*/ + +#ifndef PROXY_LINK_H +#define PROXY_LINK_H + +#include <stddef.h> +#include <stdint.h> +#include <glib.h>
I'm guessing this is the cause - nothing should be including this directly - it is pulled in for you via qemu/osdep.h
include/io/proxy-link.h line 35
Quoted 5 lines
include/io/proxy-link.h new file +5
-0+#include <pthread.h> + +#include "qemu/osdep.h" +#include "qom/object.h" +#include "qemu/thread.h"
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Re: [Qemu-devel] [RFC v3 PATCH 07/45] multi-process: define proxy-link object
Quoted 19 lines · Daniel P. Berrangé
Quoted 7 lines · Jagannathan Raman
Defines proxy-link object which forms the communication link between QEMU & emulation program.
Adds functions to configure members of proxy-link object instance. Adds functions to send and receive messages over the communication channel.
Adds GMainLoop to handle events received on the communication channel.include/io/proxy-link.h line 30
Quoted 7 lines
include/io/proxy-link.h new file +7
-0+ +#ifndef PROXY_LINK_H +#define PROXY_LINK_H + +#include <stddef.h> +#include <stdint.h> +#include <glib.h> I'm guessing this is the cause - nothing should be including this directly - it is pulled in for you via
qemu/osdep.h
Quoted 3 lines
include/io/proxy-link.h line 33
Quoted 3 lines
include/io/proxy-link.h new file +3
-0+#include <pthread.h> + +#include "qemu/osdep.h"
For that matter, "qemu/osdep.h" should ALWAYS be listed first, before any system headers, and inclusion of <stddef.h> and <stdint.h> is also redundant, just as the <glib.h>.
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Re: [Qemu-devel] [RFC v3 PATCH 07/45] multi-process: define proxy-link object
Quoted 20 lines · Eric Blake
Quoted 19 lines · Daniel P. Berrangé
Quoted 7 lines · Jagannathan Raman
Defines proxy-link object which forms the communication link between QEMU & emulation program.
Adds functions to configure members of proxy-link object instance. Adds functions to send and receive messages over the communication channel.
Adds GMainLoop to handle events received on the communication channel.include/io/proxy-link.h line 30
Quoted 7 lines
include/io/proxy-link.h new file +7
-0+ +#ifndef PROXY_LINK_H +#define PROXY_LINK_H + +#include <stddef.h> +#include <stdint.h> +#include <glib.h> I'm guessing this is the cause - nothing should be including this directly - it is pulled in for you via
qemu/osdep.h
Quoted 7 lines
Quoted 3 lines
include/io/proxy-link.h line 33
Quoted 3 lines
include/io/proxy-link.h new file +3
-0+#include <pthread.h> + +#include "qemu/osdep.h" For that matter, "
qemu/osdep.h" should ALWAYS be listed first, before any system headers, and inclusion of <stddef.h> and <stdint.h> is also redundant, just as the <glib.h>.
Removing <glib.h> resolved the build issue. We'll remove <glib.h> in all files in the next rev.
We soon realized the "qemu/osdep.h" should be the first include in all the files. We'll ensure that this is the case for all files in the next revision.
Thanks!
--
Jag
Quoted 2 lines
Re: [Qemu-devel] [RFC v3 PATCH 07/45] multi-process: define proxy-link object
In reply to Jagannathan Ramaninclude/io/proxy-link.h
Quoted 6 lines · Jagannathan Raman
include/io/proxy-link.h new file +0
-0@@ -0,0 +1,147 @@
Regarding naming: so far I've seen "remote", "mpqemu", and "proxy". These concepts aren't well-defined and I'm not sure if they refer to the same thing or are different. ProxyLinkState should be named MPQemuLinkState?
It's also unclear to me how tightly coupled this "proxy link" is to PCI (since it has PCI Configuration Space commands and how it would be cleanly extended to support other busses).
Quoted 67 lines
include/io/proxy-link.h new file +67
-0+/* +* Communication channel between QEMU and remote device process +* +* Copyright 2019, Oracle and/or its affiliates. +* +* 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 PROXY_LINK_H +#define PROXY_LINK_H + +#include <stddef.h> +#include <stdint.h> +#include <glib.h> +#include <pthread.h> + +#include "qemu/osdep.h" +#include "qom/object.h" +#include "qemu/thread.h" + +typedef struct ProxyLinkState ProxyLinkState ; + +#define TYPE_PROXY_LINK "proxy-link" +#define PROXY_LINK (obj) \ + OBJECT_CHECK(ProxyLinkState, (obj), TYPE_PROXY_LINK) + +#define REMOTE_MAX_FDS 8 + +#define PROC_HDR_SIZE offsetof(ProcMsg, data1.u64) + +/* +* proc_cmd_t enum type to specify the command to be executed on the remote +* device +* +* Following commands are supported: +* CONF_READ PCI config. space read +* CONF_WRITE PCI config. space write +* +*/ +typedef enum { +INIT =0 , +CONF_READ , +CONF_WRITE , +MAX , +}proc_cmd_t ; + +/* +* ProcMsg Format of the message sent to the remote device from QEMU +* +* cmd The remote command +* bytestream Indicates if the data to be shared is structured (data1)
include/io/proxy-link.h line 77
Quoted 10 lines
include/io/proxy-link.h new file +10
-0+* or unstructured (data2) +* size Size of the data to be shared +* data1 Structured data +* fds File descriptors to be shared with remote device +* data2 Unstructured data +* +*/ +typedef struct { + proc_cmd_t cmd; + int bytestream;
Please use bool.
Quoted 6 lines
include/io/proxy-link.h new file +6
-0+size_t size; + +union { +uint64_t u64; + } data1; +
include/io/proxy-link.h line 93
Quoted 10 lines
include/io/proxy-link.h new file +10
-0+int fds[REMOTE_MAX_FDS ]; +int num_fds; + +uint8_t *data2; +} ProcMsg; + +struct conf_data_msg { +uint32_t addr; +uint32_t val; +int l;
Please pick a descriptive name for this field.
include/io/proxy-link.h line 104
Quoted 11 lines
include/io/proxy-link.h new file +11
-0+}; + +/* +* ProcChannel defines the channel that make up the communication link +* between QEMU and remote process +* +* gsrc GSource object to be used by loop +* gpfd GPollFD object containing the socket & events to monitor +* sock Socket to send/receive communication, same as the one in gpfd +* lock Mutex to synchronize access to the channel +*/
Please see the doc comment style in include/qom/object.h for examples of how to format doc comments.
Quoted 126 lines
include/io/proxy-link.h new file +43
-0+ +typedef struct ProcChannel { +GSource gsrc; +GPollFD gpfd; +int sock; +QemuMutex lock; +}ProcChannel ; + +typedef void (*proxy_link_callback )(GIOCondition cond,ProcChannel *chan); + +/* +* ProxyLinkState Instance info. of the communication +* link between QEMU and remote process. The Link could +* be made up of multiple channels. +* +* ctx GMainContext to be used for communication +* loop Main loop that would be used to poll for incoming data +* com Communication channel to transport control messages +* +*/ +struct ProxyLinkState { +Object obj; + +GMainContext *ctx; +GMainLoop *loop; + +ProcChannel *com; + +proxy_link_callback callback; +}; + +ProxyLinkState *proxy_link_create (void ); +void proxy_link_finalize (ProxyLinkState *s); + +void proxy_proc_send (ProxyLinkState *s,ProcMsg *msg,ProcChannel *chan); +int proxy_proc_recv (ProxyLinkState *s,ProcMsg *msg,ProcChannel *chan); + +void proxy_link_init_channel (ProxyLinkState *s,ProcChannel **chan,int fd); +void proxy_link_destroy_channel (ProcChannel *chan); +void proxy_link_set_callback (ProxyLinkState *s,proxy_link_callback callback); +void start_handler (ProxyLinkState *s); + +#endif io/Makefile.objs +2
-0@@ -10,3 +10,5 @@ io-obj-y += channel-util.o io-obj-y += dns-resolver.o io-obj-y += net-listener.o io-obj-y += task.o + +io-obj-$(CONFIG_MPQEMU) += proxy-link.oio/proxy-link.c new file +67
-0@@ -0,0 +1,292 @@ +/* +* Communication channel between QEMU and remote device process +* +* Copyright 2019, Oracle and/or its affiliates. +* +* 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 <assert.h> +#include <errno.h> +#include <pthread.h> +#include <stdio.h> +#include <stdlib.h> +#include <sys/types.h> +#include <sys/socket.h> +#include <sys/un.h> +#include <unistd.h> + +#include "qemu/module.h" +#include "io/proxy-link.h" +#include "qemu/log.h" + +GSourceFuncs gsrc_funcs; + +static void proxy_link_inst_init (Object *obj) +{ +ProxyLinkState *s =PROXY_LINK (obj); + + s->ctx =g_main_context_default (); + s->loop =g_main_loop_new (s->ctx, FALSE); +} + +static const TypeInfo proxy_link_info = { + .name =TYPE_PROXY_LINK , + .parent =TYPE_OBJECT , + .instance_size =sizeof (ProxyLinkState), + .instance_init = proxy_link_inst_init, +}; + +static void proxy_link_register_types (void ) +{ +type_register_static (&proxy_link_info); +} + +type_init (proxy_link_register_types) + +ProxyLinkState *proxy_link_create(void) +{ +return PROXY_LINK (object_new (TYPE_PROXY_LINK )); +} +
io/proxy-link.c line 77
Quoted 10 lines
io/proxy-link.c new file +10
-0+void proxy_link_finalize (ProxyLinkState *s) +{ +g_main_loop_unref (s->loop); +g_main_context_unref (s->ctx); +g_main_loop_quit (s->loop); + +proxy_link_destroy_channel (s->com); + +object_unref (OBJECT (s)); +}
It's strange that the destruction of ProxyLinkState does not use QEMU's object system. How about implementing .instance_finalize(), dropping proxy_link_finalize(), and letting the caller unref ProxyLinkState like a regular Object?
Quoted 58 lines
io/proxy-link.c new file +58
-0+ +void proxy_proc_send (ProxyLinkState *s,ProcMsg *msg,ProcChannel *chan) +{ +int rc; +uint8_t *data; +union { +char control[CMSG_SPACE (REMOTE_MAX_FDS *sizeof (int ))]; +struct cmsghdr align; + } u; +struct msghdr hdr; +struct cmsghdr *chdr; +int sock = chan->sock; +QemuMutex *lock = &chan->lock; + +struct iovec iov = { + .iov_base = (char *) msg, + .iov_len =PROC_HDR_SIZE , + }; + +memset (&hdr,0 ,sizeof (hdr)); +memset (&u,0 ,sizeof (u)); + + hdr.msg_iov = &iov; + hdr.msg_iovlen =1 ; + +if (msg->num_fds >REMOTE_MAX_FDS ) { +qemu_log_mask (LOG_REMOTE_DEBUG ,"%s: Max FDs exceeded\n" , __func__); +return ; + } + +if (msg->num_fds >0 ) { +size_t fdsize = msg->num_fds *sizeof (int ); + + hdr.msg_control = &u; + hdr.msg_controllen =sizeof (u); + + chdr =CMSG_FIRSTHDR (&hdr); + chdr->cmsg_len =CMSG_LEN (fdsize); + chdr->cmsg_level =SOL_SOCKET ; + chdr->cmsg_type =SCM_RIGHTS ; +memcpy (CMSG_DATA (chdr), msg->fds, fdsize); + hdr.msg_controllen =CMSG_SPACE (fdsize); + } + +qemu_mutex_lock (lock); + +do { + rc =sendmsg (sock, &hdr,0 ); + }while (rc <0 && (errno ==EINTR || errno ==EAGAIN )); + +if (rc <0 ) { +qemu_log_mask (LOG_REMOTE_DEBUG ,"%s - sendmsg rc is %d, errno is %d," +" sock %d\n" , __func__, rc, errno, sock); +qemu_mutex_unlock (lock); +return ; + } + +if (msg->bytestream) {
io/proxy-link.c line 145
Quoted 10 lines
io/proxy-link.c new file +10
-0+ data = msg->data2; + }else { + data = (uint8_t *)msg +PROC_HDR_SIZE ; + } + +do { + rc =write (sock, data, msg->size); + }while (rc <0 && (errno ==EINTR || errno ==EAGAIN )); + +qemu_mutex_unlock (lock);
Can this message be transmitted in a single sendmsg() by including 2 iovecs instead of just 1? Then no locking is needed and only one syscall is required.
Quoted 21 lines
io/proxy-link.c new file +21
-0+} + + +int proxy_proc_recv (ProxyLinkState *s,ProcMsg *msg,ProcChannel *chan) +{ +int rc; +uint8_t *data; +union { +char control[CMSG_SPACE (REMOTE_MAX_FDS *sizeof (int ))]; +struct cmsghdr align; + } u; +struct msghdr hdr; +struct cmsghdr *chdr; +size_t fdsize; +int sock = chan->sock; +QemuMutex *lock = &chan->lock; + +struct iovec iov = { + .iov_base = (char *) msg, + .iov_len =PROC_HDR_SIZE , + };
io/proxy-link.c line 176
Quoted 10 lines
io/proxy-link.c new file +10
-0+ +memset (&hdr,0 ,sizeof (hdr)); +memset (&u,0 ,sizeof (u)); + + hdr.msg_iov = &iov; + hdr.msg_iovlen =1 ; + hdr.msg_control = &u; + hdr.msg_controllen =sizeof (u); + +qemu_mutex_lock (lock);
Sockets are full-duplex (sending and receiving are independent). Is it necessary to use the same lock for both send and receive?
Quoted 10 lines
io/proxy-link.c new file +10
-0+ +do { + rc =recvmsg (sock, &hdr,0 ); + }while (rc <0 && (errno ==EINTR || errno ==EAGAIN )); + +if (rc <0 ) { +qemu_log_mask (LOG_REMOTE_DEBUG ,"%s - recvmsg rc is %d, errno is %d," +" sock %d\n" , __func__, rc, errno, sock); +qemu_mutex_unlock (lock); +return rc;
io/proxy-link.c line 196
Quoted 10 lines
io/proxy-link.c new file +10
-0+ } + + msg->num_fds =0 ; +for (chdr =CMSG_FIRSTHDR (&hdr); chdr !=NULL ; + chdr =CMSG_NXTHDR (&hdr, chdr)) { +if ((chdr->cmsg_level ==SOL_SOCKET ) && + (chdr->cmsg_type ==SCM_RIGHTS )) { + fdsize = chdr->cmsg_len -CMSG_LEN (0 ); + msg->num_fds = fdsize /sizeof (int ); +memcpy (msg->fds,CMSG_DATA (chdr), fdsize);
Please validate num_fds before memcpy to prevent the buffer overflow.
Quoted 6 lines
io/proxy-link.c new file +6
-0+break ; + } + } + +if (msg->size && msg->bytestream) { + msg->data2 =calloc (1 , msg->size);
io/proxy-link.c line 212
Quoted 10 lines
io/proxy-link.c new file +10
-0+ data = msg->data2; + }else { + data = (uint8_t *)&msg->data1; + } + +if (msg->size) { +do { + rc =read (sock, data, msg->size); + }while (rc <0 && (errno ==EINTR || errno ==EAGAIN )); + }
Please validate size to prevent the buffer overflow.
Re: [Qemu-devel] [RFC v3 PATCH 07/45] multi-process: define proxy-link object
Quoted 22 lines · Stefan Hajnoczi
io/proxy-link.c line 196
Quoted 8 lines · Jagannathan Raman
io/proxy-link.c new file +8
-0+ msg->num_fds =0 ; +for (chdr =CMSG_FIRSTHDR (&hdr); chdr !=NULL ; + chdr =CMSG_NXTHDR (&hdr, chdr)) { +if ((chdr->cmsg_level ==SOL_SOCKET ) && + (chdr->cmsg_type ==SCM_RIGHTS )) { + fdsize = chdr->cmsg_len -CMSG_LEN (0 ); + msg->num_fds = fdsize /sizeof (int ); +memcpy (msg->fds,CMSG_DATA (chdr), fdsize);Please validate
num_fdsbefore memcpy to prevent the buffer overflow.Quoted 10 lines
io/proxy-link.c new file +10
-0+break ; + } + } + +if (msg->size && msg->bytestream) { + msg->data2 =calloc (1 , msg->size); + data = msg->data2; + }else { + data = (uint8_t *)&msg->data1; + }
Quoted 8 lines
io/proxy-link.c line 212
Quoted 6 lines
io/proxy-link.c new file +6
-0+ +if (msg->size) { +do { + rc =read (sock, data, msg->size); + }while (rc <0 && (errno ==EINTR || errno ==EAGAIN )); + }Please validate size to prevent the buffer overflow.
I didn't see a reply so I want to highlight that the effort to introduce isolation between devices is pointless if the communications link is not coded securely.
Multi-process QEMU adds no security if one process can corrupt the memory of another process by sending invalid inputs. Please audit the code.
Stefan
Re: [Qemu-devel] [RFC v3 PATCH 07/45] multi-process: define proxy-link object
Quoted 32 lines · Stefan Hajnoczi
Quoted 22 lines · Stefan Hajnoczi
io/proxy-link.c line 196
Quoted 8 lines · Jagannathan Raman
io/proxy-link.c new file +8
-0+ msg->num_fds =0 ; +for (chdr =CMSG_FIRSTHDR (&hdr); chdr !=NULL ; + chdr =CMSG_NXTHDR (&hdr, chdr)) { +if ((chdr->cmsg_level ==SOL_SOCKET ) && + (chdr->cmsg_type ==SCM_RIGHTS )) { + fdsize = chdr->cmsg_len -CMSG_LEN (0 ); + msg->num_fds = fdsize /sizeof (int ); +memcpy (msg->fds,CMSG_DATA (chdr), fdsize);Please validate
num_fdsbefore memcpy to prevent the buffer overflow.Quoted 10 lines
io/proxy-link.c new file +10
-0+break ; + } + } + +if (msg->size && msg->bytestream) { + msg->data2 =calloc (1 , msg->size); + data = msg->data2; + }else { + data = (uint8_t *)&msg->data1; + }Quoted 8 lines
io/proxy-link.c line 212
Quoted 6 lines
io/proxy-link.c new file +6
-0+ +if (msg->size) { +do { + rc =read (sock, data, msg->size); + }while (rc <0 && (errno ==EINTR || errno ==EAGAIN )); + }Please validate size to prevent the buffer overflow.
Quoted 8 lines
I didn't see a reply so I want to highlight that the effort to introduce isolation between devices is pointless if the communications link is not coded securely.
Multi-process QEMU adds no security if one process can corrupt the memory of another process by sending invalid inputs. Please audit the code.
Hi Stefan
Sorry for not replyingi earlier. We have reviewed all the comments we received on the this patch series and working on the code improvements which are mostly done.
We recognize the importance of the secure code and making efforts to eliminate as much as possible these mentioned unverified inputs along with other changes.
The changes will be in the next version of the patchset we are actively working on.
The other your suggestion about reducing the number of syscalls by stuffing all of the parts of the message in the io_vec and using one sendmsg/recvmsg cannot be done at this point with the way we have organized the messages structure. But we are looking into the adoption of shared ring buffer for communication channel instead of the current mechanism to reduce the number of syscalls.
Though this change will not be a part of the next patchset as we are tinkering with live migration.
But all other recommendations and comments will be taken into account.
Regards,
Elena & Jag & JJ.
Quoted 1 line
Stefan
Re: [Qemu-devel] [RFC v3 PATCH 07/45] multi-process: define proxy-link object
Quoted 53 lines · Elena Ufimtseva
Quoted 32 lines · Stefan Hajnoczi
Quoted 22 lines · Stefan Hajnoczi
io/proxy-link.c line 196
Quoted 8 lines · Jagannathan Raman
io/proxy-link.c new file +8
-0+ msg->num_fds =0 ; +for (chdr =CMSG_FIRSTHDR (&hdr); chdr !=NULL ; + chdr =CMSG_NXTHDR (&hdr, chdr)) { +if ((chdr->cmsg_level ==SOL_SOCKET ) && + (chdr->cmsg_type ==SCM_RIGHTS )) { + fdsize = chdr->cmsg_len -CMSG_LEN (0 ); + msg->num_fds = fdsize /sizeof (int ); +memcpy (msg->fds,CMSG_DATA (chdr), fdsize);Please validate
num_fdsbefore memcpy to prevent the buffer overflow.Quoted 10 lines
io/proxy-link.c new file +10
-0+break ; + } + } + +if (msg->size && msg->bytestream) { + msg->data2 =calloc (1 , msg->size); + data = msg->data2; + }else { + data = (uint8_t *)&msg->data1; + }Quoted 8 lines
io/proxy-link.c line 212
Quoted 6 lines
io/proxy-link.c new file +6
-0+ +if (msg->size) { +do { + rc =read (sock, data, msg->size); + }while (rc <0 && (errno ==EINTR || errno ==EAGAIN )); + }Please validate size to prevent the buffer overflow.
Quoted 8 lines
I didn't see a reply so I want to highlight that the effort to introduce isolation between devices is pointless if the communications link is not coded securely.
Multi-process QEMU adds no security if one process can corrupt the memory of another process by sending invalid inputs. Please audit the code.
Hi Stefan
Sorry for not replyingi earlier. We have reviewed all the comments we received on the this patch series and working on the code improvements which are mostly done.
We recognize the importance of the secure code and making efforts to eliminate as much as possible these mentioned unverified inputs along with other changes.The changes will be in the next version of the patchset we are actively working on.
Quoted 9 lines
The other your suggestion about reducing the number of syscalls by stuffing all of the parts of the message in the
io_vecand using one sendmsg/recvmsg cannot be done at this point with the way we have organized the messages structure. But we are looking into the adoption of shared ring buffer for communication channel instead of the current mechanism to reduce the number of syscalls.
Though this change will not be a part of the next patchset as we are tinkering with live migration.
But all other recommendations and comments will be taken into account.
Thanks Elena!
Hi Stefan,
I'd like to confirm that we are targeting Live Migration for next version and we are also discussing another use case for this project.
The other use case we are discussing is testing emulated devices (as separate processes) with libfuzzer. We could test corner cases and the handling of error conditions on emulated devices using this approach.
Thanks!
--
Jag
Quoted 9 lines
Regards,
Elena & Jag & JJ.Quoted 1 line
Stefan
RFC PATCH v3 8/45 multi-process: add functions to synchronize proxy and remote endpoints
In reply to Jagannathan RamanIn 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.
---
v1 -> v2:
- Added timeout to synchronization functions
include/io/proxy-link.h | 8 ++++++++ io/proxy-link.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+)
include/io/proxy-link.h +8 -0
@@ -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"
@@ -133,11 +135,17 @@ 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,ProcChannel *chan);int proxy_proc_recv (ProxyLinkState *s,ProcMsg *msg,ProcChannel *chan); +uint64_t wait_for_remote (int efd); +void notify_proxy (int fd,uint64_t val);void proxy_link_init_channel (ProxyLinkState *s,ProcChannel **chan,int fd);void proxy_link_destroy_channel (ProcChannel *chan);
io/proxy-link.c +42 -0
54 lines not on this page · raw message
Signature · 1 line
1.8.3.1
Re: [Qemu-devel] [RFC v3 PATCH 08/45] multi-process: add functions to synchronize proxy and remote endpoints
Quoted 30 lines · Jagannathan Raman
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 <[email protected]>Signed-off-by Jagannathan Raman <[email protected]>Signed-off-by Elena Ufimtseva <[email protected]>---
v1 -> v2:
- Added timeout to synchronization functionsinclude/io/proxy-link.h | 8 ++++++++ io/proxy-link.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+)include/io/proxy-link.h +2
-0@@ -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"
include/io/proxy-link.h struct ProxyLinkState { · line 139
Quoted 5 lines
include/io/proxy-link.h +2
-0@@ -133,11 +135,17 @@ struct ProxyLinkState {proxy_link_callback callback; }; +#define GET_REMOTE_WAIT eventfd(0, 0) +#define PUT_REMOTE_WAIT (wait) close(wait)
Can you use functions instead of macros? eventfd() is Linux-specific so this code is not portable. QEMU has an EventNotifier abstraction but I'm not sure if it can be used since this patch doesn't include any code that calls GET_REMOTE_WAIT/PUT_REMOTE_WAIT and there are no comments. I don't know what the expected semantics are.
Quoted 26 lines
include/io/proxy-link.h +4
-0+#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,ProcChannel *chan);int proxy_proc_recv (ProxyLinkState *s,ProcMsg *msg,ProcChannel *chan); +uint64_t wait_for_remote (int efd); +void notify_proxy (int fd,uint64_t val);void proxy_link_init_channel (ProxyLinkState *s,ProcChannel **chan,int fd);void proxy_link_destroy_channel (ProcChannel *chan);io/proxy-link.c +2
-0@@ -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"
io/proxy-link.c int proxy_proc_recv(ProxyLinkState *s, ProcMsg *msg, ProcChannel *chan) · line 221
Quoted 4 lines
io/proxy-link.c +1
-0@@ -216,6 +218,46 @@ int proxy_proc_recv(ProxyLinkState *s, ProcMsg *msg, ProcChannel *chan)return rc; } +uint64_t wait_for_remote (int efd)
Hard to tell if this makes sense without any context. I notice that EFD_CLOEXEC and EFD_NONBLOCK were not used. It's likely that EFD_CLOEXEC should be used. Since the eventfd is used with poll(2) EFD_NONBLOCK should probably also be used so it's certain that read() will not block (which could exceed the timeout).
RFC PATCH v3 9/45 multi-process: setup PCI host bridge for remote device
In reply to Jagannathan RamanPCI host bridge is setup for the remote device process. It is implemented using remote-pcihost object. It is an extension of the PCI host bridge setup by QEMU.
Remote-pcihost configures a PCI bus which could be used by the remote
PCI device to latch on to.
--- hw/pci/Makefile.objs | 2 +- include/remote/pcihost.h | 59 ++++++++++++++++++++++++++++++++++ remote/Makefile.objs | 1 + remote/pcihost.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 145 insertions(+), 1 deletion(-) create mode 100644 include/remote/pcihost.h create mode 100644 remote/pcihost.c
hw/pci/Makefile.objs +1 -1
@@ -13,6 +13,6 @@ common-obj-$(CONFIG_PCI_EXPRESS) += pcie_port.o pcie_host.o common-obj-$(call lnot,$(CONFIG_PCI)) += pci-stub.o common-obj-$(CONFIG_ALL) += pci-stub.o -remote-pci-obj-$(CONFIG_MPQEMU) += pci.o pci_bridge.o +remote-pci-obj-$(CONFIG_MPQEMU) += pci.o pci_bridge.o pci_host.o pcie_host.o remote-pci-obj-$(CONFIG_MPQEMU) += msi.o msix.o remote-pci-obj-$(CONFIG_MPQEMU) += pcie.o
include/remote/pcihost.h new file +59 -0
59 lines not on this page · raw message
remote/Makefile.objs +1 -0
@@ -1 +1,2 @@ remote-pci-obj-$(CONFIG_MPQEMU) += remote-main.o +remote-pci-obj-$(CONFIG_MPQEMU) += pcihost.o
remote/pcihost.c new file +84 -0
84 lines not on this page · raw message
Signature · 1 line
1.8.3.1
RFC PATCH v3 10/45 multi-process: setup a machine object for remote device process
In reply to Jagannathan Ramanremote-machine object sets up various subsystems of the remote device process. Instantiate PCI host bridge object and initialize RAM, IO & PCI memory regions.
--- exec.c | 3 +- include/exec/address-spaces.h | 2 + include/remote/machine.h | 46 ++++++++++++++++ remote/Makefile.objs | 1 + remote/machine.c | 118 ++++++++++++++++++++++++++++++++++++++++++ remote/remote-main.c | 7 +++ 6 files changed, 175 insertions(+), 2 deletions(-) create mode 100644 include/remote/machine.h create mode 100644 remote/machine.c
exec.c +1 -2
@@ -197,7 +197,6 @@ typedef struct subpage_t {#define PHYS_SECTION_WATCH 3static void io_mem_init (void ); -static void memory_map_init (void );static void tcg_commit (MemoryListener *listener);static MemoryRegion io_mem_watch;
@@ -3165,7 +3164,7 @@ static void tcg_commit(MemoryListener *listener)tlb_flush (cpuas->cpu); } -static void memory_map_init (void ) +void memory_map_init (void ) { system_memory =g_malloc (sizeof (*system_memory));
include/exec/address-spaces.h +2 -0
@@ -33,6 +33,8 @@ MemoryRegion *get_system_memory(void);*/ MemoryRegion *get_system_io (void ); +void memory_map_init (void ); +extern AddressSpace address_space_memory;extern AddressSpace address_space_io;
include/remote/machine.h new file +46 -0
46 lines not on this page · raw message
remote/Makefile.objs +1 -0
@@ -1,2 +1,3 @@ remote-pci-obj-$(CONFIG_MPQEMU) += remote-main.o remote-pci-obj-$(CONFIG_MPQEMU) += pcihost.o +remote-pci-obj-$(CONFIG_MPQEMU) += machine.o
remote/machine.c new file +118 -0
118 lines not on this page · raw message
remote/remote-main.c +7 -0
@@ -26,10 +26,17 @@#include "qemu/osdep.h" #include "qemu/module.h" +#include "remote/pcihost.h" +#include "remote/machine.h" +#include "hw/boards.h" +#include "hw/qdev-core.h" +#include "qemu/main-loop.h" int main (int argc,char *argv[]) {module_call_init (MODULE_INIT_QOM ); + current_machine =MACHINE (REMOTE_MACHINE (object_new (TYPE_REMOTE_MACHINE ))); +return 0 ; }
Signature · 1 line
1.8.3.1
RFC PATCH v3 11/45 multi-process: setup memory manager for remote device
In reply to Jagannathan Ramansync_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.
--- Makefile.target | 2 + include/io/proxy-link.h | 11 ++++++ include/remote/memory.h | 34 +++++++++++++++++ remote/memory.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 146 insertions(+) create mode 100644 include/remote/memory.h create mode 100644 remote/memory.c
Makefile.target +2 -0
@@ -137,6 +137,8 @@ remote-pci-tgt-obj-$(CONFIG_MPQEMU) += stubs/monitor.o remote-pci-tgt-obj-$(CONFIG_MPQEMU) += stubs/replay.o remote-pci-tgt-obj-$(CONFIG_MPQEMU) += stubs/xen-mapcache.o +remote-pci-tgt-obj-$(CONFIG_MPQEMU) += remote/memory.o + ######################################################### # Linux user emulator target
include/io/proxy-link.h +11 -0
@@ -35,6 +35,8 @@#include "qemu/osdep.h" #include "qom/object.h" #include "qemu/thread.h" +#include "exec/cpu-common.h" +#include "exec/hwaddr.h" typedef struct ProxyLinkState ProxyLinkState ;
@@ -53,12 +55,14 @@ typedef struct ProxyLinkState ProxyLinkState;* Following commands are supported: * CONF_READ PCI config. space read * CONF_WRITE PCI config. space write +* SYNC_SYSMEM Shares QEMU's RAM with remote device's RAM * */ typedef enum {INIT =0 ,CONF_READ ,CONF_WRITE , +SYNC_SYSMEM ,MAX , }proc_cmd_t ;
@@ -75,12 +79,19 @@ typedef enum {* */ typedef struct { +hwaddr gpas[REMOTE_MAX_FDS ]; +uint64_t sizes[REMOTE_MAX_FDS ]; +ram_addr_t offsets[REMOTE_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[REMOTE_MAX_FDS];
include/remote/memory.h new file +34 -0
@@ -0,0 +1,34 @@ +/* +* Memory manager for remote device +* +* Copyright 2019, Oracle and/or its affiliates. +* +* 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
remote/memory.c new file +99 -0
99 lines not on this page · raw message
Signature · 1 line
1.8.3.1
RFC PATCH v3 12/45 multi-process: remote process initialization
In reply to Jagannathan RamanAdds the handler to process message from QEMU, Initialize remote process main loop, handles SYNC_SYSMEM message by updating its "system_memory" container using shared file descriptors received from QEMU.
---
v1 -> v2:
- Separate thread for message processing is removed
v2 -> v3:
- Added multi-channel support in the remote end
remote/remote-main.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+)
remote/remote-main.c +81 -0
@@ -23,6 +23,8 @@*/ #include <stdio.h> +#include <glib.h> +#include <unistd.h> #include "qemu/osdep.h" #include "qemu/module.h"
@@ -31,12 +33,91 @@#include "hw/boards.h" #include "hw/qdev-core.h" #include "qemu/main-loop.h" +#include "remote/memory.h" +#include "io/proxy-link.h" +#include "qapi/error.h" +#include "qemu/main-loop.h" +#include "sysemu/cpus.h" +#include "qemu-common.h" +#include "hw/pci/pci.h" +#include "qemu/thread.h" +#include "qemu/main-loop.h" +#include "qemu/config-file.h" +#include "sysemu/sysemu.h" +#include "block/block.h" + +static ProxyLinkState *proxy_link; +PCIDevice *remote_pci_dev; + +static void process_msg (GIOCondition cond,ProcChannel *chan) +{ +ProcMsg *msg =NULL ; +Error *err =NULL ; + +if ((cond &G_IO_HUP ) || (cond &G_IO_ERR )) { +error_setg (&err,"socket closed, cond is %d" , cond); + goto finalize_loop; + } + + msg =g_malloc0 (sizeof (ProcMsg)); + +if (proxy_proc_recv (proxy_link, msg, chan) <0 ) { +error_setg (&err,"Failed to receive message" ); + goto finalize_loop; + } + +switch (msg->cmd) { +case INIT : +break ; +case CONF_WRITE : +break ; +case CONF_READ : +break ; +default : +error_setg (&err,"Unknown command" ); + goto finalize_loop; + } + +g_free (msg); + +return ; + +finalize_loop: +error_report_err (err); +g_free (msg); +proxy_link_finalize (proxy_link); + proxy_link =NULL ; +}int main (int argc,char *argv[]) { +Error *err =NULL ; +module_call_init (MODULE_INIT_QOM ); +bdrv_init_with_whitelist (); + +if (qemu_init_main_loop (&err)) { +error_report_err (err); +return -EBUSY ; + } + +qemu_init_cpu_loop (); + +page_size_init (); + current_machine =MACHINE (REMOTE_MACHINE (object_new (TYPE_REMOTE_MACHINE ))); + proxy_link =proxy_link_create (); +if (!proxy_link) { +printf ("Could not create proxy link\n" ); +return -1 ; + } + +proxy_link_init_channel (proxy_link, &proxy_link->com,STDIN_FILENO ); +proxy_link_set_callback (proxy_link, process_msg); + +start_handler (proxy_link); +return 0 ; }
Signature · 1 line
1.8.3.1
RFC PATCH v3 13/45 multi-process: introduce proxy object
In reply to Jagannathan RamanFrom: Elena Ufimtseva <[email protected]>
Defines a PCI Device proxy object as a parent of TYPE_PCI_DEVICE. PCI Proxy Object is responsible for registering PCI BARs,i MemoryRegionOps to handle access to the BARs and forwarding those to the remote device.
PCI Proxy object intercepts config space reads and writes. In case of pci config write it forwards it to the remote device using communication channel set by proxy-link object.
--- hw/Makefile.objs | 2 + hw/proxy/Makefile.objs | 1 + hw/proxy/qemu-proxy.c | 247 ++++++++++++++++++++++++++++++++++++++++++ include/hw/proxy/qemu-proxy.h | 81 ++++++++++++++ remote/remote-main.c | 28 +++++ 5 files changed, 359 insertions(+) create mode 100644 hw/proxy/Makefile.objs create mode 100644 hw/proxy/qemu-proxy.c create mode 100644 include/hw/proxy/qemu-proxy.h
hw/Makefile.objs +2 -0
@@ -44,6 +44,8 @@ endif common-obj-y += $(devices-dirs-y) obj-y += $(devices-dirs-y) +common-obj-$(CONFIG_MPQEMU) += proxy/ + remote-pci-obj-$(CONFIG_MPQEMU) += core/ remote-pci-obj-$(CONFIG_MPQEMU) += block/ remote-pci-obj-$(CONFIG_MPQEMU) += pci/
hw/proxy/Makefile.objs new file +1 -0
@@ -0,0 +1 @@ +common-obj-$(CONFIG_MPQEMU) += qemu-proxy.o
hw/proxy/qemu-proxy.c new file +247 -0
247 lines not on this page · raw message
include/hw/proxy/qemu-proxy.h new file +81 -0
81 lines not on this page · raw message
remote/remote-main.c +28 -0
@@ -49,6 +49,32 @@static ProxyLinkState *proxy_link;PCIDevice *remote_pci_dev; +static void process_config_write (ProcMsg *msg) +{ +struct conf_data_msg *conf = (struct conf_data_msg *)msg->data2; + +qemu_mutex_lock_iothread (); +pci_default_write_config (remote_pci_dev, conf->addr, conf->val, conf->l); +qemu_mutex_unlock_iothread (); +} + +static void process_config_read (ProcMsg *msg) +{ +struct conf_data_msg *conf = (struct conf_data_msg *)msg->data2; +uint32_t val; +int wait; + + wait = msg->fds[0 ]; + +qemu_mutex_lock_iothread (); + val =pci_default_read_config (remote_pci_dev, conf->addr, conf->l); +qemu_mutex_unlock_iothread (); + +notify_proxy (wait, val); + +PUT_REMOTE_WAIT (wait); +} +static void process_msg (GIOCondition cond,ProcChannel *chan) {ProcMsg *msg =NULL ;
@@ -70,8 +96,10 @@ static void process_msg(GIOCondition cond, ProcChannel *chan)case INIT :break ;case CONF_WRITE : +process_config_write (msg);break ;case CONF_READ : +process_config_read (msg);break ;default :error_setg (&err,"Unknown command" );
Signature · 1 line
1.8.3.1
RFC PATCH v3 14/45 mutli-process: build remote command line args
In reply to Jagannathan RamanFrom: Elena Ufimtseva <[email protected]>
---
New patch in v3
hw/proxy/qemu-proxy.c | 80 +++++++++++++++++++++++++++++++++---------- include/hw/proxy/qemu-proxy.h | 2 +- 2 files changed, 62 insertions(+), 20 deletions(-)
hw/proxy/qemu-proxy.c +61 -19
@@ -45,47 +45,89 @@static void pci_proxy_dev_realize (PCIDevice *dev,Error **errp); +static int add_argv (char *command_str,char **argv,int argc) +{ +int max_args =64 ; + +if (argc < max_args -1 ) { + argv[argc++] = command_str; + argv[argc] =0 ; + }else { +return 0 ; + } + +return argc; +} + +static int make_argv (char *command_str,char **argv,int argc) +{ +int max_args =64 ; + +char *p2 =strtok (command_str," " ); +while (p2 && argc < max_args -1 ) { + argv[argc++] = p2; + p2 =strtok (0 ," " ); + } + argv[argc] =0 ; + +return argc; +} +int remote_spawn (PCIProxyDev *pdev,const char *command,Error **errp) { -char *args[3 ];pid_t rpid;int fd[2 ] = {-1 ,-1 };Error *local_error =NULL ; +char *argv[64 ]; +int argc =0 , _argc; +char *sfd; +char *exec_dir; +int rc = -EINVAL ;if (pdev->managed) {/* Child is forked by external program (such as libvirt). */ -return -1 ; +return rc; }if (socketpair (AF_UNIX ,SOCK_STREAM ,0 , fd)) {error_setg (errp,"Unable to create unix socket." ); -return -1 ; +return rc; } + exec_dir =g_strdup_printf ("%s/%s" ,qemu_get_exec_dir (),"qemu-scsi-dev" ); + argc =add_argv (exec_dir, argv, argc); + sfd =g_strdup_printf ("%d" , fd[1 ]); + argc =add_argv (sfd, argv, argc); + _argc = argc; + argc =make_argv ((char *)command, argv, argc); +/* TODO: Restrict the forked process' permissions and capabilities. */ rpid =qemu_fork (&local_error);if (rpid ==-1 ) {error_setg (errp,"Unable to spawn emulation program." );close (fd[0 ]); -close (fd[1 ]); -return -1 ; + goto fail; }if (rpid ==0 ) {close (fd[0 ]); - - args[0 ] =g_strdup (command); - args[1 ] =g_strdup_printf ("%d" , fd[1 ]); - args[2 ] =NULL ; -execvp (args[0 ], (char *const *)args); +execvp (argv[0 ], (char *const *)argv);exit (1 ); } pdev->remote_pid = rpid; - pdev->rsocket = fd[0 ]; + pdev->rsocket = fd[1 ]; + pdev->socket = fd[0 ]; + rc =0 ; + +fail:close (fd[1 ]); -return 0 ; +for (int i =0 ; i < _argc; i++) { +g_free (argv[i]); + } + +return rc; }static int get_proxy_sock (PCIDevice *dev)
@@ -94,7 +136,7 @@ static int get_proxy_sock(PCIDevice *dev) pdev =PCI_PROXY_DEV (dev); -return pdev->rsocket; +return pdev->socket; }static void set_proxy_sock (PCIDevice *dev,int socket)
@@ -103,7 +145,7 @@ static void set_proxy_sock(PCIDevice *dev, int socket) pdev =PCI_PROXY_DEV (dev); - pdev->rsocket = socket; + pdev->socket = socket; pdev->managed = true; }
@@ -198,16 +240,16 @@ static void pci_proxy_dev_register_types(void)type_init (pci_proxy_dev_register_types) -static void init_proxy(PCIDevice *dev, char *command, Error **errp) +static void init_proxy(PCIDevice *dev, char *command, bool need_spawn, Error **errp) {PCIProxyDev *pdev =PCI_PROXY_DEV (dev);Error *local_error =NULL ;if (!pdev->managed) { -if (command) { -remote_spawn (pdev, command, &local_error); - }else { -return ; +if (need_spawn) { +if (!remote_spawn (pdev, command, &local_error)) { +return ; + } } }else { pdev->remote_pid =atoi (pdev->rid);
include/hw/proxy/qemu-proxy.h +1 -1
@@ -63,7 +63,7 @@ typedef struct PCIProxyDev {void (*set_remote_opts) (PCIDevice *dev,QDict *qdict,unsigned int cmd);void (*proxy_ready) (PCIDevice *dev); -void (*init_proxy) (PCIDevice *pdev,char *command,Error **errp); +void (*init_proxy) (PCIDevice *dev,char *command,bool need_spawn,Error **errp); } PCIProxyDev;
Signature · 1 line
1.8.3.1
RFC PATCH v3 15/45 multi-process: add support of device id to communication channel
In reply to Jagannathan RamanFrom: Elena Ufimtseva <[email protected]>
---
New patch in v3
include/io/proxy-link.h | 3 +++ io/proxy-link.c | 37 ++++++++++++++++++++++++++++++++----- 2 files changed, 35 insertions(+), 5 deletions(-)
include/io/proxy-link.h +3 -0
@@ -88,6 +88,7 @@ typedef struct {proc_cmd_t cmd;int bytestream;size_t size; +size_t size_id;union {uint64_t u64;
@@ -98,6 +99,8 @@ typedef struct {int num_fds;uint8_t *data2; +uint8_t *id; + } ProcMsg;struct conf_data_msg {
io/proxy-link.c +32 -5
@@ -81,7 +81,7 @@ void proxy_link_finalize(ProxyLinkState *s)void proxy_proc_send (ProxyLinkState *s,ProcMsg *msg,ProcChannel *chan) {int rc; -uint8_t *data; +uint8_t *data, *buf =NULL ;union {char control[CMSG_SPACE (REMOTE_MAX_FDS *sizeof (int ))];struct cmsghdr align;
@@ -140,10 +140,19 @@ void proxy_proc_send(ProxyLinkState *s, ProcMsg *msg, ProcChannel *chan) data = (uint8_t *)msg +PROC_HDR_SIZE ; } +if (msg->size_id >0 ) { + buf =calloc (1 , msg->size + msg->size_id); +assert (buf); +memcpy (buf, data, msg->size); +memcpy (buf + msg->size, msg->id, msg->size_id); + data = buf; + }do { - rc =write (sock, data, msg->size); + rc =write (sock, data, msg->size + msg->size_id); }while (rc <0 && (errno ==EINTR || errno ==EAGAIN )); +free (buf); +qemu_mutex_unlock (lock); }
@@ -151,7 +160,7 @@ void proxy_proc_send(ProxyLinkState *s, ProcMsg *msg, ProcChannel *chan)int proxy_proc_recv (ProxyLinkState *s,ProcMsg *msg,ProcChannel *chan) {int rc; -uint8_t *data; +uint8_t *data, *buf =NULL ;union {char control[CMSG_SPACE (REMOTE_MAX_FDS *sizeof (int ))];struct cmsghdr align;
@@ -207,10 +216,28 @@ int proxy_proc_recv(ProxyLinkState *s, ProcMsg *msg, ProcChannel *chan) data = (uint8_t *)&msg->data1; } -if (msg->size) { +if (msg->size) { +if (msg->size_id >0 ) { + buf =calloc (1 , msg->size + msg->size_id); + data = buf; + }do { - rc =read (sock, data, msg->size); + rc =read (sock, data, msg->size + msg->size_id); }while (rc <0 && (errno ==EINTR || errno ==EAGAIN )); +if (rc <0 ) { +fprintf (stderr,"Read sock is an error!\n" ); +return rc; + } + } +if (msg->size && msg->bytestream) { +memcpy (msg->data2, data, msg->size); + }else { +memcpy ((uint8_t *)&msg->data1, data, msg->size); + } + +if (msg->size_id >0 ) { + msg->id =calloc (1 , msg->size_id); +memcpy (msg->id, data + msg->size, msg->size_id); }qemu_mutex_unlock (lock);
Signature · 1 line
1.8.3.1
RFC PATCH v3 16/45 multi-process: PCI BAR read/write handling for proxy & remote endpoints
In reply to Jagannathan RamanProxy device object implements handler for PCI BAR writes and reads. The handler uses BAR_WRITE/BAR_READ message to communicate to the remote process with the BAR address and value to be written/read.
The remote process implements handler for BAR_WRITE/BAR_READ message.
--- hw/proxy/qemu-proxy.c | 50 +++++++++++++++++++++++++++++ include/hw/proxy/qemu-proxy.h | 5 +++ include/io/proxy-link.h | 12 +++++++ remote/remote-main.c | 73 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 140 insertions(+)
hw/proxy/qemu-proxy.c +50 -0
@@ -287,3 +287,53 @@ static void pci_proxy_dev_realize(PCIDevice *device, Error **errp) dev->get_proxy_sock = get_proxy_sock; dev->init_proxy = init_proxy; } + +static void send_bar_access_msg (ProxyLinkState *proxy_link,MemoryRegion *mr, +bool write,hwaddr addr,uint64_t *val, +unsigned size,bool memory) +{ +ProcMsg msg; +int wait; + +memset (&msg,0 ,sizeof (ProcMsg)); + + msg.bytestream =0 ; + msg.size =sizeof (msg.data1); + msg.data1.bar_access.addr = mr->addr + addr; + msg.data1.bar_access.size = size; + msg.data1.bar_access.memory = memory; + +if (write) { + msg.cmd =BAR_WRITE ; + msg.data1.bar_access.val = *val; + }else { + wait =GET_REMOTE_WAIT ; + + msg.cmd =BAR_READ ; + msg.num_fds =1 ; + msg.fds[0 ] = wait; + } + +proxy_proc_send (proxy_link, &msg, proxy_link->com); + +if (!write) { + *val =wait_for_remote (wait); +PUT_REMOTE_WAIT (wait); + } +} + +void proxy_default_bar_write (PCIProxyDev *dev,MemoryRegion *mr,hwaddr addr, +uint64_t val,unsigned size,bool memory) +{ +send_bar_access_msg (dev->proxy_link, mr, true, addr, &val, size, memory); +} + +uint64_t proxy_default_bar_read (PCIProxyDev *dev,MemoryRegion *mr,hwaddr addr, +unsigned size,bool memory) +{ +uint64_t val; + +send_bar_access_msg (dev->proxy_link, mr, false, addr, &val, size, memory); + +return val; +}
include/hw/proxy/qemu-proxy.h +5 -0
@@ -77,5 +77,10 @@ typedef struct PCIProxyDevClass {int remote_spawn (PCIProxyDev *pdev,const char *command,Error **errp); +void proxy_default_bar_write (PCIProxyDev *dev,MemoryRegion *mr,hwaddr addr, +uint64_t val,unsigned size,bool memory); + +uint64_t proxy_default_bar_read (PCIProxyDev *dev,MemoryRegion *mr,hwaddr addr, +unsigned size,bool memory);#endif /* QEMU_PROXY_H */
include/io/proxy-link.h +12 -0
@@ -56,6 +56,8 @@ typedef struct ProxyLinkState ProxyLinkState;* CONF_READ PCI config. space read * CONF_WRITE PCI config. space write * SYNC_SYSMEM Shares QEMU's RAM with remote device's RAM +* BAR_WRITE Writes to PCI BAR region +* BAR_READ Reads from PCI BAR region * */ typedef enum {
@@ -63,6 +65,8 @@ typedef enum {CONF_READ ,CONF_WRITE ,SYNC_SYSMEM , +BAR_WRITE , +BAR_READ ,MAX , } proc_cmd_t;
@@ -85,6 +89,13 @@ typedef struct { } sync_sysmem_msg_t;typedef struct { +hwaddr addr; +uint64_t val; +unsigned size; +bool memory; +}bar_access_msg_t ; + +typedef struct { proc_cmd_t cmd; int bytestream; size_t size;
@@ -93,6 +104,7 @@ typedef struct {union {uint64_t u64;sync_sysmem_msg_t sync_sysmem; +bar_access_msg_t bar_access; } data1;int fds[REMOTE_MAX_FDS ];
remote/remote-main.c +73 -0
91 lines not on this page · raw message
Signature · 1 line
1.8.3.1
RFC PATCH v3 17/45 multi-process: modify BARs read/write to support dev_id
In reply to Jagannathan RamanFrom: Elena Ufimtseva <[email protected]>
---
New patch in v3
hw/proxy/qemu-proxy.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-)
hw/proxy/qemu-proxy.c +19 -3
@@ -288,13 +288,16 @@ static void pci_proxy_dev_realize(PCIDevice *device, Error **errp) dev->init_proxy = init_proxy; } -static void send_bar_access_msg (ProxyLinkState *proxy_link,MemoryRegion *mr, +static void send_bar_access_msg (PCIProxyDev *dev,MemoryRegion *mr,bool write,hwaddr addr,uint64_t *val,unsigned size,bool memory) { +ProxyLinkState *proxy_link;ProcMsg msg;int wait; + proxy_link = dev->proxy_link; +memset (&msg,0 ,sizeof (ProcMsg)); msg.bytestream =0 ;
@@ -314,18 +317,31 @@ static void send_bar_access_msg(ProxyLinkState *proxy_link, MemoryRegion *mr, msg.fds[0 ] = wait; } +if (dev->dev_id) { + msg.size_id =strlen (dev->dev_id) +1 ; + msg.id =calloc (1 , msg.size_id); +memcpy (msg.id, dev->dev_id, msg.size_id); + }else { + msg.size_id =0 ; + } +proxy_proc_send (proxy_link, &msg, proxy_link->com);if (!write) { *val =wait_for_remote (wait);PUT_REMOTE_WAIT (wait); } + +if (msg.id) { +free (msg.id); + } + }void proxy_default_bar_write (PCIProxyDev *dev,MemoryRegion *mr,hwaddr addr,uint64_t val,unsigned size,bool memory) { -send_bar_access_msg (dev->proxy_link, mr, true, addr, &val, size, memory); +send_bar_access_msg (dev, mr, true, addr, &val, size, memory); } uint64_t proxy_default_bar_read(PCIProxyDev *dev, MemoryRegion *mr, hwaddr addr,
@@ -333,7 +349,7 @@ uint64_t proxy_default_bar_read(PCIProxyDev *dev, MemoryRegion *mr, hwaddr addr, {uint64_t val; -send_bar_access_msg (dev->proxy_link, mr, false, addr, &val, size, memory); +send_bar_access_msg (dev, mr, false, addr, &val, size, memory);return val; }
Signature · 1 line
1.8.3.1
RFC PATCH v3 18/45 multi-process: support dev id in config read/write
In reply to Jagannathan RamanFrom: Elena Ufimtseva <[email protected]>
---
New patch in v3
hw/proxy/qemu-proxy.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
hw/proxy/qemu-proxy.c +12 -3
@@ -151,12 +151,16 @@ static void set_proxy_sock(PCIDevice *dev, int socket) }static int config_op_send (PCIProxyDev *dev,uint32_t addr,uint32_t *val,int l, -unsigned int op) +char *id,unsigned int op) {ProcMsg msg;struct conf_data_msg conf_data;int wait; +if (!id) { +return -EINVAL ; + } +memset (&msg,0 ,sizeof (ProcMsg)); conf_data.addr = addr; conf_data.val = (op ==CONF_WRITE ) ? *val :0 ;
@@ -171,6 +175,8 @@ static int config_op_send(PCIProxyDev *dev, uint32_t addr, uint32_t *val, int l, msg.size =sizeof (conf_data); msg.cmd = op; msg.bytestream =1 ; + msg.id = (uint8_t *)g_strdup (dev->dev_id); + msg.size_id =strlen (dev->dev_id) +1 ;if (op ==CONF_WRITE ) { msg.num_fds =0 ;
@@ -188,6 +194,7 @@ static int config_op_send(PCIProxyDev *dev, uint32_t addr, uint32_t *val, int l, }free (msg.data2); +free (msg.id);return 0 ; }
@@ -198,7 +205,8 @@ static uint32_t pci_proxy_read_config(PCIDevice *d, uint32_t addr, int len) (void )pci_default_read_config (d, addr, len); -config_op_send (PCI_PROXY_DEV (d), addr, &val, len,CONF_READ ); +config_op_send (PCI_PROXY_DEV (d), addr, &val, len, +PCI_PROXY_DEV (d)->dev_id,CONF_READ );return val; }
@@ -208,7 +216,8 @@ static void pci_proxy_write_config(PCIDevice *d, uint32_t addr, uint32_t val, {pci_default_write_config (d, addr, val, l); -config_op_send (PCI_PROXY_DEV (d), addr, &val, l,CONF_WRITE ); +config_op_send (PCI_PROXY_DEV (d), addr, &val, l, +PCI_PROXY_DEV (d)->dev_id,CONF_WRITE ); }static void pci_proxy_dev_class_init (ObjectClass *klass,void *data)
Signature · 1 line
1.8.3.1
RFC PATCH v3 19/45 multi-process: Add LSI device proxy object
In reply to Jagannathan RamanAdds proxy-lsi53c895a object, as a derivative of the pci-proxy-dev object. This object is the proxy for the lsi53c895a object instantiated by the remote process.
--- hw/proxy/Makefile.objs | 1 + hw/proxy/proxy-lsi53c895a.c | 162 ++++++++++++++++++++++++++++++++++++ include/hw/proxy/proxy-lsi53c895a.h | 42 ++++++++++ 3 files changed, 205 insertions(+) create mode 100644 hw/proxy/proxy-lsi53c895a.c create mode 100644 include/hw/proxy/proxy-lsi53c895a.h
hw/proxy/Makefile.objs +1 -0
@@ -1 +1,2 @@ common-obj-$(CONFIG_MPQEMU) += qemu-proxy.o +common-obj-$(CONFIG_MPQEMU) += proxy-lsi53c895a.o
hw/proxy/proxy-lsi53c895a.c new file +162 -0
162 lines not on this page · raw message
include/hw/proxy/proxy-lsi53c895a.h new file +42 -0
42 lines not on this page · raw message
Signature · 1 line
1.8.3.1
Re: [Qemu-devel] [RFC v3 PATCH 19/45] multi-process: Add LSI device proxy object
Hi,
Quoted 16 lines
hw/proxy/proxy-lsi53c895a.c new file +16
-0+static uint64_t proxy_lsi_io_read (void *opaque,hwaddr addr,unsigned size) +{ +ProxyLSIState *s = opaque; + +return proxy_default_bar_read (PCI_PROXY_DEV (s), &s->io_io, addr, size, + false); +} + +static void proxy_lsi_io_write (void *opaque,hwaddr addr,uint64_t val, +unsigned size) +{ +ProxyLSIState *s = opaque; + +proxy_default_bar_write (PCI_PROXY_DEV (s), &s->io_io, addr, val, size, + false); +}
hw/proxy/proxy-lsi53c895a.c line 58
Quoted 10 lines
hw/proxy/proxy-lsi53c895a.c new file +10
-0+ +static const MemoryRegionOps proxy_lsi_io_ops = { + .read = proxy_lsi_io_read, + .write = proxy_lsi_io_write, + .endianness =DEVICE_NATIVE_ENDIAN , + .impl = { + .min_access_size =1 , + .max_access_size =1 , + }, +};
Hmm, as more devices get proxy support there will be alot of simliar boilerplate.
I think it would be useful to have a
struct pci_device_description {
u16 vendor_id,
u16 device_id,
[ ... ]
struct {
[ ... ]
} bar[6];
};hw/proxy/proxy-lsi53c895a.c line 138
Quoted 2 lines
hw/proxy/proxy-lsi53c895a.c new file +2
-0+ proxy_class->realize = proxy_lsi_realize; + proxy_class->command =g_strdup ("qemu-scsi-dev" );
Hook that up here (proxy_class->description = &lsi_description), then have the pci proxy realize function setup everything. All pci bar access is just forwarded to the proxy, that should be doable without duplicating the code for each proxied pci device ...
At least parts of the pci_device_description can probably also used for non-proxy device setup (should work for pci config space, probably would not work for memory regions as they are very device specific).
cheers,
Gerd
Re: [Qemu-devel] [RFC v3 PATCH 19/45] multi-process: Add LSI device proxy object
Quoted 46 lines · Gerd Hoffmann
Hi,Quoted 16 lines
hw/proxy/proxy-lsi53c895a.c new file +16
-0+static uint64_t proxy_lsi_io_read (void *opaque,hwaddr addr,unsigned size) +{ +ProxyLSIState *s = opaque; + +return proxy_default_bar_read (PCI_PROXY_DEV (s), &s->io_io, addr, size, + false); +} + +static void proxy_lsi_io_write (void *opaque,hwaddr addr,uint64_t val, +unsigned size) +{ +ProxyLSIState *s = opaque; + +proxy_default_bar_write (PCI_PROXY_DEV (s), &s->io_io, addr, val, size, + false); +}hw/proxy/proxy-lsi53c895a.c line 58
Quoted 10 lines
hw/proxy/proxy-lsi53c895a.c new file +10
-0+ +static const MemoryRegionOps proxy_lsi_io_ops = { + .read = proxy_lsi_io_read, + .write = proxy_lsi_io_write, + .endianness =DEVICE_NATIVE_ENDIAN , + .impl = { + .min_access_size =1 , + .max_access_size =1 , + }, +};Hmm, as more devices get proxy support there will be alot of simliar boilerplate.
I think it would be useful to have a
struct pci_device_description { u16 vendor_id, u16 device_id, [ ... ] struct { [ ... ] } bar[6]; };hw/proxy/proxy-lsi53c895a.c line 138
Quoted 2 lines
hw/proxy/proxy-lsi53c895a.c new file +2
-0+ proxy_class->realize = proxy_lsi_realize; + proxy_class->command =g_strdup ("qemu-scsi-dev" );
Quoted 8 lines
Hook that up here (
proxy_class->description=&lsi_description), then have the pci proxy realize function setup everything. All pci bar access is just forwarded to the proxy, that should be doable without duplicating the code for each proxied pci device ...At least parts of the
pci_device_descriptioncan probably also used for non-proxy device setup (should work for pci config space, probably would not work for memory regions as they are very device specific).
Sounds great. We'll move similar boilerplate code to the pci proxy class in the next rev.
Thanks!
--
Jag
Quoted 5 lines
cheers,
Gerd
RFC PATCH v3 20/45 multi-process: Synchronize remote memory
In reply to Jagannathan RamanAdd memory-listener object which is used to keep the view of the RAM in sync between QEMU and remote process.
A MemoryListener is registered for system-memory AddressSpace. The listener sends SYNC_SYSMEM message to the remote process when memory listener commits the changes to memory, the remote process receives the message and processes it in the handler for SYNC_SYSMEM message.
---
v2 -> v3:
- Refactored code to obtain fd from host address, added
get_fd_from_hostaddr().
- Discovered a bug which results in invalid FDs (-1) being sent over to the remote process. Fixed this by checking if the FD value is valid before sending over to remote.
Makefile.target | 1 + hw/proxy/memory-sync.c | 226 +++++++++++++++++++++++++++++++++++++++++ hw/proxy/qemu-proxy.c | 5 + include/hw/proxy/memory-sync.h | 51 ++++++++++ include/hw/proxy/qemu-proxy.h | 2 + remote/remote-main.c | 11 ++ 6 files changed, 296 insertions(+) create mode 100644 hw/proxy/memory-sync.c create mode 100644 include/hw/proxy/memory-sync.h
Makefile.target +1 -0
@@ -125,6 +125,7 @@ obj-$(CONFIG_TCG) += fpu/softfloat.o obj-y += target/$(TARGET_BASE_ARCH)/ obj-y += disas.o obj-$(call notempty,$(TARGET_XML_FILES)) += gdbstub-xml.o +obj-$(CONFIG_MPQEMU) += hw/proxy/memory-sync.o LIBS := $(libs_cpu) $(LIBS) remote-pci-tgt-obj-$(CONFIG_MPQEMU) += accel/stubs/kvm-stub.o
hw/proxy/memory-sync.c new file +226 -0
226 lines not on this page · raw message
hw/proxy/qemu-proxy.c +5 -0
@@ -42,6 +42,8 @@#include "qapi/qmp/qstring.h" #include "sysemu/sysemu.h" #include "hw/proxy/qemu-proxy.h" +#include "hw/proxy/memory-sync.h" +#include "qom/object.h" static void pci_proxy_dev_realize (PCIDevice *dev,Error **errp);
@@ -277,6 +279,8 @@ static void init_proxy(PCIDevice *dev, char *command, bool need_spawn, Error **eproxy_link_init_channel (pdev->proxy_link, &pdev->proxy_link->com, pdev->socket); + +configure_memory_sync (pdev->sync, pdev->proxy_link); }static void pci_proxy_dev_realize (PCIDevice *device,Error **errp)
@@ -295,6 +299,7 @@ static void pci_proxy_dev_realize(PCIDevice *device, Error **errp) dev->set_proxy_sock = set_proxy_sock; dev->get_proxy_sock = get_proxy_sock; dev->init_proxy = init_proxy; + dev->sync =REMOTE_MEM_SYNC (object_new (TYPE_MEMORY_LISTENER )); } static void send_bar_access_msg(PCIProxyDev *dev, MemoryRegion *mr,
include/hw/proxy/memory-sync.h new file +51 -0
51 lines not on this page · raw message
include/hw/proxy/qemu-proxy.h +2 -0
@@ -24,6 +24,7 @@#define QEMU_PROXY_H #include "io/proxy-link.h" +#include "hw/proxy/memory-sync.h" #define TYPE_PCI_PROXY_DEV "pci-proxy-dev"
@@ -44,6 +45,7 @@ typedef struct PCIProxyDev {ProxyLinkState *proxy_link; +RemoteMemSync *sync;EventNotifier intr;EventNotifier resample;
remote/remote-main.c +11 -0
@@ -46,6 +46,7 @@#include "sysemu/sysemu.h" #include "block/block.h" #include "exec/memattrs.h" +#include "exec/address-spaces.h" static ProxyLinkState *proxy_link;PCIDevice *remote_pci_dev;
@@ -174,6 +175,16 @@ static void process_msg(GIOCondition cond, ProcChannel *chan) goto finalize_loop; }break ; +case SYNC_SYSMEM : +/* +* TODO: ensure no active DMA is happening when +* sysmem is being updated +*/ +remote_sysmem_reconfig (msg, &err); +if (err) { + goto finalize_loop; + } +break ;default :error_setg (&err,"Unknown command" ); goto finalize_loop;
Signature · 1 line
1.8.3.1
RFC PATCH v3 21/45 multi-process: create IOHUB object to handle irq
In reply to Jagannathan RamanIOHUB object is added to manage PCI IRQs. It uses KVM_IRQFD ioctl to create irqfd to injecting PCI interrupts to the guest. IOHUB object forwards the irqfd to the remote process. Remote process uses this fd to directly send interrupts to the guest, bypassing QEMU.
--- Makefile.target | 1 + hw/proxy/Makefile.objs | 1 - hw/proxy/qemu-proxy.c | 64 +++++++++++++++++ include/hw/pci/pci_ids.h | 3 + include/hw/proxy/qemu-proxy.h | 5 ++ include/io/proxy-link.h | 8 +++ include/remote/iohub.h | 63 +++++++++++++++++ include/remote/machine.h | 2 + remote/Makefile.objs | 1 + remote/iohub.c | 159 ++++++++++++++++++++++++++++++++++++++++++ remote/machine.c | 15 ++++ remote/remote-main.c | 4 ++ 12 files changed, 325 insertions(+), 1 deletion(-) create mode 100644 include/remote/iohub.h create mode 100644 remote/iohub.c
Makefile.target +1 -0
@@ -126,6 +126,7 @@ obj-y += target/$(TARGET_BASE_ARCH)/ obj-y += disas.o obj-$(call notempty,$(TARGET_XML_FILES)) += gdbstub-xml.o obj-$(CONFIG_MPQEMU) += hw/proxy/memory-sync.o +obj-$(CONFIG_MPQEMU) += hw/proxy/qemu-proxy.o LIBS := $(libs_cpu) $(LIBS) remote-pci-tgt-obj-$(CONFIG_MPQEMU) += accel/stubs/kvm-stub.o
hw/proxy/Makefile.objs +0 -1
@@ -1,2 +1 @@ -common-obj-$(CONFIG_MPQEMU) += qemu-proxy.o common-obj-$(CONFIG_MPQEMU) += proxy-lsi53c895a.o
hw/proxy/qemu-proxy.c +64 -0
88 lines not on this page · raw message
include/hw/pci/pci_ids.h +3 -0
@@ -191,6 +191,9 @@#define PCI_DEVICE_ID_SUN_SIMBA 0x5000#define PCI_DEVICE_ID_SUN_SABRE 0xa000 +#define PCI_VENDOR_ID_ORACLE 0x108e +#define PCI_DEVICE_ID_REMOTE_IOHUB 0xb000 +#define PCI_VENDOR_ID_CMD 0x1095#define PCI_DEVICE_ID_CMD_646 0x0646
include/hw/proxy/qemu-proxy.h +5 -0
@@ -23,8 +23,11 @@#ifndef QEMU_PROXY_H #define QEMU_PROXY_H +#include <linux/kvm.h> +#include "io/proxy-link.h" #include "hw/proxy/memory-sync.h" +#include "qemu/event_notifier.h" #define TYPE_PCI_PROXY_DEV "pci-proxy-dev"
@@ -46,6 +49,8 @@ typedef struct PCIProxyDev {ProxyLinkState *proxy_link;RemoteMemSync *sync; +struct kvm_irqfd irqfd; +EventNotifier intr;EventNotifier resample;
include/io/proxy-link.h +8 -0
@@ -58,6 +58,8 @@ typedef struct ProxyLinkState ProxyLinkState;* SYNC_SYSMEM Shares QEMU's RAM with remote device's RAM * BAR_WRITE Writes to PCI BAR region * BAR_READ Reads from PCI BAR region +* SET_IRQFD Sets the IRQFD to be used to raise interrupts directly +* from remote device * */ typedef enum {
@@ -67,6 +69,7 @@ typedef enum {SYNC_SYSMEM ,BAR_WRITE ,BAR_READ , +SET_IRQFD ,MAX , } proc_cmd_t;
@@ -96,6 +99,10 @@ typedef struct { } bar_access_msg_t;typedef struct { +int intx; +}set_irqfd_msg_t ; + +typedef struct { proc_cmd_t cmd; int bytestream; size_t size;
@@ -105,6 +112,7 @@ typedef struct {uint64_t u64;sync_sysmem_msg_t sync_sysmem;bar_access_msg_t bar_access; +set_irqfd_msg_t set_irqfd; } data1;int fds[REMOTE_MAX_FDS ];
include/remote/iohub.h new file +63 -0
63 lines not on this page · raw message
include/remote/machine.h +2 -0
@@ -30,11 +30,13 @@#include "hw/boards.h" #include "remote/pcihost.h" #include "qemu/notify.h" +#include "remote/iohub.h" typedef struct RemMachineState {MachineState parent_obj;RemPCIHost *host; +RemoteIOHubState *iohub; }RemMachineState ;#define TYPE_REMOTE_MACHINE "remote-machine"
remote/Makefile.objs +1 -0
@@ -1,3 +1,4 @@ remote-pci-obj-$(CONFIG_MPQEMU) += remote-main.o remote-pci-obj-$(CONFIG_MPQEMU) += pcihost.o remote-pci-obj-$(CONFIG_MPQEMU) += machine.o +remote-pci-obj-$(CONFIG_MPQEMU) += iohub.o
remote/iohub.c new file +159 -0
159 lines not on this page · raw message
remote/machine.c +15 -0
@@ -40,6 +40,8 @@#include "qemu-common.h" #include "sysemu/sysemu.h" #include "qemu/notify.h" +#include "hw/pci/pci_host.h" +#include "remote/iohub.h" static NotifierList machine_init_done_notifiers =NOTIFIER_LIST_INITIALIZER (machine_init_done_notifiers);
@@ -70,6 +72,8 @@ static void remote_machine_init(Object *obj)RemMachineState *s =REMOTE_MACHINE (obj);RemPCIHost *rem_host;MemoryRegion *system_memory, *system_io, *pci_memory; +PCIHostState *pci_host; +PCIDevice *pci_dev;Error *error_abort =NULL ;
@@ -101,6 +105,17 @@ static void remote_machine_init(Object *obj)qemu_mutex_unlock_iothread ();qdev_init_nofail (DEVICE (rem_host)); + + pci_host =PCI_HOST_BRIDGE (rem_host); + pci_dev =pci_create_simple_multifunction (pci_host->bus, +PCI_DEVFN (REMOTE_IOHUB_DEV , +REMOTE_IOHUB_FUNC ), + true,TYPE_REMOTE_IOHUB_DEVICE ); + + s->iohub =REMOTE_IOHUB_DEVICE (pci_dev); + +pci_bus_irqs (pci_host->bus, remote_iohub_set_irq, remote_iohub_map_irq, + s->iohub,REMOTE_IOHUB_NB_PIRQS ); }static const TypeInfo remote_machine = {
remote/remote-main.c +4 -0
@@ -47,6 +47,7 @@#include "block/block.h" #include "exec/memattrs.h" #include "exec/address-spaces.h" +#include "remote/iohub.h" static ProxyLinkState *proxy_link;PCIDevice *remote_pci_dev;
@@ -185,6 +186,9 @@ static void process_msg(GIOCondition cond, ProcChannel *chan) goto finalize_loop; }break ; +case SET_IRQFD : +process_set_irqfd_msg (remote_pci_dev, msg); +break ;default :error_setg (&err,"Unknown command" ); goto finalize_loop;
Signature · 1 line
1.8.3.1
RFC PATCH v3 22/45 multi-process: configure remote side devices
In reply to Jagannathan RamanFrom: Elena Ufimtseva <[email protected]>
Add functions to configure remote devices.
--- hw/proxy/qemu-proxy.c | 43 ++++++++++++++++++++++++++++++++++++++++++- include/hw/proxy/qemu-proxy.h | 2 ++ include/io/proxy-link.h | 4 ++++ 3 files changed, 48 insertions(+), 1 deletion(-)
hw/proxy/qemu-proxy.c +42 -1
@@ -50,8 +50,47 @@#include "qemu/event_notifier.h" #include "sysemu/kvm.h" #include "util/event_notifier-posix.c" +#include "hw/boards.h" +#include "include/qemu/log.h" static void pci_proxy_dev_realize (PCIDevice *dev,Error **errp); +static void setup_irqfd (PCIProxyDev *dev); + +static void proxy_ready (PCIDevice *dev) +{ +PCIProxyDev *pdev =PCI_PROXY_DEV (dev); + +setup_irqfd (pdev); +} + +static void set_remote_opts (PCIDevice *dev,QDict *qdict,unsigned int cmd) +{ +QString *qstr; +ProcMsg msg; +const char *str; +PCIProxyDev *pdev; + + pdev =PCI_PROXY_DEV (dev); + + qstr =qobject_to_json (QOBJECT (qdict)); + str =qstring_get_str (qstr); + +memset (&msg,0 ,sizeof (ProcMsg)); + + msg.data2 = (uint8_t *)str; + msg.cmd = cmd; + msg.bytestream =1 ; + msg.size =qstring_get_length (qstr) +1 ; + msg.num_fds =0 ; +if (pdev->dev_id) { + msg.id = (uint8_t *)pdev->dev_id; + msg.size_id =strlen ((char *)pdev->dev_id) +1 ; + } + +proxy_proc_send (pdev->proxy_link, &msg, pdev->proxy_link->com); + +return ; +}static int add_argv (char *command_str,char **argv,int argc) {
@@ -344,7 +383,6 @@ static void init_proxy(PCIDevice *dev, char *command, bool need_spawn, Error **e pdev->socket);configure_memory_sync (pdev->sync, pdev->proxy_link); -setup_irqfd (pdev); }static void pci_proxy_dev_realize (PCIDevice *device,Error **errp)
@@ -364,6 +402,9 @@ static void pci_proxy_dev_realize(PCIDevice *device, Error **errp) dev->get_proxy_sock = get_proxy_sock; dev->init_proxy = init_proxy; dev->sync =REMOTE_MEM_SYNC (object_new (TYPE_MEMORY_LISTENER )); + + dev->set_remote_opts = set_remote_opts; + dev->proxy_ready = proxy_ready; } static void send_bar_access_msg(PCIProxyDev *dev, MemoryRegion *mr,
include/hw/proxy/qemu-proxy.h +2 -0
@@ -28,6 +28,8 @@#include "io/proxy-link.h" #include "hw/proxy/memory-sync.h" #include "qemu/event_notifier.h" +#include "hw/pci/pci.h" +#include "block/qdict.h" #define TYPE_PCI_PROXY_DEV "pci-proxy-dev"
include/io/proxy-link.h +4 -0
@@ -70,6 +70,10 @@ typedef enum {BAR_WRITE ,BAR_READ ,SET_IRQFD , +DEV_OPTS , +DRIVE_OPTS , +DEVICE_ADD , +DEVICE_DEL ,MAX , } proc_cmd_t;
Signature · 1 line
1.8.3.1
RFC PATCH v3 23/45 multi-process: add qdev_proxy_add to create proxy devices
In reply to Jagannathan RamanFrom: Elena Ufimtseva <[email protected]>
This is handled while parsing the command line options. The parsed options are being sent to remote process as the messgaes containing JSON strings.
---
v1 -> v2:
- parse socket and command suboptions of drive/device commands
hw/proxy/qemu-proxy.c | 3 +- include/hw/proxy/qemu-proxy.h | 7 ++ include/monitor/qdev.h | 24 ++++ qdev-monitor.c | 254 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 287 insertions(+), 1 deletion(-)
hw/proxy/qemu-proxy.c +2 -1
@@ -360,7 +360,8 @@ static void init_proxy(PCIDevice *dev, char *command, bool need_spawn, Error **eif (!pdev->managed) {if (need_spawn) { -if (!remote_spawn (pdev, command, &local_error)) { +if (remote_spawn (pdev, command, &local_error)) { +fprintf (stderr,"remote spawn failed\n" );return ; } }
include/hw/proxy/qemu-proxy.h +7 -0
@@ -86,6 +86,13 @@ typedef struct PCIProxyDevClass {int remote_spawn (PCIProxyDev *pdev,const char *command,Error **errp); +typedef struct PCIProxyDevList { + QLIST_HEAD(, PCIProxyDev) devices; +}proxy_dev_list_t ; + +extern QemuMutex proxy_list_lock; +extern proxy_dev_list_t proxy_dev_list; +void proxy_default_bar_write (PCIProxyDev *dev,MemoryRegion *mr,hwaddr addr,uint64_t val,unsigned size,bool memory);
include/monitor/qdev.h +24 -0
@@ -2,6 +2,7 @@#define MONITOR_QDEV_H #include "hw/qdev-core.h" +#include "hw/proxy/qemu-proxy.h" /*** monitor commands ***/
@@ -9,7 +10,30 @@ void hmp_info_qtree(Monitor *mon, const QDict *qdict);void hmp_info_qdm (Monitor *mon,const QDict *qdict);void qmp_device_add (QDict *qdict,QObject **ret_data,Error **errp); +DeviceState *qdev_remote_add (QemuOpts *opts,bool device,Error **errp); +void qdev_proxy_fire (void ); +int qdev_device_help (QemuOpts *opts); +DeviceState *qdev_proxy_add (const char *rid,const char *id,char *bus, +char *command,int rsocket,bool managed, +Error **errp); + +struct remote_process { +int rid; +int remote_pid; +unsigned int type; +int socket; +char *command; +QemuOpts *opts; + +QLIST_ENTRY (remote_process) next; +}; + +void remote_process_register (struct remote_process *p); + +struct remote_process *get_remote_process_type (unsigned int type); +struct remote_process *get_remote_process_rid (unsigned int rid); +DeviceState *qdev_device_add (QemuOpts *opts,Error **errp);void qdev_set_id (DeviceState *dev,const char *id);
qdev-monitor.c +254 -0
272 lines not on this page · raw message
Signature · 1 line
1.8.3.1
RFC PATCH v3 24/45 multi-process: remote: add setup_devices and setup_drive msg processing
In reply to Jagannathan RamanFrom: Elena Ufimtseva <[email protected]>
Receive by remote side the configuration messages and build the device object from JSON device descriptions.
---
v1 -> v2:
- for new command line suboptions with libvirtd support, clean the options before creating drives/devices
- use default pci bus/address for now
include/hw/qdev-core.h | 2 + qdev-monitor.c | 2 +- remote/remote-main.c | 231 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 234 insertions(+), 1 deletion(-)
include/hw/qdev-core.h +2 -0
@@ -360,6 +360,8 @@ BusState *qdev_get_parent_bus(DeviceState *dev);DeviceState *qdev_find_recursive (BusState *bus,const char *id); +DeviceState *find_device_state (const char *id,Error **errp); +/* Returns 0 to walk children, > 0 to skip walk, < 0 to terminate walk. */ typedef int (qbus_walkerfn )(BusState *bus,void *opaque);typedef int (qdev_walkerfn )(DeviceState *dev,void *opaque);
qdev-monitor.c +1 -1
@@ -1017,7 +1017,7 @@ void qmp_device_add(QDict *qdict, QObject **ret_data, Error **errp)object_unref (OBJECT (dev)); } -static DeviceState *find_device_state (const char *id,Error **errp) +DeviceState *find_device_state (const char *id,Error **errp) {Object *obj;
remote/remote-main.c +231 -0
254 lines not on this page · raw message
Signature · 1 line
1.8.3.1
RFC PATCH v3 25/45 multi-process: remote: use fd for socket from parent process
In reply to Jagannathan RamanFrom: Elena Ufimtseva <[email protected]>
--- remote/remote-main.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
remote/remote-main.c +9 -1
@@ -63,6 +63,7 @@#include "block/qdict.h" #include "qapi/qmp/qlist.h" #include "qemu/log.h" +#include "qemu/cutils.h" static ProxyLinkState *proxy_link;PCIDevice *remote_pci_dev;
@@ -439,6 +440,7 @@ finalize_loop:int main (int argc,char *argv[]) {Error *err =NULL ; +int fd =-1 ;module_call_init (MODULE_INIT_QOM );
@@ -461,7 +463,13 @@ int main(int argc, char *argv[])return -1 ; } -proxy_link_init_channel (proxy_link, &proxy_link->com,STDIN_FILENO ); + fd =qemu_parse_fd (argv[1 ]); +if (fd ==-1 ) { +printf ("Failed to parse fd for remote process.\n" ); +return -EINVAL ; + } + +proxy_link_init_channel (proxy_link, &proxy_link->com, fd);proxy_link_set_callback (proxy_link, process_msg);start_handler (proxy_link);
Signature · 1 line
1.8.3.1
RFC PATCH v3 26/45 multi-process: remote: add create_done condition
In reply to Jagannathan RamanFrom: Elena Ufimtseva <[email protected]>
Do not allow BAR,MMIO handlers and irq setup to run before the configuration of the devices completes.
--- remote/remote-main.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-)
remote/remote-main.c +20 -9
@@ -67,6 +67,7 @@static ProxyLinkState *proxy_link;PCIDevice *remote_pci_dev; +bool create_done;static void process_config_write (ProcMsg *msg) {
@@ -369,21 +370,31 @@ static void process_msg(GIOCondition cond, ProcChannel *chan)case INIT :break ;case CONF_WRITE : -process_config_write (msg); +if (create_done) { +process_config_write (msg); + } +break ;case CONF_READ : -process_config_read (msg); +if (create_done) { +process_config_read (msg); + } +break ;case BAR_WRITE : -process_bar_write (msg, &err); -if (err) { - goto finalize_loop; +if (create_done) { +process_bar_write (msg, &err); +if (err) { +error_report_err (err); + } }break ;case BAR_READ : -process_bar_read (msg, &err); -if (err) { - goto finalize_loop; +if (create_done) { +process_bar_read (msg, &err); +if (err) { +error_report_err (err); + } }break ;case SYNC_SYSMEM :
@@ -403,7 +414,7 @@ static void process_msg(GIOCondition cond, ProcChannel *chan)qemu_mutex_lock_iothread ();qemu_run_machine_init_done_notifiers ();qemu_mutex_unlock_iothread (); - + create_done = true;break ;case DRIVE_OPTS :if (setup_drive (msg, &err)) {
Signature · 1 line
1.8.3.1
RFC PATCH v3 27/45 multi-process: add processing of remote drive and device command line
In reply to Jagannathan RamanFrom: Elena Ufimtseva <[email protected]>
Add processing of command line options drive and device. After remote devices are created along with their proxies, signal the proxies to finish the configuration steps.
---
v1 -> v2:
- change command line option for remote process drive/device to use existing -drive/-device options
- process drive and device options only after non-remote devices and drives are added
vl.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+)
vl.c +76 -0
@@ -32,6 +32,11 @@#include "qemu/uuid.h" #include "sysemu/seccomp.h" #include "sysemu/tcg.h" +#include "qapi/qmp/qdict.h" +#include "block/qdict.h" +#include "qapi/qmp/qstring.h" +#include "qapi/qmp/qjson.h" +#include "qapi/qmp/qlist.h" #ifdef CONFIG_SDL #if defined(__APPLE__) || defined(main)
@@ -1135,11 +1140,43 @@ static int cleanup_add_fd(void *opaque, QemuOpts *opts, Error **errp)#define MTD_OPTS ""#define SD_OPTS "" +#if defined(CONFIG_MPQEMU ) +static int rdrive_init_func (void *opaque,QemuOpts *opts,Error **errp) +{ +DeviceState *dev; + + dev =qdev_remote_add (opts, false/* this is drive */ , errp); +if (!dev) { +error_setg (errp,"qdev_remote_add failed for drive." ); +return -1 ; + } +object_unref (OBJECT (dev)); +return 0 ; +} +#endif + +static int pass; +static int drive_init_func (void *opaque,QemuOpts *opts,Error **errp) {BlockInterfaceType *block_default_type = opaque; +#if defined(CONFIG_MPQEMU ) +const char *remote; + + remote =qemu_opt_get (opts,"remote" ); +if (pass && remote) { +return rdrive_init_func (opaque, opts, errp); + }else { +if (!remote && !pass) { +drive_new (opts, *block_default_type, errp); + } + } + +return 0 ; +#else return drive_new (opts, *block_default_type, errp) ==NULL ; +#endif }static int drive_enable_snapshot (void *opaque,QemuOpts *opts,Error **errp)
@@ -2184,10 +2221,35 @@ static int device_help_func(void *opaque, QemuOpts *opts, Error **errp)return qdev_device_help (opts); } +#if defined(CONFIG_MPQEMU ) +static int rdevice_init_func (void *opaque,QemuOpts *opts,Error **errp) +{ +DeviceState *dev; + + dev =qdev_remote_add (opts, true/* this is device */ , errp); +if (!dev) { +error_setg (errp,"qdev_remote_add failed for device." ); +return -1 ; + } +object_unref (OBJECT (dev)); +return 0 ; +} +#endif +static int device_init_func (void *opaque,QemuOpts *opts,Error **errp) {DeviceState *dev; +#if defined(CONFIG_MPQEMU ) +const char *remote; + + remote =qemu_opt_get (opts,"remote" ); +if (remote) { +/* This will be a remote process */ +return rdevice_init_func (opaque, opts, errp); + } +#endif + dev =qdev_device_add (opts, errp);if (!dev) {return -1 ;
@@ -4367,6 +4429,17 @@ int main(int argc, char **argv, char **envp)/* Check if IGD GFX passthrough. */ igd_gfx_passthru (); +#if defined(CONFIG_MPQEMU ) +/* +* Parse the list for remote drives here as we launch PCIProxyDev here and +* need PCI host initialized. As a TODO: could defer init of PCIProxyDev instead. +*/ +if (qemu_opts_foreach (qemu_find_opts ("drive" ), drive_init_func, + &machine_class->block_default_type, &error_fatal)) { +exit (0 ); + } +#endif +/* init generic devices */ rom_set_order_override (FW_CFG_ORDER_OVERRIDE_DEVICE ); qemu_opts_foreach(qemu_find_opts("device"),
@@ -4424,6 +4497,9 @@ int main(int argc, char **argv, char **envp)qemu_register_reset (qbus_reset_all_fn,sysbus_get_default ());qemu_run_machine_init_done_notifiers (); +#if defined(CONFIG_MPQEMU ) +qdev_proxy_fire (); +#endif if (rom_check_and_register_reset () !=0 ) {error_report ("rom check and register reset failed" );exit (1 );
Signature · 1 line
1.8.3.1
RFC PATCH v3 28/45 multi-process: Introduce build flags to separate remote process code
In reply to Jagannathan RamanIntroduce SCSI_PROCESS & REMOTE_PROCESS build flags to separate code that applies only to remote processes.
---
New patch in v3
Makefile.target | 4 ++++ rules.mak | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)
Makefile.target +4 -0
@@ -256,6 +256,10 @@ ifdef CONFIG_DARWIN $(call quiet-command,SetFile -a C $@,"SETFILE","$(TARGET_DIR)$@") endif +ifdef CONFIG_MPQEMU +$(SCSI_DEV_BUILD): REMOTE_FLAGS = -DREMOTE_PROCESS -DSCSI_PROCESS +endif + $(SCSI_DEV_BUILD): $(all-remote-lsi-obj-y) $(COMMON_LDADDS) $(call LINK, $(filter-out %.mak, $^)) ifdef CONFIG_DARWIN
rules.mak +1 -1
@@ -67,7 +67,7 @@ expand-objs = $(strip $(sort $(filter %.o,$1)) \ %.o: %.c $(call quiet-command,$(CC) $(QEMU_LOCAL_INCLUDES) $(QEMU_INCLUDES) \ - $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) $($@-cflags) \ + $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) $($@-cflags) $(REMOTE_FLAGS) \ -c -o $@ $<,"CC","$(TARGET_DIR)$@") %.o: %.rc $(call quiet-command,$(WINDRES) -I. -o $@ $<,"RC","$(TARGET_DIR)$@")
Signature · 1 line
1.8.3.1
RFC PATCH v3 29/45 multi-process: refractor vl.c code to re-use in remote
In reply to Jagannathan RamanFrom: Elena Ufimtseva <[email protected]>
---
New patch in v3
Makefile.objs | 2 + remote/Makefile.objs | 1 + vl-parse.c | 157 +++++++++++++++++++++++++++++++++++++++++++++++++++ vl.c | 150 +----------------------------------------------- vl.h | 54 ++++++++++++++++++ 5 files changed, 215 insertions(+), 149 deletions(-) create mode 100644 vl-parse.c create mode 100644 vl.h
Makefile.objs +2 -0
@@ -104,6 +104,8 @@ qemu-seccomp.o-libs := $(SECCOMP_LIBS) common-obj-$(CONFIG_FDT) += device_tree.o +common-obj-y += vl-parse.o + ###################################################################### # qapi
remote/Makefile.objs +1 -0
@@ -2,3 +2,4 @@ remote-pci-obj-$(CONFIG_MPQEMU) += remote-main.o remote-pci-obj-$(CONFIG_MPQEMU) += pcihost.o remote-pci-obj-$(CONFIG_MPQEMU) += machine.o remote-pci-obj-$(CONFIG_MPQEMU) += iohub.o +remote-pci-obj-$(CONFIG_MPQEMU) +=../vl-parse.o
vl-parse.c new file +157 -0
157 lines not on this page · raw message
vl.c +1 -149
186 lines not on this page · raw message
vl.h new file +54 -0
54 lines not on this page · raw message
Signature · 1 line
1.8.3.1
RFC PATCH v3 30/45 multi-process: add remote option
In reply to Jagannathan RamanFrom: Elena Ufimtseva <[email protected]>
---
New patch in v3
qemu-options.hx | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
qemu-options.hx +21 -0
@@ -27,6 +27,27 @@ STEXI Display version information and exit ETEXI +DEF("remote", HAS_ARG, QEMU_OPTION_remote, + "-remote socket[,prop[=value][,...]]\n" + " add remote process\n" + " prop=value,... sets driver properties\n" + " use '-remote help' to print all possible properties\n", + QEMU_ARCH_ALL) +STEXI +@table @option +@item rid +@findex -rid +remote id +@item socket +@findex -socket +Remote process socket +@item command +@findex -command +Remote process command. + +@end table +ETEXI + DEF("machine", HAS_ARG, QEMU_OPTION_machine, \ "-machine [type=]name[,prop[=value][,...]]\n" " selects emulated machine ('-machine help' for list)\n"
Signature · 1 line
1.8.3.1
RFC PATCH v3 31/45 multi-process: add remote options parser
In reply to Jagannathan RamanFrom: Elena Ufimtseva <[email protected]>
---
New patch in v3
vl.c | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+)
vl.c +117 -0
@@ -279,6 +279,28 @@ static QemuOptsList qemu_option_rom_opts = { }, }; +static QemuOptsList qemu_remote_opts = { + .name ="remote" , + .head =QTAILQ_HEAD_INITIALIZER (qemu_remote_opts.head), + .desc = { + { + .name ="rid" , + .type =QEMU_OPT_NUMBER , + .help ="id of the remote process" + },{ + .name ="socket" , + .type =QEMU_OPT_NUMBER , + .help ="Socket for remote" , + },{ + .name ="command" , + .type =QEMU_OPT_STRING , + .help ="command to run" , + }, + {/* end of list */ } + }, +}; + +static QemuOptsList qemu_machine_opts = { .name ="machine" , .implied_opt_name ="type" ,
@@ -346,6 +368,87 @@ static QemuOptsList qemu_boot_opts = { }, }; +#if defined(CONFIG_MPQEMU ) +static int device_remote_add (void *opaque,QemuOpts *opts,Error **errp) +{ +unsigned int rid = *(unsigned int *)opaque; +const char *opt_rid =NULL ; +struct remote_process *p =NULL ;; + + opt_rid =qemu_opt_get (opts,"rid" ); +if (!opt_rid) { +return 0 ; + } + + p =get_remote_process_rid (rid); +if (!p) { +return -EINVAL ; + } + +if (atoi (opt_rid) == rid) { +qemu_opt_set (opts,"command" , p->command, errp); +rdevice_init_func (opaque, opts, errp); +qemu_opts_del (opts); + } +return 0 ; +} + +static int parse_remote (void *opaque,QemuOpts *opts,Error **errp) +{ +int rid; +int socket; +char *c_sock; +const char *command =NULL ; +struct remote_process r_proc; + + rid =atoi (qemu_opt_get (opts,"rid" )); +if (rid <0 ) { +error_setg (errp,"rid is required." ); +return -1 ; + } +if (get_remote_process_rid (rid)) { +error_setg (errp,"There is already process with rid %d" , rid); + goto cont_devices; + } + + c_sock = (char *)qemu_opt_get (opts,"socket" ); +if (c_sock) { + socket =atoi (c_sock); + }else { + socket =-1 ; + } + + command =qemu_opt_get (opts,"command" ); + +if (socket <=STDERR_FILENO && socket !=-1 ) { + socket =-1 ; + } + +if (!command && socket <0 ) { +error_setg (errp,"No correct socket or command defined for remote." ); +return -1 ; + } + +if (rid <0 ) { +error_setg (errp,"id option is required and must be non-negative" ); +return -1 ; + } + r_proc.rid = rid; + r_proc.socket = socket; + r_proc.command =g_strdup (command); +remote_process_register (&r_proc); + + cont_devices: +if (qemu_opts_foreach (qemu_find_opts ("device" ), device_remote_add, + &rid,NULL )) { +error_setg (errp,"Could not process some of the remote devices." ); + } + +return 0 ; +} + +#endif +static QemuOptsList qemu_add_fd_opts = { .name ="add-fd" , .head =QTAILQ_HEAD_INITIALIZER (qemu_add_fd_opts.head),
@@ -2861,6 +2964,7 @@ int main(int argc, char **argv, char **envp)qemu_add_opts (&qemu_icount_opts);qemu_add_opts (&qemu_semihosting_config_opts);qemu_add_opts (&qemu_fw_cfg_opts); +qemu_add_opts (&qemu_remote_opts);module_call_init (MODULE_INIT_OPTS );runstate_init ();
@@ -3697,6 +3801,14 @@ int main(int argc, char **argv, char **envp)exit (1 );#endif break ; +case QEMU_OPTION_remote: + opts =qemu_opts_parse_noisily (qemu_find_opts ("remote" ), + optarg, false); +if (!opts) { +exit (1 ); + } +break ; +case QEMU_OPTION_object: opts =qemu_opts_parse_noisily (qemu_find_opts ("object" ), optarg, true);
@@ -4297,6 +4409,11 @@ int main(int argc, char **argv, char **envp)qemu_opts_foreach (qemu_find_opts ("device" ), device_init_func,NULL , &error_fatal); +#ifdef CONFIG_MPQEMU +qemu_opts_foreach (qemu_find_opts ("remote" ), + parse_remote,NULL , &error_fatal); +#endif +cpu_synchronize_all_post_init ();rom_reset_order_override ();
Signature · 1 line
1.8.3.1
RFC PATCH v3 32/45 multi-process: add parse_cmdline in remote process
In reply to Jagannathan RamanFrom: Elena Ufimtseva <[email protected]>
---
New patch in v3
remote/Makefile.objs | 1 + remote/remote-main.c | 11 +++++ remote/remote-opts.c | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++ remote/remote-opts.h | 31 ++++++++++++++ 4 files changed, 156 insertions(+) create mode 100644 remote/remote-opts.c create mode 100644 remote/remote-opts.h
remote/Makefile.objs +1 -0
@@ -1,4 +1,5 @@ remote-pci-obj-$(CONFIG_MPQEMU) += remote-main.o +remote-pci-obj-$(CONFIG_MPQEMU) += remote-opts.o remote-pci-obj-$(CONFIG_MPQEMU) += pcihost.o remote-pci-obj-$(CONFIG_MPQEMU) += machine.o remote-pci-obj-$(CONFIG_MPQEMU) += iohub.o
remote/remote-main.c +11 -0
@@ -64,6 +64,7 @@#include "qapi/qmp/qlist.h" #include "qemu/log.h" #include "qemu/cutils.h" +#include "remote-opts.h" static ProxyLinkState *proxy_link;PCIDevice *remote_pci_dev;
@@ -468,6 +469,13 @@ int main(int argc, char *argv[]) current_machine =MACHINE (REMOTE_MACHINE (object_new (TYPE_REMOTE_MACHINE ))); +qemu_add_opts (&qemu_device_opts); +qemu_add_opts (&qemu_drive_opts); +qemu_add_drive_opts (&qemu_legacy_drive_opts); +qemu_add_drive_opts (&qemu_common_drive_opts); +qemu_add_drive_opts (&qemu_drive_opts); +qemu_add_drive_opts (&bdrv_runtime_opts); + proxy_link =proxy_link_create ();if (!proxy_link) {printf ("Could not create proxy link\n" );
@@ -481,6 +489,9 @@ int main(int argc, char *argv[]) }proxy_link_init_channel (proxy_link, &proxy_link->com, fd); + +parse_cmdline (argc -2 , argv +2 ,NULL ); +proxy_link_set_callback (proxy_link, process_msg);start_handler (proxy_link);
remote/remote-opts.c new file +113 -0
113 lines not on this page · raw message
remote/remote-opts.h new file +31 -0
@@ -0,0 +1,31 @@ +/* +* Remote device initialization +* +* Copyright 2019, Oracle and/or its affiliates. +* +* 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_OPTS_H +#define REMOTE_OPTS_H + +void parse_cmdline (int argc,char **argv,char **envp); + +#endif +
Signature · 1 line
1.8.3.1
RFC PATCH v3 33/45 multi-process: add support for multiple devices
In reply to Jagannathan RamanFrom: Elena Ufimtseva <[email protected]>
Add suport for multiple devices in one remote process.
---
New patch in v3
remote/remote-main.c | 140 ++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 115 insertions(+), 25 deletions(-)
remote/remote-main.c +115 -25
@@ -67,19 +67,83 @@#include "remote-opts.h" static ProxyLinkState *proxy_link; -PCIDevice *remote_pci_dev; -bool create_done; -static void process_config_write (ProcMsg *msg) +typedef struct remote_pci_devs { +char *id; +DeviceState *ds; +unsigned int created; +QLIST_ENTRY (remote_pci_devs) next; +}remote_pci_devs ; +typedef struct pci_devs_listhead pci_devs_listhead ; + +QLIST_HEAD(pci_devs_listhead, remote_pci_devs) pci_devs_head; +/* This is needed to distinguish between different devices being initialized. */ + +QemuMutex remote_ds_lock; +static bool done_init; + + +static remote_pci_devs *get_ds_from_list (const char *id,unsigned int size_id) +{ +remote_pci_devs *d; + +qemu_mutex_lock (&remote_ds_lock); + QLIST_FOREACH(d, &pci_devs_head, next) { +if (id && d->id) { +if (strncmp (id, d->id, size_id) ==0 ) { +qemu_mutex_unlock (&remote_ds_lock); +return d; + } + } + } +qemu_mutex_unlock (&remote_ds_lock); + +return NULL ; +} + +static void add_to_pci_devs_list (DeviceState *dev) +{ +remote_pci_devs *d; + +if (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE )) { + d =g_malloc (sizeof (remote_pci_devs)); + d->ds = dev; + d->id =g_strdup (dev->id); +if (!d->id) { +return ; + } +qemu_mutex_lock (&remote_ds_lock); +QLIST_INSERT_HEAD (&pci_devs_head, d, next); +qemu_mutex_unlock (&remote_ds_lock); + + } +} + +static void del_from_pci_devs_list (const char *id) +{ +remote_pci_devs *d; + + d =get_ds_from_list ((char *)id,strlen ((char *)id)); +if (!d) { +return ; + } +g_free (d->id); +qemu_mutex_lock (&remote_ds_lock); +QLIST_REMOVE (d, next); +qemu_mutex_unlock (&remote_ds_lock); +g_free (d); +} + +static void process_config_write (ProcMsg *msg,DeviceState *ds) {struct conf_data_msg *conf = (struct conf_data_msg *)msg->data2;qemu_mutex_lock_iothread (); -pci_default_write_config (remote_pci_dev, conf->addr, conf->val, conf->l); +pci_default_write_config (PCI_DEVICE (ds), conf->addr, conf->val, conf->l);qemu_mutex_unlock_iothread (); } -static void process_config_read (ProcMsg *msg) +static void process_config_read (ProcMsg *msg,DeviceState *ds) {struct conf_data_msg *conf = (struct conf_data_msg *)msg->data2;uint32_t val;
@@ -88,7 +152,7 @@ static void process_config_read(ProcMsg *msg) wait = msg->fds[0 ];qemu_mutex_lock_iothread (); - val =pci_default_read_config (remote_pci_dev, conf->addr, conf->l); + val =pci_default_read_config (PCI_DEVICE (ds), conf->addr, conf->l);qemu_mutex_unlock_iothread ();notify_proxy (wait, val);
@@ -233,6 +297,8 @@ fail:notify_proxy (wait,1 );PUT_REMOTE_WAIT (wait); + +del_from_pci_devs_list ((const char *)msg->id); }static int init_drive (QDict *rqdict,Error **errp)
@@ -313,7 +379,7 @@ static int setup_device(ProcMsg *msg, Error **errp) qstr =qstring_from_str ((char *)msg->data2); obj =qobject_from_json (qstring_get_str (qstr), &local_error);if (!obj) { -error_setg (errp,"Could not get object!" ); +error_setg (errp,"Could not get object" );return rc; }
@@ -338,13 +404,12 @@ static int setup_device(ProcMsg *msg, Error **errp) dev =qdev_device_add (opts, &local_error);if (!dev) { -error_setg (errp,"Could not add device %s." , +error_setg (errp,"Could not add device %s" ,qstring_get_str (qobject_to_json (QOBJECT (qdict))));return rc; } -if (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE )) { - remote_pci_dev =PCI_DEVICE (dev); - } + +add_to_pci_devs_list (dev);qemu_opts_del (opts);return 0 ;
@@ -354,10 +419,13 @@ static void process_msg(GIOCondition cond, ProcChannel *chan) {ProcMsg *msg =NULL ;Error *err =NULL ; +remote_pci_devs *r =NULL ;if ((cond &G_IO_HUP ) || (cond &G_IO_ERR )) {error_setg (&err,"socket closed, cond is %d" , cond); - goto finalize_loop; +proxy_link_finalize (proxy_link); + proxy_link =NULL ; +return ; } msg =g_malloc0 (sizeof (ProcMsg));
@@ -367,23 +435,32 @@ static void process_msg(GIOCondition cond, ProcChannel *chan) goto finalize_loop; } +if (msg->cmd !=DEV_OPTS && msg->cmd !=DRIVE_OPTS && + msg->cmd !=SYNC_SYSMEM ) { + r =get_ds_from_list ((const char *)msg->id, msg->size_id); +if (!r) { +error_setg (&err,"Message was received for unknown device" ); + goto exit_loop; + } + } +switch (msg->cmd) {case INIT :break ;case CONF_WRITE : -if (create_done) { -process_config_write (msg); +if (r->created) { +process_config_write (msg, r->ds); }break ;case CONF_READ : -if (create_done) { -process_config_read (msg); +if (r->created) { +process_config_read (msg, r->ds); }break ;case BAR_WRITE : -if (create_done) { +if (r->created) {process_bar_write (msg, &err);if (err) {error_report_err (err);
@@ -391,7 +468,7 @@ static void process_msg(GIOCondition cond, ProcChannel *chan) }break ;case BAR_READ : -if (create_done) { +if (r->created) {process_bar_read (msg, &err);if (err) {error_report_err (err);
@@ -410,12 +487,15 @@ static void process_msg(GIOCondition cond, ProcChannel *chan) }break ;case SET_IRQFD : -process_set_irqfd_msg (remote_pci_dev, msg); -qdev_machine_creation_done (); -qemu_mutex_lock_iothread (); -qemu_run_machine_init_done_notifiers (); -qemu_mutex_unlock_iothread (); - create_done = true; +process_set_irqfd_msg (PCI_DEVICE (r->ds), msg); + r->created = true; +if (!done_init) { +qdev_machine_creation_done (); +qemu_mutex_lock_iothread (); +qemu_run_machine_init_done_notifiers (); +qemu_mutex_unlock_iothread (); + done_init = true; + }break ;case DRIVE_OPTS :if (setup_drive (msg, &err)) {
@@ -438,18 +518,26 @@ static void process_msg(GIOCondition cond, ProcChannel *chan) goto finalize_loop; } +exit_loop: +if (msg->id) { +free (msg->id); + }g_free (msg);return ; finalize_loop:error_report_err (err); +if (msg->id) { +free (msg->id); + }g_free (msg); +proxy_link_finalize (proxy_link); proxy_link =NULL ; } -int main (int argc,char *argv[]) +int main (int argc,char *argv[],char **envp) {Error *err =NULL ;int fd =-1 ;
@@ -491,6 +579,8 @@ int main(int argc, char *argv[])proxy_link_init_channel (proxy_link, &proxy_link->com, fd);parse_cmdline (argc -2 , argv +2 ,NULL ); +qemu_mutex_init (&remote_ds_lock); +QLIST_INIT (&pci_devs_head);proxy_link_set_callback (proxy_link, process_msg);
Signature · 1 line
1.8.3.1
RFC PATCH v3 34/45 multi-process: add heartbeat timer and signal handler
In reply to Jagannathan RamanFrom: Elena Ufimtseva <[email protected]>
Add a signal handler for launched remote processes and set up the heartbeat timer for remote processes.
--- hw/proxy/qemu-proxy.c | 101 ++++++++++++++++++++++++++++++++++++++++++++++++ include/io/proxy-link.h | 1 + 2 files changed, 102 insertions(+)
hw/proxy/qemu-proxy.c +101 -0
@@ -53,14 +53,96 @@#include "hw/boards.h" #include "include/qemu/log.h" +QEMUTimer *hb_timer;static void pci_proxy_dev_realize (PCIDevice *dev,Error **errp);static void setup_irqfd (PCIProxyDev *dev); +static void pci_dev_exit (PCIDevice *dev); +static void start_heartbeat_timer (void ); +static void stop_heartbeat_timer (void ); +static void childsig_handler (int sig,siginfo_t *siginfo,void *ctx); +static void broadcast_msg (ProcMsg *msg,bool need_reply); + +static void childsig_handler (int sig,siginfo_t *siginfo,void *ctx) +{ +/* TODO: Add proper handler. */ +printf ("Child (pid %d) is dead? Signal is %d, Exit code is %d.\n" , + siginfo->si_pid, siginfo->si_signo, siginfo->si_code); +} + +static void broadcast_msg (ProcMsg *msg,bool need_reply) +{ +PCIProxyDev *entry; +unsigned int pid; +int wait; + + QLIST_FOREACH(entry, &proxy_dev_list.devices, next) { +if (need_reply) { + wait =GET_REMOTE_WAIT ; + msg->num_fds =1 ; + msg->fds[0 ] = wait; + } + +proxy_proc_send (entry->proxy_link, msg, entry->proxy_link->com); +if (need_reply) { + pid = (uint32_t )wait_for_remote (wait); +PUT_REMOTE_WAIT (wait); +/* TODO: Add proper handling. */ +if (pid) { + need_reply =0 ; + } + } + } +} + +#define NOP_INTERVAL 1000000 + +static void remote_ping (void *opaque) +{ +ProcMsg msg; + +memset (&msg,0 ,sizeof (ProcMsg)); + + msg.num_fds =0 ; + msg.cmd =PROXY_PING ; + msg.bytestream =0 ; + msg.size =0 ; + +broadcast_msg (&msg, true); +timer_mod (hb_timer,qemu_clock_get_ms (QEMU_CLOCK_VIRTUAL ) +NOP_INTERVAL ); + +} + +void start_heartbeat_timer (void ) +{ + hb_timer =timer_new_ms (QEMU_CLOCK_VIRTUAL , + remote_ping, + &proxy_dev_list); +timer_mod (hb_timer,qemu_clock_get_ms (QEMU_CLOCK_VIRTUAL ) +NOP_INTERVAL ); + +} + +static void stop_heartbeat_timer (void ) +{ +timer_del (hb_timer); +timer_free (hb_timer); +} + +static void set_sigchld_handler (void ) +{ +struct sigaction sa_sigterm; +memset (&sa_sigterm,0 ,sizeof (sa_sigterm)); + sa_sigterm.sa_sigaction = childsig_handler; + sa_sigterm.sa_flags =SA_SIGINFO |SA_NOCLDWAIT |SA_NOCLDSTOP ; +sigaction (SIGCHLD , &sa_sigterm,NULL ); +}static void proxy_ready (PCIDevice *dev) {PCIProxyDev *pdev =PCI_PROXY_DEV (dev);setup_irqfd (pdev); +set_sigchld_handler (); +start_heartbeat_timer (); }static void set_remote_opts (PCIDevice *dev,QDict *qdict,unsigned int cmd)
@@ -272,6 +354,7 @@ static void pci_proxy_dev_class_init(ObjectClass *klass, void *data)PCIDeviceClass *k =PCI_DEVICE_CLASS (klass); k->realize = pci_proxy_dev_realize; + k->exit = pci_dev_exit; k->config_read = pci_proxy_read_config; k->config_write = pci_proxy_write_config; }
@@ -408,6 +491,24 @@ static void pci_proxy_dev_realize(PCIDevice *device, Error **errp) dev->proxy_ready = proxy_ready; } +static void pci_dev_exit (PCIDevice *pdev) +{ +PCIProxyDev *entry, *sentry; +PCIProxyDev *dev =PCI_PROXY_DEV (pdev); + +stop_heartbeat_timer (); + + QLIST_FOREACH_SAFE(entry, &proxy_dev_list.devices, next, sentry) { +if (entry->remote_pid == dev->remote_pid) { +QLIST_REMOVE (entry, next); + } + } + +if (!QLIST_EMPTY (&proxy_dev_list.devices)) { +start_heartbeat_timer (); + } +} +static void send_bar_access_msg (PCIProxyDev *dev,MemoryRegion *mr,bool write,hwaddr addr,uint64_t *val,unsigned size,bool memory)
include/io/proxy-link.h +1 -0
@@ -74,6 +74,7 @@ typedef enum {DRIVE_OPTS ,DEVICE_ADD ,DEVICE_DEL , +PROXY_PING ,MAX , } proc_cmd_t;
Signature · 1 line
1.8.3.1
RFC PATCH v3 35/45 multi-process: handle heartbeat messages in remote process
In reply to Jagannathan RamanFrom: Elena Ufimtseva <[email protected]>
and reply back to proxy object.
--- remote/remote-main.c | 6 ++++++ 1 file changed, 6 insertions(+)
remote/remote-main.c +6 -0
@@ -420,6 +420,7 @@ static void process_msg(GIOCondition cond, ProcChannel *chan)ProcMsg *msg =NULL ;Error *err =NULL ;remote_pci_devs *r =NULL ; +int wait;if ((cond &G_IO_HUP ) || (cond &G_IO_ERR )) {error_setg (&err,"socket closed, cond is %d" , cond);
@@ -513,6 +514,11 @@ static void process_msg(GIOCondition cond, ProcChannel *chan)case DEVICE_DEL :process_device_del_msg (msg);break ; +case PROXY_PING : + wait = msg->fds[0 ]; +notify_proxy (wait, (uint32_t )getpid ()); +PUT_REMOTE_WAIT (wait); +break ;default :error_setg (&err,"Unknown command" ); goto finalize_loop;
Signature · 1 line
1.8.3.1
RFC PATCH v3 36/45 multi-process: Use separate MMIO communication channel
In reply to Jagannathan RamanUsing a separate communication channel for MMIO helps with improving Performance
---
New patch in v3
hw/proxy/qemu-proxy.c | 38 ++++++++++++++++++++++++++------------ include/hw/proxy/qemu-proxy.h | 1 + include/io/proxy-link.h | 7 +++++++ io/proxy-link.c | 2 ++ qdev-monitor.c | 1 + remote/remote-main.c | 20 ++++++++++++++------ 6 files changed, 51 insertions(+), 18 deletions(-)
hw/proxy/qemu-proxy.c +26 -12
@@ -205,20 +205,22 @@ static int make_argv(char *command_str, char **argv, int argc)int remote_spawn (PCIProxyDev *pdev,const char *command,Error **errp) {pid_t rpid; -int fd[2 ] = {-1 ,-1 }; +int fd[2 ], mmio[2 ];Error *local_error =NULL ;char *argv[64 ];int argc =0 , _argc;char *sfd;char *exec_dir;int rc = -EINVAL ; +struct timeval timeout = {.tv_sec =10 , .tv_usec =0 };if (pdev->managed) {/* Child is forked by external program (such as libvirt). */ return rc; } -if (socketpair (AF_UNIX ,SOCK_STREAM ,0 , fd)) { +if (socketpair (AF_UNIX ,SOCK_STREAM ,0 , fd) || +socketpair (AF_UNIX ,SOCK_STREAM ,0 , mmio)) {error_setg (errp,"Unable to create unix socket." );return rc; }
@@ -226,6 +228,8 @@ int remote_spawn(PCIProxyDev *pdev, const char *command, Error **errp) argc =add_argv (exec_dir, argv, argc); sfd =g_strdup_printf ("%d" , fd[1 ]); argc =add_argv (sfd, argv, argc); + sfd =g_strdup_printf ("%d" , mmio[1 ]); + argc =add_argv (sfd, argv, argc); _argc = argc; argc =make_argv ((char *)command, argv, argc);
@@ -235,22 +239,32 @@ int remote_spawn(PCIProxyDev *pdev, const char *command, Error **errp)if (rpid ==-1 ) {error_setg (errp,"Unable to spawn emulation program." );close (fd[0 ]); +close (mmio[0 ]); goto fail; }if (rpid ==0 ) {close (fd[0 ]); +close (mmio[0 ]);execvp (argv[0 ], (char *const *)argv);exit (1 ); } pdev->remote_pid = rpid; pdev->rsocket = fd[1 ]; pdev->socket = fd[0 ]; + pdev->mmio_sock = mmio[0 ]; + +if (setsockopt (mmio[0 ],SOL_SOCKET ,SO_RCVTIMEO , (char *)&timeout, +sizeof (timeout)) <0 ) { +error_setg (errp,"Unable to set timeout for socket" ); + goto fail; + } rc =0 ; fail:close (fd[1 ]); +close (mmio[1 ]);for (int i =0 ; i < _argc; i++) {g_free (argv[i]);
@@ -466,6 +480,9 @@ static void init_proxy(PCIDevice *dev, char *command, bool need_spawn, Error **eproxy_link_init_channel (pdev->proxy_link, &pdev->proxy_link->com, pdev->socket); +proxy_link_init_channel (pdev->proxy_link, &pdev->proxy_link->mmio, + pdev->mmio_sock); +configure_memory_sync (pdev->sync, pdev->proxy_link); }
@@ -514,8 +531,7 @@ static void send_bar_access_msg(PCIProxyDev *dev, MemoryRegion *mr, unsigned size, bool memory) {ProxyLinkState *proxy_link; -ProcMsg msg; -int wait; +ProcMsg msg, ret; proxy_link = dev->proxy_link;
@@ -531,11 +547,7 @@ static void send_bar_access_msg(PCIProxyDev *dev, MemoryRegion *mr, msg.cmd =BAR_WRITE ; msg.data1.bar_access.val = *val; }else { - wait =GET_REMOTE_WAIT ; - msg.cmd =BAR_READ ; - msg.num_fds =1 ; - msg.fds[0 ] = wait; }if (dev->dev_id) {
@@ -546,17 +558,19 @@ static void send_bar_access_msg(PCIProxyDev *dev, MemoryRegion *mr, msg.size_id =0 ; } -proxy_proc_send (proxy_link, &msg, proxy_link->com); +proxy_proc_send (proxy_link, &msg, proxy_link->mmio); -if (!write) { - *val =wait_for_remote (wait); -PUT_REMOTE_WAIT (wait); +if (write) { +return ; }if (msg.id) {free (msg.id); } +proxy_proc_recv (proxy_link, &ret, proxy_link->mmio); + + *val = ret.data1.mmio_ret.val; } void proxy_default_bar_write(PCIProxyDev *dev, MemoryRegion *mr, hwaddr addr,
include/hw/proxy/qemu-proxy.h +1 -0
@@ -59,6 +59,7 @@ typedef struct PCIProxyDev {pid_t remote_pid;int rsocket;int socket; +int mmio_sock;char *rid;
include/io/proxy-link.h +7 -0
@@ -75,6 +75,7 @@ typedef enum {DEVICE_ADD ,DEVICE_DEL ,PROXY_PING , +MMIO_RETURN ,MAX , } proc_cmd_t;
@@ -108,6 +109,10 @@ typedef struct { } set_irqfd_msg_t;typedef struct { +uint64_t val; +}mmio_ret_msg_t ; + +typedef struct { proc_cmd_t cmd; int bytestream; size_t size;
@@ -118,6 +123,7 @@ typedef struct {sync_sysmem_msg_t sync_sysmem;bar_access_msg_t bar_access;set_irqfd_msg_t set_irqfd; +mmio_ret_msg_t mmio_ret; } data1;int fds[REMOTE_MAX_FDS ];
@@ -170,6 +176,7 @@ struct ProxyLinkState {GMainLoop *loop;ProcChannel *com; +ProcChannel *mmio;proxy_link_callback callback; };
io/proxy-link.c +2 -0
@@ -74,6 +74,7 @@ void proxy_link_finalize(ProxyLinkState *s)g_main_loop_quit (s->loop);proxy_link_destroy_channel (s->com); +proxy_link_destroy_channel (s->mmio);object_unref (OBJECT (s)); }
@@ -356,6 +357,7 @@ void start_handler(ProxyLinkState *s) {g_assert (g_source_attach (&s->com->gsrc, s->ctx)); +g_assert (g_source_attach (&s->mmio->gsrc, s->ctx));g_main_loop_run (s->loop); }
qdev-monitor.c +1 -0
@@ -710,6 +710,7 @@ DeviceState *qdev_proxy_add(const char *rid, const char *id, char *bus,if (old_pdev) { pdev->rsocket = old_pdev->rsocket; pdev->socket = old_pdev->socket; + pdev->mmio_sock = old_pdev->mmio_sock; pdev->remote_pid = old_pdev->remote_pid; }else { pdev->rsocket = managed ? rsocket :-1 ;
remote/remote-main.c +14 -6
@@ -180,8 +180,8 @@ static void process_bar_write(ProcMsg *msg, Error **errp)static void process_bar_read (ProcMsg *msg,Error **errp) {bar_access_msg_t *bar_access = &msg->data1.bar_access; +ProcMsg ret = {0 };AddressSpace *as; -int wait = msg->fds[0 ];MemTxResult res;uint64_t val =0 ;
@@ -215,9 +215,10 @@ static void process_bar_read(ProcMsg *msg, Error **errp) } fail: -notify_proxy (wait, val); - -PUT_REMOTE_WAIT (wait); + ret.cmd =MMIO_RETURN ; + ret.data1.mmio_ret.val = val; + ret.size =sizeof (ret.data1); +proxy_proc_send (proxy_link, &ret, proxy_link->mmio); }static void process_device_add_msg (ProcMsg *msg)
@@ -581,10 +582,17 @@ int main(int argc, char *argv[], char **envp)printf ("Failed to parse fd for remote process.\n" );return -EINVAL ; } -proxy_link_init_channel (proxy_link, &proxy_link->com, fd); -parse_cmdline (argc -2 , argv +2 ,NULL ); + fd =qemu_parse_fd (argv[2 ]); +if (fd ==-1 ) { +printf ("Failed to parse fd for remote process.\n" ); +return -EINVAL ; + } +proxy_link_init_channel (proxy_link, &proxy_link->mmio, fd); + +parse_cmdline (argc -3 , argv +3 ,NULL ); +qemu_mutex_init (&remote_ds_lock);QLIST_INIT (&pci_devs_head);
Signature · 1 line
1.8.3.1
RFC PATCH v3 37/45 multi-process: perform device reset in the remote process
In reply to Jagannathan RamanPerform device reset in the remote process when QEMU performs device reset. This is required to reset the internal state (like registers, etc...) of emulated devices
---
New patch in v3
hw/proxy/proxy-lsi53c895a.c | 6 ++++++ hw/proxy/qemu-proxy.c | 14 ++++++++++++++ include/hw/proxy/qemu-proxy.h | 2 ++ include/io/proxy-link.h | 1 + remote/remote-main.c | 11 +++++++++++ 5 files changed, 34 insertions(+)
hw/proxy/proxy-lsi53c895a.c +6 -0
@@ -128,6 +128,11 @@ static void proxy_lsi_realize(PCIProxyDev *dev, Error **errp)pci_register_bar (pci_dev,2 ,PCI_BASE_ADDRESS_SPACE_MEMORY , &s->ram_io); } +static void proxy_lsi_reset (DeviceState *dev) +{ +proxy_device_reset (dev); +} +static void proxy_lsi_class_init (ObjectClass *klass,void *data) {DeviceClass *dc =DEVICE_CLASS (klass);
@@ -145,6 +150,7 @@ static void proxy_lsi_class_init(ObjectClass *klass, void *data)set_bit (DEVICE_CATEGORY_STORAGE , dc->categories); dc->desc ="LSI Proxy Device" ; + dc->reset = proxy_lsi_reset; }static const TypeInfo lsi_proxy_dev_type_info = {
hw/proxy/qemu-proxy.c +14 -0
@@ -588,3 +588,17 @@ uint64_t proxy_default_bar_read(PCIProxyDev *dev, MemoryRegion *mr, hwaddr addr,return val; } + +void proxy_device_reset (DeviceState *dev) +{ +PCIProxyDev *pdev =PCI_PROXY_DEV (dev); +ProcMsg msg; + +memset (&msg,0 ,sizeof (ProcMsg)); + + msg.bytestream =0 ; + msg.size =sizeof (msg.data1); + msg.cmd =DEVICE_RESET ; + +proxy_proc_send (pdev->proxy_link, &msg, pdev->proxy_link->com); +}
include/hw/proxy/qemu-proxy.h +2 -0
@@ -100,4 +100,6 @@ void proxy_default_bar_write(PCIProxyDev *dev, MemoryRegion *mr, hwaddr addr,uint64_t proxy_default_bar_read (PCIProxyDev *dev,MemoryRegion *mr,hwaddr addr,unsigned size,bool memory); +void proxy_device_reset (DeviceState *dev); +#endif /* QEMU_PROXY_H */
include/io/proxy-link.h +1 -0
@@ -76,6 +76,7 @@ typedef enum {DEVICE_DEL ,PROXY_PING ,MMIO_RETURN , +DEVICE_RESET ,MAX , } proc_cmd_t;
remote/remote-main.c +11 -0
@@ -66,6 +66,9 @@#include "qemu/cutils.h" #include "remote-opts.h" +#include "monitor/monitor.h" +#include "sysemu/reset.h" +static ProxyLinkState *proxy_link; typedef struct remote_pci_devs {
@@ -302,6 +305,11 @@ fail:del_from_pci_devs_list ((const char *)msg->id); } +static void process_device_reset_msg (ProcMsg *msg) +{ +qemu_devices_reset (); +} +static int init_drive (QDict *rqdict,Error **errp) {QemuOpts *opts;
@@ -520,6 +528,9 @@ static void process_msg(GIOCondition cond, ProcChannel *chan)notify_proxy (wait, (uint32_t )getpid ());PUT_REMOTE_WAIT (wait);break ; +case DEVICE_RESET : +process_device_reset_msg (msg); +break ;default :error_setg (&err,"Unknown command" ); goto finalize_loop;
Signature · 1 line
1.8.3.1
RFC PATCH v3 38/45 multi-process/mon: stub functions to enable QMP module for remote process
In reply to Jagannathan RamanQMP module doesn't need some functions to run independently on the remote processes. However, these functions are necessary for compilation. Therefore, these functions are stub'ed out. The stub functions raise an assert if QEMU is built in debug mode (--enable-debug).
---
New patch in v3
accel/stubs/tcg-stub.c | 10 +++ configure | 4 ++ include/qemu-common.h | 8 +++ stubs/gdbstub.c | 21 +++++++ stubs/migration.c | 162 +++++++++++++++++++++++++++++++++++++++++++++++++ stubs/monitor.c | 32 ++++++++++ stubs/net-stub.c | 69 +++++++++++++++++++++ stubs/qapi-misc.c | 41 +++++++++++++ stubs/qapi-target.c | 49 +++++++++++++++ stubs/ui-stub.c | 130 +++++++++++++++++++++++++++++++++++++++ stubs/vl-stub.c | 92 ++++++++++++++++++++++++++++ 11 files changed, 618 insertions(+) create mode 100644 stubs/migration.c create mode 100644 stubs/qapi-misc.c create mode 100644 stubs/qapi-target.c create mode 100644 stubs/ui-stub.c
accel/stubs/tcg-stub.c +10 -0
@@ -109,3 +109,13 @@ page_collection_lock(tb_page_addr_t start, tb_page_addr_t end)void page_collection_unlock (struct page_collection *set) { } + +void dump_exec_info (void ) +{ +qemu_debug_assert (0 ); +} + +void dump_opcount_info (void ) +{ +qemu_debug_assert (0 ); +}
configure +4 -0
@@ -7290,6 +7290,10 @@ if test "$mpqemu" = "yes" ; then echo "CONFIG_MPQEMU=y" >> $config_host_mak fi +if test "$debug" = "yes" ; then + echo "CONFIG_DEBUG=y" >> $config_host_mak +fi + if test "$bochs" = "yes" ; then echo "CONFIG_BOCHS=y" >> $config_host_mak fi
include/qemu-common.h +8 -0
@@ -10,6 +10,8 @@#ifndef QEMU_COMMON_H #define QEMU_COMMON_H +#include <assert.h> +#define TFR (expr) do { if ((expr) != -1) break; } while (errno == EINTR)/* Copyright string for -version arguments, About dialogs, etc */
@@ -130,4 +132,10 @@ void page_size_init(void);* returned. */ bool dump_in_progress (void ); +#ifdef CONFIG_DEBUG +#define qemu_debug_assert (x) assert(x) +#else +#define qemu_debug_assert (x) +#endif +#endif
stubs/gdbstub.c +21 -0
@@ -1,6 +1,27 @@#include "qemu/osdep.h" +#include "qemu-common.h" #include "exec/gdbstub.h" /* xml_builtin */ const char *const xml_builtin[][2 ] = { {NULL ,NULL } }; + +#ifdef CONFIG_USER_ONLY + +int gdbserver_start (int port) +{ +qemu_debug_assert (0 ); + +return -ENOSYS ; +} + +#else + +int gdbserver_start (const char *device) +{ +qemu_debug_assert (0 ); + +return -ENOSYS ; +} + +#endif
stubs/migration.c new file +162 -0
162 lines not on this page · raw message
stubs/monitor.c +32 -0
@@ -1,4 +1,5 @@#include "qemu/osdep.h" +#include "qemu-common.h" #include "qapi/error.h" #include "qapi/qapi-emit-events.h" #include "monitor/monitor.h"
@@ -8,16 +9,37 @@#include "qapi/qapi-commands-qdev.h" #include "hw/qdev-core.h" #include "sysemu/sysemu.h" +#include "monitor/qdev.h" +#include "sysemu/blockdev.h" +#include "sysemu/sysemu.h" +#include "monitor/hmp.h" + +#include "qapi/qapi-types-block-core.h" +#include "qapi/qapi-commands-block-core.h" + +#pragma weak cur_mon +#pragma weak monitor_vprintf +#pragma weak monitor_get_fd +#pragma weak monitor_init +#pragma weak qapi_event_emit +#pragma weak monitor_get_cpu_index +#pragma weak monitor_printf +#pragma weak monitor_cur_is_qmp +#pragma weak qmp_device_list_properties +#pragma weak monitor_init_qmp +#pragma weak monitor_init_hmp __threadMonitor *cur_mon;int monitor_vprintf (Monitor *mon,const char *fmt,va_list ap) { +qemu_debug_assert (0 );abort (); }int monitor_get_fd (Monitor *mon,const char *name,Error **errp) { +qemu_debug_assert (0 );error_setg (errp,"only QEMU supports file descriptor passing" );return -1 ; }
@@ -28,29 +50,39 @@ void monitor_init_qmp(Chardev *chr, bool pretty)void monitor_init_hmp (Chardev *chr,bool use_readline) { +qemu_debug_assert (0 ); }void qapi_event_emit (QAPIEvent event,QDict *qdict) { +qemu_debug_assert (0 ); }int monitor_get_cpu_index (void ) { +qemu_debug_assert (0 ); +return -ENOSYS ; }int monitor_printf (Monitor *mon,const char *fmt, ...) { +qemu_debug_assert (0 ); +return -ENOSYS ; }bool monitor_cur_is_qmp (void ) { +qemu_debug_assert (0 ); +return false; }ObjectPropertyInfoList *qmp_device_list_properties (const char *typename,Error **errp) { +qemu_debug_assert (0 ); +return NULL ; }
stubs/net-stub.c +69 -0
78 lines not on this page · raw message
stubs/qapi-misc.c new file +41 -0
41 lines not on this page · raw message
stubs/qapi-target.c new file +49 -0
49 lines not on this page · raw message
stubs/ui-stub.c new file +130 -0
130 lines not on this page · raw message
stubs/vl-stub.c +92 -0
113 lines not on this page · raw message
Signature · 1 line
1.8.3.1
RFC PATCH v3 39/45 multi-process/mon: build system for QMP module in remote process
In reply to Jagannathan RamanMakefile changes necessary to compile QMP module for the remote process
---
New patch in v3
Makefile.objs | 7 +++++++ Makefile.target | 20 +++++++++++++++++++- hw/core/Makefile.objs | 1 + monitor/Makefile.objs | 3 +++ qapi/Makefile.objs | 2 ++ qom/Makefile.objs | 1 + ui/Makefile.objs | 2 ++ 7 files changed, 35 insertions(+), 1 deletion(-)
Makefile.objs +7 -0
@@ -30,6 +30,7 @@ remote-pci-obj-$(CONFIG_MPQEMU) += backends/ remote-pci-obj-$(CONFIG_MPQEMU) += block/ remote-pci-obj-$(CONFIG_MPQEMU) += migration/ remote-pci-obj-$(CONFIG_MPQEMU) += remote/ +remote-pci-obj-$(CONFIG_MPQEMU) += monitor/ remote-pci-obj-$(CONFIG_MPQEMU) += cpus-common.o remote-pci-obj-$(CONFIG_MPQEMU) += dma-helpers.o
@@ -42,6 +43,7 @@ remote-pci-obj-$(CONFIG_MPQEMU) += iothread.o # remote-lsi-obj-y is code used to implement remote LSI device remote-lsi-obj-$(CONFIG_MPQEMU) += hw/ +remote-lsi-obj-$(CONFIG_MPQEMU) += ui/ ####################################################################### # crypto-obj-y is code used by both qemu system emulation and qemu-img
@@ -112,6 +114,11 @@ common-obj-y += vl-parse.o common-obj-y += qapi/ endif +remote-pci-obj-$(CONFIG_MPQEMU) += qapi/ +remote-pci-obj-$(CONFIG_MPQEMU) += blockdev-nbd.o +remote-pci-obj-$(CONFIG_MPQEMU) += job-qmp.o +remote-pci-obj-$(CONFIG_MPQEMU) += balloon.o + ####################################################################### # Target-independent parts used in system and user emulation common-obj-y += cpus-common.o
Makefile.target +19 -1
@@ -135,11 +135,29 @@ remote-pci-tgt-obj-$(CONFIG_MPQEMU) += accel/stubs/hax-stub.o remote-pci-tgt-obj-$(CONFIG_MPQEMU) += accel/stubs/whpx-stub.o remote-pci-tgt-obj-$(CONFIG_MPQEMU) += stubs/vl-stub.o remote-pci-tgt-obj-$(CONFIG_MPQEMU) += stubs/net-stub.o -remote-pci-tgt-obj-$(CONFIG_MPQEMU) += stubs/monitor.o remote-pci-tgt-obj-$(CONFIG_MPQEMU) += stubs/replay.o remote-pci-tgt-obj-$(CONFIG_MPQEMU) += stubs/xen-mapcache.o +remote-pci-tgt-obj-$(CONFIG_MPQEMU) += stubs/migration.o +remote-pci-tgt-obj-$(CONFIG_MPQEMU) += stubs/ui-stub.o +remote-pci-tgt-obj-$(CONFIG_MPQEMU) += stubs/gdbstub.o +remote-pci-tgt-obj-$(CONFIG_MPQEMU) += stubs/qapi-target.o +remote-pci-tgt-obj-$(CONFIG_MPQEMU) += stubs/qapi-misc.o remote-pci-tgt-obj-$(CONFIG_MPQEMU) += remote/memory.o +remote-pci-tgt-obj-$(CONFIG_MPQEMU) += arch_init.o +remote-pci-tgt-obj-$(CONFIG_MPQEMU) += monitor/misc.o + +remote-pci-tgt-obj-$(CONFIG_MPQEMU) += qapi/qapi-introspect.o +remote-pci-tgt-obj-$(CONFIG_MPQEMU) += qapi/qapi-commands-block-core.o +remote-pci-tgt-obj-$(CONFIG_MPQEMU) += qapi/qapi-commands-block.o +remote-pci-tgt-obj-$(CONFIG_MPQEMU) += qapi/qapi-commands-misc.o +remote-pci-tgt-obj-$(CONFIG_MPQEMU) += qapi/qapi-commands.o +remote-pci-tgt-obj-$(CONFIG_MPQEMU) += qapi/qapi-commands-machine-target.o +remote-pci-tgt-obj-$(CONFIG_MPQEMU) += qapi/qapi-commands-misc-target.o +remote-pci-tgt-obj-$(CONFIG_MPQEMU) += qapi/qapi-visit-machine-target.o +remote-pci-tgt-obj-$(CONFIG_MPQEMU) += qapi/qapi-visit-misc-target.o +remote-pci-tgt-obj-$(CONFIG_MPQEMU) += qapi/qapi-types-machine-target.o +remote-pci-tgt-obj-$(CONFIG_MPQEMU) += qapi/qapi-types-misc-target.o ######################################################### # Linux user emulator target
hw/core/Makefile.objs +1 -0
@@ -42,3 +42,4 @@ remote-pci-obj-$(CONFIG_MPQEMU) += nmi.o remote-pci-obj-$(CONFIG_MPQEMU) += qdev-properties-system.o remote-pci-obj-$(CONFIG_MPQEMU) += qdev-fw.o remote-pci-obj-$(CONFIG_MPQEMU) += numa.o +remote-pci-obj-$(CONFIG_MPQEMU) += machine-qmp-cmds.o
monitor/Makefile.objs +3 -0
@@ -1,3 +1,6 @@ obj-y += misc.o common-obj-y += monitor.o qmp.o hmp.o common-obj-y += qmp-cmds.o hmp-cmds.o + +remote-pci-obj-$(CONFIG_MPQEMU) += monitor.o qmp.o hmp.o +remote-pci-obj-$(CONFIG_MPQEMU) += qmp-cmds.o hmp-cmds.o
qapi/Makefile.objs +2 -0
@@ -30,3 +30,5 @@ obj-y += $(QAPI_TARGET_MODULES:%=qapi-events-%.o) obj-y += qapi-events.o obj-y += $(QAPI_TARGET_MODULES:%=qapi-commands-%.o) obj-y += qapi-commands.o + +remote-pci-obj-$(CONFIG_MPQEMU) += $(QAPI_COMMON_MODULES:%=qapi-commands-%.o)
qom/Makefile.objs +1 -0
@@ -7,3 +7,4 @@ common-obj-$(CONFIG_SOFTMMU) += qom-hmp-cmds.o qom-qmp-cmds.o remote-pci-obj-$(CONFIG_MPQEMU) += object.o qom-qobject.o container.o remote-pci-obj-$(CONFIG_MPQEMU) += object_interfaces.o remote-pci-obj-$(CONFIG_MPQEMU) += cpu.o +remote-pci-obj-$(CONFIG_MPQEMU) += qom-qmp-cmds.o
ui/Makefile.objs +2 -0
@@ -65,3 +65,5 @@ console-gl.o-libs += $(OPENGL_LIBS) egl-helpers.o-libs += $(OPENGL_LIBS) egl-context.o-libs += $(OPENGL_LIBS) egl-headless.o-libs += $(OPENGL_LIBS) + +remote-lsi-obj-$(CONFIG_MPQEMU) += vnc-stubs.o
Signature · 1 line
1.8.3.1
RFC PATCH v3 40/45 multi-process/mon: Refactor monitor/chardev functions out of vl.c
In reply to Jagannathan RamanSome of the initialization helper functions w.r.t monitor & chardev in vl.c are also used by the remote process. Therefore, these functions are refactored into a shared file that both QEMU & remote process could use.
---
New patch in v3
vl-parse.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ vl.c | 91 ------------------------------------------------------------- vl.h | 4 +++ 3 files changed, 96 insertions(+), 91 deletions(-)
vl-parse.c +92 -0
@@ -155,3 +155,95 @@ int device_init_func(void *opaque, QemuOpts *opts, Error **errp)object_unref (OBJECT (dev));return 0 ; } + +void monitor_parse (const char *optarg,const char *mode,bool pretty) +{ +static int monitor_device_index; +QemuOpts *opts; +const char *p; +char label[32 ]; + +if (strstart (optarg,"chardev:" , &p)) { +snprintf (label,sizeof (label),"%s" , p); + }else { +snprintf (label,sizeof (label),"compat_monitor%d" , + monitor_device_index); + opts =qemu_chr_parse_compat (label, optarg, true); +if (!opts) { +error_report ("parse error: %s" , optarg); +exit (1 ); + } + } + + opts =qemu_opts_create (qemu_find_opts ("mon" ), label,1 , &error_fatal); +qemu_opt_set (opts,"mode" , mode, &error_abort); +qemu_opt_set (opts,"chardev" , label, &error_abort); +if (!strcmp (mode,"control" )) { +qemu_opt_set_bool (opts,"pretty" , pretty, &error_abort); + }else { +assert (pretty == false); + } + monitor_device_index++; +} + +int mon_init_func (void *opaque,QemuOpts *opts,Error **errp) +{ +Chardev *chr; +bool qmp; +bool pretty = false; +const char *chardev; +const char *mode; + + mode =qemu_opt_get (opts,"mode" ); +if (mode ==NULL ) { + mode ="readline" ; + } +if (strcmp (mode,"readline" ) ==0 ) { + qmp = false; + }else if (strcmp (mode,"control" ) ==0 ) { + qmp = true; + }else { +error_setg (errp,"unknown monitor mode \"%s\"" , mode); +return -1 ; + } + +if (!qmp &&qemu_opt_get (opts,"pretty" )) { +warn_report ("'pretty' is deprecated for HMP monitors, it has no effect " +"and will be removed in future versions" ); + } +if (qemu_opt_get_bool (opts,"pretty" ,0 )) { + pretty = true; + } + + chardev =qemu_opt_get (opts,"chardev" ); +if (!chardev) { +error_report ("chardev is required" ); +exit (1 ); + } + chr =qemu_chr_find (chardev); +if (chr ==NULL ) { +error_setg (errp,"chardev \"%s\" not found" , chardev); +return -1 ; + } + +if (qmp) { +monitor_init_qmp (chr, pretty); + }else { +monitor_init_hmp (chr, true); + } +return 0 ; +} + +int chardev_init_func (void *opaque,QemuOpts *opts,Error **errp) +{ +Error *local_err =NULL ; + +if (!qemu_chr_new_from_opts (opts,NULL , &local_err)) { +if (local_err) { +error_propagate (errp, local_err); +return -1 ; + } +exit (0 ); + } +return 0 ; +}
vl.c +0 -91
103 lines not on this page · raw message
vl.h +4 -0
@@ -50,5 +50,9 @@ int device_init_func(void *opaque, QemuOpts *opts, Error **errp);int rdrive_init_func (void *opaque,QemuOpts *opts,Error **errp);int rdevice_init_func (void *opaque,QemuOpts *opts,Error **errp); +void monitor_parse (const char *optarg,const char *mode,bool pretty); +int mon_init_func (void *opaque,QemuOpts *opts,Error **errp); +int chardev_init_func (void *opaque,QemuOpts *opts,Error **errp); +#endif /* VL_H */
Signature · 1 line
1.8.3.1
Re: [Qemu-devel] [RFC v3 PATCH 40/45] multi-process/mon: Refactor monitor/chardev functions out of vl.c
Quoted 8 lines · * Jagannathan Raman ([email protected]) wrote:
Some of the initialization helper functions w.r.t monitor & chardev in
vl.care also used by the remote process. Therefore, these functions are refactored into a shared file that both QEMU & remote process could use.Signed-off-by Elena Ufimtseva <[email protected]>Signed-off-by John G Johnson <[email protected]>Signed-off-by Jagannathan Raman <[email protected]>
Shouldn't the monitor parts be moved into something under monitor/ and the chardev parts be moved into chardev/ ?
Dave
Quoted 234 lines
---
New patch in v3vl-parse.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ vl.c | 91 ------------------------------------------------------------- vl.h | 4 +++ 3 files changed, 96 insertions(+), 91 deletions(-)vl-parse.c +92
-0@@ -155,3 +155,95 @@ int device_init_func(void *opaque, QemuOpts *opts, Error **errp)object_unref (OBJECT (dev));return 0 ; } + +void monitor_parse (const char *optarg,const char *mode,bool pretty) +{ +static int monitor_device_index; +QemuOpts *opts; +const char *p; +char label[32 ]; + +if (strstart (optarg,"chardev:" , &p)) { +snprintf (label,sizeof (label),"%s" , p); + }else { +snprintf (label,sizeof (label),"compat_monitor%d" , + monitor_device_index); + opts =qemu_chr_parse_compat (label, optarg, true); +if (!opts) { +error_report ("parse error: %s" , optarg); +exit (1 ); + } + } + + opts =qemu_opts_create (qemu_find_opts ("mon" ), label,1 , &error_fatal); +qemu_opt_set (opts,"mode" , mode, &error_abort); +qemu_opt_set (opts,"chardev" , label, &error_abort); +if (!strcmp (mode,"control" )) { +qemu_opt_set_bool (opts,"pretty" , pretty, &error_abort); + }else { +assert (pretty == false); + } + monitor_device_index++; +} + +int mon_init_func (void *opaque,QemuOpts *opts,Error **errp) +{ +Chardev *chr; +bool qmp; +bool pretty = false; +const char *chardev; +const char *mode; + + mode =qemu_opt_get (opts,"mode" ); +if (mode ==NULL ) { + mode ="readline" ; + } +if (strcmp (mode,"readline" ) ==0 ) { + qmp = false; + }else if (strcmp (mode,"control" ) ==0 ) { + qmp = true; + }else { +error_setg (errp,"unknown monitor mode \"%s\"" , mode); +return -1 ; + } + +if (!qmp &&qemu_opt_get (opts,"pretty" )) { +warn_report ("'pretty' is deprecated for HMP monitors, it has no effect " +"and will be removed in future versions" ); + } +if (qemu_opt_get_bool (opts,"pretty" ,0 )) { + pretty = true; + } + + chardev =qemu_opt_get (opts,"chardev" ); +if (!chardev) { +error_report ("chardev is required" ); +exit (1 ); + } + chr =qemu_chr_find (chardev); +if (chr ==NULL ) { +error_setg (errp,"chardev \"%s\" not found" , chardev); +return -1 ; + } + +if (qmp) { +monitor_init_qmp (chr, pretty); + }else { +monitor_init_hmp (chr, true); + } +return 0 ; +} + +int chardev_init_func (void *opaque,QemuOpts *opts,Error **errp) +{ +Error *local_err =NULL ; + +if (!qemu_chr_new_from_opts (opts,NULL , &local_err)) { +if (local_err) { +error_propagate (errp, local_err); +return -1 ; + } +exit (0 ); + } +return 0 ; +}vl.c +0
-91@@ -2264,19 +2264,6 @@ static int device_help_func(void *opaque, QemuOpts *opts, Error **errp)return qdev_device_help (opts); } -static int chardev_init_func (void *opaque,QemuOpts *opts,Error **errp) -{ -Error *local_err =NULL ; - -if (!qemu_chr_new_from_opts (opts,NULL , &local_err)) { -if (local_err) { -error_propagate (errp, local_err); -return -1 ; - } -exit (0 ); - } -return 0 ; -}#ifdef CONFIG_VIRTFS static int fsdev_init_func (void *opaque,QemuOpts *opts,Error **errp)@@ -2285,84 +2272,6 @@ static int fsdev_init_func(void *opaque, QemuOpts *opts, Error **errp) }#endif -static int mon_init_func (void *opaque,QemuOpts *opts,Error **errp) -{ -Chardev *chr; -bool qmp; -bool pretty = false; -const char *chardev; -const char *mode; - - mode =qemu_opt_get (opts,"mode" ); -if (mode ==NULL ) { - mode ="readline" ; - } -if (strcmp (mode,"readline" ) ==0 ) { - qmp = false; - }else if (strcmp (mode,"control" ) ==0 ) { - qmp = true; - }else { -error_setg (errp,"unknown monitor mode \"%s\"" , mode); -return -1 ; - } - -if (!qmp &&qemu_opt_get (opts,"pretty" )) { -warn_report ("'pretty' is deprecated for HMP monitors, it has no effect " -"and will be removed in future versions" ); - } -if (qemu_opt_get_bool (opts,"pretty" ,0 )) { - pretty = true; - } - - chardev =qemu_opt_get (opts,"chardev" ); -if (!chardev) { -error_report ("chardev is required" ); -exit (1 ); - } - chr =qemu_chr_find (chardev); -if (chr ==NULL ) { -error_setg (errp,"chardev \"%s\" not found" , chardev); -return -1 ; - } - -if (qmp) { -monitor_init_qmp (chr, pretty); - }else { -monitor_init_hmp (chr, true); - } -return 0 ; -} - -static void monitor_parse (const char *optarg,const char *mode,bool pretty) -{ -static int monitor_device_index =0 ; -QemuOpts *opts; -const char *p; -char label[32 ]; - -if (strstart (optarg,"chardev:" , &p)) { -snprintf (label,sizeof (label),"%s" , p); - }else { -snprintf (label,sizeof (label),"compat_monitor%d" , - monitor_device_index); - opts =qemu_chr_parse_compat (label, optarg, true); -if (!opts) { -error_report ("parse error: %s" , optarg); -exit (1 ); - } - } - - opts =qemu_opts_create (qemu_find_opts ("mon" ), label,1 , &error_fatal); -qemu_opt_set (opts,"mode" , mode, &error_abort); -qemu_opt_set (opts,"chardev" , label, &error_abort); -if (!strcmp (mode,"control" )) { -qemu_opt_set_bool (opts,"pretty" , pretty, &error_abort); - }else { -assert (pretty == false); - } - monitor_device_index++; -} -struct device_config {enum {DEV_USB ,/* -usbdevice */ vl.h +4
-0@@ -50,5 +50,9 @@ int device_init_func(void *opaque, QemuOpts *opts, Error **errp);int rdrive_init_func (void *opaque,QemuOpts *opts,Error **errp);int rdevice_init_func (void *opaque,QemuOpts *opts,Error **errp); +void monitor_parse (const char *optarg,const char *mode,bool pretty); +int mon_init_func (void *opaque,QemuOpts *opts,Error **errp); +int chardev_init_func (void *opaque,QemuOpts *opts,Error **errp); +#endif /* VL_H */ Signature · 1 line
1.8.3.1
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Re: [Qemu-devel] [RFC v3 PATCH 40/45] multi-process/mon: Refactor monitor/chardev functions out of vl.c
Quoted 6 lines · Dr. David Alan Gilbert
Quoted 5 lines · * Jagannathan Raman ([email protected]) wrote:
Some of the initialization helper functions w.r.t monitor & chardev in
vl.care also used by the remote process. Therefore, these functions are refactored into a shared file that both QEMU & remote process could use.
Quoted 6 lines
Quoted 3 lines
Signed-off-by Elena Ufimtseva <[email protected]>Signed-off-by John G Johnson <[email protected]>Signed-off-by Jagannathan Raman <[email protected]>Shouldn't the monitor parts be moved into something under monitor/ and the chardev parts be moved into chardev/ ?
Sure, will do.
Thanks!
--
Jag
Quoted 240 lines
Dave
Quoted 234 lines
---
New patch in v3vl-parse.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ vl.c | 91 ------------------------------------------------------------- vl.h | 4 +++ 3 files changed, 96 insertions(+), 91 deletions(-)vl-parse.c +92
-0@@ -155,3 +155,95 @@ int device_init_func(void *opaque, QemuOpts *opts, Error **errp)object_unref (OBJECT (dev));return 0 ; } + +void monitor_parse (const char *optarg,const char *mode,bool pretty) +{ +static int monitor_device_index; +QemuOpts *opts; +const char *p; +char label[32 ]; + +if (strstart (optarg,"chardev:" , &p)) { +snprintf (label,sizeof (label),"%s" , p); + }else { +snprintf (label,sizeof (label),"compat_monitor%d" , + monitor_device_index); + opts =qemu_chr_parse_compat (label, optarg, true); +if (!opts) { +error_report ("parse error: %s" , optarg); +exit (1 ); + } + } + + opts =qemu_opts_create (qemu_find_opts ("mon" ), label,1 , &error_fatal); +qemu_opt_set (opts,"mode" , mode, &error_abort); +qemu_opt_set (opts,"chardev" , label, &error_abort); +if (!strcmp (mode,"control" )) { +qemu_opt_set_bool (opts,"pretty" , pretty, &error_abort); + }else { +assert (pretty == false); + } + monitor_device_index++; +} + +int mon_init_func (void *opaque,QemuOpts *opts,Error **errp) +{ +Chardev *chr; +bool qmp; +bool pretty = false; +const char *chardev; +const char *mode; + + mode =qemu_opt_get (opts,"mode" ); +if (mode ==NULL ) { + mode ="readline" ; + } +if (strcmp (mode,"readline" ) ==0 ) { + qmp = false; + }else if (strcmp (mode,"control" ) ==0 ) { + qmp = true; + }else { +error_setg (errp,"unknown monitor mode \"%s\"" , mode); +return -1 ; + } + +if (!qmp &&qemu_opt_get (opts,"pretty" )) { +warn_report ("'pretty' is deprecated for HMP monitors, it has no effect " +"and will be removed in future versions" ); + } +if (qemu_opt_get_bool (opts,"pretty" ,0 )) { + pretty = true; + } + + chardev =qemu_opt_get (opts,"chardev" ); +if (!chardev) { +error_report ("chardev is required" ); +exit (1 ); + } + chr =qemu_chr_find (chardev); +if (chr ==NULL ) { +error_setg (errp,"chardev \"%s\" not found" , chardev); +return -1 ; + } + +if (qmp) { +monitor_init_qmp (chr, pretty); + }else { +monitor_init_hmp (chr, true); + } +return 0 ; +} + +int chardev_init_func (void *opaque,QemuOpts *opts,Error **errp) +{ +Error *local_err =NULL ; + +if (!qemu_chr_new_from_opts (opts,NULL , &local_err)) { +if (local_err) { +error_propagate (errp, local_err); +return -1 ; + } +exit (0 ); + } +return 0 ; +}vl.c +0
-91@@ -2264,19 +2264,6 @@ static int device_help_func(void *opaque, QemuOpts *opts, Error **errp)return qdev_device_help (opts); } -static int chardev_init_func (void *opaque,QemuOpts *opts,Error **errp) -{ -Error *local_err =NULL ; - -if (!qemu_chr_new_from_opts (opts,NULL , &local_err)) { -if (local_err) { -error_propagate (errp, local_err); -return -1 ; - } -exit (0 ); - } -return 0 ; -}#ifdef CONFIG_VIRTFS static int fsdev_init_func (void *opaque,QemuOpts *opts,Error **errp)@@ -2285,84 +2272,6 @@ static int fsdev_init_func(void *opaque, QemuOpts *opts, Error **errp) }#endif -static int mon_init_func (void *opaque,QemuOpts *opts,Error **errp) -{ -Chardev *chr; -bool qmp; -bool pretty = false; -const char *chardev; -const char *mode; - - mode =qemu_opt_get (opts,"mode" ); -if (mode ==NULL ) { - mode ="readline" ; - } -if (strcmp (mode,"readline" ) ==0 ) { - qmp = false; - }else if (strcmp (mode,"control" ) ==0 ) { - qmp = true; - }else { -error_setg (errp,"unknown monitor mode \"%s\"" , mode); -return -1 ; - } - -if (!qmp &&qemu_opt_get (opts,"pretty" )) { -warn_report ("'pretty' is deprecated for HMP monitors, it has no effect " -"and will be removed in future versions" ); - } -if (qemu_opt_get_bool (opts,"pretty" ,0 )) { - pretty = true; - } - - chardev =qemu_opt_get (opts,"chardev" ); -if (!chardev) { -error_report ("chardev is required" ); -exit (1 ); - } - chr =qemu_chr_find (chardev); -if (chr ==NULL ) { -error_setg (errp,"chardev \"%s\" not found" , chardev); -return -1 ; - } - -if (qmp) { -monitor_init_qmp (chr, pretty); - }else { -monitor_init_hmp (chr, true); - } -return 0 ; -} - -static void monitor_parse (const char *optarg,const char *mode,bool pretty) -{ -static int monitor_device_index =0 ; -QemuOpts *opts; -const char *p; -char label[32 ]; - -if (strstart (optarg,"chardev:" , &p)) { -snprintf (label,sizeof (label),"%s" , p); - }else { -snprintf (label,sizeof (label),"compat_monitor%d" , - monitor_device_index); - opts =qemu_chr_parse_compat (label, optarg, true); -if (!opts) { -error_report ("parse error: %s" , optarg); -exit (1 ); - } - } - - opts =qemu_opts_create (qemu_find_opts ("mon" ), label,1 , &error_fatal); -qemu_opt_set (opts,"mode" , mode, &error_abort); -qemu_opt_set (opts,"chardev" , label, &error_abort); -if (!strcmp (mode,"control" )) { -qemu_opt_set_bool (opts,"pretty" , pretty, &error_abort); - }else { -assert (pretty == false); - } - monitor_device_index++; -} -struct device_config {enum {DEV_USB ,/* -usbdevice */ vl.h +4
-0@@ -50,5 +50,9 @@ int device_init_func(void *opaque, QemuOpts *opts, Error **errp);int rdrive_init_func (void *opaque,QemuOpts *opts,Error **errp);int rdevice_init_func (void *opaque,QemuOpts *opts,Error **errp); +void monitor_parse (const char *optarg,const char *mode,bool pretty); +int mon_init_func (void *opaque,QemuOpts *opts,Error **errp); +int chardev_init_func (void *opaque,QemuOpts *opts,Error **errp); +#endif /* VL_H */ Signature · 1 line
1.8.3.1--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
RFC PATCH v3 41/45 multi-process/mon: trim HMP command set for remote storage processes
In reply to Jagannathan RamanTrim down the list of HMP commands available for storage class of remote processes.
---
New patch in v3
Makefile.objs | 2 + Makefile.target | 14 +- hmp-scsi-commands-info.hx | 167 ++++++++++++++++++++ hmp-scsi-commands.hx | 384 +++++++++++++++++++++++++++++++++++++++++++++ monitor/misc.c | 84 +++++----- monitor/monitor-internal.h | 38 +++++ qom/Makefile.objs | 2 +- 7 files changed, 651 insertions(+), 40 deletions(-) create mode 100644 hmp-scsi-commands-info.hx create mode 100644 hmp-scsi-commands.hx
Makefile.objs +2 -0
@@ -45,6 +45,8 @@ remote-pci-obj-$(CONFIG_MPQEMU) += iothread.o remote-lsi-obj-$(CONFIG_MPQEMU) += hw/ remote-lsi-obj-$(CONFIG_MPQEMU) += ui/ +remote-lsi-obj-$(CONFIG_MPQEMU) += device-hotplug.o + ####################################################################### # crypto-obj-y is code used by both qemu system emulation and qemu-img
Makefile.target +13 -1
@@ -210,6 +210,10 @@ endif generated-files-y += hmp-commands.h hmp-commands-info.h generated-files-y += config-devices.h +ifdef CONFIG_MPQEMU +generated-files-y += hmp-scsi-commands.h hmp-scsi-commands-info.h +endif + endif # CONFIG_SOFTMMU dummy := $(call unnest-vars,,obj-y)
@@ -294,10 +298,18 @@ hmp-commands.h: $(SRC_PATH)/hmp-commands.hx $(SRC_PATH)/scripts/hxtool hmp-commands-info.h: $(SRC_PATH)/hmp-commands-info.hx $(SRC_PATH)/scripts/hxtool $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"GEN","$(TARGET_DIR)$@") +ifdef CONFIG_MPQEMU +hmp-scsi-commands.h: $(SRC_PATH)/hmp-scsi-commands.hx $(SRC_PATH)/scripts/hxtool + $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"GEN","$(TARGET_DIR)$@") + +hmp-scsi-commands-info.h: $(SRC_PATH)/hmp-scsi-commands-info.hx $(SRC_PATH)/scripts/hxtool + $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"GEN","$(TARGET_DIR)$@") +endif + clean: clean-target rm -f *.a *~ $(PROGS) rm -f $(shell find . -name '*.[od]') - rm -f hmp-commands.h gdbstub-xml.c + rm -f hmp-commands.h gdbstub-xml.c hmp-scsi-commands.h hmp-scsi-commands-info.h rm -f trace/generated-helpers.c trace/generated-helpers.c-timestamp ifdef CONFIG_TRACE_SYSTEMTAP rm -f *.stp
hmp-scsi-commands-info.hx new file +167 -0
167 lines not on this page · raw message
hmp-scsi-commands.hx new file +384 -0
384 lines not on this page · raw message
monitor/misc.c +46 -38
322 lines not on this page · raw message
monitor/monitor-internal.h +38 -0
@@ -180,4 +180,42 @@ void help_cmd(Monitor *mon, const char *name);void handle_hmp_command (MonitorHMP *mon,const char *cmdline);int hmp_compare_cmd (const char *name,const char *list); +void do_help_cmd (Monitor *mon,const QDict *qdict); +void hmp_trace_event (Monitor *mon,const QDict *qdict); +void hmp_info_help (Monitor *mon,const QDict *qdict); +void hmp_info_registers (Monitor *mon,const QDict *qdict); +void hmp_info_jit (Monitor *mon,const QDict *qdict); +void hmp_info_opcount (Monitor *mon,const QDict *qdict); +void hmp_info_sync_profile (Monitor *mon,const QDict *qdict); +void hmp_info_history (Monitor *mon,const QDict *qdict); +void hmp_info_cpustats (Monitor *mon,const QDict *qdict); +void hmp_info_trace_events (Monitor *mon,const QDict *qdict); +void hmp_logfile (Monitor *mon,const QDict *qdict); +void hmp_log (Monitor *mon,const QDict *qdict); +void hmp_singlestep (Monitor *mon,const QDict *qdict); +void hmp_gdbserver (Monitor *mon,const QDict *qdict); +void hmp_watchdog_action (Monitor *mon,const QDict *qdict); +void hmp_memory_dump (Monitor *mon,const QDict *qdict); +void hmp_physical_memory_dump (Monitor *mon,const QDict *qdict); +void hmp_gpa2hva (Monitor *mon,const QDict *qdict); +void hmp_gva2gpa (Monitor *mon,const QDict *qdict); +void hmp_gpa2hpa (Monitor *mon,const QDict *qdict); +void do_print (Monitor *mon,const QDict *qdict); +void hmp_sum (Monitor *mon,const QDict *qdict); +void hmp_mouse_move (Monitor *mon,const QDict *qdict); +void hmp_mouse_button (Monitor *mon,const QDict *qdict); +void hmp_ioport_read (Monitor *mon,const QDict *qdict); +void hmp_ioport_write (Monitor *mon,const QDict *qdict); +void hmp_boot_set (Monitor *mon,const QDict *qdict); +void hmp_info_mtree (Monitor *mon,const QDict *qdict); +void hmp_info_profile (Monitor *mon,const QDict *qdict); +void hmp_info_capture (Monitor *mon,const QDict *qdict); +void hmp_stopcapture (Monitor *mon,const QDict *qdict); +void hmp_wavcapture (Monitor *mon,const QDict *qdict); +void hmp_acl_show (Monitor *mon,const QDict *qdict); +void hmp_acl_reset (Monitor *mon,const QDict *qdict); +void hmp_acl_policy (Monitor *mon,const QDict *qdict); +void hmp_acl_add (Monitor *mon,const QDict *qdict); +void hmp_acl_remove (Monitor *mon,const QDict *qdict); +#endif
qom/Makefile.objs +1 -1
@@ -7,4 +7,4 @@ common-obj-$(CONFIG_SOFTMMU) += qom-hmp-cmds.o qom-qmp-cmds.o remote-pci-obj-$(CONFIG_MPQEMU) += object.o qom-qobject.o container.o remote-pci-obj-$(CONFIG_MPQEMU) += object_interfaces.o remote-pci-obj-$(CONFIG_MPQEMU) += cpu.o -remote-pci-obj-$(CONFIG_MPQEMU) += qom-qmp-cmds.o +remote-pci-obj-$(CONFIG_MPQEMU) += qom-qmp-cmds.o qom-hmp-cmds.o
Signature · 1 line
1.8.3.1
Re: [Qemu-devel] [RFC v3 PATCH 41/45] multi-process/mon: trim HMP command set for remote storage processes
Quoted 93 lines · * Jagannathan Raman ([email protected]) wrote:
Trim down the list of HMP commands available for storage class of remote processes.
Signed-off-by Elena Ufimtseva <[email protected]>Signed-off-by John G Johnson <[email protected]>Signed-off-by Jagannathan Raman <[email protected]>---
New patch in v3Makefile.objs | 2 + Makefile.target | 14 +- hmp-scsi-commands-info.hx | 167 ++++++++++++++++++++ hmp-scsi-commands.hx | 384 +++++++++++++++++++++++++++++++++++++++++++++ monitor/misc.c | 84 +++++----- monitor/monitor-internal.h | 38 +++++ qom/Makefile.objs | 2 +- 7 files changed, 651 insertions(+), 40 deletions(-) create mode 100644 hmp-scsi-commands-info.hx create mode 100644 hmp-scsi-commands.hxMakefile.objs +2
-0@@ -45,6 +45,8 @@ remote-pci-obj-$(CONFIG_MPQEMU) += iothread.o remote-lsi-obj-$(CONFIG_MPQEMU) += hw/ remote-lsi-obj-$(CONFIG_MPQEMU) += ui/ +remote-lsi-obj-$(CONFIG_MPQEMU) += device-hotplug.o + ####################################################################### # crypto-obj-y is code used by both qemu system emulation and qemu-imgMakefile.target +13
-1@@ -210,6 +210,10 @@ endif generated-files-y += hmp-commands.h hmp-commands-info.h generated-files-y += config-devices.h +ifdef CONFIG_MPQEMU +generated-files-y += hmp-scsi-commands.h hmp-scsi-commands-info.h +endif + endif # CONFIG_SOFTMMU dummy := $(call unnest-vars,,obj-y)@@ -294,10 +298,18 @@ hmp-commands.h: $(SRC_PATH)/hmp-commands.hx $(SRC_PATH)/scripts/hxtool hmp-commands-info.h: $(SRC_PATH)/hmp-commands-info.hx $(SRC_PATH)/scripts/hxtool $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"GEN","$(TARGET_DIR)$@") +ifdef CONFIG_MPQEMU +hmp-scsi-commands.h: $(SRC_PATH)/hmp-scsi-commands.hx $(SRC_PATH)/scripts/hxtool + $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"GEN","$(TARGET_DIR)$@") + +hmp-scsi-commands-info.h: $(SRC_PATH)/hmp-scsi-commands-info.hx $(SRC_PATH)/scripts/hxtool + $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"GEN","$(TARGET_DIR)$@") +endif + clean: clean-target rm -f *.a *~ $(PROGS) rm -f $(shell find . -name '*.[od]') - rm -f hmp-commands.h gdbstub-xml.c + rm -f hmp-commands.h gdbstub-xml.c hmp-scsi-commands.h hmp-scsi-commands-info.h rm -f trace/generated-helpers.c trace/generated-helpers.c-timestamp ifdef CONFIG_TRACE_SYSTEMTAP rm -f *.stphmp-scsi-commands-info.hx new file +19
-0@@ -0,0 +1,167 @@ +HXCOMM Use DEFHEADING() to define headings in both help text and texi +HXCOMM Text between STEXI and ETEXI are copied to texi version and +HXCOMM discarded from C version +HXCOMM DEF(command, args, callback, arg_string, help) is used to construct +HXCOMM monitor info commands +HXCOMM HXCOMM can be used for comments, discarded from both texi and C + +STEXI +@table @option +@item info @var{subcommand} +@findex info +Show various information about the system state. +@table @option +ETEXI + + { + .name = "version", + .args_type = "", + .params = "",
hmp-scsi-commands-info.hx line 29
Quoted 10 lines
hmp-scsi-commands-info.hx new file +10
-0+ .help = "show the version of QEMU", + .cmd = hmp_info_version, + .flags = "p", + }, + +STEXI +@item info version +@findex info version +Show the version of QEMU. +ETEXI
It feels like you need a way to share this stuff without copying it; 'info version' isn't really a scsi specific command!
One idea is you could add a new field, e.g.
.subcommands = "scsi,somethingelse"
and then you process it to pick that up?
<snip>
monitor/misc.c int hmp_compare_cmd(const char *name, const char *list) · line 179
Quoted 10 lines
monitor/misc.c +1
-1@@ -176,12 +176,12 @@ int hmp_compare_cmd(const char *name, const char *list)return 0 ; } -static void do_help_cmd (Monitor *mon,const QDict *qdict) +void do_help_cmd (Monitor *mon,const QDict *qdict)
If you're unstatic'ing things that don't have hmp in the name then you need to add it, i.e. hmp_do_help_cmd.
Dave
Quoted 413 lines
monitor/misc.c +45
-37{help_cmd (mon,qdict_get_try_str (qdict,"name" )); } -static void hmp_trace_event (Monitor *mon,const QDict *qdict) +void hmp_trace_event (Monitor *mon,const QDict *qdict) {const char *tp_name =qdict_get_str (qdict,"name" );bool new_state =qdict_get_bool (qdict,"option" );@@ -225,7 +225,7 @@ static void hmp_trace_file(Monitor *mon, const QDict *qdict) }#endif -static void hmp_info_help (Monitor *mon,const QDict *qdict) +void hmp_info_help (Monitor *mon,const QDict *qdict) {help_cmd (mon,"info" ); }@@ -436,7 +436,7 @@ int monitor_get_cpu_index(void)return cs ? cs->cpu_index :UNASSIGNED_CPU_INDEX ; } -static void hmp_info_registers (Monitor *mon,const QDict *qdict) +void hmp_info_registers (Monitor *mon,const QDict *qdict) {bool all_cpus =qdict_get_try_bool (qdict,"cpustate_all" , false);CPUState *cs;@@ -459,7 +459,7 @@ static void hmp_info_registers(Monitor *mon, const QDict *qdict) }#ifdef CONFIG_TCG -static void hmp_info_jit (Monitor *mon,const QDict *qdict) +void hmp_info_jit (Monitor *mon,const QDict *qdict) {if (!tcg_enabled ()) {error_report ("JIT information is only available with accel=tcg" );@@ -470,13 +470,13 @@ static void hmp_info_jit(Monitor *mon, const QDict *qdict) dump_drift_info(); } -static void hmp_info_opcount (Monitor *mon,const QDict *qdict) +void hmp_info_opcount (Monitor *mon,const QDict *qdict) {dump_opcount_info (); }#endif -static void hmp_info_sync_profile (Monitor *mon,const QDict *qdict) +void hmp_info_sync_profile (Monitor *mon,const QDict *qdict) {int64_t max =qdict_get_try_int (qdict,"max" ,10 );bool mean =qdict_get_try_bool (qdict,"mean" , false);@@ -487,7 +487,7 @@ static void hmp_info_sync_profile(Monitor *mon, const QDict *qdict)qsp_report (max, sort_by, coalesce); } -static void hmp_info_history (Monitor *mon,const QDict *qdict) +void hmp_info_history (Monitor *mon,const QDict *qdict) {MonitorHMP *hmp_mon =container_of (mon, MonitorHMP, common);int i;@@ -507,7 +507,7 @@ static void hmp_info_history(Monitor *mon, const QDict *qdict) } } -static void hmp_info_cpustats (Monitor *mon,const QDict *qdict) +void hmp_info_cpustats (Monitor *mon,const QDict *qdict) {CPUState *cs =mon_get_cpu ();@@ -518,7 +518,7 @@ static void hmp_info_cpustats(Monitor *mon, const QDict *qdict)cpu_dump_statistics (cs,0 ); } -static void hmp_info_trace_events (Monitor *mon,const QDict *qdict) +void hmp_info_trace_events (Monitor *mon,const QDict *qdict) {const char *name =qdict_get_try_str (qdict,"name" );bool has_vcpu =qdict_haskey (qdict,"vcpu" );@@ -578,7 +578,7 @@ void qmp_client_migrate_info(const char *protocol, const char *hostname,error_setg (errp,QERR_INVALID_PARAMETER_VALUE ,"protocol" ,"spice" ); } -static void hmp_logfile (Monitor *mon,const QDict *qdict) +void hmp_logfile (Monitor *mon,const QDict *qdict) {Error *err =NULL ;@@ -588,7 +588,7 @@ static void hmp_logfile(Monitor *mon, const QDict *qdict) } } -static void hmp_log (Monitor *mon,const QDict *qdict) +void hmp_log (Monitor *mon,const QDict *qdict) {int mask;const char *items =qdict_get_str (qdict,"items" );@@ -605,7 +605,7 @@ static void hmp_log(Monitor *mon, const QDict *qdict)qemu_set_log (mask); } -static void hmp_singlestep (Monitor *mon,const QDict *qdict) +void hmp_singlestep (Monitor *mon,const QDict *qdict) {const char *option =qdict_get_try_str (qdict,"option" );if (!option || !strcmp (option,"on" )) {@@ -617,7 +617,7 @@ static void hmp_singlestep(Monitor *mon, const QDict *qdict) } } -static void hmp_gdbserver (Monitor *mon,const QDict *qdict) +void hmp_gdbserver (Monitor *mon,const QDict *qdict) {const char *device =qdict_get_try_str (qdict,"device" );if (!device)@@ -633,7 +633,7 @@ static void hmp_gdbserver(Monitor *mon, const QDict *qdict) } } -static void hmp_watchdog_action (Monitor *mon,const QDict *qdict) +void hmp_watchdog_action (Monitor *mon,const QDict *qdict) {const char *action =qdict_get_str (qdict,"action" );if (select_watchdog_action (action) ==-1 ) {@@ -775,7 +775,7 @@ static void memory_dump(Monitor *mon, int count, int format, int wsize, } } -static void hmp_memory_dump (Monitor *mon,const QDict *qdict) +void hmp_memory_dump (Monitor *mon,const QDict *qdict) {int count =qdict_get_int (qdict,"count" );int format =qdict_get_int (qdict,"format" );@@ -785,7 +785,7 @@ static void hmp_memory_dump(Monitor *mon, const QDict *qdict)memory_dump (mon, count, format, size, addr,0 ); } -static void hmp_physical_memory_dump (Monitor *mon,const QDict *qdict) +void hmp_physical_memory_dump (Monitor *mon,const QDict *qdict) {int count =qdict_get_int (qdict,"count" );int format =qdict_get_int (qdict,"format" );@@ -815,7 +815,7 @@ static void *gpa2hva(MemoryRegion **p_mr, hwaddr addr, Error **errp)return qemu_map_ram_ptr (mrs.mr->ram_block, mrs.offset_within_region); } -static void hmp_gpa2hva (Monitor *mon,const QDict *qdict) +void hmp_gpa2hva (Monitor *mon,const QDict *qdict) {hwaddr addr =qdict_get_int (qdict,"addr" );Error *local_err =NULL ;@@ -835,7 +835,7 @@ static void hmp_gpa2hva(Monitor *mon, const QDict *qdict)memory_region_unref (mr); } -static void hmp_gva2gpa (Monitor *mon,const QDict *qdict) +void hmp_gva2gpa (Monitor *mon,const QDict *qdict) {target_ulong addr =qdict_get_int (qdict,"addr" );MemTxAttrs attrs;@@ -890,7 +890,7 @@ out:return ret; } -static void hmp_gpa2hpa (Monitor *mon,const QDict *qdict) +void hmp_gpa2hpa (Monitor *mon,const QDict *qdict) {hwaddr addr =qdict_get_int (qdict,"addr" );Error *local_err =NULL ;@@ -917,7 +917,7 @@ static void hmp_gpa2hpa(Monitor *mon, const QDict *qdict) }#endif -static void do_print (Monitor *mon,const QDict *qdict) +void do_print (Monitor *mon,const QDict *qdict) {int format =qdict_get_int (qdict,"format" );hwaddr val =qdict_get_int (qdict,"val" );@@ -943,7 +943,7 @@ static void do_print(Monitor *mon, const QDict *qdict)monitor_printf (mon,"\n" ); } -static void hmp_sum (Monitor *mon,const QDict *qdict) +void hmp_sum (Monitor *mon,const QDict *qdict) {uint32_t addr;uint16_t sum;@@ -963,7 +963,7 @@ static void hmp_sum(Monitor *mon, const QDict *qdict)static int mouse_button_state; -static void hmp_mouse_move (Monitor *mon,const QDict *qdict) +void hmp_mouse_move (Monitor *mon,const QDict *qdict) {int dx, dy, dz, button;const char *dx_str =qdict_get_str (qdict,"dx_str" );@@ -987,7 +987,7 @@ static void hmp_mouse_move(Monitor *mon, const QDict *qdict)qemu_input_event_sync (); } -static void hmp_mouse_button (Monitor *mon,const QDict *qdict) +void hmp_mouse_button (Monitor *mon,const QDict *qdict) {static uint32_t bmap[INPUT_BUTTON__MAX ] = { [INPUT_BUTTON_LEFT ] =MOUSE_EVENT_LBUTTON ,@@ -1004,7 +1004,7 @@ static void hmp_mouse_button(Monitor *mon, const QDict *qdict) mouse_button_state = button_state; } -static void hmp_ioport_read (Monitor *mon,const QDict *qdict) +void hmp_ioport_read (Monitor *mon,const QDict *qdict) {int size =qdict_get_int (qdict,"size" );int addr =qdict_get_int (qdict,"addr" );@@ -1038,7 +1038,7 @@ static void hmp_ioport_read(Monitor *mon, const QDict *qdict) suffix, addr, size * 2, val); } -static void hmp_ioport_write (Monitor *mon,const QDict *qdict) +void hmp_ioport_write (Monitor *mon,const QDict *qdict) {int size =qdict_get_int (qdict,"size" );int addr =qdict_get_int (qdict,"addr" );@@ -1060,7 +1060,7 @@ static void hmp_ioport_write(Monitor *mon, const QDict *qdict) } } -static void hmp_boot_set (Monitor *mon,const QDict *qdict) +void hmp_boot_set (Monitor *mon,const QDict *qdict) {Error *local_err =NULL ;const char *bootdevice =qdict_get_str (qdict,"bootdevice" );@@ -1073,7 +1073,7 @@ static void hmp_boot_set(Monitor *mon, const QDict *qdict) } } -static void hmp_info_mtree (Monitor *mon,const QDict *qdict) +void hmp_info_mtree (Monitor *mon,const QDict *qdict) {bool flatview =qdict_get_try_bool (qdict,"flatview" , false);bool dispatch_tree =qdict_get_try_bool (qdict,"dispatch_tree" , false);@@ -1086,7 +1086,7 @@ static void hmp_info_mtree(Monitor *mon, const QDict *qdict)int64_t dev_time; -static void hmp_info_profile (Monitor *mon,const QDict *qdict) +void hmp_info_profile (Monitor *mon,const QDict *qdict) {static int64_t last_cpu_exec_time;int64_t cpu_exec_time;@@ -1103,7 +1103,7 @@ static void hmp_info_profile(Monitor *mon, const QDict *qdict) dev_time = 0; }#else -static void hmp_info_profile (Monitor *mon,const QDict *qdict) +void hmp_info_profile (Monitor *mon,const QDict *qdict) {monitor_printf (mon,"Internal profiler not compiled\n" ); }@@ -1112,7 +1112,7 @@ static void hmp_info_profile(Monitor *mon, const QDict *qdict)/* Capture support */ static QLIST_HEAD (capture_list_head, CaptureState) capture_head; -static void hmp_info_capture (Monitor *mon,const QDict *qdict) +void hmp_info_capture (Monitor *mon,const QDict *qdict) {int i;CaptureState *s;@@ -1123,7 +1123,7 @@ static void hmp_info_capture(Monitor *mon, const QDict *qdict) } } -static void hmp_stopcapture (Monitor *mon,const QDict *qdict) +void hmp_stopcapture (Monitor *mon,const QDict *qdict) {int i;int n =qdict_get_int (qdict,"n" );@@ -1139,7 +1139,7 @@ static void hmp_stopcapture(Monitor *mon, const QDict *qdict) } } -static void hmp_wavcapture (Monitor *mon,const QDict *qdict) +void hmp_wavcapture (Monitor *mon,const QDict *qdict) {const char *path =qdict_get_str (qdict,"path" );int has_freq =qdict_haskey (qdict,"freq" );@@ -1192,7 +1192,7 @@ static void hmp_warn_acl(void) warn_acl = true; } -static void hmp_acl_show (Monitor *mon,const QDict *qdict) +void hmp_acl_show (Monitor *mon,const QDict *qdict) {const char *aclname =qdict_get_str (qdict,"aclname" );QAuthZList *auth =find_auth (mon, aclname);@@ -1219,7 +1219,7 @@ static void hmp_acl_show(Monitor *mon, const QDict *qdict) } } -static void hmp_acl_reset (Monitor *mon,const QDict *qdict) +void hmp_acl_reset (Monitor *mon,const QDict *qdict) {const char *aclname =qdict_get_str (qdict,"aclname" );QAuthZList *auth =find_auth (mon, aclname);@@ -1236,7 +1236,7 @@ static void hmp_acl_reset(Monitor *mon, const QDict *qdict)monitor_printf (mon,"acl: removed all rules\n" ); } -static void hmp_acl_policy (Monitor *mon,const QDict *qdict) +void hmp_acl_policy (Monitor *mon,const QDict *qdict) {const char *aclname =qdict_get_str (qdict,"aclname" );const char *policy =qdict_get_str (qdict,"policy" );@@ -1277,7 +1277,7 @@ static QAuthZListFormat hmp_acl_get_format(const char *match) } } -static void hmp_acl_add (Monitor *mon,const QDict *qdict) +void hmp_acl_add (Monitor *mon,const QDict *qdict) {const char *aclname =qdict_get_str (qdict,"aclname" );const char *match =qdict_get_str (qdict,"match" );@@ -1330,7 +1330,7 @@ static void hmp_acl_add(Monitor *mon, const QDict *qdict) } } -static void hmp_acl_remove (Monitor *mon,const QDict *qdict) +void hmp_acl_remove (Monitor *mon,const QDict *qdict) {const char *aclname =qdict_get_str (qdict,"aclname" );const char *match =qdict_get_str (qdict,"match" );@@ -1799,13 +1799,21 @@ int monitor_fd_param(Monitor *mon, const char *fdname, Error **errp)/* Please update hmp-commands.hx when adding or changing commands */ static HMPCommand hmp_info_cmds[] = { +#if defined(SCSI_PROCESS ) +#include "hmp-scsi-commands-info.h" +#else #include "hmp-commands-info.h" +#endif { NULL, NULL, }, }; /* hmp_cmds and hmp_info_cmds would be sorted at runtime */ HMPCommand hmp_cmds[] = { +#if defined(SCSI_PROCESS) +#include "hmp-scsi-commands.h" +#else #include "hmp-commands.h" +#endif { NULL, NULL, }, };monitor/monitor-internal.h +38
-0@@ -180,4 +180,42 @@ void help_cmd(Monitor *mon, const char *name);void handle_hmp_command (MonitorHMP *mon,const char *cmdline);int hmp_compare_cmd (const char *name,const char *list); +void do_help_cmd (Monitor *mon,const QDict *qdict); +void hmp_trace_event (Monitor *mon,const QDict *qdict); +void hmp_info_help (Monitor *mon,const QDict *qdict); +void hmp_info_registers (Monitor *mon,const QDict *qdict); +void hmp_info_jit (Monitor *mon,const QDict *qdict); +void hmp_info_opcount (Monitor *mon,const QDict *qdict); +void hmp_info_sync_profile (Monitor *mon,const QDict *qdict); +void hmp_info_history (Monitor *mon,const QDict *qdict); +void hmp_info_cpustats (Monitor *mon,const QDict *qdict); +void hmp_info_trace_events (Monitor *mon,const QDict *qdict); +void hmp_logfile (Monitor *mon,const QDict *qdict); +void hmp_log (Monitor *mon,const QDict *qdict); +void hmp_singlestep (Monitor *mon,const QDict *qdict); +void hmp_gdbserver (Monitor *mon,const QDict *qdict); +void hmp_watchdog_action (Monitor *mon,const QDict *qdict); +void hmp_memory_dump (Monitor *mon,const QDict *qdict); +void hmp_physical_memory_dump (Monitor *mon,const QDict *qdict); +void hmp_gpa2hva (Monitor *mon,const QDict *qdict); +void hmp_gva2gpa (Monitor *mon,const QDict *qdict); +void hmp_gpa2hpa (Monitor *mon,const QDict *qdict); +void do_print (Monitor *mon,const QDict *qdict); +void hmp_sum (Monitor *mon,const QDict *qdict); +void hmp_mouse_move (Monitor *mon,const QDict *qdict); +void hmp_mouse_button (Monitor *mon,const QDict *qdict); +void hmp_ioport_read (Monitor *mon,const QDict *qdict); +void hmp_ioport_write (Monitor *mon,const QDict *qdict); +void hmp_boot_set (Monitor *mon,const QDict *qdict); +void hmp_info_mtree (Monitor *mon,const QDict *qdict); +void hmp_info_profile (Monitor *mon,const QDict *qdict); +void hmp_info_capture (Monitor *mon,const QDict *qdict); +void hmp_stopcapture (Monitor *mon,const QDict *qdict); +void hmp_wavcapture (Monitor *mon,const QDict *qdict); +void hmp_acl_show (Monitor *mon,const QDict *qdict); +void hmp_acl_reset (Monitor *mon,const QDict *qdict); +void hmp_acl_policy (Monitor *mon,const QDict *qdict); +void hmp_acl_add (Monitor *mon,const QDict *qdict); +void hmp_acl_remove (Monitor *mon,const QDict *qdict); +#endif qom/Makefile.objs +1
-1@@ -7,4 +7,4 @@ common-obj-$(CONFIG_SOFTMMU) += qom-hmp-cmds.o qom-qmp-cmds.o remote-pci-obj-$(CONFIG_MPQEMU) += object.o qom-qobject.o container.o remote-pci-obj-$(CONFIG_MPQEMU) += object_interfaces.o remote-pci-obj-$(CONFIG_MPQEMU) += cpu.o -remote-pci-obj-$(CONFIG_MPQEMU) += qom-qmp-cmds.o +remote-pci-obj-$(CONFIG_MPQEMU) += qom-qmp-cmds.o qom-hmp-cmds.oSignature · 1 line
1.8.3.1
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Re: [Qemu-devel] [RFC v3 PATCH 41/45] multi-process/mon: trim HMP command set for remote storage processes
Quoted 109 lines · Dr. David Alan Gilbert
Quoted 93 lines · * Jagannathan Raman ([email protected]) wrote:
Trim down the list of HMP commands available for storage class of remote processes.
Signed-off-by Elena Ufimtseva <[email protected]>Signed-off-by John G Johnson <[email protected]>Signed-off-by Jagannathan Raman <[email protected]>---
New patch in v3Makefile.objs | 2 + Makefile.target | 14 +- hmp-scsi-commands-info.hx | 167 ++++++++++++++++++++ hmp-scsi-commands.hx | 384 +++++++++++++++++++++++++++++++++++++++++++++ monitor/misc.c | 84 +++++----- monitor/monitor-internal.h | 38 +++++ qom/Makefile.objs | 2 +- 7 files changed, 651 insertions(+), 40 deletions(-)create mode 100644 hmp-scsi-commands-info.hx
create mode 100644 hmp-scsi-commands.hxMakefile.objs +2
-0@@ -45,6 +45,8 @@ remote-pci-obj-$(CONFIG_MPQEMU) += iothread.o remote-lsi-obj-$(CONFIG_MPQEMU) += hw/ remote-lsi-obj-$(CONFIG_MPQEMU) += ui/ +remote-lsi-obj-$(CONFIG_MPQEMU) += device-hotplug.o + ####################################################################### # crypto-obj-y is code used by both qemu system emulation and qemu-imgMakefile.target +13
-1@@ -210,6 +210,10 @@ endif generated-files-y += hmp-commands.h hmp-commands-info.h generated-files-y += config-devices.h +ifdef CONFIG_MPQEMU +generated-files-y += hmp-scsi-commands.h hmp-scsi-commands-info.h +endif + endif # CONFIG_SOFTMMU dummy := $(call unnest-vars,,obj-y)@@ -294,10 +298,18 @@ hmp-commands.h: $(SRC_PATH)/hmp-commands.hx $(SRC_PATH)/scripts/hxtool hmp-commands-info.h: $(SRC_PATH)/hmp-commands-info.hx $(SRC_PATH)/scripts/hxtool $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"GEN","$(TARGET_DIR)$@") +ifdef CONFIG_MPQEMU +hmp-scsi-commands.h: $(SRC_PATH)/hmp-scsi-commands.hx $(SRC_PATH)/scripts/hxtool + $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"GEN","$(TARGET_DIR)$@") + +hmp-scsi-commands-info.h: $(SRC_PATH)/hmp-scsi-commands-info.hx $(SRC_PATH)/scripts/hxtool + $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"GEN","$(TARGET_DIR)$@") +endif + clean: clean-target rm -f *.a *~ $(PROGS) rm -f $(shell find . -name '*.[od]') - rm -f hmp-commands.h gdbstub-xml.c + rm -f hmp-commands.h gdbstub-xml.c hmp-scsi-commands.h hmp-scsi-commands-info.h rm -f trace/generated-helpers.c trace/generated-helpers.c-timestamp ifdef CONFIG_TRACE_SYSTEMTAP rm -f *.stphmp-scsi-commands-info.hx new file +19
-0@@ -0,0 +1,167 @@ +HXCOMM Use DEFHEADING() to define headings in both help text and texi +HXCOMM Text between STEXI and ETEXI are copied to texi version and +HXCOMM discarded from C version +HXCOMM DEF(command, args, callback, arg_string, help) is used to construct +HXCOMM monitor info commands +HXCOMM HXCOMM can be used for comments, discarded from both texi and C + +STEXI +@table @option +@item info @var{subcommand} +@findex info +Show various information about the system state. +@table @option +ETEXI + + { + .name = "version", + .args_type = "", + .params = "",hmp-scsi-commands-info.hx line 29
Quoted 10 lines
hmp-scsi-commands-info.hx new file +10
-0+ .help = "show the version of QEMU", + .cmd = hmp_info_version, + .flags = "p", + }, + +STEXI +@item info version +@findex info version +Show the version of QEMU. +ETEXIIt feels like you need a way to share this stuff without copying it; 'info version' isn't really a scsi specific command!
One idea is you could add a new field, e.g.
Quoted 3 lines
.subcommands = "scsi,somethingelse"
and then you process it to pick that up?
What do you think about breaking up hmp-commands-info.hx into smaller files based on the types of devices it applies to - for example, storage, network, console, etc..? We could then include the generated file based on the device type.
Thanks!
--
Jag
Quoted 435 lines
<snip>
monitor/misc.c int hmp_compare_cmd(const char *name, const char *list) · line 179
Quoted 10 lines
monitor/misc.c +1
-1@@ -176,12 +176,12 @@ int hmp_compare_cmd(const char *name, const char *list)return 0 ; } -static void do_help_cmd (Monitor *mon,const QDict *qdict) +void do_help_cmd (Monitor *mon,const QDict *qdict)If you're unstatic'ing things that don't have hmp in the name then you need to add it, i.e.
hmp_do_help_cmd.Dave
Quoted 413 lines
monitor/misc.c +45
-37{help_cmd (mon,qdict_get_try_str (qdict,"name" )); } -static void hmp_trace_event (Monitor *mon,const QDict *qdict) +void hmp_trace_event (Monitor *mon,const QDict *qdict) {const char *tp_name =qdict_get_str (qdict,"name" );bool new_state =qdict_get_bool (qdict,"option" );@@ -225,7 +225,7 @@ static void hmp_trace_file(Monitor *mon, const QDict *qdict) }#endif -static void hmp_info_help (Monitor *mon,const QDict *qdict) +void hmp_info_help (Monitor *mon,const QDict *qdict) {help_cmd (mon,"info" ); }@@ -436,7 +436,7 @@ int monitor_get_cpu_index(void)return cs ? cs->cpu_index :UNASSIGNED_CPU_INDEX ; } -static void hmp_info_registers (Monitor *mon,const QDict *qdict) +void hmp_info_registers (Monitor *mon,const QDict *qdict) {bool all_cpus =qdict_get_try_bool (qdict,"cpustate_all" , false);CPUState *cs;@@ -459,7 +459,7 @@ static void hmp_info_registers(Monitor *mon, const QDict *qdict) }#ifdef CONFIG_TCG -static void hmp_info_jit (Monitor *mon,const QDict *qdict) +void hmp_info_jit (Monitor *mon,const QDict *qdict) {if (!tcg_enabled ()) {error_report ("JIT information is only available with accel=tcg" );@@ -470,13 +470,13 @@ static void hmp_info_jit(Monitor *mon, const QDict *qdict) dump_drift_info(); } -static void hmp_info_opcount (Monitor *mon,const QDict *qdict) +void hmp_info_opcount (Monitor *mon,const QDict *qdict) {dump_opcount_info (); }#endif -static void hmp_info_sync_profile (Monitor *mon,const QDict *qdict) +void hmp_info_sync_profile (Monitor *mon,const QDict *qdict) {int64_t max =qdict_get_try_int (qdict,"max" ,10 );bool mean =qdict_get_try_bool (qdict,"mean" , false);@@ -487,7 +487,7 @@ static void hmp_info_sync_profile(Monitor *mon, const QDict *qdict)qsp_report (max, sort_by, coalesce); } -static void hmp_info_history (Monitor *mon,const QDict *qdict) +void hmp_info_history (Monitor *mon,const QDict *qdict) {MonitorHMP *hmp_mon =container_of (mon, MonitorHMP, common);int i;@@ -507,7 +507,7 @@ static void hmp_info_history(Monitor *mon, const QDict *qdict) } } -static void hmp_info_cpustats (Monitor *mon,const QDict *qdict) +void hmp_info_cpustats (Monitor *mon,const QDict *qdict) {CPUState *cs =mon_get_cpu ();@@ -518,7 +518,7 @@ static void hmp_info_cpustats(Monitor *mon, const QDict *qdict)cpu_dump_statistics (cs,0 ); } -static void hmp_info_trace_events (Monitor *mon,const QDict *qdict) +void hmp_info_trace_events (Monitor *mon,const QDict *qdict) {const char *name =qdict_get_try_str (qdict,"name" );bool has_vcpu =qdict_haskey (qdict,"vcpu" );@@ -578,7 +578,7 @@ void qmp_client_migrate_info(const char *protocol, const char *hostname,error_setg (errp,QERR_INVALID_PARAMETER_VALUE ,"protocol" ,"spice" ); } -static void hmp_logfile (Monitor *mon,const QDict *qdict) +void hmp_logfile (Monitor *mon,const QDict *qdict) {Error *err =NULL ;@@ -588,7 +588,7 @@ static void hmp_logfile(Monitor *mon, const QDict *qdict) } } -static void hmp_log (Monitor *mon,const QDict *qdict) +void hmp_log (Monitor *mon,const QDict *qdict) {int mask;const char *items =qdict_get_str (qdict,"items" );@@ -605,7 +605,7 @@ static void hmp_log(Monitor *mon, const QDict *qdict)qemu_set_log (mask); } -static void hmp_singlestep (Monitor *mon,const QDict *qdict) +void hmp_singlestep (Monitor *mon,const QDict *qdict) {const char *option =qdict_get_try_str (qdict,"option" );if (!option || !strcmp (option,"on" )) {@@ -617,7 +617,7 @@ static void hmp_singlestep(Monitor *mon, const QDict *qdict) } } -static void hmp_gdbserver (Monitor *mon,const QDict *qdict) +void hmp_gdbserver (Monitor *mon,const QDict *qdict) {const char *device =qdict_get_try_str (qdict,"device" );if (!device)@@ -633,7 +633,7 @@ static void hmp_gdbserver(Monitor *mon, const QDict *qdict) } } -static void hmp_watchdog_action (Monitor *mon,const QDict *qdict) +void hmp_watchdog_action (Monitor *mon,const QDict *qdict) {const char *action =qdict_get_str (qdict,"action" );if (select_watchdog_action (action) ==-1 ) {@@ -775,7 +775,7 @@ static void memory_dump(Monitor *mon, int count, int format, int wsize, } } -static void hmp_memory_dump (Monitor *mon,const QDict *qdict) +void hmp_memory_dump (Monitor *mon,const QDict *qdict) {int count =qdict_get_int (qdict,"count" );int format =qdict_get_int (qdict,"format" );@@ -785,7 +785,7 @@ static void hmp_memory_dump(Monitor *mon, const QDict *qdict)memory_dump (mon, count, format, size, addr,0 ); } -static void hmp_physical_memory_dump (Monitor *mon,const QDict *qdict) +void hmp_physical_memory_dump (Monitor *mon,const QDict *qdict) {int count =qdict_get_int (qdict,"count" );int format =qdict_get_int (qdict,"format" );@@ -815,7 +815,7 @@ static void *gpa2hva(MemoryRegion **p_mr, hwaddr addr, Error **errp)return qemu_map_ram_ptr (mrs.mr->ram_block, mrs.offset_within_region); } -static void hmp_gpa2hva (Monitor *mon,const QDict *qdict) +void hmp_gpa2hva (Monitor *mon,const QDict *qdict) {hwaddr addr =qdict_get_int (qdict,"addr" );Error *local_err =NULL ;@@ -835,7 +835,7 @@ static void hmp_gpa2hva(Monitor *mon, const QDict *qdict)memory_region_unref (mr); } -static void hmp_gva2gpa (Monitor *mon,const QDict *qdict) +void hmp_gva2gpa (Monitor *mon,const QDict *qdict) {target_ulong addr =qdict_get_int (qdict,"addr" );MemTxAttrs attrs;@@ -890,7 +890,7 @@ out:return ret; } -static void hmp_gpa2hpa (Monitor *mon,const QDict *qdict) +void hmp_gpa2hpa (Monitor *mon,const QDict *qdict) {hwaddr addr =qdict_get_int (qdict,"addr" );Error *local_err =NULL ;@@ -917,7 +917,7 @@ static void hmp_gpa2hpa(Monitor *mon, const QDict *qdict) }#endif -static void do_print (Monitor *mon,const QDict *qdict) +void do_print (Monitor *mon,const QDict *qdict) {int format =qdict_get_int (qdict,"format" );hwaddr val =qdict_get_int (qdict,"val" );@@ -943,7 +943,7 @@ static void do_print(Monitor *mon, const QDict *qdict)monitor_printf (mon,"\n" ); } -static void hmp_sum (Monitor *mon,const QDict *qdict) +void hmp_sum (Monitor *mon,const QDict *qdict) {uint32_t addr;uint16_t sum;@@ -963,7 +963,7 @@ static void hmp_sum(Monitor *mon, const QDict *qdict)static int mouse_button_state; -static void hmp_mouse_move (Monitor *mon,const QDict *qdict) +void hmp_mouse_move (Monitor *mon,const QDict *qdict) {int dx, dy, dz, button;const char *dx_str =qdict_get_str (qdict,"dx_str" );@@ -987,7 +987,7 @@ static void hmp_mouse_move(Monitor *mon, const QDict *qdict)qemu_input_event_sync (); } -static void hmp_mouse_button (Monitor *mon,const QDict *qdict) +void hmp_mouse_button (Monitor *mon,const QDict *qdict) {static uint32_t bmap[INPUT_BUTTON__MAX ] = { [INPUT_BUTTON_LEFT ] =MOUSE_EVENT_LBUTTON ,@@ -1004,7 +1004,7 @@ static void hmp_mouse_button(Monitor *mon, const QDict *qdict) mouse_button_state = button_state; } -static void hmp_ioport_read (Monitor *mon,const QDict *qdict) +void hmp_ioport_read (Monitor *mon,const QDict *qdict) {int size =qdict_get_int (qdict,"size" );int addr =qdict_get_int (qdict,"addr" );@@ -1038,7 +1038,7 @@ static void hmp_ioport_read(Monitor *mon, const QDict *qdict) suffix, addr, size * 2, val); } -static void hmp_ioport_write (Monitor *mon,const QDict *qdict) +void hmp_ioport_write (Monitor *mon,const QDict *qdict) {int size =qdict_get_int (qdict,"size" );int addr =qdict_get_int (qdict,"addr" );@@ -1060,7 +1060,7 @@ static void hmp_ioport_write(Monitor *mon, const QDict *qdict) } } -static void hmp_boot_set (Monitor *mon,const QDict *qdict) +void hmp_boot_set (Monitor *mon,const QDict *qdict) {Error *local_err =NULL ;const char *bootdevice =qdict_get_str (qdict,"bootdevice" );@@ -1073,7 +1073,7 @@ static void hmp_boot_set(Monitor *mon, const QDict *qdict) } } -static void hmp_info_mtree (Monitor *mon,const QDict *qdict) +void hmp_info_mtree (Monitor *mon,const QDict *qdict) {bool flatview =qdict_get_try_bool (qdict,"flatview" , false);bool dispatch_tree =qdict_get_try_bool (qdict,"dispatch_tree" , false);@@ -1086,7 +1086,7 @@ static void hmp_info_mtree(Monitor *mon, const QDict *qdict)int64_t dev_time; -static void hmp_info_profile (Monitor *mon,const QDict *qdict) +void hmp_info_profile (Monitor *mon,const QDict *qdict) {static int64_t last_cpu_exec_time;int64_t cpu_exec_time;@@ -1103,7 +1103,7 @@ static void hmp_info_profile(Monitor *mon, const QDict *qdict) dev_time = 0; }#else -static void hmp_info_profile (Monitor *mon,const QDict *qdict) +void hmp_info_profile (Monitor *mon,const QDict *qdict) {monitor_printf (mon,"Internal profiler not compiled\n" ); }@@ -1112,7 +1112,7 @@ static void hmp_info_profile(Monitor *mon, const QDict *qdict)/* Capture support */ static QLIST_HEAD (capture_list_head, CaptureState) capture_head; -static void hmp_info_capture (Monitor *mon,const QDict *qdict) +void hmp_info_capture (Monitor *mon,const QDict *qdict) {int i;CaptureState *s;@@ -1123,7 +1123,7 @@ static void hmp_info_capture(Monitor *mon, const QDict *qdict) } } -static void hmp_stopcapture (Monitor *mon,const QDict *qdict) +void hmp_stopcapture (Monitor *mon,const QDict *qdict) {int i;int n =qdict_get_int (qdict,"n" );@@ -1139,7 +1139,7 @@ static void hmp_stopcapture(Monitor *mon, const QDict *qdict) } } -static void hmp_wavcapture (Monitor *mon,const QDict *qdict) +void hmp_wavcapture (Monitor *mon,const QDict *qdict) {const char *path =qdict_get_str (qdict,"path" );int has_freq =qdict_haskey (qdict,"freq" );@@ -1192,7 +1192,7 @@ static void hmp_warn_acl(void) warn_acl = true; } -static void hmp_acl_show (Monitor *mon,const QDict *qdict) +void hmp_acl_show (Monitor *mon,const QDict *qdict) {const char *aclname =qdict_get_str (qdict,"aclname" );QAuthZList *auth =find_auth (mon, aclname);@@ -1219,7 +1219,7 @@ static void hmp_acl_show(Monitor *mon, const QDict *qdict) } } -static void hmp_acl_reset (Monitor *mon,const QDict *qdict) +void hmp_acl_reset (Monitor *mon,const QDict *qdict) {const char *aclname =qdict_get_str (qdict,"aclname" );QAuthZList *auth =find_auth (mon, aclname);@@ -1236,7 +1236,7 @@ static void hmp_acl_reset(Monitor *mon, const QDict *qdict)monitor_printf (mon,"acl: removed all rules\n" ); } -static void hmp_acl_policy (Monitor *mon,const QDict *qdict) +void hmp_acl_policy (Monitor *mon,const QDict *qdict) {const char *aclname =qdict_get_str (qdict,"aclname" );const char *policy =qdict_get_str (qdict,"policy" );@@ -1277,7 +1277,7 @@ static QAuthZListFormat hmp_acl_get_format(const char *match) } } -static void hmp_acl_add (Monitor *mon,const QDict *qdict) +void hmp_acl_add (Monitor *mon,const QDict *qdict) {const char *aclname =qdict_get_str (qdict,"aclname" );const char *match =qdict_get_str (qdict,"match" );@@ -1330,7 +1330,7 @@ static void hmp_acl_add(Monitor *mon, const QDict *qdict) } } -static void hmp_acl_remove (Monitor *mon,const QDict *qdict) +void hmp_acl_remove (Monitor *mon,const QDict *qdict) {const char *aclname =qdict_get_str (qdict,"aclname" );const char *match =qdict_get_str (qdict,"match" );@@ -1799,13 +1799,21 @@ int monitor_fd_param(Monitor *mon, const char *fdname, Error **errp)/* Please update hmp-commands.hx when adding or changing commands */ static HMPCommand hmp_info_cmds[] = { +#if defined(SCSI_PROCESS ) +#include "hmp-scsi-commands-info.h" +#else #include "hmp-commands-info.h" +#endif { NULL, NULL, }, }; /* hmp_cmds and hmp_info_cmds would be sorted at runtime */ HMPCommand hmp_cmds[] = { +#if defined(SCSI_PROCESS) +#include "hmp-scsi-commands.h" +#else #include "hmp-commands.h" +#endif { NULL, NULL, }, };monitor/monitor-internal.h +38
-0@@ -180,4 +180,42 @@ void help_cmd(Monitor *mon, const char *name);void handle_hmp_command (MonitorHMP *mon,const char *cmdline);int hmp_compare_cmd (const char *name,const char *list); +void do_help_cmd (Monitor *mon,const QDict *qdict); +void hmp_trace_event (Monitor *mon,const QDict *qdict); +void hmp_info_help (Monitor *mon,const QDict *qdict); +void hmp_info_registers (Monitor *mon,const QDict *qdict); +void hmp_info_jit (Monitor *mon,const QDict *qdict); +void hmp_info_opcount (Monitor *mon,const QDict *qdict); +void hmp_info_sync_profile (Monitor *mon,const QDict *qdict); +void hmp_info_history (Monitor *mon,const QDict *qdict); +void hmp_info_cpustats (Monitor *mon,const QDict *qdict); +void hmp_info_trace_events (Monitor *mon,const QDict *qdict); +void hmp_logfile (Monitor *mon,const QDict *qdict); +void hmp_log (Monitor *mon,const QDict *qdict); +void hmp_singlestep (Monitor *mon,const QDict *qdict); +void hmp_gdbserver (Monitor *mon,const QDict *qdict); +void hmp_watchdog_action (Monitor *mon,const QDict *qdict); +void hmp_memory_dump (Monitor *mon,const QDict *qdict); +void hmp_physical_memory_dump (Monitor *mon,const QDict *qdict); +void hmp_gpa2hva (Monitor *mon,const QDict *qdict); +void hmp_gva2gpa (Monitor *mon,const QDict *qdict); +void hmp_gpa2hpa (Monitor *mon,const QDict *qdict); +void do_print (Monitor *mon,const QDict *qdict); +void hmp_sum (Monitor *mon,const QDict *qdict); +void hmp_mouse_move (Monitor *mon,const QDict *qdict); +void hmp_mouse_button (Monitor *mon,const QDict *qdict); +void hmp_ioport_read (Monitor *mon,const QDict *qdict); +void hmp_ioport_write (Monitor *mon,const QDict *qdict); +void hmp_boot_set (Monitor *mon,const QDict *qdict); +void hmp_info_mtree (Monitor *mon,const QDict *qdict); +void hmp_info_profile (Monitor *mon,const QDict *qdict); +void hmp_info_capture (Monitor *mon,const QDict *qdict); +void hmp_stopcapture (Monitor *mon,const QDict *qdict); +void hmp_wavcapture (Monitor *mon,const QDict *qdict); +void hmp_acl_show (Monitor *mon,const QDict *qdict); +void hmp_acl_reset (Monitor *mon,const QDict *qdict); +void hmp_acl_policy (Monitor *mon,const QDict *qdict); +void hmp_acl_add (Monitor *mon,const QDict *qdict); +void hmp_acl_remove (Monitor *mon,const QDict *qdict); +#endif qom/Makefile.objs +1
-1@@ -7,4 +7,4 @@ common-obj-$(CONFIG_SOFTMMU) += qom-hmp-cmds.o qom-qmp-cmds.o remote-pci-obj-$(CONFIG_MPQEMU) += object.o qom-qobject.o container.o remote-pci-obj-$(CONFIG_MPQEMU) += object_interfaces.o remote-pci-obj-$(CONFIG_MPQEMU) += cpu.o -remote-pci-obj-$(CONFIG_MPQEMU) += qom-qmp-cmds.o +remote-pci-obj-$(CONFIG_MPQEMU) += qom-qmp-cmds.o qom-hmp-cmds.oSignature · 1 line
1.8.3.1--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Re: [Qemu-devel] [RFC v3 PATCH 41/45] multi-process/mon: trim HMP command set for remote storage processes
Quoted 107 lines · * Jag Raman ([email protected]) wrote:
Quoted 104 lines · Dr. David Alan Gilbert
Quoted 88 lines · * Jagannathan Raman ([email protected]) wrote:
Trim down the list of HMP commands available for storage class of remote processes.
Signed-off-by Elena Ufimtseva <[email protected]>Signed-off-by John G Johnson <[email protected]>Signed-off-by Jagannathan Raman <[email protected]>---
New patch in v3Makefile.objs | 2 + Makefile.target | 14 +- hmp-scsi-commands-info.hx | 167 ++++++++++++++++++++ hmp-scsi-commands.hx | 384 +++++++++++++++++++++++++++++++++++++++++++++ monitor/misc.c | 84 +++++----- monitor/monitor-internal.h | 38 +++++ qom/Makefile.objs | 2 +- 7 files changed, 651 insertions(+), 40 deletions(-)create mode 100644 hmp-scsi-commands-info.hx
create mode 100644 hmp-scsi-commands.hxMakefile.objs +2
-0@@ -45,6 +45,8 @@ remote-pci-obj-$(CONFIG_MPQEMU) += iothread.o remote-lsi-obj-$(CONFIG_MPQEMU) += hw/ remote-lsi-obj-$(CONFIG_MPQEMU) += ui/ +remote-lsi-obj-$(CONFIG_MPQEMU) += device-hotplug.o + ####################################################################### # crypto-obj-y is code used by both qemu system emulation and qemu-imgMakefile.target +13
-1@@ -210,6 +210,10 @@ endif generated-files-y += hmp-commands.h hmp-commands-info.h generated-files-y += config-devices.h +ifdef CONFIG_MPQEMU +generated-files-y += hmp-scsi-commands.h hmp-scsi-commands-info.h +endif + endif # CONFIG_SOFTMMU dummy := $(call unnest-vars,,obj-y)@@ -294,10 +298,18 @@ hmp-commands.h: $(SRC_PATH)/hmp-commands.hx $(SRC_PATH)/scripts/hxtool hmp-commands-info.h: $(SRC_PATH)/hmp-commands-info.hx $(SRC_PATH)/scripts/hxtool $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"GEN","$(TARGET_DIR)$@") +ifdef CONFIG_MPQEMU +hmp-scsi-commands.h: $(SRC_PATH)/hmp-scsi-commands.hx $(SRC_PATH)/scripts/hxtool + $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"GEN","$(TARGET_DIR)$@") + +hmp-scsi-commands-info.h: $(SRC_PATH)/hmp-scsi-commands-info.hx $(SRC_PATH)/scripts/hxtool + $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"GEN","$(TARGET_DIR)$@") +endif + clean: clean-target rm -f *.a *~ $(PROGS) rm -f $(shell find . -name '*.[od]') - rm -f hmp-commands.h gdbstub-xml.c + rm -f hmp-commands.h gdbstub-xml.c hmp-scsi-commands.h hmp-scsi-commands-info.h rm -f trace/generated-helpers.c trace/generated-helpers.c-timestamp ifdef CONFIG_TRACE_SYSTEMTAP rm -f *.stphmp-scsi-commands-info.hx new file +19
-0@@ -0,0 +1,167 @@ +HXCOMM Use DEFHEADING() to define headings in both help text and texi +HXCOMM Text between STEXI and ETEXI are copied to texi version and +HXCOMM discarded from C version +HXCOMM DEF(command, args, callback, arg_string, help) is used to construct +HXCOMM monitor info commands +HXCOMM HXCOMM can be used for comments, discarded from both texi and C + +STEXI +@table @option +@item info @var{subcommand} +@findex info +Show various information about the system state. +@table @option +ETEXI + + { + .name = "version", + .args_type = "", + .params = "",hmp-scsi-commands-info.hx line 29
Quoted 10 lines
hmp-scsi-commands-info.hx new file +10
-0+ .help = "show the version of QEMU", + .cmd = hmp_info_version, + .flags = "p", + }, + +STEXI +@item info version +@findex info version +Show the version of QEMU. +ETEXIIt feels like you need a way to share this stuff without copying it; 'info version' isn't really a scsi specific command!
One idea is you could add a new field, e.g.
Quoted 8 lines
Quoted 3 lines
.subcommands = "scsi,somethingelse"
and then you process it to pick that up?
What do you think about breaking up hmp-commands-info.hx into smaller files based on the types of devices it applies to - for example, storage, network, console, etc..? We could then include the generated file based on the device type.
Yes that makes sense; however the question is whether the things your programs need split so neatly.
Dave
Quoted 394 lines
Thanks!
--
JagQuoted 390 lines
<snip>
monitor/misc.c int hmp_compare_cmd(const char *name, const char *list) · line 178
Quoted 9 lines
monitor/misc.c +1
-1@@ -176,12 +176,12 @@ int hmp_compare_cmd(const char *name, const char *list)return 0 ; } -static void do_help_cmd (Monitor *mon,const QDict *qdict) +void do_help_cmd (Monitor *mon,const QDict *qdict)If you're unstatic'ing things that don't have hmp in the name then you need to add it, i.e.
hmp_do_help_cmd.Dave
Quoted 369 lines
monitor/misc.c +45
-37{help_cmd (mon,qdict_get_try_str (qdict,"name" )); } -static void hmp_trace_event (Monitor *mon,const QDict *qdict) +void hmp_trace_event (Monitor *mon,const QDict *qdict) {const char *tp_name =qdict_get_str (qdict,"name" );bool new_state =qdict_get_bool (qdict,"option" );@@ -225,7 +225,7 @@ static void hmp_trace_file(Monitor *mon, const QDict *qdict) }#endif -static void hmp_info_help (Monitor *mon,const QDict *qdict) +void hmp_info_help (Monitor *mon,const QDict *qdict) {help_cmd (mon,"info" ); }@@ -436,7 +436,7 @@ int monitor_get_cpu_index(void)return cs ? cs->cpu_index :UNASSIGNED_CPU_INDEX ; } -static void hmp_info_registers (Monitor *mon,const QDict *qdict) +void hmp_info_registers (Monitor *mon,const QDict *qdict) {bool all_cpus =qdict_get_try_bool (qdict,"cpustate_all" , false);CPUState *cs;@@ -459,7 +459,7 @@ static void hmp_info_registers(Monitor *mon, const QDict *qdict) }#ifdef CONFIG_TCG -static void hmp_info_jit (Monitor *mon,const QDict *qdict) +void hmp_info_jit (Monitor *mon,const QDict *qdict) {if (!tcg_enabled ()) {error_report ("JIT information is only available with accel=tcg" );@@ -470,13 +470,13 @@ static void hmp_info_jit(Monitor *mon, const QDict *qdict) dump_drift_info(); } -static void hmp_info_opcount (Monitor *mon,const QDict *qdict) +void hmp_info_opcount (Monitor *mon,const QDict *qdict) {dump_opcount_info (); }#endif -static void hmp_info_sync_profile (Monitor *mon,const QDict *qdict) +void hmp_info_sync_profile (Monitor *mon,const QDict *qdict) {int64_t max =qdict_get_try_int (qdict,"max" ,10 );bool mean =qdict_get_try_bool (qdict,"mean" , false);@@ -487,7 +487,7 @@ static void hmp_info_sync_profile(Monitor *mon, const QDict *qdict)qsp_report (max, sort_by, coalesce); } -static void hmp_info_history (Monitor *mon,const QDict *qdict) +void hmp_info_history (Monitor *mon,const QDict *qdict) {MonitorHMP *hmp_mon =container_of (mon, MonitorHMP, common);int i;@@ -507,7 +507,7 @@ static void hmp_info_history(Monitor *mon, const QDict *qdict) } } -static void hmp_info_cpustats (Monitor *mon,const QDict *qdict) +void hmp_info_cpustats (Monitor *mon,const QDict *qdict) {CPUState *cs =mon_get_cpu ();@@ -518,7 +518,7 @@ static void hmp_info_cpustats(Monitor *mon, const QDict *qdict)cpu_dump_statistics (cs,0 ); } -static void hmp_info_trace_events (Monitor *mon,const QDict *qdict) +void hmp_info_trace_events (Monitor *mon,const QDict *qdict) {const char *name =qdict_get_try_str (qdict,"name" );bool has_vcpu =qdict_haskey (qdict,"vcpu" );@@ -578,7 +578,7 @@ void qmp_client_migrate_info(const char *protocol, const char *hostname,error_setg (errp,QERR_INVALID_PARAMETER_VALUE ,"protocol" ,"spice" ); } -static void hmp_logfile (Monitor *mon,const QDict *qdict) +void hmp_logfile (Monitor *mon,const QDict *qdict) {Error *err =NULL ;@@ -588,7 +588,7 @@ static void hmp_logfile(Monitor *mon, const QDict *qdict) } } -static void hmp_log (Monitor *mon,const QDict *qdict) +void hmp_log (Monitor *mon,const QDict *qdict) {int mask;const char *items =qdict_get_str (qdict,"items" );@@ -605,7 +605,7 @@ static void hmp_log(Monitor *mon, const QDict *qdict)qemu_set_log (mask); } -static void hmp_singlestep (Monitor *mon,const QDict *qdict) +void hmp_singlestep (Monitor *mon,const QDict *qdict) {const char *option =qdict_get_try_str (qdict,"option" );if (!option || !strcmp (option,"on" )) {@@ -617,7 +617,7 @@ static void hmp_singlestep(Monitor *mon, const QDict *qdict) } } -static void hmp_gdbserver (Monitor *mon,const QDict *qdict) +void hmp_gdbserver (Monitor *mon,const QDict *qdict) {const char *device =qdict_get_try_str (qdict,"device" );if (!device)@@ -633,7 +633,7 @@ static void hmp_gdbserver(Monitor *mon, const QDict *qdict) } } -static void hmp_watchdog_action (Monitor *mon,const QDict *qdict) +void hmp_watchdog_action (Monitor *mon,const QDict *qdict) {const char *action =qdict_get_str (qdict,"action" );if (select_watchdog_action (action) ==-1 ) {@@ -775,7 +775,7 @@ static void memory_dump(Monitor *mon, int count, int format, int wsize, } } -static void hmp_memory_dump (Monitor *mon,const QDict *qdict) +void hmp_memory_dump (Monitor *mon,const QDict *qdict) {int count =qdict_get_int (qdict,"count" );int format =qdict_get_int (qdict,"format" );@@ -785,7 +785,7 @@ static void hmp_memory_dump(Monitor *mon, const QDict *qdict)memory_dump (mon, count, format, size, addr,0 ); } -static void hmp_physical_memory_dump (Monitor *mon,const QDict *qdict) +void hmp_physical_memory_dump (Monitor *mon,const QDict *qdict) {int count =qdict_get_int (qdict,"count" );int format =qdict_get_int (qdict,"format" );@@ -815,7 +815,7 @@ static void *gpa2hva(MemoryRegion **p_mr, hwaddr addr, Error **errp)return qemu_map_ram_ptr (mrs.mr->ram_block, mrs.offset_within_region); } -static void hmp_gpa2hva (Monitor *mon,const QDict *qdict) +void hmp_gpa2hva (Monitor *mon,const QDict *qdict) {hwaddr addr =qdict_get_int (qdict,"addr" );Error *local_err =NULL ;@@ -835,7 +835,7 @@ static void hmp_gpa2hva(Monitor *mon, const QDict *qdict)memory_region_unref (mr); } -static void hmp_gva2gpa (Monitor *mon,const QDict *qdict) +void hmp_gva2gpa (Monitor *mon,const QDict *qdict) {target_ulong addr =qdict_get_int (qdict,"addr" );MemTxAttrs attrs;@@ -890,7 +890,7 @@ out:return ret; } -static void hmp_gpa2hpa (Monitor *mon,const QDict *qdict) +void hmp_gpa2hpa (Monitor *mon,const QDict *qdict) {hwaddr addr =qdict_get_int (qdict,"addr" );Error *local_err =NULL ;@@ -917,7 +917,7 @@ static void hmp_gpa2hpa(Monitor *mon, const QDict *qdict) }#endif -static void do_print (Monitor *mon,const QDict *qdict) +void do_print (Monitor *mon,const QDict *qdict) {int format =qdict_get_int (qdict,"format" );hwaddr val =qdict_get_int (qdict,"val" );@@ -943,7 +943,7 @@ static void do_print(Monitor *mon, const QDict *qdict)monitor_printf (mon,"\n" ); } -static void hmp_sum (Monitor *mon,const QDict *qdict) +void hmp_sum (Monitor *mon,const QDict *qdict) {uint32_t addr;uint16_t sum;@@ -963,7 +963,7 @@ static void hmp_sum(Monitor *mon, const QDict *qdict)static int mouse_button_state; -static void hmp_mouse_move (Monitor *mon,const QDict *qdict) +void hmp_mouse_move (Monitor *mon,const QDict *qdict) {int dx, dy, dz, button;const char *dx_str =qdict_get_str (qdict,"dx_str" );@@ -987,7 +987,7 @@ static void hmp_mouse_move(Monitor *mon, const QDict *qdict)qemu_input_event_sync (); } -static void hmp_mouse_button (Monitor *mon,const QDict *qdict) +void hmp_mouse_button (Monitor *mon,const QDict *qdict) {static uint32_t bmap[INPUT_BUTTON__MAX ] = { [INPUT_BUTTON_LEFT ] =MOUSE_EVENT_LBUTTON ,@@ -1004,7 +1004,7 @@ static void hmp_mouse_button(Monitor *mon, const QDict *qdict) mouse_button_state = button_state; } -static void hmp_ioport_read (Monitor *mon,const QDict *qdict) +void hmp_ioport_read (Monitor *mon,const QDict *qdict) {int size =qdict_get_int (qdict,"size" );int addr =qdict_get_int (qdict,"addr" );@@ -1038,7 +1038,7 @@ static void hmp_ioport_read(Monitor *mon, const QDict *qdict) suffix, addr, size * 2, val); } -static void hmp_ioport_write (Monitor *mon,const QDict *qdict) +void hmp_ioport_write (Monitor *mon,const QDict *qdict) {int size =qdict_get_int (qdict,"size" );int addr =qdict_get_int (qdict,"addr" );@@ -1060,7 +1060,7 @@ static void hmp_ioport_write(Monitor *mon, const QDict *qdict) } } -static void hmp_boot_set (Monitor *mon,const QDict *qdict) +void hmp_boot_set (Monitor *mon,const QDict *qdict) {Error *local_err =NULL ;const char *bootdevice =qdict_get_str (qdict,"bootdevice" );@@ -1073,7 +1073,7 @@ static void hmp_boot_set(Monitor *mon, const QDict *qdict) } } -static void hmp_info_mtree (Monitor *mon,const QDict *qdict) +void hmp_info_mtree (Monitor *mon,const QDict *qdict) {bool flatview =qdict_get_try_bool (qdict,"flatview" , false);bool dispatch_tree =qdict_get_try_bool (qdict,"dispatch_tree" , false);@@ -1086,7 +1086,7 @@ static void hmp_info_mtree(Monitor *mon, const QDict *qdict)int64_t dev_time; -static void hmp_info_profile (Monitor *mon,const QDict *qdict) +void hmp_info_profile (Monitor *mon,const QDict *qdict) {static int64_t last_cpu_exec_time;int64_t cpu_exec_time;@@ -1103,7 +1103,7 @@ static void hmp_info_profile(Monitor *mon, const QDict *qdict) dev_time = 0; }#else -static void hmp_info_profile (Monitor *mon,const QDict *qdict) +void hmp_info_profile (Monitor *mon,const QDict *qdict) {monitor_printf (mon,"Internal profiler not compiled\n" ); }@@ -1112,7 +1112,7 @@ static void hmp_info_profile(Monitor *mon, const QDict *qdict)/* Capture support */ static QLIST_HEAD (capture_list_head, CaptureState) capture_head; -static void hmp_info_capture (Monitor *mon,const QDict *qdict) +void hmp_info_capture (Monitor *mon,const QDict *qdict) {int i;CaptureState *s;@@ -1123,7 +1123,7 @@ static void hmp_info_capture(Monitor *mon, const QDict *qdict) } } -static void hmp_stopcapture (Monitor *mon,const QDict *qdict) +void hmp_stopcapture (Monitor *mon,const QDict *qdict) {int i;int n =qdict_get_int (qdict,"n" );@@ -1139,7 +1139,7 @@ static void hmp_stopcapture(Monitor *mon, const QDict *qdict) } } -static void hmp_wavcapture (Monitor *mon,const QDict *qdict) +void hmp_wavcapture (Monitor *mon,const QDict *qdict) {const char *path =qdict_get_str (qdict,"path" );int has_freq =qdict_haskey (qdict,"freq" );@@ -1192,7 +1192,7 @@ static void hmp_warn_acl(void) warn_acl = true; } -static void hmp_acl_show (Monitor *mon,const QDict *qdict) +void hmp_acl_show (Monitor *mon,const QDict *qdict) {const char *aclname =qdict_get_str (qdict,"aclname" );QAuthZList *auth =find_auth (mon, aclname);@@ -1219,7 +1219,7 @@ static void hmp_acl_show(Monitor *mon, const QDict *qdict) } } -static void hmp_acl_reset (Monitor *mon,const QDict *qdict) +void hmp_acl_reset (Monitor *mon,const QDict *qdict) {const char *aclname =qdict_get_str (qdict,"aclname" );QAuthZList *auth =find_auth (mon, aclname);@@ -1236,7 +1236,7 @@ static void hmp_acl_reset(Monitor *mon, const QDict *qdict)monitor_printf (mon,"acl: removed all rules\n" ); } -static void hmp_acl_policy (Monitor *mon,const QDict *qdict) +void hmp_acl_policy (Monitor *mon,const QDict *qdict) {const char *aclname =qdict_get_str (qdict,"aclname" );const char *policy =qdict_get_str (qdict,"policy" );@@ -1277,7 +1277,7 @@ static QAuthZListFormat hmp_acl_get_format(const char *match) } } -static void hmp_acl_add (Monitor *mon,const QDict *qdict) +void hmp_acl_add (Monitor *mon,const QDict *qdict) {const char *aclname =qdict_get_str (qdict,"aclname" );const char *match =qdict_get_str (qdict,"match" );@@ -1330,7 +1330,7 @@ static void hmp_acl_add(Monitor *mon, const QDict *qdict) } } -static void hmp_acl_remove (Monitor *mon,const QDict *qdict) +void hmp_acl_remove (Monitor *mon,const QDict *qdict) {const char *aclname =qdict_get_str (qdict,"aclname" );const char *match =qdict_get_str (qdict,"match" );@@ -1799,13 +1799,21 @@ int monitor_fd_param(Monitor *mon, const char *fdname, Error **errp)/* Please update hmp-commands.hx when adding or changing commands */ static HMPCommand hmp_info_cmds[] = { +#if defined(SCSI_PROCESS ) +#include "hmp-scsi-commands-info.h" +#else #include "hmp-commands-info.h" +#endif { NULL, NULL, }, }; /* hmp_cmds and hmp_info_cmds would be sorted at runtime */ HMPCommand hmp_cmds[] = { +#if defined(SCSI_PROCESS) +#include "hmp-scsi-commands.h" +#else #include "hmp-commands.h" +#endif { NULL, NULL, }, };monitor/monitor-internal.h +38
-0@@ -180,4 +180,42 @@ void help_cmd(Monitor *mon, const char *name);void handle_hmp_command (MonitorHMP *mon,const char *cmdline);int hmp_compare_cmd (const char *name,const char *list); +void do_help_cmd (Monitor *mon,const QDict *qdict); +void hmp_trace_event (Monitor *mon,const QDict *qdict); +void hmp_info_help (Monitor *mon,const QDict *qdict); +void hmp_info_registers (Monitor *mon,const QDict *qdict); +void hmp_info_jit (Monitor *mon,const QDict *qdict); +void hmp_info_opcount (Monitor *mon,const QDict *qdict); +void hmp_info_sync_profile (Monitor *mon,const QDict *qdict); +void hmp_info_history (Monitor *mon,const QDict *qdict); +void hmp_info_cpustats (Monitor *mon,const QDict *qdict); +void hmp_info_trace_events (Monitor *mon,const QDict *qdict); +void hmp_logfile (Monitor *mon,const QDict *qdict); +void hmp_log (Monitor *mon,const QDict *qdict); +void hmp_singlestep (Monitor *mon,const QDict *qdict); +void hmp_gdbserver (Monitor *mon,const QDict *qdict); +void hmp_watchdog_action (Monitor *mon,const QDict *qdict); +void hmp_memory_dump (Monitor *mon,const QDict *qdict); +void hmp_physical_memory_dump (Monitor *mon,const QDict *qdict); +void hmp_gpa2hva (Monitor *mon,const QDict *qdict); +void hmp_gva2gpa (Monitor *mon,const QDict *qdict); +void hmp_gpa2hpa (Monitor *mon,const QDict *qdict); +void do_print (Monitor *mon,const QDict *qdict); +void hmp_sum (Monitor *mon,const QDict *qdict); +void hmp_mouse_move (Monitor *mon,const QDict *qdict); +void hmp_mouse_button (Monitor *mon,const QDict *qdict); +void hmp_ioport_read (Monitor *mon,const QDict *qdict); +void hmp_ioport_write (Monitor *mon,const QDict *qdict); +void hmp_boot_set (Monitor *mon,const QDict *qdict); +void hmp_info_mtree (Monitor *mon,const QDict *qdict); +void hmp_info_profile (Monitor *mon,const QDict *qdict); +void hmp_info_capture (Monitor *mon,const QDict *qdict); +void hmp_stopcapture (Monitor *mon,const QDict *qdict); +void hmp_wavcapture (Monitor *mon,const QDict *qdict); +void hmp_acl_show (Monitor *mon,const QDict *qdict); +void hmp_acl_reset (Monitor *mon,const QDict *qdict); +void hmp_acl_policy (Monitor *mon,const QDict *qdict); +void hmp_acl_add (Monitor *mon,const QDict *qdict); +void hmp_acl_remove (Monitor *mon,const QDict *qdict); +#endif qom/Makefile.objs +1
-1@@ -7,4 +7,4 @@ common-obj-$(CONFIG_SOFTMMU) += qom-hmp-cmds.o qom-qmp-cmds.o remote-pci-obj-$(CONFIG_MPQEMU) += object.o qom-qobject.o container.o remote-pci-obj-$(CONFIG_MPQEMU) += object_interfaces.o remote-pci-obj-$(CONFIG_MPQEMU) += cpu.o -remote-pci-obj-$(CONFIG_MPQEMU) += qom-qmp-cmds.o +remote-pci-obj-$(CONFIG_MPQEMU) += qom-qmp-cmds.o qom-hmp-cmds.oSignature · 1 line
1.8.3.1--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
RFC PATCH v3 42/45 multi-process/mon: Initialize QMP module for remote processes
In reply to Jagannathan Raman---
New patch in v3
remote/remote-main.c | 11 +++++++++++ remote/remote-opts.c | 10 ++++++++++ 2 files changed, 21 insertions(+)
remote/remote-main.c +11 -0
@@ -68,6 +68,7 @@#include "monitor/monitor.h" #include "sysemu/reset.h" +#include "vl.h" static ProxyLinkState *proxy_link;
@@ -562,6 +563,8 @@ int main(int argc, char *argv[], char **envp)module_call_init (MODULE_INIT_QOM ); +monitor_init_globals (); +bdrv_init_with_whitelist ();if (qemu_init_main_loop (&err)) {
@@ -577,6 +580,8 @@ int main(int argc, char *argv[], char **envp)qemu_add_opts (&qemu_device_opts);qemu_add_opts (&qemu_drive_opts); +qemu_add_opts (&qemu_chardev_opts); +qemu_add_opts (&qemu_mon_opts);qemu_add_drive_opts (&qemu_legacy_drive_opts);qemu_add_drive_opts (&qemu_common_drive_opts);qemu_add_drive_opts (&qemu_drive_opts);
@@ -609,6 +614,12 @@ int main(int argc, char *argv[], char **envp)proxy_link_set_callback (proxy_link, process_msg); +qemu_opts_foreach (qemu_find_opts ("chardev" ), + chardev_init_func,NULL , &error_fatal); + +qemu_opts_foreach (qemu_find_opts ("mon" ), + mon_init_func,NULL , &error_fatal); +start_handler (proxy_link);return 0 ;
remote/remote-opts.c +10 -0
@@ -95,6 +95,16 @@ void parse_cmdline(int argc, char **argv, char **envp)exit (1 ); }break ; +case QEMU_OPTION_qmp: +monitor_parse (optarg,"control" , false); +break ; +case QEMU_OPTION_monitor: +if (!strncmp (optarg,"stdio" ,5 )) { +warn_report ("STDIO not supported in remote process" ); + }else if (strncmp (optarg,"none" ,4 )) { +monitor_parse (optarg,"readline" , false); + } +break ;default :break ; }
Signature · 1 line
1.8.3.1
RFC PATCH v3 43/45 multi-process: prevent duplicate memory initialization in remote
In reply to Jagannathan RamanWhen multiple controllers are configured in a remote process, it's better for the memory to be managed by only one of the proxy objects for that process, in order to conserve file descriptors. Added "mem_int" flag for this purpose.
---
New patch in v3
hw/proxy/qemu-proxy.c | 13 ++++++++++++- include/hw/proxy/qemu-proxy.h | 1 + qdev-monitor.c | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-)
hw/proxy/qemu-proxy.c +12 -1
@@ -363,6 +363,13 @@ static void pci_proxy_write_config(PCIDevice *d, uint32_t addr, uint32_t val, PCI_PROXY_DEV(d)->dev_id, CONF_WRITE); } +static void pci_proxy_dev_inst_init (Object *obj) +{ +PCIProxyDev *dev =PCI_PROXY_DEV (obj); + + dev->mem_init = false; +} +static void pci_proxy_dev_class_init (ObjectClass *klass,void *data) {PCIDeviceClass *k =PCI_DEVICE_CLASS (klass);
@@ -377,6 +384,7 @@ static const TypeInfo pci_proxy_dev_type_info = { .name = TYPE_PCI_PROXY_DEV, .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(PCIProxyDev), + .instance_init = pci_proxy_dev_inst_init, .abstract = true, .class_size = sizeof(PCIProxyDevClass), .class_init = pci_proxy_dev_class_init,
@@ -483,7 +491,10 @@ static void init_proxy(PCIDevice *dev, char *command, bool need_spawn, Error **eproxy_link_init_channel (pdev->proxy_link, &pdev->proxy_link->mmio, pdev->mmio_sock); -configure_memory_sync (pdev->sync, pdev->proxy_link); +if (!pdev->mem_init) { + pdev->mem_init = true; +configure_memory_sync (pdev->sync, pdev->proxy_link); + } }static void pci_proxy_dev_realize (PCIDevice *device,Error **errp)
include/hw/proxy/qemu-proxy.h +1 -0
@@ -51,6 +51,7 @@ typedef struct PCIProxyDev {ProxyLinkState *proxy_link;RemoteMemSync *sync; +bool mem_init;struct kvm_irqfd irqfd;EventNotifier intr;
qdev-monitor.c +1 -1
@@ -712,10 +712,10 @@ DeviceState *qdev_proxy_add(const char *rid, const char *id, char *bus, pdev->socket = old_pdev->socket; pdev->mmio_sock = old_pdev->mmio_sock; pdev->remote_pid = old_pdev->remote_pid; + pdev->mem_init = true; }else { pdev->rsocket = managed ? rsocket :-1 ; pdev->socket = managed ? rsocket :-1 ; - } pdev->managed = managed;
Signature · 1 line
1.8.3.1
RFC PATCH v3 44/45 multi-process: add the concept description to docs/devel/qemu-multiprocess
In reply to Jagannathan RamanFrom: John G Johnson <[email protected]>
---
v2 -> v3:
- Updated with latest design of this project
docs/devel/qemu-multiprocess.txt | 627 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 627 insertions(+) create mode 100644 docs/devel/qemu-multiprocess.txt
docs/devel/qemu-multiprocess.txt new file +627 -0
@@ -0,0 +1,627 @@ +Disaggregating QEMU + +This document describes implementation details of multi-process +qemu. + +QEMU can be broadly described as providing three main services. One is a +VM control point, where VMs can be created, migrated, re-configured, and +destroyed. A second is to emulate the CPU instructions within the VM, +often accelerated by HW virtualization features such as Intel’s VT +extensions. Finally, it provides IO services to the VM by emulating HW +IO devices, such as disk and network devices. + +A disaggregated QEMU + +A disaggregated QEMU involves separating QEMU services into separate +host processes. Each of these processes can be given only the privileges +it needs to provide its service, e.g., a disk service could be given +access only the the disk images it provides, and not be allowed to +access other files, or any network devices. An attacker who compromised +this service would not be able to use this exploit to access files or +devices beyond what the disk service was given access to. + +A QEMU control process would remain, but in disaggregated mode, it would +be a control point that executes the processes needed to support the VM +being created, but have no direct interfaces to the VM. During VM +execution, it would still provide the user interface to hot-plug devices +or live migrate the VM. + +A first step in creating a disaggregated QEMU is to separate IO services +from the main QEMU program, which would continue to provide CPU +emulation. i.e., the control process would also be the CPU emulation +process. In a later phase, CPU emulation could be separated from the +control process. + + +Disaggregating IO services + +Disaggregating IO services is a good place to begin QEMU disaggregating +for a couple of reasons. One is the sheer number of IO devices QEMU can +emulate provides a large surface of interfaces which could potentially +be exploited, and, indeed, have been a source of exploits in the past. +Another is the modular nature of QEMU device emulation code provides +interface points where the QEMU functions that perform device emulation +can be separated from the QEMU functions that manage the emulation of +guest CPU instructions. + +QEMU device emulation + +QEMU uses a object oriented SW architecture for device emulation code. +Configured objects are all compiled into the QEMU binary, then objects +are instantiated by name when used by the guest VM. For example, the +code to emulate a device named “foo” is always present in QEMU, but its +instantiation code is only run when the device is included in the target +VM. (e.g., via the QEMU command line as _-device foo_) + +The object model is hierarchical, so device emulation code names its +parent object (such as “pci-device” for a PCI device) and QEMU will +instantiate a parent object before calling the device’s instantiation +code. + +Current separation models + +In order to separate the device emulation code from the CPU emulation +code, the device object code must run in a different process. There are +a couple of existing QEMU features that can run emulation code +separately from the main QEMU process. These are examined below. + +vhost user model + +Virtio guest device drivers can be connected to vhost user applications +in order to perform their IO operations. This model uses special virtio +device drivers in the guest and vhost user device objects in QEMU, but +once the QEMU vhost user code has configured the vhost user application, +mission-mode IO is performed by the application. The vhost user +application is a daemon process that can be contacted via a known UNIX +domain socket. + +vhost socket + +As mentioned above, one of the tasks of the vhost device object within +QEMU is to contact the vhost application and send it configuration +information about this device instance. As part of the configuration +process, the application can also be sent other file descriptors over +the socket, which then can be used by the vhost user application in +various ways, some of which are described below. + +vhost MMIO store acceleration + +VMs are often run using HW virtualization features via the KVM kernel +driver. This driver allows QEMU to accelerate the emulation of guest CPU +instructions by running the guest in a virtual HW mode. When the guest +executes instructions that cannot be executed by virtual HW mode, +execution returns to the KVM driver so it can inform QEMU to emulate the +instructions in SW. + +One of the events that can cause a return to QEMU is when a guest device +driver accesses an IO location. QEMU then dispatches the memory +operation to the corresponding QEMU device object. In the case of a +vhost user device, the memory operation would need to be sent over a +socket to the vhost application. This path is accelerated by the QEMU +virtio code by setting up an eventfd file descriptor that the vhost +application can directly receive MMIO store notifications from the KVM +driver, instead of needing them to be sent to the QEMU process first. + +vhost interrupt acceleration + +Another optimization used by the vhost application is the ability to +directly inject interrupts into the VM via the KVM driver, again, +bypassing the need to send the interrupt back to the QEMU process first. +The QEMU virtio setup code configures the KVM driver with an eventfd +that triggers the device interrupt in the guest when the eventfd is +written. This irqfd file descriptor is then passed to the vhost user +application program. + +vhost access to guest memory + +The vhost application is also allowed to directly access guest memory, +instead of needing to send the data as messages to QEMU. This is also +done with file descriptors sent to the vhost user application by QEMU. +These descriptors can be passed to mmap() by the vhost application to +map the guest address space into the vhost application. + +IOMMUs introduce another level of complexity, since the address given to +the guest virtio device to DMA to or from is not a guest physical +address. This case is handled by having vhost code within QEMU register +as a listener for IOMMU mapping changes. The vhost application maintains +a cache of IOMMMU translations: sending translation requests back to +QEMU on cache misses, and in turn receiving flush requests from QEMU +when mappings are purged. + +applicability to device separation + +Much of the vhost model can be re-used by separated device emulation. In +particular, the ideas of using a socket between QEMU and the device +emulation application, using a file descriptor to inject interrupts into +the VM via KVM, and allowing the application to mmap() the guest should +be re used. + +There are, however, some notable differences between how a vhost +application works and the needs of separated device emulation. The most +basic is that vhost uses custom virtio device drivers which always +trigger IO with MMIO stores. A separated device emulation model must +work with existing IO device models and guest device drivers. MMIO loads +break vhost store acceleration since they are synchronous - guest +progress cannot continue until the load has been emulated. By contrast, +stores are asynchronous, the guest can continue after the store event +has been sent to the vhost application. + +Another difference is that in the vhost user model, a single daemon can +support multiple QEMU instances. This is contrary to the security regime +desired, in which the emulation application should only be allowed to +access the files or devices the VM it’s running on behalf of can access. + + +New separation model based on proxy objects + +A different model based on proxy objects in the QEMU program +communicating with remote emulation programs could provide separation +while minimizing the changes needed to the device emulation code. The +rest of this section is a discussion of how a proxy object model would +work. + + +Remote emulation processes + +The remote emulation process will run the QEMU object hierarchy without +modification. The device emulation objects will be also be based on the +QEMU code, because for anything but the simplest device, it would not be +a tractable to re-implement both the object model and the many device +backends that QEMU has. + +The processes will communicate with the QEMU process over UNIX domain +sockets. The processes can be executed either as standalone processes, +or be executed by QEMU. In both cases, the host backends the emulation +processes will provide are specified on its command line, as they would +be for QEMU. For example: + + disk-proc -blockdev driver=file,node-name=file0,filename=disk-file0 \ + -blockdev driver=qcow2,node-name=drive0,file=file0 + +would indicate process _disk-proc_ uses a qcow2 emulated disk named +_file0_ as its backend. + +Emulation processes may emulate more than one guest controller. A common +configuration might be to put all controllers of the same device class +(e.g., disk, network, etc.) in a single process, so that all backends of +the same type can be managed by a single QMP monitor. + +communication with QEMU + +Remote emulation processes will recognize a _-socket_ argument that +specifies the path of a UNIX domain socket used to communicate with the +QEMU process. If no _-socket_ argument is present, the process will use +file descriptor 0 to communicate with QEMU. For example, + + disk-proc -socket /tmp/disk0-sock <backend list> + +will communicate with QEMU using the socket path _/tmp/disk0-sock_. + +remote process QMP monitor + +Remote emulation processes can be monitored via QMP, similar to QEMU +itself. The QMP monitor socket is specified the same as for a QEMU +process: + + disk-proc -qmp unix:/tmp/disk-mon,server + +can be monitored over the UNIX socket path _/tmp/disk-mon_. + +QEMU command line + +The QEMU command line options will need to be modified to indicate which +items are emulated by a separate program, and which remain emulated by +QEMU itself. + +identifying remote emulation processes + +Remote emulation processes will be identified to QEMU using a _-remote_ +command line option. This option can either specify a command that QEMU +will execute, or can specify a UNIX domain socket that QEMU can use to +connect to an existing process. Both forms require a “id” option that +identifies the process to later _-device_ options. The process version +is: + + -remote id=disk-proc,command="disk-proc <backend list>" + +And the socket version is: + + -remote id=disk-proc,socket="/tmp/disk0-sock" + +In the latter case, the remote process must be given the same socket on +its command line when it is executed: + + disk-proc -socket /tmp/disk0-sock <backend list> + +identifying devices emulated remotely + +Devices that are to be emulated in a separate process will be identify +the remote process with a “remote” option on their _-device_ command +line specification. e.g., an LSI SCSI controller and disk can be +specified as: + + -device lsi53c895a,id=scsi0 + -device scsi-hd,drive=drive0,bus=scsi0.0,scsi-id=0 + +If these devices are emulated by remote process “disk-proc,” as +described in the previous section, the QEMU command line would be: + + -device lsi53c895a,id=scsi0,remote=disk-proc + -device scsi-hd,drive=drive0,bus=scsi0.0,scsi-id=0,remote=disk-proc + +Some devices are implicitly created by the machine object. e.g., the q35 +machine object will create its PCI bus, and attach an ich9-ahci IDE +controller to it. In this case, options will need to be added to the +_-machine_ command line. e.g., + + -machine pc-q35,ide-remote=disk-proc + +will use the remote process with an “id” of “disk-proc” to emulate the +IDE controller and its disks. + +The disks themselves still need to be specified with _-remote_ option, +as in the example above. e.g., + + -device ide-hd,drive=drive0,bus=ide.0,unit=0,remote=disk-proc + + +QEMU management of remote processes + +Each _-remote_ instance on the QEMU command line will create a remote +process proxy instance in QEMU. They will be held on a _QList_ that can +be searched for by its “id” property. The remote process proxy will also +establish a communication channel between QEMU and the remote process. +This can be done in one of two methods: direction execution of the +process by QEMU with fork() and exec() system calls, or by connecting to +an existing process. + +direct execution + +When the remote process is directly executed, the remote process proxy +will setup a communication channel between itself and the emulation +process. This channel will be created using socketpair() and the remote +process side of the pair will be given to the process as file descriptor +0. + +connecting to an existing process + +Some environments wish to deny QEMU the ability to execute fork() and +exec() In these case, emulation processes will be started before QEMU, +and a UNIX domain socket will be given to each emulation process to +communicate with QEMU over. After communication is established, the +socket will be unlinked from the file system space by the QEMU process. + +communication with emulation process + +primary socket + +Whether the process was executed by QEMU or externally, there will be a +primary socket for communication between QEMU and the remote process. +This channel will handle configuration commands from QEMU to the +process, either from the QEMU command line, or from QMP commands that +affect the devices being emulated by the process. This channel will only +allow one message to be pending at a time; if additional messages +arrive, they must wait for previous ones to be acknowledged from the +remote side. + +secondary sockets + +The primary socket can pass the file descriptors of secondary sockets +for operations that occur in parallel with commands on the primary +channel. These include MMIO operations generated by the guest, interrupt +notifications generated by the devices being emulated, or _vmstate_ for +live migration. These secondary sockets will be created at the behest of +the device proxies that require them. A disk device proxy wouldn’t need +any secondary sockets, but a disk controller device proxy may need both +an MMIO socket and an interrupt socket. + +emulation process attached via QMP command + +There will be a new “attach-process” QMP command to facilitate device +hot-plug. This command’s arguments will be the same as the _-remote_ +command line when it’s used to attach to a remote process. i.e., it will +need an “id” argument so that hot-plugged devices can later find it, and +a “socket” argument to identify the UNIX domain socket that will be used +to communicate with QEMU. + + +QEMU device proxy objects + +QEMU has an object model based on sub-classes inherited from the +“object” super-class. The sub-classes that are of interest here are the +“device” and “bus” sub-classes whose child sub-classes make up the +device tree of a QEMU emulated system. + +The proxy object model will use device proxy objects to replace the +device emulation code within the QEMU process. These objects will live +in the same place in the object and bus hierarchies as the objects they +replace. i.e., the proxy object for an LSI SCSI controller will be a +sub-class of the “pci-device” class, and will have the same PCI bus +parent and the same SCSI bus child objects as the LSI controller object +it replaces. + +After the QEMU command line has been parsed, the remote devices will be +instantiated in the same manner as local devices are. (i.e., +qdev_device_add()). In order to distinguish them from regular _-device_ +device objects, their class name will be the name of the class it +replaces, with “-proxy” appended. e.g., the “lsi53c895a” proxy class +will be “lsi53c895a-proxy.” + +device JSON description + +The remote process needs a JSON representation of the command line +options used to create the object. This JSON representation is used to +create the corresponding object in the emulation process. e.g., for an +LSI SCSI controller invoked as: + + -device lsi53c895a,id=scsi0,remote=lsi-scsi + +the proxy object would create a + + { "driver" : "lsi53c895a", "id" : "scsi0" } + +JSON description. The “driver” option is assigned to the device name +when the command line is parsed, so the “-proxy” appended by the command +line parsing code is removed. The “remote” option isn’t needed in the +JSON description since it only applies to the proxy object in the QEMU +process. + +device object whitelist + +Some device objects may not need a proxy. These are devices with no +direct guest interfaces. (e.g., no MMIO, PIO, or interrupts). There will +be a whitelist of such devices, and any devices on this list will not be +instantiated in QEMU. Their JSON representation will still be sent to +the remote process, so the object can be created there. + +object initialization + +QEMU object initialization occurs in two phases. The first +initialization happens once per object class. (i.e., there can be many +SCSI disks in an emulated system, but the “scsi-hd” class has its +class_init() function called only once) The second phase happens when +each object’s instance_init() function is called to initialize each +instance of the object. + +All device objects are sub-classes of the “device” class, so they also +have a realize() function that is called after instance_init() is called +and after the object’s static properties have been initialized. Many +device objects don’t even provide an instance_init() function, and do +all their per-instance work in realize(). + +class_init + +The class_init() method of a proxy object will, in general behave +similarly to the object it replaces, including setting any static +properties and methods needed by the proxy. + +instance_init / realize + +The instance_init() and realize() functions would only need to perform +tasks related to being a proxy, such are registering its own MMIO +handlers, or creating a child bus that other proxy devices can be +attached to later. + +Other tasks will are device-specific. For example, PCI device objects +will initialize the PCI config space in order to make a valid PCI device +tree within the QEMU process. + +address space registration + +Most devices are driven by guest device driver accesses to IO addresses +or ports. The QEMU device emulation code uses QEMU’s memory region +function calls (such as memory_region_init_io()) to add callback +functions that QEMU will invoke when the guest accesses the device’s +areas of the IO address space. When a guest driver does access the +device, the VM will exit HW virtualization mode and return to QEMU, +which will then lookup and execute the corresponding callback function. + +A proxy object would need to mirror the memory region calls the actual +device emulator would perform in its initialization code, but with its +own callbacks. When invoked by QEMU as a result of a guest IO operation, +they will forward the operation to the device emulation process. + +PCI config space + +PCI devices also have a configuration space that can be accessed by the +guest driver. Guest accesses to this space is not handled by the device +emulation object, but by its PCI parent object. Much of this space is +read-only, but certain registers (especially BAR and MSI-related ones) +need to be propagated to the emulation process. + +PCI parent proxy + +One way to propagate guest PCI config accesses is to create a +“pci-device-proxy” class that can serve as the parent of a PCI device +proxy object. This class’s parent would be “pci-device” and it would +override the PCI parent’s config_read() and config_write() methods with +ones that forward these operations to the emulation program. + +interrupt receipt + +A proxy for a device that generates interrupts will need to create a +socket to receive interrupt indications from the emulation process. An +incoming interrupt indication would then be sent up to its bus parent to +be injected into the guest. For example, a PCI device object may use +pci_set_irq(). + +live migration + +The proxy will register to save and restore any _vmstate_ it needs over +a live migration event. The device proxy does not need to manage the +remote device’s _vmstate_; that will be handled by the remote process +proxy (see below). + + +QEMU remote device operation + +Generic device operations, such as DMA, will be performs by the remote +process proxy by sending messages to the remote process. + +DMA operations + +DMA operations would be handled much like vhost applications do. One of +the initial messages sent to the emulation process is a guest memory +table. Each entry in this table consists of a file descriptor and size +that the emulation process can mmap() to directly access guest memory, +similar to vhost_user_set_mem_table(). Note guest memory must be backed +by file descriptors, such as when QEMU is given the _-mem-path_ command +line option. + +IOMMU operations + +When the emulated system includes an IOMMU, the remote process proxy in +QEMU will need to create a socket for IOMMU requests from the emulation +process. It will handle those requests with an +address_space_get_iotlb_entry() call. In order to handle IOMMU unmaps, +the remote process proxy will also register as a listener on the +device’s DMA address space. When an IOMMU memory region is created +within the DMA address space, an IOMMU notifier for unmaps will be added +to the memory region that will forward unmaps to the emulation process +over the IOMMU socket. + +device hot-plug via QMP + +An QMP “device_add” command can add a device emulated by a remote +process. It needs to add a “remote” option to the command, just as the +_-device_ command line option does. The remote process may either be one +started at QEMU startup, or be one added by the “add-process” QMP +command described above. In either case, the remote process proxy will +forward the new device’s JSON description to the corresponding emulation +process. + +live migration + +The remote process proxy will also register for live migration +notifications with vmstate_register(). When called to save state, the +proxy will send the remote process a secondary socket file descriptor to +save the remote process’s device _vmstate_ over. The incoming byte +stream length and data will be saved as the proxy’s _vmstate_. When the +proxy is resumed on its new host, this _vmstate_ will be extracted, and +a secondary socket file descriptor will be sent to the new remote +process through which it receives the _vmstate_ in order to restore the +devices there. + +device emulation in remote process + +The parts of QEMU that the emulation program will need include the +object model; the memory emulation objects; the device emulation objects +of the targeted device, and any dependent devices; and, the device’s +backends. It will also need code to setup the machine environment, +handle requests from the QEMU process, and route machine-level requests +(such as interrupts or IOMMU mappings) back to the QEMU process. + +initialization + +The process initialization sequence will follow the same sequence +followed by QEMU. It will first initialize the backend objects, then +device emulation objects. The JSON descriptions sent by the QEMU process +will drive which objects need to be created. + +- address spaces + + Before the device objects are created, the initial address spaces + and memory regions must be configured with memory_map_init(). This + creates a RAM memory region object (_system_memory_) and an IO + memory region object (_system_io_). + +- RAM + + RAM memory region creation will follow how pc_memory_init() creates + them, but must use memory_region_init_ram_from_fd() instead of + memory_region_allocate_system_memory(). The file descriptors needed + will be supplied by the guest memory table from above. Those RAM + regions would then be added to the _system_memory_ memory region + with memory_region_add_subregion(). + +- PCI + + IO initialization will be driven by the JSON descriptions sent from + the QEMU process. For a PCI device, a PCI bus will need to be + created with pci_root_bus_new(), and a PCI memory region will need + to be created and added to the _system_memory_ memory region with + memory_region_add_subregion_overlap(). The overlap version is + required for architectures where PCI memory overlaps with RAM + memory. + +MMIO handling + +The device emulation objects will use memory_region_init_io() to install +their MMIO handlers, and pci_register_bar() to associate those handlers +with a PCI BAR, as they do within QEMU currently. + +In order to use address_space_rw() in the emulation process to handle +MMIO requests from QEMU, the PCI physical addresses must be the same in +the QEMU process and the device emulation process. In order to +accomplish that, guest BAR programming must also be forwarded from QEMU +to the emulation process. + +interrupt injection + +When device emulation wants to inject an interrupt into the VM, the +request climbs the device’s bus object hierarchy until the point where a +bus object knows how to signal the interrupt to the guest. The details +depend on the type of interrupt being raised. + +- PCI pin interrupts + + On x86 systems, there is an emulated IOAPIC object attached to the + root PCI bus object, and the root PCI object forwards interrupt + requests to it. The IOAPIC object, in turn, calls the KVM driver to + inject the corresponding interrupt into the VM. The simplest way to + handle this in an emulation process would be to setup the root PCI + bus driver (via pci_bus_irqs()) to send a interrupt request back to + the QEMU process, and have the device proxy object reflect it up the + PCI tree there. + +- PCI MSI/X interrupts + + PCI MSI/X interrupts are implemented in HW as DMA writes to a + CPU-specific PCI address. In QEMU on x86, a KVM APIC object receives + these DMA writes, then calls into the KVM driver to inject the + interrupt into the VM. A simple emulation process implementation + would be to send the MSI DMA address from QEMU as a message at + initialization, then install an address space handler at that + address which forwards the MSI message back to QEMU. + +DMA operations + +When a emulation object wants to DMA into or out of guest memory, it +first must use dma_memory_map() to convert the DMA address to a local +virtual address. The emulation process memory region objects setup above +will be used to translate the DMA address to a local virtual address the +device emulation code can access. + +IOMMU + +When an IOMMU is in use in QEMU, DMA translation uses IOMMU memory +regions to translate the DMA address to a guest physical address before +that physical address can be translated to a local virtual address. The +emulation process will need similar functionality. + +- IOTLB cache + + The emulation process will maintain a cache of recent IOMMU + translations (the IOTLB). When the translate() callback of an IOMMU + memory region is invoked, the IOTLB cache will be searched for an + entry that will map the DMA address to a guest PA. On a cache miss, + a message will be sent back to QEMU requesting the corresponding + translation entry, which be both be used to return a guest address + and be added to the cache. + +- IOTLB purge + + The IOMMU emulation will also need to act on unmap requests from + QEMU. These happen when the guest IOMMU driver purges an entry from + the guest’s translation table. + +live migration + +When a remote process receives a live migration indication from QEMU, it +will set up a channel using the received file descriptor with +qio_channel_socket_new_fd(). This channel will be used to create a +_QEMUfile_ that can be passed to qemu_save_device_state() to send the +process’s device state back to QEMU. This method will be reversed on +restore - the channel will be passed to qemu_loadvm_state() to restore +the device state. +
Signature · 1 line
1.8.3.1
Re: [Qemu-devel] [RFC v3 PATCH 44/45] multi-process: add the concept description to docs/devel/qemu-multiprocess
Hi,
docs/devel/qemu-multiprocess.txt line 66
Quoted 6 lines
docs/devel/qemu-multiprocess.txt new file +6
-0+Current separation models + +In order to separate the device emulation code from the CPU emulation +code, the device object code must run in a different process. There are +a couple of existing QEMU features that can run emulation code +separately from the main QEMU process. These are examined below.
There also is vfio+mdev. Right now a kernel interface, so (hardware-assisted) device emulation runs in the linux kernel. IIRC someone suggested to build a process->process interface based on the vfio api. What happened to that idea?
docs/devel/qemu-multiprocess.txt line 250
Quoted 5 lines
docs/devel/qemu-multiprocess.txt new file +5
-0+If these devices are emulated by remote process “disk-proc,” as +described in the previous section, the QEMU command line would be: + + -device lsi53c895a,id=scsi0,remote=disk-proc + -device scsi-hd,drive=drive0,bus=scsi0.0,scsi-id=0,remote=disk-proc
Does that work with the patch series?
Why does qemu need to know about scsi-hd?
cheers,
Gerd
Re: [Qemu-devel] [RFC v3 PATCH 44/45] multi-process: add the concept description to docs/devel/qemu-multiprocess
In reply to Jagannathan RamanQuoted 6 lines · Jagannathan Raman
From: John G Johnson <[email protected]>
Signed-off-by John G Johnson <[email protected]>Signed-off-by Elena Ufimtseva <[email protected]>Signed-off-by Jagannathan Raman <[email protected]>
Quoted 7 lines
---
v2 -> v3:
- Updated with latest design of this projectdocs/devel/qemu-multiprocess.txt | 627 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 627 insertions(+) create mode 100644 docs/devel/qemu-multiprocess.txt
Hi; you can ignore this review comment until there's more consensus on whether we want to take this patch series, but new documents in docs/ should be in RST format and included in the relevant contents page (here docs/devel/index.rst), please.
thanks
-- PMM
Re: [Qemu-devel] [RFC v3 PATCH 44/45] multi-process: add the concept description to docs/devel/qemu-multiprocess
Quoted 27 lines · Peter Maydell
Quoted 11 lines · Jagannathan Raman
From: John G Johnson <[email protected]>
Signed-off-by John G Johnson <[email protected]>Signed-off-by Elena Ufimtseva <[email protected]>Signed-off-by Jagannathan Raman <[email protected]>---
v2 -> v3:
- Updated with latest design of this projectdocs/devel/qemu-multiprocess.txt | 627+++++++++++++++++++++++++++++++++++++++
Quoted 2 lines
1 file changed, 627 insertions(+) create mode 100644 docs/devel/qemu-multiprocess.txtHi; you can ignore this review comment until there's more consensus on whether we want to take this patch series, but new documents in docs/ should be in RST format and included in the relevant contents page (here
docs/devel/index.rst), please.thanks
-- PMMThanks Peter, will change this.
Signature · 1 line
Elena
RFC PATCH v3 45/45 multi-process: add configure and usage information
In reply to Jagannathan RamanFrom: Elena Ufimtseva <[email protected]>
---
Changes in v3:
- since the changes were made to use existing device/drive options,
the document was modified to reflect this.
--- docs/qemu-multiprocess.txt | 86 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 docs/qemu-multiprocess.txt
docs/qemu-multiprocess.txt new file +86 -0
@@ -0,0 +1,86 @@ +Multi-process QEMU +================== + +This document describes how to configure and use multi-process qemu. +For the design document refer to docs/devel/qemu-multiprocess. + +1) Configuration +---------------- + +To enable support for multi-process add --enable-mpqemu +to the list of options for the "configure" script. + + +2) Usage +-------- + +To start qemu with devices intended to run in a separate emulation +process without libvirtd support, the following should be used on QEMU +command line. As of now, we only support the emulation of lsi53c895a +in a separate process + +* Since parts of the RAM are shared between QEMU & remote process, a + memory-backend-file is required to facilitate this, as follows: + + -object memory-backend-file,id=mem,mem-path=/dev/shm/,size=4096M,share=on + +* The devices to be emulated in the separate process are defined as + before with addition of "rid" suboption that serves as a remote group + identificator. + + -device <device options>,rid="remote process id" + + For exmaple, for non multi-process qemu: + -device lsi53c895a,id=scsi0 device + -device scsi-hd,drive=drive0,bus=scsi0.0,scsi-id=0 + -drive id=drive0,file=data-disk.img + + and for multi-process qemu and no libvirt + support (i.e. QEMU forks child processes): + -device lsi53c895a,id=scsi0,rid=0 + -device scsi-hd,drive=drive0,bus=scsi0.0,scsi-id=0,rid="0" + +* The command-line options for the remote process is added to the "command" + suboption of the newly added "-remote" option. + + -remote [socket],rid=,command="..." + + The drives to be emulated by the remote process are specified as part of + this command sub-option. The device to be used to connect to the monitor + is also specified as part of this suboption. + + For example, the following option adds a drive and monitor to the remote + process: + -remote rid=0,command="-drive id=drive0,,file=data-disk.img -monitor unix:/home/qmp-sock,,server,,nowait" + + Note: There's an issue with this "command" subtion which we are in the + process of fixing. To work around this issue, it requires additional + "comma" characters as illustrated above, and in the example below. + +* Example QEMU command-line to launch lsi53c895a in a remote process + + #/bin/sh + qemu-system-x86_64 \ + -name "OL7.4" \ + -machine q35,accel=kvm \ + -smp sockets=1,cores=1,threads=1 \ + -cpu host \ + -m 2048 \ + -object memory-backend-file,id=mem,mem-path=/dev/shm/,size=2G,share=on \ + -numa node,memdev=mem \ + -device virtio-scsi-pci,id=virtio_scsi_pci0 \ + -drive id=drive_image1,if=none,format=raw,file=/root/ol7.qcow2 \ + -device scsi-hd,id=image1,drive=drive_image1,bus=virtio_scsi_pci0.0 \ + -boot d \ + -monitor stdio \ + -vnc :0 \ + -device lsi53c895a,id=lsi0,remote,rid=8,command="qemu-scsi-dev" \ + -device scsi-hd,id=drive2,drive=drive_image2,bus=lsi0.0,scsi-id=0,remote,rid=8,command="qemu-scsi-dev"\ + -remote rid=8,command="-drive id=drive_image2,,file=/root/remote-process-disk.img -monitor unix:/home/qmp-sock,,server,,nowait" + + We could connect to the monitor using the following command: + socat /home/qmp-sock stdio + + After hotplugging disks to the remote process, please execute the + following command in the guest to refresh the list of storage devices: + rescan_scsi_bus.sh -a
Signature · 1 line
1.8.3.1
Quoted 12 lines · Jagannathan Raman
Started with the presentation in October 2017 made by Marc-Andre (Red Hat) and Konrad Wilk (Oracle) [1], and continued by Jag's BoF at KVM Forum 2018, the multi-process project is now a prototype and presented in this patchset.
This first series enables the emulation of lsi53c895a in a separate process.
We posted the Proof Of Concept patches [2] before the BoF session in 2018. Subsequently, we posted RFC v1 [3] & RFC v2 [4] of this series.
Thanks to the v1 & v2 review, we were able to incorporate the feedback into our goals.
Quoted 6 lines
In the summer of 2019, we participated in a conference with folks at RedHat, who provided us with feedback to improve the design of this project.
We want to present version 3 of this series which incorporates the feedback we received for v2 & the enhancements suggested in the conference. Following are the improvements made in this series:
This patch series fails to apply to git master when I attempt and confirmed by patchew's failed attempt too
https://patchew.org/QEMU/[email protected]/
Can you do one of the following
- Tell us what git hash it was based on instead of master
or
- provide a pointer to a publically accessible git repo with it applied
or
- Repost with based on current git master
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Quoted 20 lines · Daniel P. Berrangé
Quoted 12 lines · Jagannathan Raman
Started with the presentation in October 2017 made by Marc-Andre (Red Hat) and Konrad Wilk (Oracle) [1], and continued by Jag's BoF at KVM Forum 2018, the multi-process project is now a prototype and presented in this patchset.
This first series enables the emulation of lsi53c895a in a separate process.
We posted the Proof Of Concept patches [2] before the BoF session in 2018. Subsequently, we posted RFC v1 [3] & RFC v2 [4] of this series.
Thanks to the v1 & v2 review, we were able to incorporate the feedback into our goals.
Quoted 6 lines
In the summer of 2019, we participated in a conference with folks at RedHat, who provided us with feedback to improve the design of this project.
We want to present version 3 of this series which incorporates the feedback we received for v2 & the enhancements suggested in the conference. Following are the improvements made in this series:
Quoted 8 lines
This patch series fails to apply to git master when I attempt and confirmed by patchew's failed attempt too
https://patchew.org/QEMU/[email protected]/Can you do one of the following
- Tell us what git hash it was based on instead of master
Hi Daniel,
These patches are based on the latest release, v4.1.0. They are on top of the following git hash:9e06029aea3 Update version for v4.1.0 release
Quoted 2 lines
or
- provide a pointer to a publically accessible git repo with it applied
They are also publicly available from the following gitub repo.:
https://github.com/oracle/qemu.git [branch multi-process-qemu-v0.3]
Thanks!
--
Jag
Quoted 6 lines
or
- Repost with based on current git masterRegards,
Daniel