Introduce xenpvh machine for arm architecture
v3 cover Introduce xenpvh machine for arm architecture
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Hi,
This series add xenpvh machine for aarch64. Motivation behind creating xenpvh 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 xenpvh 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:
v2->v3:
1. Change machine name to xenpvh as per Jurgen's input.
2. Add docs/system/xenpvh.rst documentation.
3. Removed GUEST_TPM_BASE and added tpm_base_address as property.
4. Correct CONFIG_TPM related issues.
5. Added xen_register_backend() function call to xen_register_ioreq().
6. Added Oleksandr's suggestion i.e. removed extra interface opening and used accel=xen option
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 (5):
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 hw/arm: introduce xenpvh machine meson.build: enable xenpv machine build for ARM
docs/system/arm/xenpvh.rst | 34 +
docs/system/target-arm.rst | 1 +
hw/arm/meson.build | 2 +
hw/arm/xen_arm.c | 184 +++++
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 | 889 ++++++++++++++++++++++++
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 | 97 +++
include/hw/xen/xen_common.h | 13 +-
meson.build | 4 +-
18 files changed, 1363 insertions(+), 1017 deletions(-)
create mode 100644 docs/system/arm/xenpvh.rst
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 v3 4/12 xen_arm: Add "accel = xen" and drop extra interface openings
In order to use virtio backends we need to make sure that Xen accelerator is enabled (xen_enabled() returns true) as the memory/cache systems check for xen_enabled() to perform specific actions. Without that the xen-mapcache (which is needed for mapping guest memory) is not in use.
Also drop extra interface opening as this is already done in xen-all.c (so drop xen_init_ioreq() completely) and skip virtio/tpm initialization if device emulation is not available.
--- hw/arm/xen_arm.c | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-)
hw/arm/xen_arm.c +2 -27
@@ -137,30 +137,6 @@ void qmp_xen_set_global_dirty_log(bool enable, Error **errp) { } -static int xen_init_ioreq (XenIOState *state,unsigned int max_cpus) -{ - xen_dmod =xendevicemodel_open (0 ,0 ); - 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); - -xenstore_record_dm_state (xenstore,"running" ); - -return 0 ; -} -static void xen_enable_tpm (void ) {#ifdef CONFIG_TPM
@@ -198,9 +174,7 @@ static void xen_arm_init(MachineState *machine)xen_init_ram (machine); -if (xen_init_ioreq (xam->state, machine->smp.cpus)) { -return ; - } +xen_register_ioreq (xam->state, machine->smp.cpus, xen_memory_listener);xen_create_virtio_mmio_devices (xam);
@@ -218,6 +192,7 @@ static void xen_arm_machine_class_init(ObjectClass *oc, void *data) mc->max_cpus =1 ;/* Set explicitly here to make sure that real ram_size is passed */ mc->default_ram_size =0 ; + mc->default_machine_opts ="accel=xen" ;machine_class_allow_dynamic_sysbus_dev (mc,TYPE_TPM_TIS_SYSBUS ); }
Signature · 1 line
2.17.0
PATCH v3 1/10 hw/i386/xen/: move xen-mapcache.c to hw/xen/
In reply to Vikram Garhwalxen-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
PATCH v3 2/10 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 v3 3/10 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 v3 4/10 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 | 870 ++++++++++++++++++++++++++ include/hw/i386/xen_arch_hvm.h | 11 + include/hw/xen/arch_hvm.h | 3 + include/hw/xen/xen-hvm-common.h | 97 +++ 8 files changed, 1063 insertions(+), 974 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 +64 -959
1,103 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 +870 -0
870 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 +97 -0
97 lines not on this page · raw message
Signature · 1 line
2.17.0
PATCH v3 5/10 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
PATCH v3 6/10 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,12 +846,44 @@ 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 ();xen_register_backend (state);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 v3 7/10 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 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
hw/xen/xen-hvm-common.c +6 -6
@@ -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;
@@ -726,7 +726,7 @@ void destroy_hvm_domain(bool reboot)return ; }if (errno !=ENOTTY /* old Xen */ ) { -perror ("xendevicemodel_shutdown failed" ); +error_report ("xendevicemodel_shutdown failed with error %d" , errno); }/* 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++) {
@@ -860,13 +860,13 @@ void xen_register_ioreq(XenIOState *state, unsigned int max_cpus, state->xce_handle =xenevtchn_open (NULL ,0 );if (state->xce_handle ==NULL ) { -perror ("xen: event channel open" ); +error_report ("xen: event channel open failed with error %d" , errno); goto err; } state->xenstore =xs_daemon_open ();if (state->xenstore ==NULL ) { -perror ("xen: xenstore open" ); +error_report ("xen: xenstore open failed with error %d" , errno); goto err; }
Signature · 1 line
2.17.0
PATCH v3 8/10 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
@@ -1471,6 +1471,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 v3 9/10 hw/arm: introduce xenpvh machine
In reply to Vikram GarhwalAdd a new machine xenpvh 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 xenpvh QEMU to connect to swtpm:
-chardev socket,id=chrtpm,path=/tmp/myvtpm2/swtpm-sock \
-tpmdev emulator,id=tpm0,chardev=chrtpm \
-machine tpm-base-addr=0x0c000000 \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 &
--- docs/system/arm/xenpvh.rst | 34 +++++++ docs/system/target-arm.rst | 1 + hw/arm/meson.build | 2 + hw/arm/xen_arm.c | 184 ++++++++++++++++++++++++++++++++++ include/hw/arm/xen_arch_hvm.h | 9 ++ include/hw/xen/arch_hvm.h | 2 + 6 files changed, 232 insertions(+) create mode 100644 docs/system/arm/xenpvh.rst create mode 100644 hw/arm/xen_arm.c create mode 100644 include/hw/arm/xen_arch_hvm.h
docs/system/arm/xenpvh.rst new file +34 -0
@@ -0,0 +1,34 @@ +XENPVH (``xenpvh``) +========================================= +This machine creates a IOREQ server to register/connect with Xen Hypervisor. + +When TPM is enabled, this machine also creates a tpm-tis-device at a user input +tpm base address, adds a TPM emulator and connects to a swtpm application +running on host machine via chardev socket. This enables xenpvh to support TPM +functionalities for a guest domain. + +More information about TPM use and installing swtpm linux application can be +found at: docs/specs/tpm.rst. + +Example for starting swtpm on host machine: +.. code-block:: console + + mkdir /tmp/vtpm2 + swtpm socket --tpmstate dir=/tmp/vtpm2 \ + --ctrl type=unixio,path=/tmp/vtpm2/swtpm-sock & + +Sample QEMU xenpvh commands for running and connecting with Xen: +.. code-block:: console + + qemu-system-aarch64 -xen-domid 1 \ + -chardev socket,id=libxl-cmd,path=qmp-libxl-1,server=on,wait=off \ + -mon chardev=libxl-cmd,mode=control \ + -chardev socket,id=libxenstat-cmd,path=qmp-libxenstat-1,server=on,wait=off \ + -mon chardev=libxenstat-cmd,mode=control \ + -xen-attach -name guest0 -vnc none -display none -nographic \ + -machine xenpvh -m 1301 \ + -chardev socket,id=chrtpm,path=tmp/vtpm2/swtpm-sock \ + -tpmdev emulator,id=tpm0,chardev=chrtpm -machine tpm-base-addr=0x0C000000 + +In above QEMU command, last two lines are for connecting xenpvh QEMU to swtpm +via chardev socket.
docs/system/target-arm.rst +1 -0
@@ -106,6 +106,7 @@ undocumented; you can get a complete list by running arm/stm32 arm/virt arm/xlnx-versal-virt + arm/xenpvh Emulated CPU architecture support =================================
hw/arm/meson.build +2 -0
@@ -61,6 +61,8 @@ 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('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) softmmu_ss.add(when: 'CONFIG_ARM_SMMUV3', if_true: files('smmu-common.c')) softmmu_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4_boards.c'))
hw/arm/xen_arm.c new file +184 -0
184 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
PATCH v3 10/10 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
@@ -135,7 +135,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