Introduce xenpv machine for arm architecture
v2 cover Introduce xenpv machine for arm architecture
Hi,
This series add xenpv machine for aarch64. Motivation behind creating xenpv machine with IOREQ and TPM was to enable each guest on Xen aarch64 to have it's own unique and emulated TPM.
This series does following:
1. Moved common xen functionalities from hw/i386/xen to hw/xen/ so those can be used for aarch64.
2. We added a minimal xenpv arm machine which creates an IOREQ server and support TPM.
Also, checkpatch.pl fails for 03/12 and 06/12. These fails are due to moving old code to new place which was not QEMU code style compatible. No new add code was added.
Regards,
Vikram
ChangeLog:
v1 -> v2
Merged patch 05 and 06.
04/12: xen-hvm-common.c:
1. Moved xen_be_init() and xen_be_register_common() from xen_register_ioreq() to xen_register_backend().
2. Changed g_malloc to g_new and perror -> error_setg_errno.
3. Created a local subroutine function for Xen_IOREQ_register.
4. Fixed build issues with inclusion of xenstore.h.
5. Fixed minor errors.
Stefano Stabellini (5):
hw/i386/xen/xen-hvm: move x86-specific fields out of XenIOState
xen-hvm: reorganize xen-hvm and move common function to xen-hvm-common include/hw/xen/xen_common: return error from xen_create_ioreq_server hw/xen/xen-hvm-common: skip ioreq creation on ioreq registration
failure
meson.build: do not set have_xen_pci_passthrough for aarch64 targets
Vikram Garhwal (6):
hw/i386/xen/: move xen-mapcache.c to hw/xen/ hw/i386/xen: rearrange xen_hvm_init_pc hw/xen/xen-hvm-common: Use g_new and error_setg_errno accel/xen/xen-all: export xenstore_record_dm_state hw/arm: introduce xenpv machine
meson.build: enable xenpv machine build for ARM
accel/xen/xen-all.c | 2 +-
hw/arm/meson.build | 2 +
hw/arm/xen_arm.c | 175 +++++
hw/i386/meson.build | 1 +
hw/i386/xen/meson.build | 1 -
hw/i386/xen/trace-events | 19 -
hw/i386/xen/xen-hvm.c | 1084 +++---------------------------
hw/xen/meson.build | 7 +
hw/xen/trace-events | 19 +
hw/xen/xen-hvm-common.c | 888 ++++++++++++++++++++++++
hw/{i386 => }/xen/xen-mapcache.c | 0
include/hw/arm/xen_arch_hvm.h | 9 +
include/hw/i386/xen_arch_hvm.h | 11 +
include/hw/xen/arch_hvm.h | 5 +
include/hw/xen/xen-hvm-common.h | 98 +++
include/hw/xen/xen.h | 2 +
include/hw/xen/xen_common.h | 13 +-
meson.build | 4 +-
18 files changed, 1323 insertions(+), 1017 deletions(-)
create mode 100644 hw/arm/xen_arm.c
create mode 100644 hw/xen/xen-hvm-common.c
rename hw/{i386 => }/xen/xen-mapcache.c (100%)
create mode 100644 include/hw/arm/xen_arch_hvm.h
create mode 100644 include/hw/i386/xen_arch_hvm.h
create mode 100644 include/hw/xen/arch_hvm.h
create mode 100644 include/hw/xen/xen-hvm-common.hSignature · 1 line
2.17.0
PATCH v2 1/11 hw/i386/xen/: move xen-mapcache.c to hw/xen/
xen-mapcache.c contains common functions which can be used for enabling Xen on aarch64 with IOREQ handling. Moving it out from hw/i386/xen to hw/xen to make it accessible for both aarch64 and x86.
---
hw/i386/meson.build | 1 +
hw/i386/xen/meson.build | 1 -
hw/i386/xen/trace-events | 5 -----
hw/xen/meson.build | 4 ++++
hw/xen/trace-events | 5 +++++
hw/{i386 => }/xen/xen-mapcache.c | 0
6 files changed, 10 insertions(+), 6 deletions(-)
rename hw/{i386 => }/xen/xen-mapcache.c (100%)hw/i386/meson.build +1 -0
@@ -33,5 +33,6 @@ subdir('kvm') subdir('xen') i386_ss.add_all(xenpv_ss) +i386_ss.add_all(xen_ss) hw_arch += {'i386': i386_ss}
hw/i386/xen/meson.build +0 -1
@@ -1,6 +1,5 @@ i386_ss.add(when: 'CONFIG_XEN', if_true: files( 'xen-hvm.c', - 'xen-mapcache.c', 'xen_apic.c', 'xen_platform.c', 'xen_pvdevice.c',
hw/i386/xen/trace-events +0 -5
@@ -21,8 +21,3 @@ xen_map_resource_ioreq(uint32_t id, void *addr) "id: %u addr: %p" cpu_ioreq_config_read(void *req, uint32_t sbdf, uint32_t reg, uint32_t size, uint32_t data) "I/O=%p sbdf=0x%x reg=%u size=%u data=0x%x" cpu_ioreq_config_write(void *req, uint32_t sbdf, uint32_t reg, uint32_t size, uint32_t data) "I/O=%p sbdf=0x%x reg=%u size=%u data=0x%x" -# xen-mapcache.c -xen_map_cache(uint64_t phys_addr) "want 0x%"PRIx64 -xen_remap_bucket(uint64_t index) "index 0x%"PRIx64 -xen_map_cache_return(void* ptr) "%p" -
hw/xen/meson.build +4 -0
@@ -22,3 +22,7 @@ else endif specific_ss.add_all(when: ['CONFIG_XEN', xen], if_true: xen_specific_ss) + +xen_ss = ss.source_set() + +xen_ss.add(when: 'CONFIG_XEN', if_true: files('xen-mapcache.c'))
hw/xen/trace-events +5 -0
@@ -41,3 +41,8 @@ xs_node_vprintf(char *path, char *value) "%s %s" xs_node_vscanf(char *path, char *value) "%s %s" xs_node_watch(char *path) "%s" xs_node_unwatch(char *path) "%s" + +# xen-mapcache.c +xen_map_cache(uint64_t phys_addr) "want 0x%"PRIx64 +xen_remap_bucket(uint64_t index) "index 0x%"PRIx64 +xen_map_cache_return(void* ptr) "%p"
hw/xen/xen-mapcache.c renamed from hw/i386/xen/xen-mapcache.c +0 -0
Signature · 1 line
2.17.0
Re: [QEMU][PATCH v2 01/11] hw/i386/xen/: move xen-mapcache.c to hw/xen/
Quoted 21 lines · Vikram Garhwal
xen-mapcache.ccontains common functions which can be used for enabling Xen on aarch64 with IOREQ handling. Moving it out from hw/i386/xen to hw/xen to make it accessible for both aarch64 and x86.Signed-off-by Vikram Garhwal <[email protected]>Signed-off-by Stefano Stabellini <[email protected]>--- hw/i386/meson.build | 1 + hw/i386/xen/meson.build | 1 - hw/i386/xen/trace-events | 5 ----- hw/xen/meson.build | 4 ++++ hw/xen/trace-events | 5 +++++ hw/{i386 => }/xen/xen-mapcache.c | 0 6 files changed, 10 insertions(+), 6 deletions(-)rename hw/{i386 =>
}/xen/xen-mapcache.c(100%)hw/i386/meson.build +0
-0
hw/i386/meson.build subdir('kvm') · line 36
Quoted 4 lines
hw/i386/meson.build +1
-0@@ -33,5 +33,6 @@ subdir('kvm') subdir('xen') i386_ss.add_all(xenpv_ss) +i386_ss.add_all(xen_ss)
Not needed ...
hw/xen/meson.build else · line 28
Quoted 12 lines
hw/xen/meson.build +4
-0@@ -22,3 +22,7 @@ else endif specific_ss.add_all(when: ['CONFIG_XEN', xen], if_true: xen_specific_ss) + +xen_ss = ss.source_set() + +xen_ss.add(when: 'CONFIG_XEN', if_true: files('xen-mapcache.c'))
... because we can simply add in the softmmu_ss list at the beginning of this file.
Otherwise LGTM.
PATCH v2 2/11 hw/i386/xen: rearrange xen_hvm_init_pc
In reply to Vikram GarhwalIn preparation to moving most of xen-hvm code to an arch-neutral location, move non IOREQ references to:
- xen_get_vmport_regs_pfn
- xen_suspend_notifier
- xen_wakeup_notifier
- xen_ram_init
towards the end of the xen_hvm_init_pc() function.
This is done to keep the common ioreq functions in one place which will be moved to new function in next patch in order to make it common to both x86 and aarch64 machines.
--- hw/i386/xen/xen-hvm.c | 49 ++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 24 deletions(-)
hw/i386/xen/xen-hvm.c +25 -24
@@ -1416,12 +1416,6 @@ void xen_hvm_init_pc(PCMachineState *pcms, MemoryRegion **ram_memory) state->exit.notify = xen_exit_notifier;qemu_add_exit_notifier (&state->exit); - state->suspend.notify = xen_suspend_notifier; -qemu_register_suspend_notifier (&state->suspend); - - state->wakeup.notify = xen_wakeup_notifier; -qemu_register_wakeup_notifier (&state->wakeup); -/* * Register wake-up support in QMP query-current-machine API */
@@ -1432,23 +1426,6 @@ void xen_hvm_init_pc(PCMachineState *pcms, MemoryRegion **ram_memory) goto err; } - rc =xen_get_vmport_regs_pfn (xen_xc, xen_domid, &ioreq_pfn); -if (!rc) { -DPRINTF ("shared vmport page at pfn %lx\n" , ioreq_pfn); - state->shared_vmport_page = -xenforeignmemory_map (xen_fmem, xen_domid,PROT_READ |PROT_WRITE , -1 , &ioreq_pfn,NULL ); -if (state->shared_vmport_page ==NULL ) { -error_report ("map shared vmport IO page returned error %d handle=%p" , - errno, xen_xc); - goto err; - } - }else if (rc != -ENOSYS ) { -error_report ("get vmport regs pfn returned error %d, rc=%d" , - errno, rc); - goto err; - } -/* Note: cpus is empty at this point in init */ state->cpu_by_vcpu_id = g_new0(CPUState *, max_cpus);
@@ -1486,7 +1463,6 @@ void xen_hvm_init_pc(PCMachineState *pcms, MemoryRegion **ram_memory)#else xen_map_cache_init (NULL , state);#endif -xen_ram_init (pcms, ms->ram_size, ram_memory);qemu_add_vm_change_state_handler (xen_hvm_change_state_handler, state);
@@ -1513,6 +1489,31 @@ void xen_hvm_init_pc(PCMachineState *pcms, MemoryRegion **ram_memory)QLIST_INIT (&xen_physmap);xen_read_physmap (state); + state->suspend.notify = xen_suspend_notifier; +qemu_register_suspend_notifier (&state->suspend); + + state->wakeup.notify = xen_wakeup_notifier; +qemu_register_wakeup_notifier (&state->wakeup); + + rc =xen_get_vmport_regs_pfn (xen_xc, xen_domid, &ioreq_pfn); +if (!rc) { +DPRINTF ("shared vmport page at pfn %lx\n" , ioreq_pfn); + state->shared_vmport_page = +xenforeignmemory_map (xen_fmem, xen_domid,PROT_READ |PROT_WRITE , +1 , &ioreq_pfn,NULL ); +if (state->shared_vmport_page ==NULL ) { +error_report ("map shared vmport IO page returned error %d handle=%p" , + errno, xen_xc); + goto err; + } + }else if (rc != -ENOSYS ) { +error_report ("get vmport regs pfn returned error %d, rc=%d" , + errno, rc); + goto err; + } + +xen_ram_init (pcms, ms->ram_size, ram_memory); +/* Disable ACPI build because Xen handles it */ pcms->acpi_build_enabled = false;
Signature · 1 line
2.17.0
PATCH v2 3/11 hw/i386/xen/xen-hvm: move x86-specific fields out of XenIOState
In reply to Vikram GarhwalFrom: Stefano Stabellini <[email protected]>
In preparation to moving most of xen-hvm code to an arch-neutral location, move:
- shared_vmport_page
- log_for_dirtybit
- dirty_bitmap
- suspend
- wakeup
out of XenIOState struct as these are only used on x86, especially the ones related to dirty logging.
Updated XenIOState can be used for both aarch64 and x86.
Also, remove free_phys_offset as it was unused.
--- hw/i386/xen/xen-hvm.c | 58 ++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 31 deletions(-)
hw/i386/xen/xen-hvm.c +27 -31
@@ -73,6 +73,7 @@ struct shared_vmport_iopage { };typedef struct shared_vmport_iopage shared_vmport_iopage_t ;#endif +static shared_vmport_iopage_t *shared_vmport_page;static inline uint32_t xen_vcpu_eport (shared_iopage_t *shared_page,int i) {
@@ -95,6 +96,11 @@ typedef struct XenPhysmap { } XenPhysmap; static QLIST_HEAD(, XenPhysmap) xen_physmap; +static const XenPhysmap *log_for_dirtybit; +/* Buffer used by xen_sync_dirty_bitmap */ +static unsigned long *dirty_bitmap; +static Notifier suspend; +static Notifier wakeup; typedef struct XenPciDevice { PCIDevice *pci_dev;
@@ -105,7 +111,6 @@ typedef struct XenPciDevice { typedef struct XenIOState { ioservid_t ioservid; shared_iopage_t *shared_page; - shared_vmport_iopage_t *shared_vmport_page; buffered_iopage_t *buffered_io_page; xenforeignmemory_resource_handle *fres; QEMUTimer *buffered_io_timer;
@@ -125,14 +130,8 @@ typedef struct XenIOState {MemoryListener io_listener; QLIST_HEAD(, XenPciDevice) dev_list;DeviceListener device_listener; -hwaddr free_phys_offset; -const XenPhysmap *log_for_dirtybit; -/* Buffer used by xen_sync_dirty_bitmap */ -unsigned long *dirty_bitmap;Notifier exit; -Notifier suspend; -Notifier wakeup; } XenIOState;/* Xen specific function for piix pci */
@@ -462,10 +461,10 @@ static int xen_remove_from_physmap(XenIOState *state, }QLIST_REMOVE (physmap, list); -if (state->log_for_dirtybit == physmap) { - state->log_for_dirtybit =NULL ; -g_free (state->dirty_bitmap); - state->dirty_bitmap =NULL ; +if (log_for_dirtybit == physmap) { + log_for_dirtybit =NULL ; +g_free (dirty_bitmap); + dirty_bitmap =NULL ; }g_free (physmap);
@@ -626,16 +625,16 @@ static void xen_sync_dirty_bitmap(XenIOState *state,return ; } -if (state->log_for_dirtybit ==NULL ) { - state->log_for_dirtybit = physmap; - state->dirty_bitmap = g_new(unsigned long, bitmap_size); - }else if (state->log_for_dirtybit != physmap) { +if (log_for_dirtybit ==NULL ) { + log_for_dirtybit = physmap; + dirty_bitmap = g_new(unsigned long, bitmap_size); + }else if (log_for_dirtybit != physmap) {/* Only one range for dirty bitmap can be tracked. */ return ; } rc =xen_track_dirty_vram (xen_domid, start_addr >>TARGET_PAGE_BITS , - npages, state->dirty_bitmap); + npages, dirty_bitmap);if (rc <0 ) {#ifndef ENODATA #define ENODATA ENOENT
@@ -650,7 +649,7 @@ static void xen_sync_dirty_bitmap(XenIOState *state, }for (i =0 ; i < bitmap_size; i++) { -unsigned long map = state->dirty_bitmap[i]; +unsigned long map = dirty_bitmap[i];while (map !=0 ) { j =ctzl (map); map &= ~(1ul << j);
@@ -676,12 +675,10 @@ static void xen_log_start(MemoryListener *listener,static void xen_log_stop (MemoryListener *listener,MemoryRegionSection *section,int old,int new) { -XenIOState *state =container_of (listener, XenIOState, memory_listener); -if (old & ~new & (1 <<DIRTY_MEMORY_VGA )) { - state->log_for_dirtybit =NULL ; -g_free (state->dirty_bitmap); - state->dirty_bitmap =NULL ; + log_for_dirtybit =NULL ; +g_free (dirty_bitmap); + dirty_bitmap =NULL ;/* Disable dirty bit tracking */ xen_track_dirty_vram (xen_domid,0 ,0 ,NULL ); }
@@ -1021,9 +1018,9 @@ static void handle_vmport_ioreq(XenIOState *state, ioreq_t *req) {vmware_regs_t *vmport_regs; -assert (state->shared_vmport_page); +assert (shared_vmport_page); vmport_regs = - &state->shared_vmport_page->vcpu_vmport_regs[state->send_vcpu]; + &shared_vmport_page->vcpu_vmport_regs[state->send_vcpu];QEMU_BUILD_BUG_ON (sizeof (*req) <sizeof (*vmport_regs)); current_cpu = state->cpu_by_vcpu_id[state->send_vcpu];
@@ -1468,7 +1465,6 @@ void xen_hvm_init_pc(PCMachineState *pcms, MemoryRegion **ram_memory) state->memory_listener = xen_memory_listener;memory_listener_register (&state->memory_listener, &address_space_memory); - state->log_for_dirtybit =NULL ; state->io_listener = xen_io_listener;memory_listener_register (&state->io_listener, &address_space_io);
@@ -1489,19 +1485,19 @@ void xen_hvm_init_pc(PCMachineState *pcms, MemoryRegion **ram_memory)QLIST_INIT (&xen_physmap);xen_read_physmap (state); - state->suspend.notify = xen_suspend_notifier; -qemu_register_suspend_notifier (&state->suspend); + suspend.notify = xen_suspend_notifier; +qemu_register_suspend_notifier (&suspend); - state->wakeup.notify = xen_wakeup_notifier; -qemu_register_wakeup_notifier (&state->wakeup); + wakeup.notify = xen_wakeup_notifier; +qemu_register_wakeup_notifier (&wakeup); rc =xen_get_vmport_regs_pfn (xen_xc, xen_domid, &ioreq_pfn);if (!rc) {DPRINTF ("shared vmport page at pfn %lx\n" , ioreq_pfn); - state->shared_vmport_page = + shared_vmport_page =xenforeignmemory_map (xen_fmem, xen_domid,PROT_READ |PROT_WRITE ,1 , &ioreq_pfn,NULL ); -if (state->shared_vmport_page ==NULL ) { +if (shared_vmport_page ==NULL ) {error_report ("map shared vmport IO page returned error %d handle=%p" , errno, xen_xc); goto err;
Signature · 1 line
2.17.0
PATCH v2 4/11 xen-hvm: reorganize xen-hvm and move common function to xen-hvm-common
In reply to Vikram GarhwalFrom: Stefano Stabellini <[email protected]>
This patch does following:
1. creates arch_handle_ioreq() and arch_xen_set_memory(). This is done in preparation for moving most of xen-hvm code to an arch-neutral location, move the x86-specific portion of xen_set_memory to arch_xen_set_memory. Also, move handle_vmport_ioreq to arch_handle_ioreq.
2. Pure code movement: move common functions to hw/xen/xen-hvm-common.c Extract common functionalities from hw/i386/xen/xen-hvm.c and move them to hw/xen/xen-hvm-common.c. These common functions are useful for creating an IOREQ server.
xen_hvm_init_pc() contains the architecture independent code for creating and mapping a IOREQ server, connecting memory and IO listeners, initializing a xen bus and registering backends. Moved this common xen code to a new function xen_register_ioreq() which can be used by both x86 and ARM machines.
Following functions are moved to hw/xen/xen-hvm-common.c:
xen_vcpu_eport(), xen_vcpu_ioreq(), xen_ram_alloc(), xen_set_memory(), xen_region_add(), xen_region_del(), xen_io_add(), xen_io_del(), xen_device_realize(), xen_device_unrealize(), cpu_get_ioreq_from_shared_memory(), cpu_get_ioreq(), do_inp(), do_outp(), rw_phys_req_item(), read_phys_req_item(), write_phys_req_item(), cpu_ioreq_pio(), cpu_ioreq_move(), cpu_ioreq_config(), handle_ioreq(), handle_buffered_iopage(), handle_buffered_io(), cpu_handle_ioreq(), xen_main_loop_prepare(), xen_hvm_change_state_handler(), xen_exit_notifier(), xen_map_ioreq_server(), destroy_hvm_domain() and xen_shutdown_fatal_error()
3. Removed static type from below functions:
1. xen_region_add()
2. xen_region_del()
3. xen_io_add()
4. xen_io_del()
5. xen_device_realize()
6. xen_device_unrealize()
7. xen_hvm_change_state_handler()
8. cpu_ioreq_pio()
9. xen_exit_notifier()
4. Replace TARGET_PAGE_SIZE with XC_PAGE_SIZE to match the page side with Xen.
--- hw/i386/xen/trace-events | 14 - hw/i386/xen/xen-hvm.c | 1023 ++----------------------------- hw/xen/meson.build | 5 +- hw/xen/trace-events | 14 + hw/xen/xen-hvm-common.c | 868 ++++++++++++++++++++++++++ include/hw/i386/xen_arch_hvm.h | 11 + include/hw/xen/arch_hvm.h | 3 + include/hw/xen/xen-hvm-common.h | 98 +++ 8 files changed, 1063 insertions(+), 973 deletions(-) create mode 100644 hw/xen/xen-hvm-common.c create mode 100644 include/hw/i386/xen_arch_hvm.h create mode 100644 include/hw/xen/arch_hvm.h create mode 100644 include/hw/xen/xen-hvm-common.h
hw/i386/xen/trace-events +0 -14
@@ -7,17 +7,3 @@ xen_platform_log(char *s) "xen platform: %s" xen_pv_mmio_read(uint64_t addr) "WARNING: read from Xen PV Device MMIO space (address 0x%"PRIx64")" xen_pv_mmio_write(uint64_t addr) "WARNING: write to Xen PV Device MMIO space (address 0x%"PRIx64")" -# xen-hvm.c -xen_ram_alloc(unsigned long ram_addr, unsigned long size) "requested: 0x%lx, size 0x%lx" -xen_client_set_memory(uint64_t start_addr, unsigned long size, bool log_dirty) "0x%"PRIx64" size 0x%lx, log_dirty %i" -handle_ioreq(void *req, uint32_t type, uint32_t dir, uint32_t df, uint32_t data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=%p type=%d dir=%d df=%d ptr=%d port=0x%"PRIx64" data=0x%"PRIx64" count=%d size=%d" -handle_ioreq_read(void *req, uint32_t type, uint32_t df, uint32_t data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=%p read type=%d df=%d ptr=%d port=0x%"PRIx64" data=0x%"PRIx64" count=%d size=%d" -handle_ioreq_write(void *req, uint32_t type, uint32_t df, uint32_t data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=%p write type=%d df=%d ptr=%d port=0x%"PRIx64" data=0x%"PRIx64" count=%d size=%d" -cpu_ioreq_pio(void *req, uint32_t dir, uint32_t df, uint32_t data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=%p pio dir=%d df=%d ptr=%d port=0x%"PRIx64" data=0x%"PRIx64" count=%d size=%d" -cpu_ioreq_pio_read_reg(void *req, uint64_t data, uint64_t addr, uint32_t size) "I/O=%p pio read reg data=0x%"PRIx64" port=0x%"PRIx64" size=%d" -cpu_ioreq_pio_write_reg(void *req, uint64_t data, uint64_t addr, uint32_t size) "I/O=%p pio write reg data=0x%"PRIx64" port=0x%"PRIx64" size=%d" -cpu_ioreq_move(void *req, uint32_t dir, uint32_t df, uint32_t data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=%p copy dir=%d df=%d ptr=%d port=0x%"PRIx64" data=0x%"PRIx64" count=%d size=%d" -xen_map_resource_ioreq(uint32_t id, void *addr) "id: %u addr: %p" -cpu_ioreq_config_read(void *req, uint32_t sbdf, uint32_t reg, uint32_t size, uint32_t data) "I/O=%p sbdf=0x%x reg=%u size=%u data=0x%x" -cpu_ioreq_config_write(void *req, uint32_t sbdf, uint32_t reg, uint32_t size, uint32_t data) "I/O=%p sbdf=0x%x reg=%u size=%u data=0x%x" -
hw/i386/xen/xen-hvm.c +65 -958
1,104 lines not on this page · raw message
hw/xen/meson.build +4 -1
@@ -25,4 +25,7 @@ specific_ss.add_all(when: ['CONFIG_XEN', xen], if_true: xen_specific_ss) xen_ss = ss.source_set() -xen_ss.add(when: 'CONFIG_XEN', if_true: files('xen-mapcache.c')) +xen_ss.add(when: 'CONFIG_XEN', if_true: files( + 'xen-mapcache.c', + 'xen-hvm-common.c', +))
hw/xen/trace-events +14 -0
@@ -42,6 +42,20 @@ xs_node_vscanf(char *path, char *value) "%s %s" xs_node_watch(char *path) "%s" xs_node_unwatch(char *path) "%s" +# xen-hvm.c +xen_ram_alloc(unsigned long ram_addr, unsigned long size) "requested: 0x%lx, size 0x%lx" +xen_client_set_memory(uint64_t start_addr, unsigned long size, bool log_dirty) "0x%"PRIx64" size 0x%lx, log_dirty %i" +handle_ioreq(void *req, uint32_t type, uint32_t dir, uint32_t df, uint32_t data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=%p type=%d dir=%d df=%d ptr=%d port=0x%"PRIx64" data=0x%"PRIx64" count=%d size=%d" +handle_ioreq_read(void *req, uint32_t type, uint32_t df, uint32_t data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=%p read type=%d df=%d ptr=%d port=0x%"PRIx64" data=0x%"PRIx64" count=%d size=%d" +handle_ioreq_write(void *req, uint32_t type, uint32_t df, uint32_t data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=%p write type=%d df=%d ptr=%d port=0x%"PRIx64" data=0x%"PRIx64" count=%d size=%d" +cpu_ioreq_pio(void *req, uint32_t dir, uint32_t df, uint32_t data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=%p pio dir=%d df=%d ptr=%d port=0x%"PRIx64" data=0x%"PRIx64" count=%d size=%d" +cpu_ioreq_pio_read_reg(void *req, uint64_t data, uint64_t addr, uint32_t size) "I/O=%p pio read reg data=0x%"PRIx64" port=0x%"PRIx64" size=%d" +cpu_ioreq_pio_write_reg(void *req, uint64_t data, uint64_t addr, uint32_t size) "I/O=%p pio write reg data=0x%"PRIx64" port=0x%"PRIx64" size=%d" +cpu_ioreq_move(void *req, uint32_t dir, uint32_t df, uint32_t data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=%p copy dir=%d df=%d ptr=%d port=0x%"PRIx64" data=0x%"PRIx64" count=%d size=%d" +xen_map_resource_ioreq(uint32_t id, void *addr) "id: %u addr: %p" +cpu_ioreq_config_read(void *req, uint32_t sbdf, uint32_t reg, uint32_t size, uint32_t data) "I/O=%p sbdf=0x%x reg=%u size=%u data=0x%x" +cpu_ioreq_config_write(void *req, uint32_t sbdf, uint32_t reg, uint32_t size, uint32_t data) "I/O=%p sbdf=0x%x reg=%u size=%u data=0x%x" + # xen-mapcache.c xen_map_cache(uint64_t phys_addr) "want 0x%"PRIx64 xen_remap_bucket(uint64_t index) "index 0x%"PRIx64
hw/xen/xen-hvm-common.c new file +868 -0
868 lines not on this page · raw message
include/hw/i386/xen_arch_hvm.h new file +11 -0
@@ -0,0 +1,11 @@ +#ifndef HW_XEN_ARCH_I386_HVM_H +#define HW_XEN_ARCH_I386_HVM_H + +#include <xen/hvm/ioreq.h> +#include "hw/xen/xen-hvm-common.h" + +void arch_handle_ioreq (XenIOState *state,ioreq_t *req); +void arch_xen_set_memory (XenIOState *state, +MemoryRegionSection *section, +bool add); +#endif
include/hw/xen/arch_hvm.h new file +3 -0
@@ -0,0 +1,3 @@ +#if defined(TARGET_I386 ) || defined(TARGET_X86_64 ) +#include "hw/i386/xen_arch_hvm.h" +#endif
include/hw/xen/xen-hvm-common.h new file +98 -0
98 lines not on this page · raw message
Signature · 1 line
2.17.0
PATCH v2 5/11 include/hw/xen/xen_common: return error from xen_create_ioreq_server
In reply to Vikram GarhwalFrom: Stefano Stabellini <[email protected]>
This is done to prepare for enabling xenpv support for ARM architecture. On ARM it is possible to have a functioning xenpv machine with only the PV backends and no IOREQ server. If the IOREQ server creation fails, continue to the PV backends initialization.
--- include/hw/xen/xen_common.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
include/hw/xen/xen_common.h +8 -5
@@ -467,9 +467,10 @@ static inline void xen_unmap_pcidev(domid_t dom, { } -static inline void xen_create_ioreq_server (domid_t dom, -ioservid_t *ioservid) +static inline int xen_create_ioreq_server (domid_t dom, +ioservid_t *ioservid) { +return 0 ; } static inline void xen_destroy_ioreq_server(domid_t dom,
@@ -600,8 +601,8 @@ static inline void xen_unmap_pcidev(domid_t dom, PCI_FUNC(pci_dev->devfn)); } -static inline void xen_create_ioreq_server (domid_t dom, -ioservid_t *ioservid) +static inline int xen_create_ioreq_server (domid_t dom, +ioservid_t *ioservid) { int rc = xendevicemodel_create_ioreq_server(xen_dmod, dom, HVM_IOREQSRV_BUFIOREQ_ATOMIC,
@@ -609,12 +610,14 @@ static inline void xen_create_ioreq_server(domid_t dom,if (rc ==0 ) {trace_xen_ioreq_server_create (*ioservid); -return ; +return rc; } *ioservid =0 ; use_default_ioreq_server = true;trace_xen_default_ioreq_server (); + +return rc; } static inline void xen_destroy_ioreq_server(domid_t dom,
Signature · 1 line
2.17.0
Re: [QEMU][PATCH v2 05/11] include/hw/xen/xen_common: return error from xen_create_ioreq_server
Hi Stefano and Vikram,
Quoted 18 lines · Vikram Garhwal
From: Stefano Stabellini <[email protected]>
This is done to prepare for enabling xenpv support for ARM architecture. On ARM it is possible to have a functioning xenpv machine with only the PV backends and no IOREQ server. If the IOREQ server creation fails, continue to the PV backends initialization.
Signed-off-by Stefano Stabellini <[email protected]>Signed-off-by Vikram Garhwal <[email protected]>--- include/hw/xen/xen_common.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)include/hw/xen/xen_common.h +0
-0
include/hw/xen/xen_common.h static inline void xen_unmap_pcidev(domid_t dom, · line 471
Quoted 5 lines
include/hw/xen/xen_common.h +0
-2@@ -467,9 +467,10 @@ static inline void xen_unmap_pcidev(domid_t dom, { } -static inline void xen_create_ioreq_server (domid_t dom, -ioservid_t *ioservid)
How long are we supposed to maintain this code? Per [*]:
In general XenProject.org supports stable branches for 18 months full support plus 18 months security fixes. When a new X.Y.0 release is made there is usually one more release on the to-be-retired stable branch to mop up any loose patches sitting in the repository at which point the branch is retired.
4.17 was just released. 4.5 was 7 years ago. IIUC EOL'ed 4 years ago.
[*] https://wiki.xenproject.org/wiki/Xen_Project_Maintenance_Releases#Stable_Maintenance_Branches
Regards,
Phil.
Re: [QEMU][PATCH v2 05/11] include/hw/xen/xen_common: return error from xen_create_ioreq_server
Quoted 34 lines · Philippe Mathieu-Daudé
Hi Stefano and Vikram,
Quoted 18 lines · Vikram Garhwal
From: Stefano Stabellini <[email protected]>
This is done to prepare for enabling xenpv support for ARM architecture. On ARM it is possible to have a functioning xenpv machine with only the PV backends and no IOREQ server. If the IOREQ server creation fails, continue to the PV backends initialization.
Signed-off-by Stefano Stabellini <[email protected]>Signed-off-by Vikram Garhwal <[email protected]>---
include/hw/xen/xen_common.h| 13 ++++++++-----1 file changed, 8 insertions(+), 5 deletions(-)include/hw/xen/xen_common.h +0
-0include/hw/xen/xen_common.h static inline void xen_unmap_pcidev(domid_t dom, · line 470
Quoted 4 lines
include/hw/xen/xen_common.h +0
-2@@ -467,9 +467,10 @@ static inline void xen_unmap_pcidev(domid_t dom, { } -static inline void xen_create_ioreq_server (domid_t dom, - ioservid_t *ioservid)How long are we supposed to maintain this code? Per [*]:
In general XenProject.org supports stable branches for 18 months full support plus 18 months security fixes. When a new X.Y.0 release is made there is usually one more release on the to-be-retired stable branch to mop up any loose patches sitting in the repository at which point the branch is retired.
Quoted 3 lines
4.17 was just released. 4.5 was 7 years ago. IIUC EOL'ed 4 years ago.
[*] https://wiki.xenproject.org/wiki/Xen_Project_Maintenance_Releases#Stable_Maintenance_Branches
+Paolo for commit 14efd8d3b5 ("meson, configure: move Xen detection to meson"):
xen_libs = {
'4.11.0': [ 'xenstore', 'xenctrl', 'xendevicemodel',
'xenforeignmemory', 'xengnttab', 'xenevtchn', 'xentoolcore' ],
'4.10.0': [ 'xenstore', 'xenctrl', 'xendevicemodel',
'xenforeignmemory', 'xengnttab', 'xenevtchn', 'xentoolcore' ],
'4.9.0': [ 'xenstore', 'xenctrl', 'xendevicemodel',
'xenforeignmemory', 'xengnttab', 'xenevtchn' ],
'4.8.0': [ 'xenstore', 'xenctrl', 'xenforeignmemory',
'xengnttab', 'xenevtchn' ],
'4.7.1': [ 'xenstore', 'xenctrl', 'xenforeignmemory',
'xengnttab', 'xenevtchn' ],
'4.6.0': [ 'xenstore', 'xenctrl' ],
'4.5.0': [ 'xenstore', 'xenctrl' ],
'4.2.0': [ 'xenstore', 'xenctrl' ],
}According to repology for the 'xen' package:
FreeBSD (ports): 4.16 Debian 11: 4.14.5 Fedora 35: 4.16.2 Ubuntu 20.04: 4.11.3
OpenSUSE Leap 15.3: 4.14.1
RHEL 8: ?
Re: [QEMU][PATCH v2 05/11] include/hw/xen/xen_common: return error from xen_create_ioreq_server
Quoted 29 lines · Philippe Mathieu-Daudé
Quoted 28 lines · Philippe Mathieu-Daudé
Hi Stefano and Vikram,
Quoted 18 lines · Vikram Garhwal
From: Stefano Stabellini <[email protected]>
This is done to prepare for enabling xenpv support for ARM architecture. On ARM it is possible to have a functioning xenpv machine with only the PV backends and no IOREQ server. If the IOREQ server creation fails, continue to the PV backends initialization.
Signed-off-by Stefano Stabellini <[email protected]>Signed-off-by Vikram Garhwal <[email protected]>---
include/hw/xen/xen_common.h| 13 ++++++++-----1 file changed, 8 insertions(+), 5 deletions(-)include/hw/xen/xen_common.h +0
-0include/hw/xen/xen_common.h static inline void xen_unmap_pcidev(domid_t dom, · line 470
Quoted 4 lines
include/hw/xen/xen_common.h +0
-2@@ -467,9 +467,10 @@ static inline void xen_unmap_pcidev(domid_t dom, { } -static inline void xen_create_ioreq_server (domid_t dom, - ioservid_t *ioservid)How long are we supposed to maintain this code? Per [*]:
Quoted 7 lines
Quoted 7 lines
In general XenProject.org supports stable branches for 18 months full support plus 18 months security fixes. When a new X.Y.0 release is made there is usually one more release on the to-be-retired stable branch to mop up any loose patches sitting in the repository at which point the branch is retired.
4.17 was just released. 4.5 was 7 years ago. IIUC EOL'ed 4 years ago.
Hi Philippe,
So far we have not removed any of the old compatibility code in the xen headers like xen_common.h. However, you have a point and I think we could do so going forward. Like you wrote, 4.5 was 7 years ago, I would be happy to remove the old compatibility code to support ancient releases and that would simplify the code in the QEMU xen headers quite a bit.
That said, the change in this patch is orthogonal. This is needed anyway because we can have very modern Xen builds without IOREQ server capabilities (it is a kconfig option). So we would still need this patch.
Cheers,
Stefano
Quoted 31 lines
Quoted 2 lines
[*]
https://wiki.xenproject.org/wiki/Xen_Project_Maintenance_Releases#Stable_Maintenance_Branches+Paolo for commit
14efd8d3b5("meson, configure: move Xen detection to meson"):xen_libs = { '4.11.0': [ 'xenstore', 'xenctrl', 'xendevicemodel', 'xenforeignmemory', 'xengnttab', 'xenevtchn', 'xentoolcore' ], '4.10.0': [ 'xenstore', 'xenctrl', 'xendevicemodel', 'xenforeignmemory', 'xengnttab', 'xenevtchn', 'xentoolcore' ], '4.9.0': [ 'xenstore', 'xenctrl', 'xendevicemodel', 'xenforeignmemory', 'xengnttab', 'xenevtchn' ], '4.8.0': [ 'xenstore', 'xenctrl', 'xenforeignmemory', 'xengnttab', 'xenevtchn' ], '4.7.1': [ 'xenstore', 'xenctrl', 'xenforeignmemory', 'xengnttab', 'xenevtchn' ], '4.6.0': [ 'xenstore', 'xenctrl' ], '4.5.0': [ 'xenstore', 'xenctrl' ], '4.2.0': [ 'xenstore', 'xenctrl' ], }According to repology for the 'xen' package:
FreeBSD (ports): 4.16 Debian 11: 4.14.5 Fedora 35: 4.16.2 Ubuntu 20.04: 4.11.3OpenSUSE Leap 15.3: 4.14.1
RHEL 8: ?
PATCH v2 6/11 hw/xen/xen-hvm-common: skip ioreq creation on ioreq registration failure
In reply to Vikram GarhwalFrom: Stefano Stabellini <[email protected]>
On ARM it is possible to have a functioning xenpv machine with only the PV backends and no IOREQ server. If the IOREQ server creation fails continue to the PV backends initialization.
Also, moved the IOREQ registration and mapping subroutine to new function xen_do_ioreq_register().
--- hw/xen/xen-hvm-common.c | 53 ++++++++++++++++++++++++++++------------- 1 file changed, 36 insertions(+), 17 deletions(-)
hw/xen/xen-hvm-common.c +36 -17
@@ -777,25 +777,12 @@ err:exit (1 ); } -void xen_register_ioreq (XenIOState *state,unsigned int max_cpus, -MemoryListener xen_memory_listener) +static void xen_do_ioreq_register (XenIOState *state, +unsigned int max_cpus, +MemoryListener xen_memory_listener) {int i, rc; - state->xce_handle =xenevtchn_open (NULL ,0 ); -if (state->xce_handle ==NULL ) { -perror ("xen: event channel open" ); - goto err; - } - - state->xenstore =xs_daemon_open (); -if (state->xenstore ==NULL ) { -perror ("xen: xenstore open" ); - goto err; - } - -xen_create_ioreq_server (xen_domid, &state->ioservid); - state->exit.notify = xen_exit_notifier;qemu_add_exit_notifier (&state->exit);
@@ -859,10 +846,42 @@ void xen_register_ioreq(XenIOState *state, unsigned int max_cpus,QLIST_INIT (&state->dev_list);device_listener_register (&state->device_listener); +return ; + +err: +error_report ("xen hardware virtual machine initialisation failed" ); +exit (1 ); +} + +void xen_register_ioreq (XenIOState *state,unsigned int max_cpus, +MemoryListener xen_memory_listener) +{ +int rc; + + state->xce_handle =xenevtchn_open (NULL ,0 ); +if (state->xce_handle ==NULL ) { +perror ("xen: event channel open" ); + goto err; + } + + state->xenstore =xs_daemon_open (); +if (state->xenstore ==NULL ) { +perror ("xen: xenstore open" ); + goto err; + } + + rc =xen_create_ioreq_server (xen_domid, &state->ioservid); +if (!rc) { +xen_do_ioreq_register (state, max_cpus, xen_memory_listener); + }else { +warn_report ("xen: failed to create ioreq server" ); + } +xen_bus_init ();return ; + err: -error_report ("xen hardware virtual machine initialisation failed" ); +error_report ("xen hardware virtual machine backend registration failed" );exit (1 ); }
Signature · 1 line
2.17.0
PATCH v2 7/11 hw/xen/xen-hvm-common: Use g_new and error_setg_errno
In reply to Vikram GarhwalReplace g_malloc with g_new and perror with error_setg_errno.
--- hw/xen/xen-hvm-common.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
hw/xen/xen-hvm-common.c +8 -7
@@ -34,7 +34,7 @@ void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, MemoryRegion *mr,trace_xen_ram_alloc (ram_addr, size); nr_pfn = size >>TARGET_PAGE_BITS ; - pfn_list =g_malloc (sizeof (*pfn_list) * nr_pfn); + pfn_list =g_new (xen_pfn_t, nr_pfn);for (i =0 ; i < nr_pfn; i++) { pfn_list[i] = (ram_addr >>TARGET_PAGE_BITS ) + i;
@@ -717,7 +717,7 @@ void destroy_hvm_domain(bool reboot)xc_interface *xc_handle;int sts;int rc; - +Error *errp =NULL ;unsigned int reason = reboot ? SHUTDOWN_reboot : SHUTDOWN_poweroff;if (xen_dmod) {
@@ -726,7 +726,7 @@ void destroy_hvm_domain(bool reboot)return ; }if (errno !=ENOTTY /* old Xen */ ) { -perror ("xendevicemodel_shutdown failed" ); +error_setg_errno (&errp, errno,"xendevicemodel_shutdown failed" ); }/* well, try the old thing then */ }
@@ -797,7 +797,7 @@ static void xen_do_ioreq_register(XenIOState *state, }/* Note: cpus is empty at this point in init */ - state->cpu_by_vcpu_id =g_malloc0 (max_cpus *sizeof (CPUState *)); + state->cpu_by_vcpu_id = g_new0(CPUState *, max_cpus); rc =xen_set_ioreq_server_state (xen_domid, state->ioservid, true);if (rc <0 ) {
@@ -806,7 +806,7 @@ static void xen_do_ioreq_register(XenIOState *state, goto err; } - state->ioreq_local_port =g_malloc0 (max_cpus *sizeof (evtchn_port_t)); + state->ioreq_local_port =g_new0 (evtchn_port_t, max_cpus);/* FIXME: how about if we overflow the page here? */ for (i =0 ; i < max_cpus; i++) {
@@ -857,16 +857,17 @@ void xen_register_ioreq(XenIOState *state, unsigned int max_cpus, MemoryListener xen_memory_listener) {int rc; +Error *errp =NULL ; state->xce_handle =xenevtchn_open (NULL ,0 );if (state->xce_handle ==NULL ) { -perror ("xen: event channel open" ); +error_setg_errno (&errp, errno,"xen: event channel open" ); goto err; } state->xenstore =xs_daemon_open ();if (state->xenstore ==NULL ) { -perror ("xen: xenstore open" ); +error_setg_errno (&errp, errno,"xen: xenstore open" ); goto err; }
Signature · 1 line
2.17.0
Re: [QEMU][PATCH v2 07/11] hw/xen/xen-hvm-common: Use g_new and error_setg_errno
Quoted 18 lines · Vikram Garhwal
Replace
g_mallocwithg_newand perror witherror_setg_errno.Signed-off-by Vikram Garhwal <[email protected]>--- hw/xen/xen-hvm-common.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)hw/xen/xen-hvm-common.c +1
-1@@ -717,7 +717,7 @@ void destroy_hvm_domain(bool reboot)xc_interface *xc_handle;int sts;int rc; - +Error *errp =NULL ;unsigned int reason = reboot ? SHUTDOWN_reboot : SHUTDOWN_poweroff;if (xen_dmod) {
hw/xen/xen-hvm-common.c void destroy_hvm_domain(bool reboot) · line 729
Quoted 5 lines
hw/xen/xen-hvm-common.c +1
-1@@ -726,7 +726,7 @@ void destroy_hvm_domain(bool reboot)return ; }if (errno !=ENOTTY /* old Xen */ ) { -perror ("xendevicemodel_shutdown failed" ); +error_setg_errno (&errp, errno,"xendevicemodel_shutdown failed" );
See "qapi/error.h":
* = Passing errors around =
*
* Errors get passed to the caller through the conventional @errp
* parameter.
Here you are not passing the error to the caller.
Maybe you are looking for the "qemu/error-report.h" API?
Quoted 15 lines
hw/xen/xen-hvm-common.c +2
-1}/* well, try the old thing then */ }@@ -857,16 +857,17 @@ void xen_register_ioreq(XenIOState *state, unsigned int max_cpus, MemoryListener xen_memory_listener) {int rc; +Error *errp =NULL ; state->xce_handle =xenevtchn_open (NULL ,0 );if (state->xce_handle ==NULL ) { -perror ("xen: event channel open" ); +error_setg_errno (&errp, errno,"xen: event channel open" );
hw/xen/xen-hvm-common.c void xen_register_ioreq(XenIOState *state, unsigned int max_cpus, · line 873
Quoted 10 lines
hw/xen/xen-hvm-common.c +1
-1goto err; } state->xenstore =xs_daemon_open ();if (state->xenstore ==NULL ) { -perror ("xen: xenstore open" ); +error_setg_errno (&errp, errno,"xen: xenstore open" ); goto err; }
Ditto.
Re: [QEMU][PATCH v2 07/11] hw/xen/xen-hvm-common: Use g_new and error_setg_errno
Quoted 27 lines · Philippe Mathieu-Daudé
Quoted 18 lines · Vikram Garhwal
Replace
g_mallocwithg_newand perror witherror_setg_errno.Signed-off-by Vikram Garhwal <[email protected]>--- hw/xen/xen-hvm-common.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)hw/xen/xen-hvm-common.c +1
-1@@ -717,7 +717,7 @@ void destroy_hvm_domain(bool reboot)xc_interface *xc_handle;int sts;int rc; - +Error *errp =NULL ;unsigned int reason = reboot ? SHUTDOWN_reboot : SHUTDOWN_poweroff;if (xen_dmod) {hw/xen/xen-hvm-common.c void destroy_hvm_domain(bool reboot) · line 729
Quoted 5 lines
hw/xen/xen-hvm-common.c +1
-1@@ -726,7 +726,7 @@ void destroy_hvm_domain(bool reboot)return ; }if (errno !=ENOTTY /* old Xen */ ) { -perror ("xendevicemodel_shutdown failed" ); +error_setg_errno (&errp, errno,"xendevicemodel_shutdown failed" );See "
qapi/error.h":
Quoted 6 lines
* = Passing errors around =
*
* Errors get passed to the caller through the conventional @errp
* parameter.Here you are not passing the error to the caller.
Instead, you're leaking its memory.
Quoted 1 line
Maybe you are looking for the "
qemu/error-report.h" API?
Plausible.
Also, @errp is the conventional name for the Error ** parameter used to pass errors to the caller. Local Error * variables are usually called @err or @local_err (I prefer the former).
[...]
Re: [QEMU][PATCH v2 07/11] hw/xen/xen-hvm-common: Use g_new and error_setg_errno
Hi Markus & Philippe,
Thanks for reviewing this one. Please see the question below.
Quoted 35 lines · Markus Armbruster
Quoted 25 lines · Philippe Mathieu-Daudé
Quoted 17 lines · Vikram Garhwal
Replace
g_mallocwithg_newand perror witherror_setg_errno.Signed-off-by Vikram Garhwal <[email protected]>--- hw/xen/xen-hvm-common.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)hw/xen/xen-hvm-common.c +1
-1@@ -717,7 +717,7 @@ void destroy_hvm_domain(bool reboot)xc_interface *xc_handle;int sts;int rc; - +Error *errp =NULL ;unsigned int reason = reboot ? SHUTDOWN_reboot : SHUTDOWN_poweroff;if (xen_dmod) {hw/xen/xen-hvm-common.c void destroy_hvm_domain(bool reboot) · line 729
Quoted 5 lines
hw/xen/xen-hvm-common.c +1
-1@@ -726,7 +726,7 @@ void destroy_hvm_domain(bool reboot)return ; }if (errno !=ENOTTY /* old Xen */ ) { -perror ("xendevicemodel_shutdown failed" ); +error_setg_errno (&errp, errno,"xendevicemodel_shutdown failed" );See "
qapi/error.h":Quoted 6 lines
* = Passing errors around =
*
* Errors get passed to the caller through the conventional @errp
* parameter.Here you are not passing the error to the caller.
Instead, you're leaking its memory.
Quoted 9 lines
Quoted 1 line
Maybe you are looking for the "
qemu/error-report.h" API?Plausible.
Also, @errp is the conventional name for the Error ** parameter used to pass errors to the caller. Local Error * variables are usually called @err or @local_err (I prefer the former).
[...]
IIUC, error_set_errno() is not okay as it needs to be called with errp from caller. But error_set(&err, "") is okay with locally defined **err = NULL; Is that correct understanding?
PATCH v2 8/11 accel/xen/xen-all: export xenstore_record_dm_state
In reply to Vikram Garhwalxenstore_record_dm_state() will also be used in aarch64 xenpv machine.
--- accel/xen/xen-all.c | 2 +- include/hw/xen/xen.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)
accel/xen/xen-all.c +1 -1
@@ -100,7 +100,7 @@ void xenstore_store_pv_console_info(int i, Chardev *chr) } -static void xenstore_record_dm_state (struct xs_handle *xs,const char *state) +void xenstore_record_dm_state (struct xs_handle *xs,const char *state) {char path[50 ];
include/hw/xen/xen.h +2 -0
@@ -19,6 +19,7 @@ enum xen_mode {extern uint32_t xen_domid;extern enum xen_mode xen_mode;extern bool xen_domid_restrict; +struct xs_handle ;int xen_pci_slot_get_pirq (PCIDevice *pci_dev,int irq_num);int xen_set_pci_link_route (uint8_t link,uint8_t irq);
@@ -31,5 +32,6 @@ qemu_irq *xen_interrupt_controller_init(void);void xenstore_store_pv_console_info (int i,Chardev *chr);void xen_register_framebuffer (struct MemoryRegion *mr); +void xenstore_record_dm_state (struct xs_handle *xs,const char *state);#endif /* QEMU_HW_XEN_H */
Signature · 1 line
2.17.0
PATCH v2 9/11 meson.build: do not set have_xen_pci_passthrough for aarch64 targets
In reply to Vikram GarhwalFrom: Stefano Stabellini <[email protected]>
have_xen_pci_passthrough is only used for Xen x86 VMs.
--- meson.build | 2 ++ 1 file changed, 2 insertions(+)
meson.build +2 -0
@@ -1469,6 +1469,8 @@ have_xen_pci_passthrough = get_option('xen_pci_passthrough') \ error_message: 'Xen PCI passthrough requested but Xen not enabled') \ .require(targetos == 'linux', error_message: 'Xen PCI passthrough not available on this platform') \ + .require(cpu == 'x86' or cpu == 'x86_64', + error_message: 'Xen PCI passthrough not available on this platform') \ .allowed()
Signature · 1 line
2.17.0
PATCH v2 10/11 hw/arm: introduce xenpv machine
In reply to Vikram GarhwalAdd a new machine xenpv which creates a IOREQ server to register/connect with Xen Hypervisor.
Optional: When CONFIG_TPM is enabled, it also creates a tpm-tis-device, adds a TPM emulator and connects to swtpm running on host machine via chardev socket and support TPM functionalities for a guest domain.
Extra command line for aarch64 xenpv QEMU to connect to swtpm:
-chardev socket,id=chrtpm,path=/tmp/myvtpm2/swtpm-sock \
-tpmdev emulator,id=tpm0,chardev=chrtpm \swtpm implements a TPM software emulator(TPM 1.2 & TPM 2) built on libtpms and provides access to TPM functionality over socket, chardev and CUSE interface. Github repo: https://github.com/stefanberger/swtpm
Example for starting swtpm on host machine:
mkdir /tmp/vtpm2
swtpm socket --tpmstate dir=/tmp/vtpm2 \
--ctrl type=unixio,path=/tmp/vtpm2/swtpm-sock &
/* Comment about machine name. Will be removed in next version*/ Please reply with the machine name you agree. Below are two possible names:
1. xenpv
2. xenpvh
--- hw/arm/meson.build | 2 + hw/arm/xen_arm.c | 175 ++++++++++++++++++++++++++++++++++ include/hw/arm/xen_arch_hvm.h | 9 ++ include/hw/xen/arch_hvm.h | 2 + 4 files changed, 188 insertions(+) create mode 100644 hw/arm/xen_arm.c create mode 100644 include/hw/arm/xen_arch_hvm.h
hw/arm/meson.build +2 -0
@@ -62,5 +62,7 @@ arm_ss.add(when: 'CONFIG_FSL_IMX7', if_true: files('fsl-imx7.c', 'mcimx7d-sabre. arm_ss.add(when: 'CONFIG_ARM_SMMUV3', if_true: files('smmu-common.c', 'smmuv3.c')) arm_ss.add(when: 'CONFIG_FSL_IMX6UL', if_true: files('fsl-imx6ul.c', 'mcimx6ul-evk.c')) arm_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_soc.c')) +arm_ss.add(when: 'CONFIG_XEN', if_true: files('xen_arm.c')) +arm_ss.add_all(xen_ss) hw_arch += {'arm': arm_ss}
hw/arm/xen_arm.c new file +175 -0
175 lines not on this page · raw message
include/hw/arm/xen_arch_hvm.h new file +9 -0
@@ -0,0 +1,9 @@ +#ifndef HW_XEN_ARCH_ARM_HVM_H +#define HW_XEN_ARCH_ARM_HVM_H + +#include <xen/hvm/ioreq.h> +void arch_handle_ioreq (XenIOState *state,ioreq_t *req); +void arch_xen_set_memory (XenIOState *state, +MemoryRegionSection *section, +bool add); +#endif
include/hw/xen/arch_hvm.h +2 -0
@@ -1,3 +1,5 @@#if defined(TARGET_I386 ) || defined(TARGET_X86_64 )#include "hw/i386/xen_arch_hvm.h" +#elif defined(TARGET_ARM ) || defined(TARGET_ARM_64 ) +#include "hw/arm/xen_arch_hvm.h" #endif
Signature · 1 line
2.17.0
Re: [QEMU][PATCH v2 10/11] hw/arm: introduce xenpv machine
Quoted 19 lines · Vikram Garhwal
Add a new machine xenpv which creates a IOREQ server to register/connect with Xen Hypervisor.
Optional: When
CONFIG_TPMis enabled, it also creates a tpm-tis-device, adds a TPM emulator and connects to swtpm running on host machine via chardev socket and support TPM functionalities for a guest domain.Extra command line for aarch64 xenpv QEMU to connect to swtpm:
-chardev socket,id=chrtpm,path=/tmp/myvtpm2/swtpm-sock \ -tpmdev emulator,id=tpm0,chardev=chrtpm \swtpm implements a TPM software
emulator(TPM 1.2 & TPM 2)built on libtpms and provides access to TPM functionality over socket, chardev and CUSE interface. Github repo: https://github.com/stefanberger/swtpm
Example for starting swtpm on host machine:
mkdir/tmp/vtpm2
swtpm socket --tpmstate dir=/tmp/vtpm2 \
--ctrl type=unixio,path=/tmp/vtpm2/swtpm-sock &
Quoted 4 lines
/* Comment about machine name. Will be removed in next version*/ Please reply with the machine name you agree. Below are two possible names:
1. xenpv
2. xenpvh
Please us xenpvh, as on Arm the guests are more like PVH guests.
This will be needed on x86 to support e.g. virtio for PVH guests, and xenpv is already taken on x86 for PV guests.
Juergen
Re: [QEMU][PATCH v2 10/11] hw/arm: introduce xenpv machine
In reply to Vikram GarhwalQuoted 41 lines · Vikram Garhwal
Add a new machine xenpv which creates a IOREQ server to register/connect with Xen Hypervisor.
Optional: When
CONFIG_TPMis enabled, it also creates a tpm-tis-device, adds a TPM emulator and connects to swtpm running on host machine via chardev socket and support TPM functionalities for a guest domain.Extra command line for aarch64 xenpv QEMU to connect to swtpm:
-chardev socket,id=chrtpm,path=/tmp/myvtpm2/swtpm-sock \ -tpmdev emulator,id=tpm0,chardev=chrtpm \swtpm implements a TPM software
emulator(TPM 1.2 & TPM 2)built on libtpms and provides access to TPM functionality over socket, chardev and CUSE interface. Github repo: https://github.com/stefanberger/swtpm
Example for starting swtpm on host machine:
mkdir/tmp/vtpm2
swtpm socket --tpmstate dir=/tmp/vtpm2 \
--ctrl type=unixio,path=/tmp/vtpm2/swtpm-sock &/* Comment about machine name. Will be removed in next version*/ Please reply with the machine name you agree. Below are two possible names:
1. xenpv
2. xenpvhSigned-off-by Vikram Garhwal <[email protected]>Signed-off-by Stefano Stabellini <[email protected]>--- hw/arm/meson.build | 2 + hw/arm/xen_arm.c | 175 ++++++++++++++++++++++++++++++++++ include/hw/arm/xen_arch_hvm.h | 9 ++ include/hw/xen/arch_hvm.h | 2 + 4 files changed, 188 insertions(+)create mode 100644
hw/arm/xen_arm.ccreate mode 100644include/hw/arm/xen_arch_hvm.hinclude/hw/xen/arch_hvm.h +0
-0
include/hw/xen/arch_hvm.h line 5
Quoted 5 lines
include/hw/xen/arch_hvm.h +2
-0@@ -1,3 +1,5 @@#if defined(TARGET_I386 ) || defined(TARGET_X86_64 )#include "hw/i386/xen_arch_hvm.h" +#elif defined(TARGET_ARM ) || defined(TARGET_ARM_64 ) +#include "hw/arm/xen_arch_hvm.h" #endif
Do we really want to maintain a 32-bit PV machine?
Re: [QEMU][PATCH v2 10/11] hw/arm: introduce xenpv machine
In reply to Vikram GarhwalQuoted 120 lines · Vikram Garhwal
Add a new machine xenpv which creates a IOREQ server to register/connect with Xen Hypervisor.
Optional: When
CONFIG_TPMis enabled, it also creates a tpm-tis-device, adds a TPM emulator and connects to swtpm running on host machine via chardev socket and support TPM functionalities for a guest domain.Extra command line for aarch64 xenpv QEMU to connect to swtpm:
-chardev socket,id=chrtpm,path=/tmp/myvtpm2/swtpm-sock \ -tpmdev emulator,id=tpm0,chardev=chrtpm \swtpm implements a TPM software
emulator(TPM 1.2 & TPM 2)built on libtpms and provides access to TPM functionality over socket, chardev and CUSE interface. Github repo: https://github.com/stefanberger/swtpm
Example for starting swtpm on host machine:
mkdir/tmp/vtpm2
swtpm socket --tpmstate dir=/tmp/vtpm2 \
--ctrl type=unixio,path=/tmp/vtpm2/swtpm-sock &/* Comment about machine name. Will be removed in next version*/ Please reply with the machine name you agree. Below are two possible names:
1. xenpv
2. xenpvhSigned-off-by Vikram Garhwal <[email protected]>Signed-off-by Stefano Stabellini <[email protected]>--- hw/arm/meson.build | 2 + hw/arm/xen_arm.c | 175 ++++++++++++++++++++++++++++++++++ include/hw/arm/xen_arch_hvm.h | 9 ++ include/hw/xen/arch_hvm.h | 2 + 4 files changed, 188 insertions(+) create mode 100644 hw/arm/xen_arm.c create mode 100644 include/hw/arm/xen_arch_hvm.hhw/arm/meson.build +2
-0@@ -62,5 +62,7 @@ arm_ss.add(when: 'CONFIG_FSL_IMX7', if_true: files('fsl-imx7.c', 'mcimx7d-sabre. arm_ss.add(when: 'CONFIG_ARM_SMMUV3', if_true: files('smmu-common.c', 'smmuv3.c')) arm_ss.add(when: 'CONFIG_FSL_IMX6UL', if_true: files('fsl-imx6ul.c', 'mcimx6ul-evk.c')) arm_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_soc.c')) +arm_ss.add(when: 'CONFIG_XEN', if_true: files('xen_arm.c')) +arm_ss.add_all(xen_ss) hw_arch += {'arm': arm_ss}hw/arm/xen_arm.c new file +67
-0@@ -0,0 +1,175 @@ +/* +* QEMU ARM Xen PV Machine +* +* +* 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 "qemu/osdep.h" +#include "qemu/error-report.h" +#include "qapi/qapi-commands-migration.h" +#include "hw/boards.h" +#include "hw/sysbus.h" +#include "sysemu/block-backend.h" +#include "sysemu/tpm_backend.h" +#include "sysemu/sysemu.h" +#include "hw/xen/xen-legacy-backend.h" +#include "hw/xen/xen-hvm-common.h" +#include "sysemu/tpm.h" +#include "hw/xen/arch_hvm.h" + +#define TYPE_XEN_ARM MACHINE_TYPE_NAME("xenpv") +OBJECT_DECLARE_SIMPLE_TYPE(XenArmState, XEN_ARM) + +static MemoryListener xen_memory_listener = { + .region_add = xen_region_add, + .region_del = xen_region_del, + .log_start =NULL , + .log_stop =NULL , + .log_sync =NULL , + .log_global_start =NULL , + .log_global_stop =NULL , + .priority =10 , +}; + +struct XenArmState { +/*< private >*/ +MachineState parent; + +XenIOState *state; +}; + +void arch_handle_ioreq (XenIOState *state,ioreq_t *req) +{ +hw_error ("Invalid ioreq type 0x%x\n" , req->type); + +return ; +} + +void arch_xen_set_memory (XenIOState *state,MemoryRegionSection *section, +bool add) +{
hw/arm/xen_arm.c line 77
Quoted 10 lines
hw/arm/xen_arm.c new file +10
-0+} + +void xen_hvm_modified_memory (ram_addr_t start,ram_addr_t length) +{ +} + +void qmp_xen_set_global_dirty_log (bool enable,Error **errp) +{ +} +
This function is only used under CONFIG_TPM so without it you get:
../../hw/arm/xen_arm.c:78:12: error: ‘xen_init_ioreq’ defined but not used [-Werror=unused-function]
78 | static int xen_init_ioreq(XenIOState *state, unsigned int max_cpus)
| ^~~~~~~~~~~~~~
cc1: all warnings being treated as errors
I think I reported this on v1 as well.
Quoted 58 lines
hw/arm/xen_arm.c new file +58
-0+static int xen_init_ioreq (XenIOState *state,unsigned int max_cpus) +{ + xen_dmod =xendevicemodel_open (0 ,0 ); +if (xen_dmod ==NULL ) { +perror ("xen: can't open xen device model interface\n" ); +return -1 ; + } + + xen_xc =xc_interface_open (0 ,0 ,0 ); +if (xen_xc ==NULL ) { +perror ("xen: can't open xen interface\n" ); +return -1 ; + } + + xen_fmem =xenforeignmemory_open (0 ,0 ); +if (xen_fmem ==NULL ) { +perror ("xen: can't open xen fmem interface\n" ); +xc_interface_close (xen_xc); +return -1 ; + } + +xen_register_ioreq (state, max_cpus, xen_memory_listener); + +xen_register_backend (state); + +xenstore_record_dm_state (state->xenstore,"running" ); + +return 0 ; +} + +static void xen_enable_tpm (void ) +{ +/* qemu_find_tpm_be is only available when CONFIG_TPM is enabled. */ +#ifdef CONFIG_TPM +Error *errp =NULL ; +DeviceState *dev; +SysBusDevice *busdev; + +TPMBackend *be =qemu_find_tpm_be ("tpm0" ); +if (be ==NULL ) { +DPRINTF ("Couldn't fine the backend for tpm0\n" ); +return ; + } + dev =qdev_new (TYPE_TPM_TIS_SYSBUS ); +object_property_set_link (OBJECT (dev),"tpmdev" ,OBJECT (be), &errp); +object_property_set_str (OBJECT (dev),"tpmdev" , be->id, &errp); + busdev =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (busdev, &error_fatal); +sysbus_mmio_map (busdev,0 ,GUEST_TPM_BASE ); + +DPRINTF ("Connected tpmdev at address 0x%lx\n" ,GUEST_TPM_BASE ); +#endif +} + +static void xen_arm_init (MachineState *machine) +{ +XenArmState *xam =XEN_ARM (machine); +
hw/arm/xen_arm.c line 145
Quoted 10 lines
hw/arm/xen_arm.c new file +10
-0+ xam->state =g_new0 (XenIOState,1 ); + +/* For now enable IOREQ only for CONFIG_TPM. */ +#ifdef CONFIG_TPM +if (xen_init_ioreq (xam->state, machine->smp.cpus)) { +return ; + } +#endif + +xen_enable_tpm ();
In fact this just looks weird - you guard the call to init_ioreq with ifdefs guarding it but nest those ifdefs in xen_enable_tpm. Surely you want the IOREQ server support even if you don't have TPM. Otherwise it should be a hard configure requirement.
Quoted 55 lines
hw/arm/xen_arm.c new file +30
-0+ +return ; +} + +static void xen_arm_machine_class_init (ObjectClass *oc,void *data) +{ + +MachineClass *mc =MACHINE_CLASS (oc); + mc->desc ="Xen Para-virtualized PC" ; + mc->init = xen_arm_init; + mc->max_cpus =1 ; + +#ifdef CONFIG_TPM +machine_class_allow_dynamic_sysbus_dev (mc,TYPE_TPM_TIS_SYSBUS ); +#endif +} + +static const TypeInfo xen_arm_machine_type = { + .name =TYPE_XEN_ARM , + .parent =TYPE_MACHINE , + .class_init = xen_arm_machine_class_init, + .instance_size =sizeof (XenArmState), +}; + +static void xen_arm_machine_register_types (void ) +{ +type_register_static (&xen_arm_machine_type); +} + +type_init (xen_arm_machine_register_types)include/hw/arm/xen_arch_hvm.h new file +9
-0@@ -0,0 +1,9 @@ +#ifndef HW_XEN_ARCH_ARM_HVM_H +#define HW_XEN_ARCH_ARM_HVM_H + +#include <xen/hvm/ioreq.h> +void arch_handle_ioreq (XenIOState *state,ioreq_t *req); +void arch_xen_set_memory (XenIOState *state, +MemoryRegionSection *section, +bool add); +#endif include/hw/xen/arch_hvm.h +2
-0@@ -1,3 +1,5 @@#if defined(TARGET_I386 ) || defined(TARGET_X86_64 )#include "hw/i386/xen_arch_hvm.h" +#elif defined(TARGET_ARM ) || defined(TARGET_ARM_64 ) +#include "hw/arm/xen_arch_hvm.h" #endif
Signature · 1 line
Alex Bennée
Re: [QEMU][PATCH v2 10/11] hw/arm: introduce xenpv machine
In reply to Vikram GarhwalQuoted 18 lines · Vikram Garhwal
Add a new machine xenpv which creates a IOREQ server to register/connect with Xen Hypervisor.
Optional: When
CONFIG_TPMis enabled, it also creates a tpm-tis-device, adds a TPM emulator and connects to swtpm running on host machine via chardev socket and support TPM functionalities for a guest domain.Extra command line for aarch64 xenpv QEMU to connect to swtpm:
-chardev socket,id=chrtpm,path=/tmp/myvtpm2/swtpm-sock \ -tpmdev emulator,id=tpm0,chardev=chrtpm \swtpm implements a TPM software
emulator(TPM 1.2 & TPM 2)built on libtpms and provides access to TPM functionality over socket, chardev and CUSE interface. Github repo: https://github.com/stefanberger/swtpm
Example for starting swtpm on host machine:
mkdir/tmp/vtpm2
swtpm socket --tpmstate dir=/tmp/vtpm2 \
--ctrl type=unixio,path=/tmp/vtpm2/swtpm-sock &
<snip>
Quoted 10 lines
hw/arm/xen_arm.c new file +10
-0+ +static void xen_enable_tpm (void ) +{ +/* qemu_find_tpm_be is only available when CONFIG_TPM is enabled. */ +#ifdef CONFIG_TPM +Error *errp =NULL ; +DeviceState *dev; +SysBusDevice *busdev; + +TPMBackend *be =qemu_find_tpm_be ("tpm0" );
hw/arm/xen_arm.c line 126
Quoted 10 lines
hw/arm/xen_arm.c new file +10
-0+if (be ==NULL ) { +DPRINTF ("Couldn't fine the backend for tpm0\n" ); +return ; + } + dev =qdev_new (TYPE_TPM_TIS_SYSBUS ); +object_property_set_link (OBJECT (dev),"tpmdev" ,OBJECT (be), &errp); +object_property_set_str (OBJECT (dev),"tpmdev" , be->id, &errp); + busdev =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (busdev, &error_fatal); +sysbus_mmio_map (busdev,0 ,GUEST_TPM_BASE );
Still fails on my aarch64 Debian machine:
FAILED: libqemu-aarch64-softmmu.fa.p/hw_arm_xen_arm.c.o
cc -Ilibqemu-aarch64-softmmu.fa.p -I. -I../.. -Itarget/arm -I../../target/arm -Iqapi -Itrace -Iui -Iui/shader -I/usr/include/pixman-1 -I/usr/local/include -I/usr/include/capstone -I/usr/include/spice-server -I/usr/include/spice-1 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -fdiagnostics-color=auto -Wall -Winvalid-pch -Werror -std=gnu11 -O2 -g -isystem /home/alex/lsrc/qemu.git/linux-headers -isystem linux-headers -iquote . -iquote /home/alex/lsrc/qemu.git -iquote /home/alex/lsrc/qemu.git/include -iquote /home/alex/lsrc/qemu.git/tcg/aarch64 -pthread -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv -Wold-style-declaration -Wold-style-definition -Wtype-limits -Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers -Wempty-body -Wnested-externs -Wendif-labels -Wexpansion-to-defined -Wimplicit-fallthrough=2 -Wno-missing-include-dirs -Wno-shift-negative-value -Wno-psabi -fstack-protector-strong -fPIE -isystem../../linux-headers -isystemlinux-headers -DNEED_CPU_H '-DCONFIG_TARGET="aarch64-softmmu-config-target.h"' '-DCONFIG_DEVICES="aarch64-softmmu-config-devices.h"' -MD -MQ libqemu-aarch64-softmmu.fa.p/hw_arm_xen_arm.c.o -MF libqemu-aarch64-softmmu.fa.p/hw_arm_xen_arm.c.o.d -o libqemu-aarch64-softmmu.fa.p/hw_arm_xen_arm.c.o -c ../../hw/arm/xen_arm.c ../../hw/arm/xen_arm.c: In function ‘xen_enable_tpm’:
../../hw/arm/xen_arm.c:126:32: error: ‘GUEST_TPM_BASE’ undeclared (first use in this function); did you mean ‘GUEST_RAM_BASE’?
126 | sysbus_mmio_map(busdev, 0, GUEST_TPM_BASE);
| ^~~~~~~~~~~~~~
| GUEST_RAM_BASE ../../hw/arm/xen_arm.c:126:32: note: each undeclared identifier is reported only once for each function it appears in [2082/3246] Compiling C object libqemu-aarch64-softmmu.fa.p/hw_xen_xen-mapcache.c.o
[2083/3246] Compiling C object libqemu-aarch64-softmmu.fa.p/hw_xen_xen-hvm-common.c.o
ninja: build stopped: subcommand failed.
make: *** [Makefile:165: run-ninja] Error 1
hw/arm/xen_arm.c line 130
Quoted 4 lines
hw/arm/xen_arm.c new file +4
-0+ +DPRINTF ("Connected tpmdev at address 0x%lx\n" ,GUEST_TPM_BASE ); +#endif +}
If there is a minimum required version for TPM then it needs to be picked up by configure.
Signature · 1 line
Alex Bennée
Re: [QEMU][PATCH v2 10/11] hw/arm: introduce xenpv machine
Hi Alex,
Quoted 46 lines · Alex Bennée
Quoted 18 lines · Vikram Garhwal
Add a new machine xenpv which creates a IOREQ server to register/connect with Xen Hypervisor.
Optional: When
CONFIG_TPMis enabled, it also creates a tpm-tis-device, adds a TPM emulator and connects to swtpm running on host machine via chardev socket and support TPM functionalities for a guest domain.Extra command line for aarch64 xenpv QEMU to connect to swtpm:
-chardev socket,id=chrtpm,path=/tmp/myvtpm2/swtpm-sock \ -tpmdev emulator,id=tpm0,chardev=chrtpm \swtpm implements a TPM software
emulator(TPM 1.2 & TPM 2)built on libtpms and provides access to TPM functionality over socket, chardev and CUSE interface. Github repo: https://github.com/stefanberger/swtpm
Example for starting swtpm on host machine:
mkdir/tmp/vtpm2
swtpm socket --tpmstate dir=/tmp/vtpm2 \
--ctrl type=unixio,path=/tmp/vtpm2/swtpm-sock &<snip>
Quoted 10 lines
hw/arm/xen_arm.c new file +10
-0+ +static void xen_enable_tpm (void ) +{ +/* qemu_find_tpm_be is only available when CONFIG_TPM is enabled. */ +#ifdef CONFIG_TPM +Error *errp =NULL ; +DeviceState *dev; +SysBusDevice *busdev; + +TPMBackend *be =qemu_find_tpm_be ("tpm0" );hw/arm/xen_arm.c line 126
Quoted 10 lines
hw/arm/xen_arm.c new file +10
-0+if (be ==NULL ) { +DPRINTF ("Couldn't fine the backend for tpm0\n" ); +return ; + } + dev =qdev_new (TYPE_TPM_TIS_SYSBUS ); +object_property_set_link (OBJECT (dev),"tpmdev" ,OBJECT (be), &errp); +object_property_set_str (OBJECT (dev),"tpmdev" , be->id, &errp); + busdev =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (busdev, &error_fatal); +sysbus_mmio_map (busdev,0 ,GUEST_TPM_BASE );Still fails on my aarch64 Debian machine:
FAILED:
libqemu-aarch64-softmmu.fa.p/hw_arm_xen_arm.c.o
cc -Ilibqemu-aarch64-softmmu.fa.p -I. -I../.. -Itarget/arm -I../../target/arm -Iqapi -Itrace -Iui -Iui/shader -I/usr/include/pixman-1 -I/usr/local/include -I/usr/include/capstone -I/usr/include/spice-server -I/usr/include/spice-1 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -fdiagnostics-color=auto -Wall -Winvalid-pch -Werror -std=gnu11 -O2 -g -isystem/home/alex/lsrc/qemu.git/linux-headers-isystem linux-headers -iquote . -iquote/home/alex/lsrc/qemu.git-iquote/home/alex/lsrc/qemu.git/include-iquote/home/alex/lsrc/qemu.git/tcg/aarch64-pthread -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv -Wold-style-declaration -Wold-style-definition -Wtype-limits -Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers -Wempty-body -Wnested-externs -Wendif-labels -Wexpansion-to-defined -Wimplicit-fallthrough=2 -Wno-missing-include-dirs -Wno-shift-negative-value -Wno-psabi -fstack-protector-strong -fPIE -isystem../../linux-headers -isystemlinux-headers -DNEED_CPU_H '-DCONFIG_TARGET="aarch64-softmmu-config-target.h"' '-DCONFIG_DEVICES="aarch64-softmmu-config-devices.h"' -MD -MQlibqemu-aarch64-softmmu.fa.p/hw_arm_xen_arm.c.o-MF libqemu-aarch64-softmmu.fa.p/hw_arm_xen_arm.c.o.d -olibqemu-aarch64-softmmu.fa.p/hw_arm_xen_arm.c.o-c../../hw/arm/xen_arm.c../../hw/arm/xen_arm.c: In function ‘xen_enable_tpm’:
Quoted 10 lines
../../hw/arm/xen_arm.c:126:32: error: ‘GUEST_TPM_BASE’ undeclared (first use in this function); did you mean ‘GUEST_RAM_BASE’?
126 | sysbus_mmio_map(busdev, 0, GUEST_TPM_BASE);
| ^~~~~~~~~~~~~~
| GUEST_RAM_BASE
../../hw/arm/xen_arm.c:126:32: note: each undeclared identifier is reported only once for each function it appears in
[2082/3246] Compiling C object libqemu-aarch64-softmmu.fa.p/hw_xen_xen-mapcache.c.o
[2083/3246] Compiling C object libqemu-aarch64-softmmu.fa.p/hw_xen_xen-hvm-common.c.o
ninja: build stopped: subcommand failed.
make: *** [Makefile:165: run-ninja] Error 1Do you know what Xen version your build env has?
Another way to fix this(as Julien suggested) is by setting this GUEST_TPM_BASE value via a property or something and user can set it via command line.
@[email protected], do you think of any other fix?
Quoted 7 lines
hw/arm/xen_arm.c line 130
Quoted 4 lines
hw/arm/xen_arm.c new file +4
-0+ +DPRINTF ("Connected tpmdev at address 0x%lx\n" ,GUEST_TPM_BASE ); +#endif +}If there is a minimum required version for TPM then it needs to be picked up by configure.
Re: [QEMU][PATCH v2 10/11] hw/arm: introduce xenpv machine
Quoted 81 lines · Vikram Garhwal
Quoted 80 lines · Alex Bennée
Quoted 23 lines · Vikram Garhwal
Add a new machine xenpv which creates a IOREQ server to register/connect with
Xen Hypervisor.Optional: When
CONFIG_TPMis enabled, it also creates a tpm-tis-device, adds a
TPM emulator and connects to swtpm running on host machine via chardev socket
and support TPM functionalities for a guest domain.Extra command line for aarch64 xenpv QEMU to connect to swtpm:
-chardev socket,id=chrtpm,path=/tmp/myvtpm2/swtpm-sock \ -tpmdev emulator,id=tpm0,chardev=chrtpm \swtpm implements a TPM software
emulator(TPM 1.2 & TPM 2)built on libtpms and
provides access to TPM functionality over socket, chardev and CUSE interface.
Github repo: https://github.com/stefanberger/swtpm
Example for starting swtpm on host machine:
mkdir/tmp/vtpm2
swtpm socket --tpmstate dir=/tmp/vtpm2 \
--ctrl type=unixio,path=/tmp/vtpm2/swtpm-sock &<snip>
Quoted 10 lines
hw/arm/xen_arm.c new file +10
-0+ +static void xen_enable_tpm (void ) +{ +/* qemu_find_tpm_be is only available when CONFIG_TPM is enabled. */ +#ifdef CONFIG_TPM +Error *errp =NULL ; +DeviceState *dev; +SysBusDevice *busdev; + +TPMBackend *be =qemu_find_tpm_be ("tpm0" );hw/arm/xen_arm.c line 126
Quoted 10 lines
hw/arm/xen_arm.c new file +10
-0+if (be ==NULL ) { +DPRINTF ("Couldn't fine the backend for tpm0\n" ); +return ; + } + dev =qdev_new (TYPE_TPM_TIS_SYSBUS ); +object_property_set_link (OBJECT (dev),"tpmdev" ,OBJECT (be), &errp); +object_property_set_str (OBJECT (dev),"tpmdev" , be->id, &errp); + busdev =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (busdev, &error_fatal); +sysbus_mmio_map (busdev,0 ,GUEST_TPM_BASE );Still fails on my aarch64 Debian machine:
FAILED: libqemu-aarch64-softmmu.fa.p/hw_arm_xen_arm.c.o cc -Ilibqemu-aarch64-softmmu.fa.p -I. -I../.. -Itarget/arm(quoted diff) +0
-5-I../../target/arm -Iqapi -Itrace -Iui -Iui/shader -I/usr/include/pixman-1 -I/usr/local/include -I/usr/include/capstone -I/usr/include/spice-server -I/usr/include/spice-1 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -fdiagnostics-color=auto -Wall -Winvalid-pch -Werror -std=gnu11 -O2 -g -isystem
/home/alex/lsrc/qemu.git/linux-headers-isystem linux-headers -iquote .(quoted diff) +0
-11-iquote /home/alex/lsrc/qemu.git -iquote /home/alex/lsrc/qemu.git/include -iquote /home/alex/lsrc/qemu.git/tcg/aarch64 -pthread -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv -Wold-style-declaration -Wold-style-definition -Wtype-limits -Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers -Wempty-body -Wnested-externs -Wendif-labels -Wexpansion-to-defined -Wimplicit-fallthrough=2 -Wno-missing-include-dirs -Wno-shift-negative-value -Wno-psabi -fstack-protector-strong -fPIE -isystem../../linux-headers -isystemlinux-headers -DNEED_CPU_H'-DCONFIG_TARGET="aarch64-softmmu-config-target.h"' '-DCONFIG_DEVICES="aarch64-softmmu-config-devices.h"' -MD -MQ
libqemu-aarch64-softmmu.fa.p/hw_arm_xen_arm.c.o-MF libqemu-aarch64-softmmu.fa.p/hw_arm_xen_arm.c.o.d -olibqemu-aarch64-softmmu.fa.p/hw_arm_xen_arm.c.o-c../../hw/arm/xen_arm.c
../../hw/arm/xen_arm.c: In function ‘xen_enable_tpm’:../../hw/arm/xen_arm.c:126:32: error: ‘GUEST_TPM_BASE’ undeclared (first use in this function); did you mean ‘GUEST_RAM_BASE’? 126 | sysbus_mmio_map(busdev, 0, GUEST_TPM_BASE); | ^~~~~~~~~~~~~~ | GUEST_RAM_BASE
../../hw/arm/xen_arm.c:126:32: note: each undeclared identifier is
reported only once for each function it appears in
Quoted 8 lines
Quoted 7 lines
[2082/3246] Compiling C object
libqemu-aarch64-softmmu.fa.p/hw_xen_xen-mapcache.c.o
[2083/3246] Compiling C objectlibqemu-aarch64-softmmu.fa.p/hw_xen_xen-hvm-common.c.o
ninja: build stopped: subcommand failed.
make: *** [Makefile:165: run-ninja] Error 1Do you know what Xen version your build env has?
I think Alex is just building against upstream Xen. GUEST_TPM_BASE is not defined there yet. I think we would need to introduce in xen_common.h something like:
#ifndef GUEST_TPM_BASE
#define GUEST_TPM_BASE 0x0c000000
#endif
We already have similar code in xen_common.h for other things. Also, it would be best to get GUEST_TPM_BASE defined upstream in Xen first.
Quoted 4 lines
Another way to fix this(as Julien suggested) is by setting this
GUEST_TPM_BASEvalue via a property or something and user can set it via command line.@[email protected], do you think of any other fix?
Setting the TPM address from the command line is nice and preferable to hardcoding the value in xen_common.h. It comes with the challenge that it is not very scalable (imagine we have a dozen emulated devices) but for now it is fine and a good way to start if you can arrange it.
Re: [QEMU][PATCH v2 10/11] hw/arm: introduce xenpv machine
Hi,
Quoted 9 lines · Stefano Stabellini
Quoted 1 line
Do you know what Xen version your build env has?
I think Alex is just building against upstream Xen.
GUEST_TPM_BASEis not defined there yet. I think we would need to introduce inxen_common.hsomething like:#ifndef
GUEST_TPM_BASE
#defineGUEST_TPM_BASE0x0c000000
#endif
I think this would be a big mistake to add the two lines above in QEMU.
Libxl is responsible for creating the domain and generating the firwmare tables. Any mismatch of values will be a real pain to debug.
Even if...
Quoted 3 lines
We already have similar code in
xen_common.hfor other things. Also, it would be best to getGUEST_TPM_BASEdefined upstream in Xen first.
... we introduce upstream first, the guest layout is not part of the stable ABI and therefore could change from release to release.
Quoted 11 lines
Quoted 6 lines
Another way to fix this(as Julien suggested) is by setting this
GUEST_TPM_BASEvalue via a property or something and user can set it via command line.@[email protected], do you think of any other fix?
Setting the TPM address from the command line is nice and preferable to hardcoding the value in
xen_common.h. It comes with the challenge that it is not very scalable (imagine we have a dozen emulated devices) but for now it is fine and a good way to start if you can arrange it.
It is not clear which one you think is not scalable. If this is the command line option approach, then I think this is unrealistic to ask every user to rebuild there QEMU just because the guest layout has changed.
Today the rebuild may only be necessary when switching to a new release. But in the future we may imagine a per-domain layout (e.g. for legacy purpose). So you will now need to request the user to have one QEMU built per domain.
How is that scalable?
Cheers,
Signature · 1 line
Julien Grall
Re: [QEMU][PATCH v2 10/11] hw/arm: introduce xenpv machine
Quoted 42 lines · Julien Grall
Hi,
Quoted 8 lines · Stefano Stabellini
Quoted 1 line
Do you know what Xen version your build env has?
I think Alex is just building against upstream Xen.
GUEST_TPM_BASEis
not defined there yet. I think we would need to introduce inxen_common.hsomething like:
#ifndefGUEST_TPM_BASE
#defineGUEST_TPM_BASE0x0c000000
#endifI think this would be a big mistake to add the two lines above in QEMU.
Libxl is responsible for creating the domain and generating the firwmare tables. Any mismatch of values will be a real pain to debug.
Even if...
Quoted 3 lines
We already have similar code in
xen_common.hfor other things. Also, it
would be best to getGUEST_TPM_BASEdefined upstream in Xen first.... we introduce upstream first, the guest layout is not part of the stable ABI and therefore could change from release to release.
Quoted 10 lines
Quoted 5 lines
Another way to fix this(as Julien suggested) is by setting this
GUEST_TPM_BASEvalue via a property or something and user can set it via command line.@[email protected], do you think of any other fix?
Setting the TPM address from the command line is nice and preferable to
hardcoding the value inxen_common.h. It comes with the challenge that it is not very scalable (imagine we have a dozen emulated devices) but for now it is fine and a good way to start if you can arrange it.It is not clear which one you think is not scalable. If this is the command line option approach, then I think this is unrealistic to ask every user to rebuild there QEMU just because the guest layout has changed.
Quoted 4 lines
Today the rebuild may only be necessary when switching to a new release. But in the future we may imagine a per-domain layout (e.g. for legacy purpose). So you will now need to request the user to have one QEMU built per domain.
I agree if this is something that can change it needs to be configured from the command line or somehow otherwise gleaned from the source of truth. Isn't this information available via XenStore? Isn't that what Viresh has to do for all the VirtIO devices he's adding to libxl?
A default value for the option could be done I guess.
Quoted 4 lines
How is that scalable?
Cheers,
Signature · 2 lines
Alex Bennée Virtualisation Tech Lead @ Linaro
PATCH v2 11/11 meson.build: enable xenpv machine build for ARM
In reply to Vikram GarhwalAdd CONFIG_XEN for aarch64 device to support build for ARM targets.
--- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meson.build +1 -1
@@ -125,7 +125,7 @@ endif if cpu in ['x86', 'x86_64', 'arm', 'aarch64'] # i386 emulator provides xenpv machine type for multiple architectures accelerator_targets += { - 'CONFIG_XEN': ['i386-softmmu', 'x86_64-softmmu'], + 'CONFIG_XEN': ['i386-softmmu', 'x86_64-softmmu', 'aarch64-softmmu'], } endif if cpu in ['x86', 'x86_64']
Signature · 1 line
2.17.0
Quoted 10 lines · Vikram Garhwal
Hi,
This series add xenpv machine for aarch64. Motivation behind creating xenpv machine with IOREQ and TPM was to enable each guest on Xen aarch64 to have it's own unique and emulated TPM.This series does following:
1. Moved common xen functionalities from hw/i386/xen to hw/xen/ so those can be used for aarch64.
2. We added a minimal xenpv arm machine which creates an IOREQ server and support TPM.
So I've managed to test the basics:
16:02:33 [root@latte:~] # xl create simple-guest.conf
Parsing config from simple-guest.conf
libxl: info: libxl_create.c:120:libxl__domain_build_info_setdefault: qemu-xen is unavailable, using qemu-xen-traditional instead: No such file or directory 16:02:43 [root@latte:~] # xl list
Name ID Mem VCPUs State Time(s)
Domain-0 0 4096 4 r----- 25.6
xenpv-test-guest 2 4095 2 r----- 14.9
16:02:51 [root@latte:~] # ps ax | grep qemu
578 ? Sl 0:00 /home/alex/lsrc/qemu.git/builds/xen/qemu-system-aarch64 -xen-domid 0 -xen-attach -name dom0 -nographic -M xenpv -daemonize -monitor /dev/null -serial /dev/null -parallel /dev/null -pidfile /var/run/xen/qemu-dom0.pid
2053 pts/2 S+ 0:00 grep --color=auto qemuHowever I'm a little lost on how to add HW to this machine. Is it all via the guest configuration?
I think it would be worthwhile adding some documentation for this machine to the manual, maybe docs/system/xen/xenpv.rst and then it can be linked to from the appropriate target-arm.rst.
Quoted 61 lines
Also, checkpatch.pl fails for 03/12 and 06/12. These fails are due to moving old code to new place which was not QEMU code style compatible. No new add code was added.
Regards,
VikramChangeLog:
v1 -> v2
Merged patch 05 and 06.
04/12:xen-hvm-common.c:
1. Movedxen_be_init()andxen_be_register_common()fromxen_register_ioreq()toxen_register_backend().
2. Changedg_malloctog_newand perror ->error_setg_errno.
3. Created a local subroutine function forXen_IOREQ_register.
4. Fixed build issues with inclusion ofxenstore.h.
5. Fixed minor errors.Stefano Stabellini (5):
hw/i386/xen/xen-hvm: move x86-specific fields out of XenIOState
xen-hvm: reorganize xen-hvm and move common function to xen-hvm-commoninclude/hw/xen/xen_common: return error fromxen_create_ioreq_serverhw/xen/xen-hvm-common: skip ioreq creation on ioreq registration
failure
meson.build: do not sethave_xen_pci_passthroughfor aarch64 targetsVikram Garhwal (6):
hw/i386/xen/: movexen-mapcache.cto hw/xen/ hw/i386/xen: rearrangexen_hvm_init_pchw/xen/xen-hvm-common: Useg_newanderror_setg_errnoaccel/xen/xen-all: exportxenstore_record_dm_statehw/arm: introduce xenpv machine
meson.build: enable xenpv machine build for ARMaccel/xen/xen-all.c | 2 +- hw/arm/meson.build | 2 + hw/arm/xen_arm.c | 175 +++++ hw/i386/meson.build | 1 + hw/i386/xen/meson.build | 1 - hw/i386/xen/trace-events | 19 - hw/i386/xen/xen-hvm.c | 1084 +++--------------------------- hw/xen/meson.build | 7 + hw/xen/trace-events | 19 + hw/xen/xen-hvm-common.c | 888 ++++++++++++++++++++++++ hw/{i386 => }/xen/xen-mapcache.c | 0 include/hw/arm/xen_arch_hvm.h | 9 + include/hw/i386/xen_arch_hvm.h | 11 + include/hw/xen/arch_hvm.h | 5 + include/hw/xen/xen-hvm-common.h | 98 +++ include/hw/xen/xen.h | 2 + include/hw/xen/xen_common.h | 13 +- meson.build | 4 +- 18 files changed, 1323 insertions(+), 1017 deletions(-) create mode 100644 hw/arm/xen_arm.c create mode 100644 hw/xen/xen-hvm-common.c rename hw/{i386 => }/xen/xen-mapcache.c (100%) create mode 100644 include/hw/arm/xen_arch_hvm.h create mode 100644 include/hw/i386/xen_arch_hvm.h create mode 100644 include/hw/xen/arch_hvm.h create mode 100644 include/hw/xen/xen-hvm-common.h
Signature · 1 line
Alex Bennée