From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arianna Avanzini Subject: [PATCH v6 08/11] tools, libxl: parse optional start gfn from the iomem config option Date: Mon, 21 Apr 2014 15:45:01 +0200 Message-ID: <1398087904-16594-9-git-send-email-avanzini.arianna@gmail.com> References: <1398087904-16594-1-git-send-email-avanzini.arianna@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1398087904-16594-1-git-send-email-avanzini.arianna@gmail.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: Ian.Campbell@eu.citrix.com, paolo.valente@unimore.it, keir@xen.org, stefano.stabellini@eu.citrix.com, Ian.Jackson@eu.citrix.com, dario.faggioli@citrix.com, tim@xen.org, julien.grall@citrix.com, etrudeau@broadcom.com, JBeulich@suse.com, avanzini.arianna@gmail.com, viktor.kleinik@globallogic.com List-Id: xen-devel@lists.xenproject.org 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 Cc: Dario Faggioli Cc: Paolo Valente Cc: Stefano Stabellini Cc: Julien Grall Cc: Jan Beulich Cc: Keir Fraser Cc: Tim Deegan Cc: Ian Jackson Cc: Eric Trudeau Cc: Viktor Kleinik --- v6: - Document what happens if the new "gfn" parameter is omitted while specifying the "iomem" option in the domain configuration. - Add LIBXL_INVALID_GFN macro with value "~(uint64_t)0". - Fix typo in the comment to the LIBXL_HAVE_BUILDINFO_IOMEM_START_GFN macro. v5: - Initialize the gfn field of the iomem structure with the value "(uint64_t)-1". - Defer the assignment of the value of "start" to "gfn", if "gfn" has been initialized to the default value, in libxl. - Use a local variable to keep the return value of sscanf() for better code readability. v4: - Add definition of a LIBXL_HAVE_BUILDINFO_IOMEM_START_GFN macro to indicate the availability of the new option. - Simplify the code parsing the new optional parameter by using the switch construct on the return value of the sscanf() function instead of calling the function twice. - Add a short paragraph to the manpage about the use of the iomem option to passthrough devices protected by an IOMMU. - Add comments to the fields of the "iomem" structure. --- docs/man/xl.cfg.pod.5 | 15 +++++++++++---- tools/libxl/libxl.h | 10 ++++++++++ tools/libxl/libxl_create.c | 6 ++++++ tools/libxl/libxl_internal.h | 1 + tools/libxl/libxl_types.idl | 7 +++++-- tools/libxl/xl_cmdimpl.c | 19 ++++++++++--------- 6 files changed, 43 insertions(+), 15 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index a6663b9..da6e0bc 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -602,12 +602,19 @@ 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. +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. +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 b2c3015..a78944d 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -95,6 +95,16 @@ #define LIBXL_HAVE_BUILDINFO_EVENT_CHANNELS 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 * * The only guarantee which libxl makes regarding ABI compatibility diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index d015cf4..6aa630e 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; @@ -212,6 +214,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 c2b73c4..2dba844 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 0f7bbf8..f3aaa46 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -170,8 +170,11 @@ libxl_ioport_range = Struct("ioport_range", [ ]) libxl_iomem_range = Struct("iomem_range", [ - ("start", uint64), - ("number", uint64), + ("start", uint64), # start host frame number to be mapped + # to the guest + ("number", uint64), # number of frames to be mapped + ("gfn", uint64, {'init_val': -1}), # guest frame number used as a start + # for the mapping ]) libxl_vga_interface_info = Struct("vga_interface_info", [ diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 0b38b32..9a0ad4e 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -1200,6 +1200,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) { @@ -1213,19 +1214,19 @@ 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); } } } - - if (!xlu_cfg_get_list (config, "disk", &vbds, 0, 0)) { d_config->num_disks = 0; d_config->disks = NULL; -- 1.9.1