From: Arianna Avanzini Date: Sat, 30 Aug 2014 16:29:43 +0000 (+0200) Subject: tools/libxl: parse optional start gfn from the iomem config option X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~4486 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=dcccaf806a92eabb95929a67c344ac1e9ead6257;p=xen.git tools/libxl: parse optional start gfn from the iomem config option Currently, the "iomem" domU config option allows to specify a machine address range to be mapped to the domU. However, there is no way to specify the guest address range used for the mapping. This commit extends the iomem option handling code to parse an additional, optional parameter: this parameter, if given, specifies the start guest address used for the mapping; if no start guest address is given, a 1:1 mapping is performed as default. Signed-off-by: Arianna Avanzini Acked-by: Ian Campbell Acked-by: Julien Grall Cc: Dario Faggioli Cc: Paolo Valente Cc: Stefano Stabellini Cc: Jan Beulich Cc: Keir Fraser Cc: Tim Deegan Cc: Ian Jackson Cc: Andrew Cooper Cc: Eric Trudeau Cc: Viktor Kleinik Cc: Andrii Tseglytskyi --- diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index f1fc906d0f..517ae2fb92 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -670,12 +670,20 @@ is given in hexadecimal and may either a span e.g. C<2f8-2ff> It is recommended to use this option only for trusted VMs under administrator control. -=item B +=item B -Allow guest to access specific hardware I/O memory pages. B -is a physical page number. B is the number -of pages beginning with B to allow access. Both values -must be given in hexadecimal. +Allow auto-translated domains to access specific hardware I/O memory pages. + +B is a physical page number. B is the number of pages +beginning with B to allow access. B specifies the guest frame +number where the mapping will start in the domU's address space. If B is +not given, the mapping will be performed using B as a start in the +domU's address space, therefore performing an 1:1 mapping as default. +All of these values must be given in hexadecimal. + +Note that the IOMMU won't be updated with the mappings specified with this +option. This option therefore should not be used to passthrough any +IOMMU-protected device. It is recommended to use this option only for trusted VMs under administrator control. diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index ded4ce5034..460207bf59 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -127,6 +127,16 @@ */ #define LIBXL_HAVE_LIBXL_DEVICE_DISK_DISCARD_ENABLE 1 +/* + * LIBXL_HAVE_BUILDINFO_IOMEM_START_GFN indicates that it is possible + * to specify the start guest frame number used to map a range of I/O + * memory machine frame numbers via the 'gfn' field (of type uint64) + * of the 'iomem' structure. An array of iomem structures is embedded + * in libxl_domain_build_info and used to map the indicated memory + * ranges during domain build. + */ +#define LIBXL_HAVE_BUILDINFO_IOMEM_START_GFN 1 + /* * libxl ABI compatibility * diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index fc332ef551..bc44ef5eda 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -102,6 +102,8 @@ static int sched_params_valid(libxl__gc *gc, int libxl__domain_build_info_setdefault(libxl__gc *gc, libxl_domain_build_info *b_info) { + int i; + if (b_info->type != LIBXL_DOMAIN_TYPE_HVM && b_info->type != LIBXL_DOMAIN_TYPE_PV) return ERROR_INVAL; @@ -189,8 +191,6 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, /* In libxl internals, we want to deal with vcpu_hard_affinity only! */ if (b_info->cpumap.size && !b_info->num_vcpu_hard_affinity) { - int i; - b_info->vcpu_hard_affinity = libxl__calloc(gc, b_info->max_vcpus, sizeof(libxl_bitmap)); for (i = 0; i < b_info->max_vcpus; i++) { @@ -215,6 +215,10 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, libxl_defbool_setdefault(&b_info->disable_migrate, false); + for (i = 0 ; i < b_info->num_iomem; i++) + if (b_info->iomem[i].gfn == LIBXL_INVALID_GFN) + b_info->iomem[i].gfn = b_info->iomem[i].start; + if (!b_info->event_channels) b_info->event_channels = 1023; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index beb052e799..04c9378b53 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -91,6 +91,7 @@ #define LIBXL_PV_EXTRA_MEMORY 1024 #define LIBXL_HVM_EXTRA_MEMORY 2048 #define LIBXL_MIN_DOM0_MEM (128*1024) +#define LIBXL_INVALID_GFN (~(uint64_t)0) /* use 0 as the domid of the toolstack domain for now */ #define LIBXL_TOOLSTACK_DOMID 0 #define QEMU_SIGNATURE "DeviceModelRecord0002" diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 08a79275bb..931c9e96d0 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -185,8 +185,12 @@ libxl_ioport_range = Struct("ioport_range", [ ]) libxl_iomem_range = Struct("iomem_range", [ + # start host frame number to be mapped to the guest ("start", uint64), + # number of frames to be mapped ("number", uint64), + # guest frame number used as a start for the mapping + ("gfn", uint64, {'init_val': "LIBXL_INVALID_GFN"}), ]) libxl_vga_interface_info = Struct("vga_interface_info", [ diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 409a795268..e6b96154be 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -1199,6 +1199,7 @@ static void parse_config_data(const char *config_source, } if (!xlu_cfg_get_list(config, "iomem", &iomem, &num_iomem, 0)) { + int ret; b_info->num_iomem = num_iomem; b_info->iomem = calloc(num_iomem, sizeof(*b_info->iomem)); if (b_info->iomem == NULL) { @@ -1212,13 +1213,15 @@ static void parse_config_data(const char *config_source, "xl: Unable to get element %d in iomem list\n", i); exit(1); } - if(sscanf(buf, "%" SCNx64",%" SCNx64, - &b_info->iomem[i].start, - &b_info->iomem[i].number) - != 2) { - fprintf(stderr, - "xl: Invalid argument parsing iomem: %s\n", buf); - exit(1); + libxl_iomem_range_init(&b_info->iomem[i]); + ret = sscanf(buf, "%" SCNx64",%" SCNx64"@%" SCNx64, + &b_info->iomem[i].start, + &b_info->iomem[i].number, + &b_info->iomem[i].gfn); + if (ret < 2) { + fprintf(stderr, + "xl: Invalid argument parsing iomem: %s\n", buf); + exit(1); } } }