xl / libxl: named PCI pass-through devices
v3 cover xl / libxl: named PCI pass-through devices
From: Paul Durrant <[email protected]>
Paul Durrant (23):
xl / libxl: s/pcidev/pci and remove DEFINE_DEVICE_TYPE_STRUCT_X
libxl: make libxl__device_list() work correctly for
LIBXL__DEVICE_KIND_PCI...
libxl: Make sure devices added by pci-attach are reflected in the
config
libxl: add/recover 'rdm_policy' to/from PCI backend in xenstore
libxl: s/detatched/detached in libxl_pci.c
libxl: remove extraneous arguments to do_pci_remove() in libxl_pci.c
libxl: stop using aodev->device_config in libxl__device_pci_add()...
libxl: generalise 'driver_path' xenstore access functions in
libxl_pci.c
libxl: remove unnecessary check from libxl__device_pci_add()
libxl: remove get_all_assigned_devices() from libxl_pci.c
libxl: make sure callers of libxl_device_pci_list() free the list
after use
libxl: add libxl_device_pci_assignable_list_free()...
libxl: use COMPARE_PCI() macro is_pci_in_array()...
docs/man: extract documentation of PCI_SPEC_STRING from the xl.cfg
manpage... docs/man: improve documentation of PCI_SPEC_STRING... docs/man: fix xl(1) documentation for 'pci' operations
libxl: introduce 'libxl_pci_bdf' in the idl...
libxlu: introduce xlu_pci_parse_spec_string()
libxl: modify
libxl_device_pci_assignable_add/remove/list/list_free()...
docs/man: modify xl(1) in preparation for naming of assignable devices xl / libxl: support naming of assignable devices
docs/man: modify xl-pci-configuration(5) to add 'name' field to
PCI_SPEC_STRING
xl / libxl: support 'xl pci-attach/detach' by name
docs/man/xl-pci-configuration.5.pod | 218 +++++++ docs/man/xl.1.pod.in | 39 +- docs/man/xl.cfg.5.pod.in | 68 +-- tools/golang/xenlight/helpers.gen.go | 77 ++- tools/golang/xenlight/types.gen.go | 8 +- tools/include/libxl.h | 67 ++- tools/include/libxlutil.h | 8 +- tools/libs/light/libxl_create.c | 6 +- tools/libs/light/libxl_device.c | 66 ++- tools/libs/light/libxl_dm.c | 18 +- tools/libs/light/libxl_internal.h | 55 +- tools/libs/light/libxl_pci.c | 1048 ++++++++++++++++++---------------- tools/libs/light/libxl_types.idl | 19 +- tools/libs/util/libxlu_pci.c | 359 ++++++------ tools/ocaml/libs/xl/xenlight_stubs.c | 19 +- tools/xl/xl_cmdtable.c | 16 +- tools/xl/xl_parse.c | 30 +- tools/xl/xl_pci.c | 163 +++--- tools/xl/xl_sxp.c | 12 +- 19 files changed, 1367 insertions(+), 929 deletions(-) create mode 100644 docs/man/xl-pci-configuration.5.pod
---
Cc: Anthony PERARD <[email protected]>
Cc: Christian Lindig <[email protected]>
Cc: David Scott <[email protected]>
Cc: George Dunlap <[email protected]>
Cc: Ian Jackson <[email protected]>
Cc: Nick Rosbrook <[email protected]>
Cc: Wei Liu <[email protected]>
Signature · 1 line
2.11.0
PATCH v3 1/23 xl / libxl: s/pcidev/pci and remove DEFINE_DEVICE_TYPE_STRUCT_X
From: Paul Durrant <[email protected]>
The seemingly arbitrary use of 'pci' and 'pcidev' in the code in libxl_pci.c is confusing and also compromises use of some macros used for other device types. Indeed it seems that DEFINE_DEVICE_TYPE_STRUCT_X exists solely because of this duality.
This patch purges use of 'pcidev' from the libxl code, allowing evaluation of DEFINE_DEVICE_TYPE_STRUCT_X to be replaced with DEFINE_DEVICE_TYPE_STRUCT, hence allowing removal of the former.
For consistency the xl and libs/util code is also modified, but in this case it is purely cosmetic.
NOTE: Some of the more gross formatting errors (such as lack of spaces after
keywords) that came into context have been fixed in libxl_pci.c.
---
Cc: Ian Jackson <[email protected]>
Cc: Wei Liu <[email protected]>
Cc: Anthony PERARD <[email protected]>
--- tools/include/libxl.h | 17 +- tools/libs/light/libxl_create.c | 6 +- tools/libs/light/libxl_dm.c | 18 +- tools/libs/light/libxl_internal.h | 45 ++- tools/libs/light/libxl_pci.c | 582 +++++++++++++++++++------------------- tools/libs/light/libxl_types.idl | 2 +- tools/libs/util/libxlu_pci.c | 36 +-- tools/xl/xl_parse.c | 28 +- tools/xl/xl_pci.c | 68 ++--- tools/xl/xl_sxp.c | 12 +- 10 files changed, 409 insertions(+), 405 deletions(-)
tools/include/libxl.h +12 -5
@@ -445,6 +445,13 @@#define LIBXL_HAVE_DISK_SAFE_REMOVE 1/* +* LIBXL_HAVE_CONFIG_PCIS indicates that the 'pcidevs' and 'num_pcidevs' +* fields in libxl_domain_config have been renamed to 'pcis' and 'num_pcis' +* respectively. +*/ +#define LIBXL_HAVE_CONFIG_PCIS 1 + +/* * libxl ABI compatibility * * The only guarantee which libxl makes regarding ABI compatibility
@@ -2300,15 +2307,15 @@ int libxl_device_pvcallsif_destroy(libxl_ctx *ctx, uint32_t domid,/* PCI Passthrough */ int libxl_device_pci_add(libxl_ctx *ctx, uint32_t domid, - libxl_device_pci *pcidev, + libxl_device_pci *pci, const libxl_asyncop_how *ao_how) LIBXL_EXTERNAL_CALLERS_ONLY; int libxl_device_pci_remove(libxl_ctx *ctx, uint32_t domid, - libxl_device_pci *pcidev, + libxl_device_pci *pci, const libxl_asyncop_how *ao_how) LIBXL_EXTERNAL_CALLERS_ONLY; int libxl_device_pci_destroy(libxl_ctx *ctx, uint32_t domid, - libxl_device_pci *pcidev, + libxl_device_pci *pci, const libxl_asyncop_how *ao_how) LIBXL_EXTERNAL_CALLERS_ONLY;
@@ -2352,8 +2359,8 @@ int libxl_device_events_handler(libxl_ctx *ctx,* added or is not bound, the functions will emit a warning but return * SUCCESS. */ -int libxl_device_pci_assignable_add (libxl_ctx *ctx,libxl_device_pci *pcidev,int rebind); -int libxl_device_pci_assignable_remove (libxl_ctx *ctx,libxl_device_pci *pcidev,int rebind); +int libxl_device_pci_assignable_add (libxl_ctx *ctx,libxl_device_pci *pci,int rebind); +int libxl_device_pci_assignable_remove (libxl_ctx *ctx,libxl_device_pci *pci,int rebind);libxl_device_pci *libxl_device_pci_assignable_list (libxl_ctx *ctx,int *num);/* CPUID handling */
tools/libs/light/libxl_create.c +3 -3
@@ -1100,7 +1100,7 @@ int libxl__domain_config_setdefault(libxl__gc *gc, goto error_out; } -bool need_pt = d_config->num_pcidevs || d_config->num_dtdevs; +bool need_pt = d_config->num_pcis || d_config->num_dtdevs;if (c_info->passthrough ==LIBXL_PASSTHROUGH_DEFAULT ) { c_info->passthrough = need_pt ?LIBXL_PASSTHROUGH_ENABLED :LIBXL_PASSTHROUGH_DISABLED ;
@@ -1141,7 +1141,7 @@ int libxl__domain_config_setdefault(libxl__gc *gc,* assignment when PoD is enabled. */ if (d_config->c_info.type !=LIBXL_DOMAIN_TYPE_PV && - d_config->num_pcidevs && pod_enabled) { + d_config->num_pcis && pod_enabled) { ret =ERROR_INVAL ;LOGD (ERROR , domid,"PCI device assignment for HVM guest failed due to PoD enabled" );
@@ -1817,7 +1817,7 @@ const libxl__device_type *device_type_tbl[] = { &libxl__vtpm_devtype, &libxl__usbctrl_devtype, &libxl__usbdev_devtype, - &libxl__pcidev_devtype, + &libxl__pci_devtype, &libxl__dtdev_devtype, &libxl__vdispl_devtype, &libxl__vsnd_devtype,
tools/libs/light/libxl_dm.c +9 -9
@@ -442,7 +442,7 @@ int libxl__domain_device_construct_rdm(libxl__gc *gc,/* Might not expose rdm. */ if (strategy ==LIBXL_RDM_RESERVE_STRATEGY_IGNORE && - !d_config->num_pcidevs) + !d_config->num_pcis)return 0 ;/* Query all RDM entries in this platform */
@@ -469,13 +469,13 @@ int libxl__domain_device_construct_rdm(libxl__gc *gc, }/* Query RDM entries per-device */ -for (i =0 ; i < d_config->num_pcidevs; i++) { +for (i =0 ; i < d_config->num_pcis; i++) {unsigned int n, nr_entries; - seg = d_config->pcidevs[i].domain; - bus = d_config->pcidevs[i].bus; - devfn =PCI_DEVFN (d_config->pcidevs[i].dev, - d_config->pcidevs[i].func); + seg = d_config->pcis[i].domain; + bus = d_config->pcis[i].bus; + devfn =PCI_DEVFN (d_config->pcis[i].dev, + d_config->pcis[i].func); nr_entries =0 ; rc =libxl__xc_device_get_rdm (gc,0 , seg, bus, devfn, &nr_entries, &xrdm);
@@ -488,7 +488,7 @@ int libxl__domain_device_construct_rdm(libxl__gc *gc,assert (xrdm); rc =libxl__device_pci_setdefault (gc,DOMID_INVALID , - &d_config->pcidevs[i], false); + &d_config->pcis[i], false);if (rc) goto out;
@@ -516,7 +516,7 @@ int libxl__domain_device_construct_rdm(libxl__gc *gc,* global policy in this case. */ d_config->rdms[j].policy - = d_config->pcidevs[i].rdm_policy; + = d_config->pcis[i].rdm_policy; new = false;break ; }
@@ -526,7 +526,7 @@ int libxl__domain_device_construct_rdm(libxl__gc *gc,add_rdm_entry (gc, d_config,pfn_to_paddr (xrdm[n].start_pfn),pfn_to_paddr (xrdm[n].nr_pages), - d_config->pcidevs[i].rdm_policy); + d_config->pcis[i].rdm_policy); } }
tools/libs/light/libxl_internal.h +21 -24
65 lines not on this page · raw message
tools/libs/light/libxl_pci.c +291 -291
1,518 lines not on this page · raw message
tools/libs/light/libxl_types.idl +1 -1
@@ -940,7 +940,7 @@ libxl_domain_config = Struct("domain_config", [ ("disks", Array(libxl_device_disk, "num_disks")), ("nics", Array(libxl_device_nic, "num_nics")), - ("pcidevs", Array(libxl_device_pci, "num_pcidevs")), + ("pcis", Array(libxl_device_pci, "num_pcis")), ("rdms", Array(libxl_device_rdm, "num_rdms")), ("dtdevs", Array(libxl_device_dtdev, "num_dtdevs")), ("vfbs", Array(libxl_device_vfb, "num_vfbs")),
tools/libs/util/libxlu_pci.c +18 -18
@@ -23,15 +23,15 @@ static int hex_convert(const char *str, unsigned int *val, unsigned int mask)return 0 ; } -static int pcidev_struct_fill (libxl_device_pci *pcidev,unsigned int domain, -unsigned int bus,unsigned int dev, -unsigned int func,unsigned int vdevfn) +static int pci_struct_fill (libxl_device_pci *pci,unsigned int domain, +unsigned int bus,unsigned int dev, +unsigned int func,unsigned int vdevfn) { - pcidev->domain = domain; - pcidev->bus = bus; - pcidev->dev = dev; - pcidev->func = func; - pcidev->vdevfn = vdevfn; + pci->domain = domain; + pci->bus = bus; + pci->dev = dev; + pci->func = func; + pci->vdevfn = vdevfn;return 0 ; }
@@ -47,7 +47,7 @@ static int pcidev_struct_fill(libxl_device_pci *pcidev, unsigned int domain,#define STATE_RDM_STRATEGY 10#define STATE_RESERVE_POLICY 11#define INVALID 0xffffffff -int xlu_pci_parse_bdf (XLU_Config *cfg,libxl_device_pci *pcidev,const char *str) +int xlu_pci_parse_bdf (XLU_Config *cfg,libxl_device_pci *pci,const char *str) {unsigned state =STATE_DOMAIN ;unsigned dom =INVALID , bus =INVALID , dev =INVALID , func =INVALID , vslot =0 ;
@@ -110,11 +110,11 @@ int xlu_pci_parse_bdf(XLU_Config *cfg, libxl_device_pci *pcidev, const char *str } *ptr ='\0' ;if ( !strcmp (tok,"*" ) ) { - pcidev->vfunc_mask =LIBXL_PCI_FUNC_ALL ; + pci->vfunc_mask =LIBXL_PCI_FUNC_ALL ; }else {if (hex_convert (tok, &func,0x7 ) ) goto parse_error; - pcidev->vfunc_mask = (1 <<0 ); + pci->vfunc_mask = (1 <<0 ); } tok = ptr +1 ; }
@@ -141,18 +141,18 @@ int xlu_pci_parse_bdf(XLU_Config *cfg, libxl_device_pci *pcidev, const char *str state = (*ptr ==',' ) ?STATE_OPTIONS_K :STATE_TERMINAL ; *ptr ='\0' ;if ( !strcmp (optkey,"msitranslate" ) ) { - pcidev->msitranslate =atoi (tok); + pci->msitranslate =atoi (tok); }else if ( !strcmp (optkey,"power_mgmt" ) ) { - pcidev->power_mgmt =atoi (tok); + pci->power_mgmt =atoi (tok); }else if ( !strcmp (optkey,"permissive" ) ) { - pcidev->permissive =atoi (tok); + pci->permissive =atoi (tok); }else if ( !strcmp (optkey,"seize" ) ) { - pcidev->seize =atoi (tok); + pci->seize =atoi (tok); }else if (!strcmp (optkey,"rdm_policy" )) {if (!strcmp (tok,"strict" )) { - pcidev->rdm_policy =LIBXL_RDM_RESERVE_POLICY_STRICT ; + pci->rdm_policy =LIBXL_RDM_RESERVE_POLICY_STRICT ; }else if (!strcmp (tok,"relaxed" )) { - pcidev->rdm_policy =LIBXL_RDM_RESERVE_POLICY_RELAXED ; + pci->rdm_policy =LIBXL_RDM_RESERVE_POLICY_RELAXED ; }else { XLU__PCI_ERR(cfg, "%s is not an valid PCI RDM property" " policy: 'strict' or 'relaxed'.",
@@ -175,7 +175,7 @@ int xlu_pci_parse_bdf(XLU_Config *cfg, libxl_device_pci *pcidev, const char *strassert (dom !=INVALID && bus !=INVALID && dev !=INVALID && func !=INVALID );/* Just a pretty way to fill in the values */ -pcidev_struct_fill (pcidev, dom, bus, dev, func, vslot <<3 ); +pci_struct_fill (pci, dom, bus, dev, func, vslot <<3 );free (buf2);
tools/xl/xl_parse.c +14 -14
@@ -1470,24 +1470,24 @@ void parse_config_data(const char *config_source, }if (!xlu_cfg_get_list (config,"pci" , &pcis,0 ,0 )) { - d_config->num_pcidevs =0 ; - d_config->pcidevs =NULL ; + d_config->num_pcis =0 ; + d_config->pcis =NULL ;for (i =0 ; (buf =xlu_cfg_get_listitem (pcis, i)) !=NULL ; i++) { -libxl_device_pci *pcidev; - - pcidev =ARRAY_EXTEND_INIT_NODEVID (d_config->pcidevs, - d_config->num_pcidevs, - libxl_device_pci_init); - pcidev->msitranslate = pci_msitranslate; - pcidev->power_mgmt = pci_power_mgmt; - pcidev->permissive = pci_permissive; - pcidev->seize = pci_seize; +libxl_device_pci *pci; + + pci =ARRAY_EXTEND_INIT_NODEVID (d_config->pcis, + d_config->num_pcis, + libxl_device_pci_init); + pci->msitranslate = pci_msitranslate; + pci->power_mgmt = pci_power_mgmt; + pci->permissive = pci_permissive; + pci->seize = pci_seize;/* * Like other pci option, the per-device policy always follows * the global policy by default. */ - pcidev->rdm_policy = b_info->u.hvm.rdm.policy; - e =xlu_pci_parse_bdf (config, pcidev, buf); + pci->rdm_policy = b_info->u.hvm.rdm.policy; + e =xlu_pci_parse_bdf (config, pci, buf);if (e) { fprintf(stderr, "unable to parse PCI BDF `%s' for passthrough\n",
@@ -1495,7 +1495,7 @@ void parse_config_data(const char *config_source,exit (-e); } } -if (d_config->num_pcidevs && c_info->type ==LIBXL_DOMAIN_TYPE_PV ) +if (d_config->num_pcis && c_info->type ==LIBXL_DOMAIN_TYPE_PV )libxl_defbool_set (&b_info->u.pv.e820_host, true); }
tools/xl/xl_pci.c +34 -34
173 lines not on this page · raw message
tools/xl/xl_sxp.c +6 -6
@@ -190,16 +190,16 @@ void printf_info_sexp(int domid, libxl_domain_config *d_config, FILE *fh)fprintf (fh,"\t)\n" ); } -for (i =0 ; i < d_config->num_pcidevs; i++) { +for (i =0 ; i < d_config->num_pcis; i++) {fprintf (fh,"\t(device\n" );fprintf (fh,"\t\t(pci\n" );fprintf (fh,"\t\t\t(pci dev %04x:%02x:%02x.%01x@%02x)\n" , - d_config->pcidevs[i].domain, d_config->pcidevs[i].bus, - d_config->pcidevs[i].dev, d_config->pcidevs[i].func, - d_config->pcidevs[i].vdevfn); + d_config->pcis[i].domain, d_config->pcis[i].bus, + d_config->pcis[i].dev, d_config->pcis[i].func, + d_config->pcis[i].vdevfn);fprintf (fh,"\t\t\t(opts msitranslate %d power_mgmt %d)\n" , - d_config->pcidevs[i].msitranslate, - d_config->pcidevs[i].power_mgmt); + d_config->pcis[i].msitranslate, + d_config->pcis[i].power_mgmt);fprintf (fh,"\t\t)\n" );fprintf (fh,"\t)\n" ); }
Signature · 1 line
2.11.0
PATCH v3 2/23 libxl: make libxl__device_list() work correctly for LIBXL__DEVICE_KIND_PCI...
In reply to Paul DurrantFrom: Paul Durrant <[email protected]>
... devices.
Currently there is an assumption built into libxl__device_list() that device backends are fully enumarated under the '/libxl' path in xenstore. This is not the case for PCI backend devices, which are only properly enumerated under '/local/domain/0/backend'.
This patch adds a new get_path() method to libxl__device_type to allow a backend implementation (such as PCI) to specify the xenstore path where devices are enumerated and modifies libxl__device_list() to use this method if it is available. Also, if the get_num() method is defined then the from_xenstore() method expects to be passed the backend path without the device number concatenated, so this issue is also rectified.
Having made libxl__device_list() work correctly, this patch removes the open-coded libxl_pci_device_pci_list() in favour of an evaluation of the LIBXL_DEFINE_DEVICE_LIST() macro. This has the side-effect of also defining libxl_pci_device_pci_list_free() which will be used in subsequent patches.
---
Cc: Ian Jackson <[email protected]>
Cc: Wei Liu <[email protected]>
Cc: Anthony PERARD <[email protected]>
v3:
- New in v3 (replacing "libxl: use LIBXL_DEFINE_DEVICE_LIST for pci devices")
--- tools/include/libxl.h | 7 +++++ tools/libs/light/libxl_device.c | 66 +++++++++++++++++++++------------------ tools/libs/light/libxl_internal.h | 2 ++ tools/libs/light/libxl_pci.c | 29 +++++------------ 4 files changed, 52 insertions(+), 52 deletions(-)
tools/include/libxl.h +7 -0
@@ -452,6 +452,12 @@#define LIBXL_HAVE_CONFIG_PCIS 1/* +* LIBXL_HAVE_DEVICE_PCI_LIST_FREE indicates that the +* libxl_device_pci_list_free() function is defined. +*/ +#define LIBXL_HAVE_DEVICE_PCI_LIST_FREE 1 + +/* * libxl ABI compatibility * * The only guarantee which libxl makes regarding ABI compatibility
@@ -2321,6 +2327,7 @@ int libxl_device_pci_destroy(libxl_ctx *ctx, uint32_t domid,libxl_device_pci *libxl_device_pci_list (libxl_ctx *ctx,uint32_t domid,int *num); +void libxl_device_pci_list_free (libxl_device_pci * list,int num);/* * Turns the current process into a backend device service daemon
tools/libs/light/libxl_device.c +35 -31
84 lines not on this page · raw message
tools/libs/light/libxl_internal.h +2 -0
@@ -3917,6 +3917,7 @@ typedef int (*device_dm_needed_fn_t)(void *, unsigned);typedef void (*device_update_config_fn_t )(libxl__gc *,void *,void *);typedef int (*device_update_devid_fn_t )(libxl__gc *,uint32_t ,void *);typedef int (*device_get_num_fn_t )(libxl__gc *,const char *,unsigned int *); +typedef int (*device_get_path_fn_t )(libxl__gc *,uint32_t ,char **);typedef int (*device_from_xenstore_fn_t )(libxl__gc *,const char *,libxl_devid ,void *); typedef int (*device_set_xenstore_config_fn_t)(libxl__gc *, uint32_t, void *,
@@ -3941,6 +3942,7 @@ struct libxl__device_type {device_update_config_fn_t update_config;device_update_devid_fn_t update_devid;device_get_num_fn_t get_num; +device_get_path_fn_t get_path;device_from_xenstore_fn_t from_xenstore;device_set_xenstore_config_fn_t set_xenstore_config; };
tools/libs/light/libxl_pci.c +8 -21
@@ -2393,29 +2393,13 @@ static int libxl__device_pci_get_num(libxl__gc *gc, const char *be_path,return rc; } -libxl_device_pci *libxl_device_pci_list (libxl_ctx *ctx,uint32_t domid,int *num) +static int libxl__device_pci_get_path (libxl__gc *gc,uint32_t domid, +char **path) { -GC_INIT (ctx); -char *be_path; -unsigned int n, i; -libxl_device_pci *pcis =NULL ; - - *num =0 ; - - be_path =libxl__domain_device_backend_path (gc,0 , domid,0 , -LIBXL__DEVICE_KIND_PCI ); -if (libxl__device_pci_get_num (gc, be_path, &n)) - goto out; + *path =libxl__domain_device_backend_path (gc,0 , domid,0 , +LIBXL__DEVICE_KIND_PCI ); - pcis =calloc (n,sizeof (libxl_device_pci)); - -for (i =0 ; i < n; i++) -libxl__device_pci_from_xs_be (gc, be_path, i, pcis + i); - - *num = n; -out: -GC_FREE ; -return pcis; +return 0 ; } void libxl__device_pci_destroy_all(libxl__egc *egc, uint32_t domid,
@@ -2492,10 +2476,13 @@ static int libxl_device_pci_compare(const libxl_device_pci *d1,return COMPARE_PCI (d1, d2); } +LIBXL_DEFINE_DEVICE_LIST(pci) +#define libxl__device_pci_update_devid NULLDEFINE_DEVICE_TYPE_STRUCT (pci,PCI , .get_num = libxl__device_pci_get_num, + .get_path = libxl__device_pci_get_path, .from_xenstore = libxl__device_pci_from_xs_be, );
Signature · 1 line
2.11.0
PATCH v3 3/23 libxl: Make sure devices added by pci-attach are reflected in the config
In reply to Paul DurrantFrom: Paul Durrant <[email protected]>
Currently libxl__device_pci_add_xenstore() is broken in that does not update the domain's configuration for the first device added (which causes creation of the overall backend area in xenstore). This can be easily observed by running 'xl list -l' after adding a single device: the device will be missing.
This patch fixes the problem and adds a DEBUG log line to allow easy verification that the domain configuration is being modified. Also, the use of libxl__device_generic_add() is dropped as it leads to a confusing situation where only partial backend information is written under the xenstore '/libxl' path. For LIBXL__DEVICE_KIND_PCI devices the only definitive information in xenstore is under '/local/domain/0/backend' (the '0' being hard-coded).
NOTE: This patch includes a whitespace in add_pcis_done().
---
Cc: Ian Jackson <[email protected]>
Cc: Wei Liu <[email protected]>
Cc: Anthony PERARD <[email protected]>
v2:
- Avoid having two completely different ways of adding devices into xenstore
v3:
- Revert some changes form v2 as there is confusion over use of the libxl and backend xenstore paths which needs to be fixed
--- tools/libs/light/libxl_pci.c | 87 +++++++++++++++++++++++--------------------- 1 file changed, 45 insertions(+), 42 deletions(-)
tools/libs/light/libxl_pci.c +45 -42
@@ -79,39 +79,55 @@ static void libxl__device_from_pci(libxl__gc *gc, uint32_t domid, device->kind =LIBXL__DEVICE_KIND_PCI ; } -static int libxl__create_pci_backend (libxl__gc *gc,uint32_t domid, -const libxl_device_pci *pci, -int num) +static void libxl__create_pci_backend (libxl__gc *gc,xs_transaction_t t, +uint32_t domid,const libxl_device_pci *pci) { -flexarray_t *front =NULL ; -flexarray_t *back =NULL ; -libxl__device device; -int i; +libxl_ctx *ctx =libxl__gc_owner (gc); +flexarray_t *front, *back; +char *fe_path, *be_path; +struct xs_permissions fe_perms[2 ], be_perms[2 ]; + +LOGD (DEBUG , domid,"Creating pci backend" ); front =flexarray_make (gc,16 ,1 ); back =flexarray_make (gc,16 ,1 ); -LOGD (DEBUG , domid,"Creating pci backend" ); - -/* add pci device */ -libxl__device_from_pci (gc, domid, pci, &device); + fe_path =libxl__domain_device_frontend_path (gc, domid,0 , +LIBXL__DEVICE_KIND_PCI ); + be_path =libxl__domain_device_backend_path (gc,0 , domid,0 , +LIBXL__DEVICE_KIND_PCI ); +flexarray_append_pair (back,"frontend" , fe_path);flexarray_append_pair (back,"frontend-id" ,GCSPRINTF ("%d" , domid)); -flexarray_append_pair (back,"online" ,"1" ); +flexarray_append_pair (back,"online" ,GCSPRINTF ("%d" ,1 ));flexarray_append_pair (back,"state" ,GCSPRINTF ("%d" , XenbusStateInitialising));flexarray_append_pair (back,"domain" ,libxl__domid_to_name (gc, domid)); -for (i =0 ; i < num; i++, pci++) -libxl_create_pci_backend_device (gc, back, i, pci); + be_perms[0 ].id =0 ; + be_perms[0 ].perms =XS_PERM_NONE ; + be_perms[1 ].id = domid; + be_perms[1 ].perms =XS_PERM_READ ; + +xs_rm (ctx->xsh, t, be_path); +xs_mkdir (ctx->xsh, t, be_path); +xs_set_permissions (ctx->xsh, t, be_path, be_perms, +ARRAY_SIZE (be_perms)); +libxl__xs_writev (gc, t, be_path,libxl__xs_kvs_of_flexarray (gc, back)); -flexarray_append_pair (back,"num_devs" ,GCSPRINTF ("%d" , num)); +flexarray_append_pair (front,"backend" , be_path);flexarray_append_pair (front,"backend-id" ,GCSPRINTF ("%d" ,0 ));flexarray_append_pair (front,"state" ,GCSPRINTF ("%d" , XenbusStateInitialising)); -return libxl__device_generic_add (gc,XBT_NULL , &device, -libxl__xs_kvs_of_flexarray (gc, back), -libxl__xs_kvs_of_flexarray (gc, front), -NULL ); + fe_perms[0 ].id = domid; + fe_perms[0 ].perms =XS_PERM_NONE ; + fe_perms[1 ].id =0 ; + fe_perms[1 ].perms =XS_PERM_READ ; + +xs_rm (ctx->xsh, t, fe_path); +xs_mkdir (ctx->xsh, t, fe_path); +xs_set_permissions (ctx->xsh, t, fe_path, + fe_perms,ARRAY_SIZE (fe_perms)); +libxl__xs_writev (gc, t, fe_path,libxl__xs_kvs_of_flexarray (gc, front)); } static int libxl__device_pci_add_xenstore(libxl__gc *gc,
@@ -135,8 +151,6 @@ static int libxl__device_pci_add_xenstore(libxl__gc *gc, be_path =libxl__domain_device_backend_path (gc,0 , domid,0 ,LIBXL__DEVICE_KIND_PCI ); num_devs =libxl__xs_read (gc,XBT_NULL ,GCSPRINTF ("%s/num_devs" , be_path)); -if (!num_devs) -return libxl__create_pci_backend (gc, domid, pci,1 );libxl_domain_type domtype =libxl__domain_type (gc, domid);if (domtype ==LIBXL_DOMAIN_TYPE_INVALID )
@@ -150,17 +164,17 @@ static int libxl__device_pci_add_xenstore(libxl__gc *gc, back =flexarray_make (gc,16 ,1 );LOGD (DEBUG , domid,"Adding new pci device to xenstore" ); - num =atoi (num_devs); + num = num_devs ?atoi (num_devs) :0 ;libxl_create_pci_backend_device (gc, back, num, pci);flexarray_append_pair (back,"num_devs" ,GCSPRINTF ("%d" , num +1 )); -if (!starting) +if (num && !starting)flexarray_append_pair (back,"state" ,GCSPRINTF ("%d" , XenbusStateReconfiguring));/* * Stubdomin config is derived from its target domain, it doesn't have * its own file. */ -if (!is_stubdomain) { +if (!is_stubdomain && !starting) { lock =libxl__lock_domain_userdata (gc, domid);if (!lock) { rc =ERROR_LOCK_FAIL ;
@@ -170,6 +184,7 @@ static int libxl__device_pci_add_xenstore(libxl__gc *gc, rc =libxl__get_domain_configuration (gc, domid, &d_config);if (rc) goto out; +LOGD (DEBUG , domid,"Adding new pci device to config" );device_add_domain_config (gc, &d_config, &libxl__pci_devtype, pci);
@@ -186,6 +201,10 @@ static int libxl__device_pci_add_xenstore(libxl__gc *gc,if (rc) goto out; } +/* This is the first device, so create the backend */ +if (!num_devs) +libxl__create_pci_backend (gc, t, domid, pci); +libxl__xs_writev (gc, t, be_path,libxl__xs_kvs_of_flexarray (gc, back)); rc =libxl__xs_transaction_commit (gc, &t);
@@ -1437,7 +1456,7 @@ out_no_irq: } } -if (!starting && !libxl_get_stubdom_id (CTX , domid)) +if (!libxl_get_stubdom_id (CTX , domid)) rc =libxl__device_pci_add_xenstore (gc, domid, pci, starting);else rc =0 ;
@@ -1765,28 +1784,12 @@ static void libxl__add_pcis(libxl__egc *egc, libxl__ao *ao, uint32_t domid, }static void add_pcis_done (libxl__egc *egc,libxl__multidev *multidev, -int rc) +int rc) {EGC_GC ;add_pcis_state *apds =CONTAINER_OF (multidev, *apds, multidev); - -/* Convenience aliases */ -libxl_domain_config *d_config = apds->d_config; -libxl_domid domid = apds->domid;libxl__ao_device *aodev = apds->outer_aodev; -if (rc) goto out; - -if (d_config->num_pcis >0 && !libxl_get_stubdom_id (CTX , domid)) { - rc =libxl__create_pci_backend (gc, domid, d_config->pcis, - d_config->num_pcis); -if (rc <0 ) { -LOGD (ERROR , domid,"libxl_create_pci_backend failed: %d" , rc); - goto out; - } - } - -out: aodev->rc = rc; aodev->callback (egc, aodev); }
Signature · 1 line
2.11.0
PATCH v3 4/23 libxl: add/recover 'rdm_policy' to/from PCI backend in xenstore
In reply to Paul DurrantFrom: Paul Durrant <[email protected]>
Other parameters, such as 'msitranslate' and 'permissive' are dealt with but 'rdm_policy' appears to be have been completely missed.
---
Cc: Ian Jackson <[email protected]>
Cc: Wei Liu <[email protected]>
--- tools/libs/light/libxl_pci.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
tools/libs/light/libxl_pci.c +6 -3
@@ -61,9 +61,9 @@ static void libxl_create_pci_backend_device(libxl__gc *gc,flexarray_append_pair (back,GCSPRINTF ("vdevfn-%d" , num),GCSPRINTF ("%x" , pci->vdevfn));flexarray_append (back,GCSPRINTF ("opts-%d" , num));flexarray_append (back, -GCSPRINTF ("msitranslate=%d,power_mgmt=%d,permissive=%d" , - pci->msitranslate, pci->power_mgmt, - pci->permissive)); +GCSPRINTF ("msitranslate=%d,power_mgmt=%d,permissive=%d,rdm_policy=%s" , + pci->msitranslate, pci->power_mgmt, + pci->permissive,libxl_rdm_reserve_policy_to_string (pci->rdm_policy)));flexarray_append_pair (back,GCSPRINTF ("state-%d" , num),GCSPRINTF ("%d" , XenbusStateInitialising)); }
@@ -2374,6 +2374,9 @@ static int libxl__device_pci_from_xs_be(libxl__gc *gc, }else if (!strcmp (p,"permissive" )) { p =strtok_r (NULL ,",=" , &saveptr); pci->permissive =atoi (p); + }else if (!strcmp (p,"rdm_policy" )) { + p =strtok_r (NULL ,",=" , &saveptr); +libxl_rdm_reserve_policy_from_string (p, &pci->rdm_policy); } }while ((p =strtok_r (NULL ,",=" , &saveptr)) !=NULL ); }
Signature · 1 line
2.11.0
PATCH v3 5/23 libxl: s/detatched/detached in libxl_pci.c
In reply to Paul DurrantFrom: Paul Durrant <[email protected]>
Simply spelling correction. Purely cosmetic fix.
---
Cc: Ian Jackson <[email protected]>
Cc: Wei Liu <[email protected]>
--- tools/libs/light/libxl_pci.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
tools/libs/light/libxl_pci.c +11 -11
@@ -1864,7 +1864,7 @@ static void pci_remove_qmp_query_cb(libxl__egc *egc, libxl__ev_qmp *qmp, const libxl__json_object *response, int rc);static void pci_remove_timeout (libxl__egc *egc,libxl__ev_time *ev,const struct timeval *requested_abs,int rc); -static void pci_remove_detatched (libxl__egc *egc, +static void pci_remove_detached (libxl__egc *egc,pci_remove_state *prs,int rc);static void pci_remove_stubdom_done (libxl__egc *egc,libxl__ao_device *aodev);
@@ -1978,7 +1978,7 @@ skip1: skip_irq: rc =0 ; out_fail: -pci_remove_detatched (egc, prs, rc);/* must be last */ +pci_remove_detached (egc, prs, rc);/* must be last */ } static void pci_remove_qemu_trad_watch_state_cb(libxl__egc *egc,
@@ -2002,7 +2002,7 @@ static void pci_remove_qemu_trad_watch_state_cb(libxl__egc *egc, rc =qemu_pci_remove_xenstore (gc, domid, pci, prs->force); out: -pci_remove_detatched (egc, prs, rc); +pci_remove_detached (egc, prs, rc); } static void pci_remove_qmp_device_del(libxl__egc *egc,
@@ -2028,7 +2028,7 @@ static void pci_remove_qmp_device_del(libxl__egc *egc,return ; out: -pci_remove_detatched (egc, prs, rc); +pci_remove_detached (egc, prs, rc); } static void pci_remove_qmp_device_del_cb(libxl__egc *egc,
@@ -2051,7 +2051,7 @@ static void pci_remove_qmp_device_del_cb(libxl__egc *egc,return ; out: -pci_remove_detatched (egc, prs, rc); +pci_remove_detached (egc, prs, rc); } static void pci_remove_qmp_retry_timer_cb(libxl__egc *egc, libxl__ev_time *ev,
@@ -2067,7 +2067,7 @@ static void pci_remove_qmp_retry_timer_cb(libxl__egc *egc, libxl__ev_time *ev,return ; out: -pci_remove_detatched (egc, prs, rc); +pci_remove_detached (egc, prs, rc); } static void pci_remove_qmp_query_cb(libxl__egc *egc,
@@ -2127,7 +2127,7 @@ static void pci_remove_qmp_query_cb(libxl__egc *egc, } out: -pci_remove_detatched (egc, prs, rc);/* must be last */ +pci_remove_detached (egc, prs, rc);/* must be last */ } static void pci_remove_timeout(libxl__egc *egc, libxl__ev_time *ev,
@@ -2146,12 +2146,12 @@ static void pci_remove_timeout(libxl__egc *egc, libxl__ev_time *ev,/* If we timed out, we might still want to keep destroying the device * (when force==true), so let the next function decide what to do on * error */ -pci_remove_detatched (egc, prs, rc); +pci_remove_detached (egc, prs, rc); } -static void pci_remove_detatched (libxl__egc *egc, -pci_remove_state *prs, -int rc) +static void pci_remove_detached (libxl__egc *egc, +pci_remove_state *prs, +int rc) {STATE_AO_GC (prs->aodev->ao);int stubdomid =0 ;
Signature · 1 line
2.11.0
PATCH v3 6/23 libxl: remove extraneous arguments to do_pci_remove() in libxl_pci.c
In reply to Paul DurrantFrom: Paul Durrant <[email protected]>
Both 'domid' and 'pci' are available in 'pci_remove_state' so there is no need to also pass them as separate arguments.
---
Cc: Ian Jackson <[email protected]>
Cc: Wei Liu <[email protected]>
--- tools/libs/light/libxl_pci.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
tools/libs/light/libxl_pci.c +4 -5
@@ -1871,14 +1871,14 @@ static void pci_remove_stubdom_done(libxl__egc *egc,static void pci_remove_done (libxl__egc *egc,pci_remove_state *prs,int rc); -static void do_pci_remove (libxl__egc *egc,uint32_t domid, -libxl_device_pci *pci,int force, -pci_remove_state *prs) +static void do_pci_remove (libxl__egc *egc,pci_remove_state *prs) {STATE_AO_GC (prs->aodev->ao);libxl_ctx *ctx =libxl__gc_owner (gc);libxl_device_pci *assigned; +uint32_t domid = prs->domid;libxl_domain_type type =libxl__domain_type (gc, domid); +libxl_device_pci *pci = prs->pci;int rc, num;uint32_t domainid = domid;
@@ -2275,7 +2275,6 @@ static void device_pci_remove_common_next(libxl__egc *egc,EGC_GC ;/* Convenience aliases */ -libxl_domid domid = prs->domid;libxl_device_pci *const pci = prs->pci;libxl__ao_device *const aodev = prs->aodev;const unsigned int pfunc_mask = prs->pfunc_mask;
@@ -2293,7 +2292,7 @@ static void device_pci_remove_common_next(libxl__egc *egc, }else { pci->vdevfn = orig_vdev; } -do_pci_remove (egc, domid, pci, prs->force, prs); +do_pci_remove (egc, prs);return ; } }
Signature · 1 line
2.11.0
PATCH v3 7/23 libxl: stop using aodev->device_config in libxl__device_pci_add()...
In reply to Paul DurrantFrom: Paul Durrant <[email protected]>
... to hold a pointer to the device.
There is already a 'pci' field in 'pci_add_state' so simply use that from the start. This also allows the 'pci' (#3) argument to be dropped from do_pci_add().
NOTE: This patch also changes the type of the 'pci_domid' field in
'pci_add_state' from 'int' to 'libxl_domid' which is more appropriate given what the field is used for.
---
Cc: Ian Jackson <[email protected]>
Cc: Wei Liu <[email protected]>
--- tools/libs/light/libxl_pci.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-)
tools/libs/light/libxl_pci.c +7 -12
@@ -1074,7 +1074,7 @@ typedef struct pci_add_state {libxl__ev_qmp qmp;libxl__ev_time timeout;libxl_device_pci *pci; -int pci_domid; +libxl_domid pci_domid; } pci_add_state; static void pci_add_qemu_trad_watch_state_cb(libxl__egc *egc,
@@ -1091,7 +1091,6 @@ static void pci_add_dm_done(libxl__egc *,static void do_pci_add (libxl__egc *egc,libxl_domid domid, -libxl_device_pci *pci,pci_add_state *pas) {STATE_AO_GC (pas->aodev->ao);
@@ -1101,7 +1100,6 @@ static void do_pci_add(libxl__egc *egc,/* init pci_add_state */ libxl__xswait_init (&pas->xswait);libxl__ev_qmp_init (&pas->qmp); - pas->pci = pci; pas->pci_domid = domid;libxl__ev_time_init (&pas->timeout);
@@ -1564,13 +1562,10 @@ void libxl__device_pci_add(libxl__egc *egc, uint32_t domid,int stubdomid =0 ;pci_add_state *pas; -/* Store *pci to be used by callbacks */ - aodev->device_config = pci; - aodev->device_type = &libxl__pci_devtype; -GCNEW (pas); pas->aodev = aodev; pas->domid = domid; + pas->pci = pci; pas->starting = starting; pas->callback = device_pci_add_stubdom_done;
@@ -1624,9 +1619,10 @@ void libxl__device_pci_add(libxl__egc *egc, uint32_t domid,GCNEW (pci_s);libxl_device_pci_init (pci_s);libxl_device_pci_copy (CTX , pci_s, pci); + pas->pci = pci_s; pas->callback = device_pci_add_stubdom_wait; -do_pci_add (egc, stubdomid, pci_s, pas);/* must be last */ +do_pci_add (egc, stubdomid, pas);/* must be last */ return ; }
@@ -1681,9 +1677,8 @@ static void device_pci_add_stubdom_done(libxl__egc *egc,int i;/* Convenience aliases */ -libxl__ao_device *aodev = pas->aodev;libxl_domid domid = pas->domid; -libxl_device_pci *pci = aodev->device_config; +libxl_device_pci *pci = pas->pci;if (rc) goto out;
@@ -1718,7 +1713,7 @@ static void device_pci_add_stubdom_done(libxl__egc *egc, pci->vdevfn = orig_vdev; } pas->callback = device_pci_add_done; -do_pci_add (egc, domid, pci, pas);/* must be last */ +do_pci_add (egc, domid, pas);/* must be last */ return ; } }
@@ -1734,7 +1729,7 @@ static void device_pci_add_done(libxl__egc *egc,EGC_GC ;libxl__ao_device *aodev = pas->aodev;libxl_domid domid = pas->domid; -libxl_device_pci *pci = aodev->device_config; +libxl_device_pci *pci = pas->pci;if (rc) { LOGD(ERROR, domid,
Signature · 1 line
2.11.0
PATCH v3 8/23 libxl: generalise 'driver_path' xenstore access functions in libxl_pci.c
In reply to Paul DurrantFrom: Paul Durrant <[email protected]>
For the purposes of re-binding a device to its previous driver libxl__device_pci_assignable_add() writes the driver path into xenstore. This path is then read back in libxl__device_pci_assignable_remove().
The functions that support this writing to and reading from xenstore are currently dedicated for this purpose and hence the node name 'driver_path' is hard-coded. This patch generalizes these utility functions and passes 'driver_path' as an argument. Subsequent patches will invoke them to access other nodes.
NOTE: Because functions will have a broader use (other than storing a
driver path in lieu of pciback) the base xenstore path is also changed from '/libxl/pciback' to '/libxl/pci'.
---
Cc: Ian Jackson <[email protected]>
Cc: Wei Liu <[email protected]>
--- tools/libs/light/libxl_pci.c | 66 +++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 34 deletions(-)
tools/libs/light/libxl_pci.c +32 -34
@@ -737,48 +737,46 @@ static int pciback_dev_unassign(libxl__gc *gc, libxl_device_pci *pci)return 0 ; } -#define PCIBACK_INFO_PATH "/libxl/pciback" +#define PCI_INFO_PATH "/libxl/pci" -static void pci_assignable_driver_path_write (libxl__gc *gc, -libxl_device_pci *pci, -char *driver_path) +static char *pci_info_xs_path (libxl__gc *gc,libxl_device_pci *pci, +const char *node) { -char *path; +return node ? +GCSPRINTF (PCI_INFO_PATH "/" PCI_BDF_XSPATH "/%s" , + pci->domain, pci->bus, pci->dev, pci->func, + node) : +GCSPRINTF (PCI_INFO_PATH "/" PCI_BDF_XSPATH , + pci->domain, pci->bus, pci->dev, pci->func); +} + + +static void pci_info_xs_write (libxl__gc *gc,libxl_device_pci *pci, +const char *node,const char *val) +{ +char *path =pci_info_xs_path (gc, pci, node); - path =GCSPRINTF (PCIBACK_INFO_PATH "/" PCI_BDF_XSPATH "/driver_path" , - pci->domain, - pci->bus, - pci->dev, - pci->func); -if (libxl__xs_printf (gc,XBT_NULL , path,"%s" , driver_path) <0 ) { -LOGE (WARN ,"Write of %s to node %s failed." , driver_path, path); +if (libxl__xs_printf (gc,XBT_NULL , path,"%s" , val) <0 ) { +LOGE (WARN ,"Write of %s to node %s failed." , val, path); } } -static char *pci_assignable_driver_path_read (libxl__gc *gc, -libxl_device_pci *pci) +static char *pci_info_xs_read (libxl__gc *gc,libxl_device_pci *pci, +const char *node) { -return libxl__xs_read (gc,XBT_NULL , -GCSPRINTF ( -PCIBACK_INFO_PATH "/" PCI_BDF_XSPATH "/driver_path" , - pci->domain, - pci->bus, - pci->dev, - pci->func)); +char *path =pci_info_xs_path (gc, pci, node); + +return libxl__xs_read (gc,XBT_NULL , path); } -static void pci_assignable_driver_path_remove (libxl__gc *gc, -libxl_device_pci *pci) +static void pci_info_xs_remove (libxl__gc *gc,libxl_device_pci *pci, +const char *node) { +char *path =pci_info_xs_path (gc, pci, node);libxl_ctx *ctx =libxl__gc_owner (gc);/* Remove the xenstore entry */ -xs_rm (ctx->xsh,XBT_NULL , -GCSPRINTF (PCIBACK_INFO_PATH "/" PCI_BDF_XSPATH , - pci->domain, - pci->bus, - pci->dev, - pci->func) ); +xs_rm (ctx->xsh,XBT_NULL , path); } static int libxl__device_pci_assignable_add(libxl__gc *gc,
@@ -824,9 +822,9 @@ static int libxl__device_pci_assignable_add(libxl__gc *gc,/* Store driver_path for rebinding to dom0 */ if ( rebind ) {if ( driver_path ) { -pci_assignable_driver_path_write (gc, pci, driver_path); +pci_info_xs_write (gc, pci,"driver_path" , driver_path); }else if ( (driver_path = -pci_assignable_driver_path_read (gc, pci)) !=NULL ) { +pci_info_xs_read (gc, pci,"driver_path" )) !=NULL ) {LOG (INFO ,PCI_BDF " not bound to a driver, will be rebound to %s" , dom, bus, dev, func, driver_path); }else {
@@ -834,7 +832,7 @@ static int libxl__device_pci_assignable_add(libxl__gc *gc, dom, bus, dev, func); } }else { -pci_assignable_driver_path_remove (gc, pci); +pci_info_xs_remove (gc, pci,"driver_path" ); }if (pciback_dev_assign (gc, pci) ) {
@@ -884,7 +882,7 @@ static int libxl__device_pci_assignable_remove(libxl__gc *gc, }/* Rebind if necessary */ - driver_path =pci_assignable_driver_path_read (gc, pci); + driver_path =pci_info_xs_read (gc, pci,"driver_path" );if ( driver_path ) {if ( rebind ) {
@@ -897,7 +895,7 @@ static int libxl__device_pci_assignable_remove(libxl__gc *gc,return -1 ; } -pci_assignable_driver_path_remove (gc, pci); +pci_info_xs_remove (gc, pci,"driver_path" ); } }else {if ( rebind ) {
Signature · 1 line
2.11.0
PATCH v3 9/23 libxl: remove unnecessary check from libxl__device_pci_add()
In reply to Paul DurrantFrom: Paul Durrant <[email protected]>
The code currently checks explicitly whether the device is already assigned, but this is actually unnecessary as assigned devices do not form part of the list returned by libxl_device_pci_assignable_list() and hence the libxl_pci_assignable() test would have already failed.
---
Cc: Ian Jackson <[email protected]>
Cc: Wei Liu <[email protected]>
--- tools/libs/light/libxl_pci.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-)
tools/libs/light/libxl_pci.c +1 -15
@@ -1555,8 +1555,7 @@ void libxl__device_pci_add(libxl__egc *egc, uint32_t domid, {STATE_AO_GC (aodev->ao);libxl_ctx *ctx =libxl__gc_owner (gc); -libxl_device_pci *assigned; -int num_assigned, rc; +int rc;int stubdomid =0 ;pci_add_state *pas;
@@ -1595,19 +1594,6 @@ void libxl__device_pci_add(libxl__egc *egc, uint32_t domid, goto out; } - rc =get_all_assigned_devices (gc, &assigned, &num_assigned); -if ( rc ) { -LOGD (ERROR , domid, -"cannot determine if device is assigned, refusing to continue" ); - goto out; - } -if (is_pci_in_array (assigned, num_assigned, pci->domain, - pci->bus, pci->dev, pci->func) ) { -LOGD (ERROR , domid,"PCI device already attached to a domain" ); - rc =ERROR_FAIL ; - goto out; - } -libxl__device_pci_reset (gc, pci->domain, pci->bus, pci->dev, pci->func); stubdomid =libxl_get_stubdom_id (ctx, domid);
Signature · 1 line
2.11.0
PATCH v3 10/23 libxl: remove get_all_assigned_devices() from libxl_pci.c
In reply to Paul DurrantFrom: Paul Durrant <[email protected]>
Use of this function is a very inefficient way to check whether a device has already been assigned.
This patch adds code that saves the domain id in xenstore at the point of assignment, and removes it again when the device id de-assigned (or the domain is destroyed). It is then straightforward to check whether a device has been assigned by checking whether a device has a saved domain id.
NOTE: To facilitate the xenstore check it is necessary to move the
pci_info_xs_read() earlier in libxl_pci.c. To keep related functions together, the rest of the pci_info_xs_XXX() functions are moved too.
---
Cc: Ian Jackson <[email protected]>
Cc: Wei Liu <[email protected]>
--- tools/libs/light/libxl_pci.c | 149 ++++++++++++++++--------------------------- 1 file changed, 55 insertions(+), 94 deletions(-)
tools/libs/light/libxl_pci.c +55 -94
@@ -336,50 +336,6 @@ retry_transaction2:return 0 ; } -static int get_all_assigned_devices (libxl__gc *gc,libxl_device_pci **list,int *num) -{ -char **domlist; -unsigned int nd =0 , i; - - *list =NULL ; - *num =0 ; - - domlist =libxl__xs_directory (gc,XBT_NULL ,"/local/domain" , &nd); -for (i =0 ; i < nd; i++) { -char *path, *num_devs; - - path =GCSPRINTF ("/local/domain/0/backend/%s/%s/0/num_devs" , -libxl__device_kind_to_string (LIBXL__DEVICE_KIND_PCI ), - domlist[i]); - num_devs =libxl__xs_read (gc,XBT_NULL , path); -if ( num_devs ) { -int ndev =atoi (num_devs), j; -char *devpath, *bdf; - -for (j =0 ; j < ndev; j++) { - devpath =GCSPRINTF ("/local/domain/0/backend/%s/%s/0/dev-%u" , -libxl__device_kind_to_string (LIBXL__DEVICE_KIND_PCI ), - domlist[i], j); - bdf =libxl__xs_read (gc,XBT_NULL , devpath); -if ( bdf ) { -unsigned dom, bus, dev, func; -if (sscanf (bdf,PCI_BDF , &dom, &bus, &dev, &func) !=4 ) -continue ; - - *list =realloc (*list,sizeof (libxl_device_pci) * ((*num) +1 )); -if (*list ==NULL ) -return ERROR_NOMEM ; -pci_struct_fill (*list + *num, dom, bus, dev, func,0 ); - (*num)++; - } - } - } - } -libxl__ptr_add (gc, *list); - -return 0 ; -} -static int is_pci_in_array (libxl_device_pci *assigned,int num_assigned,int dom,int bus,int dev,int func) {
@@ -427,19 +383,58 @@ static int sysfs_write_bdf(libxl__gc *gc, const char * sysfs_path,return 0 ; } +#define PCI_INFO_PATH "/libxl/pci" + +static char *pci_info_xs_path (libxl__gc *gc,libxl_device_pci *pci, +const char *node) +{ +return node ? +GCSPRINTF (PCI_INFO_PATH "/" PCI_BDF_XSPATH "/%s" , + pci->domain, pci->bus, pci->dev, pci->func, + node) : +GCSPRINTF (PCI_INFO_PATH "/" PCI_BDF_XSPATH , + pci->domain, pci->bus, pci->dev, pci->func); +} + + +static int pci_info_xs_write (libxl__gc *gc,libxl_device_pci *pci, +const char *node,const char *val) +{ +char *path =pci_info_xs_path (gc, pci, node); +int rc =libxl__xs_printf (gc,XBT_NULL , path,"%s" , val); + +if (rc)LOGE (WARN ,"Write of %s to node %s failed." , val, path); + +return rc; +} + +static char *pci_info_xs_read (libxl__gc *gc,libxl_device_pci *pci, +const char *node) +{ +char *path =pci_info_xs_path (gc, pci, node); + +return libxl__xs_read (gc,XBT_NULL , path); +} + +static void pci_info_xs_remove (libxl__gc *gc,libxl_device_pci *pci, +const char *node) +{ +char *path =pci_info_xs_path (gc, pci, node); +libxl_ctx *ctx =libxl__gc_owner (gc); + +/* Remove the xenstore entry */ +xs_rm (ctx->xsh,XBT_NULL , path); +} +libxl_device_pci *libxl_device_pci_assignable_list (libxl_ctx *ctx,int *num) {GC_INIT (ctx); -libxl_device_pci *pcis =NULL , *new, *assigned; +libxl_device_pci *pcis =NULL , *new;struct dirent *de;DIR *dir; -int r, num_assigned; *num =0 ; - r =get_all_assigned_devices (gc, &assigned, &num_assigned); -if (r) goto out; - dir =opendir (SYSFS_PCIBACK_DRIVER );if (NULL == dir) {if (errno ==ENOENT ) {
@@ -455,9 +450,6 @@ libxl_device_pci *libxl_device_pci_assignable_list(libxl_ctx *ctx, int *num)if (sscanf (de->d_name,PCI_BDF , &dom, &bus, &dev, &func) !=4 )continue ; -if (is_pci_in_array (assigned, num_assigned, dom, bus, dev, func)) -continue ; - new =realloc (pcis, ((*num) +1 ) *sizeof (*new));if (NULL == new)continue ;
@@ -467,6 +459,10 @@ libxl_device_pci *libxl_device_pci_assignable_list(libxl_ctx *ctx, int *num)memset (new,0 ,sizeof (*new));pci_struct_fill (new, dom, bus, dev, func,0 ); + +if (pci_info_xs_read (gc, new,"domid" ))/* already assigned */ +continue ; + (*num)++; }
@@ -737,48 +733,6 @@ static int pciback_dev_unassign(libxl__gc *gc, libxl_device_pci *pci)return 0 ; } -#define PCI_INFO_PATH "/libxl/pci" - -static char *pci_info_xs_path (libxl__gc *gc,libxl_device_pci *pci, -const char *node) -{ -return node ? -GCSPRINTF (PCI_INFO_PATH "/" PCI_BDF_XSPATH "/%s" , - pci->domain, pci->bus, pci->dev, pci->func, - node) : -GCSPRINTF (PCI_INFO_PATH "/" PCI_BDF_XSPATH , - pci->domain, pci->bus, pci->dev, pci->func); -} - - -static void pci_info_xs_write (libxl__gc *gc,libxl_device_pci *pci, -const char *node,const char *val) -{ -char *path =pci_info_xs_path (gc, pci, node); - -if (libxl__xs_printf (gc,XBT_NULL , path,"%s" , val) <0 ) { -LOGE (WARN ,"Write of %s to node %s failed." , val, path); - } -} - -static char *pci_info_xs_read (libxl__gc *gc,libxl_device_pci *pci, -const char *node) -{ -char *path =pci_info_xs_path (gc, pci, node); - -return libxl__xs_read (gc,XBT_NULL , path); -} - -static void pci_info_xs_remove (libxl__gc *gc,libxl_device_pci *pci, -const char *node) -{ -char *path =pci_info_xs_path (gc, pci, node); -libxl_ctx *ctx =libxl__gc_owner (gc); - -/* Remove the xenstore entry */ -xs_rm (ctx->xsh,XBT_NULL , path); -} -static int libxl__device_pci_assignable_add (libxl__gc *gc,libxl_device_pci *pci,int rebind)
@@ -1594,6 +1548,9 @@ void libxl__device_pci_add(libxl__egc *egc, uint32_t domid, goto out; } + rc =pci_info_xs_write (gc, pci,"domid" ,GCSPRINTF ("%u" , domid)); +if (rc) goto out; +libxl__device_pci_reset (gc, pci->domain, pci->bus, pci->dev, pci->func); stubdomid =libxl_get_stubdom_id (ctx, domid);
@@ -1721,6 +1678,7 @@ static void device_pci_add_done(libxl__egc *egc,"PCI device %x:%x:%x.%x (rc %d)" , pci->domain, pci->bus, pci->dev, pci->func, rc); +pci_info_xs_remove (gc, pci,"domid" ); } aodev->rc = rc; aodev->callback (egc, aodev);
@@ -2282,6 +2240,9 @@ out:libxl__xswait_stop (gc, &prs->xswait);libxl__ev_time_deregister (gc, &prs->timeout);libxl__ev_time_deregister (gc, &prs->retry_timer); + +if (!rc)pci_info_xs_remove (gc, pci,"domid" ); + aodev->rc = rc; aodev->callback (egc, aodev); }
Signature · 1 line
2.11.0
PATCH v3 11/23 libxl: make sure callers of libxl_device_pci_list() free the list after use
In reply to Paul DurrantFrom: Paul Durrant <[email protected]>
A previous patch introduced libxl_device_pci_list_free() which should be used by callers of libxl_device_pci_list() to properly dispose of the exported 'libxl_device_pci' types and the free the memory holding them. Whilst all current callers do ensure the memory is freed, only the code in xl's pcilist() function actually calls libxl_device_pci_dispose(). As it stands this laxity does not lead to any memory leaks, but the simple addition of .e.g. a 'string' into the idl definition of 'libxl_device_pci' would lead to leaks.
This patch makes sure all callers of libxl_device_pci_list() can call libxl_device_pci_list_free() by keeping copies of 'libxl_device_pci' structures inline in 'pci_add_state' and 'pci_remove_state' (and also making sure these are properly disposed at the end of the operations) rather than keeping pointers to the structures returned by libxl_device_pci_list().
---
Cc: Ian Jackson <[email protected]>
Cc: Wei Liu <[email protected]>
Cc: Anthony PERARD <[email protected]>
--- tools/libs/light/libxl_pci.c | 68 ++++++++++++++++++++++++-------------------- tools/xl/xl_pci.c | 3 +- 2 files changed, 38 insertions(+), 33 deletions(-)
tools/libs/light/libxl_pci.c +37 -31
@@ -1025,7 +1025,7 @@ typedef struct pci_add_state {libxl__xswait_state xswait;libxl__ev_qmp qmp;libxl__ev_time timeout; -libxl_device_pci *pci; +libxl_device_pci pci;libxl_domid pci_domid; } pci_add_state;
@@ -1097,7 +1097,7 @@ static void pci_add_qemu_trad_watch_state_cb(libxl__egc *egc,/* Convenience aliases */ libxl_domid domid = pas->domid; -libxl_device_pci *pci = pas->pci; +libxl_device_pci *pci = &pas->pci; rc =check_qemu_running (gc, domid, xswa, rc, state);if (rc ==ERROR_NOT_READY )
@@ -1118,7 +1118,7 @@ static void pci_add_qmp_device_add(libxl__egc *egc, pci_add_state *pas)/* Convenience aliases */ libxl_domid domid = pas->domid; -libxl_device_pci *pci = pas->pci; +libxl_device_pci *pci = &pas->pci;libxl__ev_qmp *const qmp = &pas->qmp; rc = libxl__ev_time_register_rel(ao, &pas->timeout,
@@ -1199,7 +1199,7 @@ static void pci_add_qmp_query_pci_cb(libxl__egc *egc,int dev_slot, dev_func;/* Convenience aliases */ -libxl_device_pci *pci = pas->pci; +libxl_device_pci *pci = &pas->pci;if (rc) goto out;
@@ -1300,7 +1300,7 @@ static void pci_add_dm_done(libxl__egc *egc,/* Convenience aliases */ bool starting = pas->starting; -libxl_device_pci *pci = pas->pci; +libxl_device_pci *pci = &pas->pci;bool hvm =libxl__domain_type (gc, domid) ==LIBXL_DOMAIN_TYPE_HVM ;libxl__ev_qmp_dispose (gc, &pas->qmp);
@@ -1516,7 +1516,10 @@ void libxl__device_pci_add(libxl__egc *egc, uint32_t domid,GCNEW (pas); pas->aodev = aodev; pas->domid = domid; - pas->pci = pci; + +libxl_device_pci_copy (CTX , &pas->pci, pci); + pci = &pas->pci; + pas->starting = starting; pas->callback = device_pci_add_stubdom_done;
@@ -1555,12 +1558,6 @@ void libxl__device_pci_add(libxl__egc *egc, uint32_t domid, stubdomid =libxl_get_stubdom_id (ctx, domid);if (stubdomid !=0 ) { -libxl_device_pci *pci_s; - -GCNEW (pci_s); -libxl_device_pci_init (pci_s); -libxl_device_pci_copy (CTX , pci_s, pci); - pas->pci = pci_s; pas->callback = device_pci_add_stubdom_wait;do_pci_add (egc, stubdomid, pas);/* must be last */
@@ -1619,7 +1616,7 @@ static void device_pci_add_stubdom_done(libxl__egc *egc,/* Convenience aliases */ libxl_domid domid = pas->domid; -libxl_device_pci *pci = pas->pci; +libxl_device_pci *pci = &pas->pci;if (rc) goto out;
@@ -1670,7 +1667,7 @@ static void device_pci_add_done(libxl__egc *egc,EGC_GC ;libxl__ao_device *aodev = pas->aodev;libxl_domid domid = pas->domid; -libxl_device_pci *pci = pas->pci; +libxl_device_pci *pci = &pas->pci;if (rc) { LOGD(ERROR, domid,
@@ -1680,6 +1677,7 @@ static void device_pci_add_done(libxl__egc *egc, rc);pci_info_xs_remove (gc, pci,"domid" ); } +libxl_device_pci_dispose (pci); aodev->rc = rc; aodev->callback (egc, aodev); }
@@ -1770,7 +1768,7 @@ static int qemu_pci_remove_xenstore(libxl__gc *gc, uint32_t domid, typedef struct pci_remove_state { libxl__ao_device *aodev; libxl_domid domid; - libxl_device_pci *pci; + libxl_device_pci pci; bool force; bool hvm; unsigned int orig_vdev;
@@ -1812,23 +1810,26 @@ static void do_pci_remove(libxl__egc *egc, pci_remove_state *prs) {STATE_AO_GC (prs->aodev->ao);libxl_ctx *ctx =libxl__gc_owner (gc); -libxl_device_pci *assigned; +libxl_device_pci *pcis; +bool attached;uint32_t domid = prs->domid;libxl_domain_type type =libxl__domain_type (gc, domid); -libxl_device_pci *pci = prs->pci; +libxl_device_pci *pci = &prs->pci;int rc, num;uint32_t domainid = domid; - assigned =libxl_device_pci_list (ctx, domid, &num); -if (assigned ==NULL ) { + pcis =libxl_device_pci_list (ctx, domid, &num); +if (!pcis) { rc =ERROR_FAIL ; goto out_fail; } -libxl__ptr_add (gc, assigned); + + attached =is_pci_in_array (pcis, num, pci->domain, + pci->bus, pci->dev, pci->func); +libxl_device_pci_list_free (pcis, num); rc =ERROR_INVAL ; -if ( !is_pci_in_array (assigned, num, pci->domain, - pci->bus, pci->dev, pci->func) ) { +if (!attached) {LOGD (ERROR , domainid,"PCI device not attached to this domain" ); goto out_fail; }
@@ -1928,7 +1929,7 @@ static void pci_remove_qemu_trad_watch_state_cb(libxl__egc *egc,/* Convenience aliases */ libxl_domid domid = prs->domid; -libxl_device_pci *const pci = prs->pci; +libxl_device_pci *const pci = &prs->pci; rc =check_qemu_running (gc, domid, xswa, rc, state);if (rc ==ERROR_NOT_READY )
@@ -1950,7 +1951,7 @@ static void pci_remove_qmp_device_del(libxl__egc *egc,int rc;/* Convenience aliases */ -libxl_device_pci *const pci = prs->pci; +libxl_device_pci *const pci = &prs->pci; rc = libxl__ev_time_register_rel(ao, &prs->timeout, pci_remove_timeout,
@@ -2020,7 +2021,7 @@ static void pci_remove_qmp_query_cb(libxl__egc *egc,/* Convenience aliases */ libxl__ao *const ao = prs->aodev->ao; -libxl_device_pci *const pci = prs->pci; +libxl_device_pci *const pci = &prs->pci;if (rc) goto out;
@@ -2075,7 +2076,7 @@ static void pci_remove_timeout(libxl__egc *egc, libxl__ev_time *ev,pci_remove_state *prs =CONTAINER_OF (ev, *prs, timeout);/* Convenience aliases */ -libxl_device_pci *const pci = prs->pci; +libxl_device_pci *const pci = &prs->pci;LOGD (WARN , prs->domid,"timed out waiting for DM to remove " PCI_PT_QDEV_ID , pci->bus, pci->dev, pci->func);
@@ -2096,7 +2097,7 @@ static void pci_remove_detached(libxl__egc *egc,bool isstubdom;/* Convenience aliases */ -libxl_device_pci *const pci = prs->pci; +libxl_device_pci *const pci = &prs->pci;libxl_domid domid = prs->domid;/* Cleaning QMP states ASAP */
@@ -2159,7 +2160,7 @@ static void pci_remove_done(libxl__egc *egc,if (rc) goto out; -libxl__device_pci_remove_xenstore (gc, prs->domid, prs->pci); +libxl__device_pci_remove_xenstore (gc, prs->domid, &prs->pci); out:device_pci_remove_common_next (egc, prs, rc); }
@@ -2177,7 +2178,10 @@ static void libxl__device_pci_remove_common(libxl__egc *egc,GCNEW (prs); prs->aodev = aodev; prs->domid = domid; - prs->pci = pci; + +libxl_device_pci_copy (CTX , &prs->pci, pci); + pci = &prs->pci; + prs->force = force;libxl__xswait_init (&prs->xswait);libxl__ev_qmp_init (&prs->qmp);
@@ -2212,7 +2216,7 @@ static void device_pci_remove_common_next(libxl__egc *egc,EGC_GC ;/* Convenience aliases */ -libxl_device_pci *const pci = prs->pci; +libxl_device_pci *const pci = &prs->pci;libxl__ao_device *const aodev = prs->aodev;const unsigned int pfunc_mask = prs->pfunc_mask;const unsigned int orig_vdev = prs->orig_vdev;
@@ -2243,6 +2247,7 @@ out:if (!rc)pci_info_xs_remove (gc, pci,"domid" ); +libxl_device_pci_dispose (pci); aodev->rc = rc; aodev->callback (egc, aodev); }
@@ -2357,7 +2362,6 @@ void libxl__device_pci_destroy_all(libxl__egc *egc, uint32_t domid, pcis =libxl_device_pci_list (CTX , domid, &num);if ( pcis ==NULL )return ; -libxl__ptr_add (gc, pcis);for (i =0 ; i < num; i++) {/* Force remove on shutdown since, on HVM, qemu will not always
@@ -2368,6 +2372,8 @@ void libxl__device_pci_destroy_all(libxl__egc *egc, uint32_t domid,libxl__device_pci_remove_common (egc, domid, pcis + i, true, aodev); } + +libxl_device_pci_list_free (pcis, num); } int libxl__grant_vga_iomem_permission(libxl__gc *gc, const uint32_t domid,
tools/xl/xl_pci.c +1 -2
@@ -35,9 +35,8 @@ static void pcilist(uint32_t domid)printf ("%02x.%01x %04x:%02x:%02x.%01x\n" , (pcis[i].vdevfn >>3 ) &0x1f , pcis[i].vdevfn &0x7 , pcis[i].domain, pcis[i].bus, pcis[i].dev, pcis[i].func); -libxl_device_pci_dispose (&pcis[i]); } -free (pcis); +libxl_device_pci_list_free (pcis, num); }int main_pcilist (int argc,char **argv)
Signature · 1 line
2.11.0
PATCH v3 12/23 libxl: add libxl_device_pci_assignable_list_free()...
In reply to Paul DurrantFrom: Paul Durrant <[email protected]>
... to be used by callers of libxl_device_pci_assignable_list().
Currently there is no API for callers of libxl_device_pci_assignable_list() to free the list. The xl function pciassignable_list() calls libxl_device_pci_dispose() on each element of the returned list, but libxl_pci_assignable() in libxl_pci.c does not. Neither does the implementation of libxl_device_pci_assignable_list() call libxl_device_pci_init().
This patch adds the new API function, makes sure it is used everywhere and also modifies libxl_device_pci_assignable_list() to initialize list entries rather than just zeroing them.
---
Cc: Ian Jackson <[email protected]>
Cc: Wei Liu <[email protected]>
Cc: Christian Lindig <[email protected]>
Cc: David Scott <[email protected]>
Cc: Anthony PERARD <[email protected]>
--- tools/include/libxl.h | 7 +++++++ tools/libs/light/libxl_pci.c | 14 ++++++++++++-- tools/ocaml/libs/xl/xenlight_stubs.c | 3 +-- tools/xl/xl_pci.c | 3 +-- 4 files changed, 21 insertions(+), 6 deletions(-)
tools/include/libxl.h +7 -0
@@ -458,6 +458,12 @@#define LIBXL_HAVE_DEVICE_PCI_LIST_FREE 1/* +* LIBXL_HAVE_DEVICE_PCI_ASSIGNABLE_LIST_FREE indicates that the +* libxl_device_pci_assignable_list_free() function is defined. +*/ +#define LIBXL_HAVE_DEVICE_PCI_ASSIGNABLE_LIST_FREE 1 + +/* * libxl ABI compatibility * * The only guarantee which libxl makes regarding ABI compatibility
@@ -2369,6 +2375,7 @@ int libxl_device_events_handler(libxl_ctx *ctx,int libxl_device_pci_assignable_add (libxl_ctx *ctx,libxl_device_pci *pci,int rebind);int libxl_device_pci_assignable_remove (libxl_ctx *ctx,libxl_device_pci *pci,int rebind);libxl_device_pci *libxl_device_pci_assignable_list (libxl_ctx *ctx,int *num); +void libxl_device_pci_assignable_list_free (libxl_device_pci *list,int num);/* CPUID handling */ int libxl_cpuid_parse_config (libxl_cpuid_policy_list *cpuid,const char * str);
tools/libs/light/libxl_pci.c +12 -2
@@ -457,7 +457,7 @@ libxl_device_pci *libxl_device_pci_assignable_list(libxl_ctx *ctx, int *num) pcis = new; new = pcis + *num; -memset (new,0 ,sizeof (*new)); +libxl_device_pci_init (new);pci_struct_fill (new, dom, bus, dev, func,0 );if (pci_info_xs_read (gc, new,"domid" ))/* already assigned */
@@ -472,6 +472,16 @@ out:return pcis; } +void libxl_device_pci_assignable_list_free (libxl_device_pci *list,int num) +{ +int i; + +for (i =0 ; i < num; i++) +libxl_device_pci_dispose (&list[i]); + +free (list); +} +/* Unbind device from its current driver, if any. If driver_path is non-NULL, * store the path to the original driver in it. */ static int sysfs_dev_unbind(libxl__gc *gc, libxl_device_pci *pci,
@@ -1490,7 +1500,7 @@ static int libxl_pci_assignable(libxl_ctx *ctx, libxl_device_pci *pci) pcis[i].func == pci->func)break ; } -free (pcis); +libxl_device_pci_assignable_list_free (pcis, num);return i != num; }
tools/ocaml/libs/xl/xenlight_stubs.c +1 -2
@@ -894,9 +894,8 @@ value stub_xl_device_pci_assignable_list(value ctx)Field (list,1 ) = temp; temp = list;Store_field (list,0 ,Val_device_pci (&c_list[i])); -libxl_device_pci_dispose (&c_list[i]); } -free (c_list); +libxl_device_pci_assignable_list_free (c_list, nb);CAMLreturn (list); }
tools/xl/xl_pci.c +1 -2
@@ -164,9 +164,8 @@ static void pciassignable_list(void)for (i =0 ; i < num; i++) {printf ("%04x:%02x:%02x.%01x\n" , pcis[i].domain, pcis[i].bus, pcis[i].dev, pcis[i].func); -libxl_device_pci_dispose (&pcis[i]); } -free (pcis); +libxl_device_pci_assignable_list_free (pcis, num); }int main_pciassignable_list (int argc,char **argv)
Signature · 1 line
2.11.0
PATCH v3 13/23 libxl: use COMPARE_PCI() macro is_pci_in_array()...
In reply to Paul DurrantFrom: Paul Durrant <[email protected]>
... rather than an open-coded equivalent.
This patch tidies up the is_pci_in_array() function, making it take a single 'libxl_device_pci' argument rather than separate domain, bus, device and function arguments. The already-available COMPARE_PCI() macro can then be used and it is also modified to return 'bool' rather than 'int'.
The patch also modifies libxl_pci_assignable() to use is_pci_in_array() rather than a separate open-coded equivalent, and also modifies it to return a 'bool' rather than an 'int'.
NOTE: The COMPARE_PCI() macro is also fixed to include the 'domain' in its
comparison, which should always have been the case.
---
Cc: Ian Jackson <[email protected]>
Cc: Wei Liu <[email protected]>
--- tools/libs/light/libxl_internal.h | 7 ++++--- tools/libs/light/libxl_pci.c | 38 +++++++++++++------------------------- 2 files changed, 17 insertions(+), 28 deletions(-)
tools/libs/light/libxl_internal.h +4 -3
@@ -4746,9 +4746,10 @@ void libxl__xcinfo2xlinfo(libxl_ctx *ctx,* devices have same identifier. */ #define COMPARE_DEVID (a, b) ((a)->devid == (b)->devid)#define COMPARE_DISK (a, b) (!strcmp((a)->vdev, (b)->vdev)) -#define COMPARE_PCI (a, b) ((a)->func == (b)->func && \ - (a)->bus == (b)->bus && \ - (a)->dev == (b)->dev) +#define COMPARE_PCI (a, b) ((a)->domain == (b)->domain && \ + (a)->bus == (b)->bus && \ + (a)->dev == (b)->dev && \ + (a)->func == (b)->func)#define COMPARE_USB (a, b) ((a)->ctrl == (b)->ctrl && \ (a)->port == (b)->port)#define COMPARE_USBCTRL (a, b) ((a)->devid == (b)->devid)
tools/libs/light/libxl_pci.c +13 -25
@@ -336,24 +336,17 @@ retry_transaction2:return 0 ; } -static int is_pci_in_array (libxl_device_pci *assigned,int num_assigned, -int dom,int bus,int dev,int func) +static bool is_pci_in_array (libxl_device_pci *pcis,int num, +libxl_device_pci *pci) {int i; -for (i =0 ; i < num_assigned; i++) { -if ( assigned[i].domain != dom ) -continue ; -if ( assigned[i].bus != bus ) -continue ; -if ( assigned[i].dev != dev ) -continue ; -if ( assigned[i].func != func ) -continue ; -return 1 ; +for (i =0 ; i < num; i++) { +if (COMPARE_PCI (pci, &pcis[i])) +break ; } -return 0 ; +return i < num; }/* Write the standard BDF into the sysfs path given by sysfs_path. */
@@ -1487,21 +1480,17 @@ int libxl_device_pci_add(libxl_ctx *ctx, uint32_t domid,return AO_INPROGRESS ; } -static int libxl_pci_assignable (libxl_ctx *ctx,libxl_device_pci *pci) +static bool libxl_pci_assignable (libxl_ctx *ctx,libxl_device_pci *pci) {libxl_device_pci *pcis; -int num, i; +int num; +bool assignable; pcis =libxl_device_pci_assignable_list (ctx, &num); -for (i =0 ; i < num; i++) { -if (pcis[i].domain == pci->domain && - pcis[i].bus == pci->bus && - pcis[i].dev == pci->dev && - pcis[i].func == pci->func) -break ; - } + assignable =is_pci_in_array (pcis, num, pci);libxl_device_pci_assignable_list_free (pcis, num); -return i != num; + +return assignable; } static void device_pci_add_stubdom_wait(libxl__egc *egc,
@@ -1834,8 +1823,7 @@ static void do_pci_remove(libxl__egc *egc, pci_remove_state *prs) goto out_fail; } - attached =is_pci_in_array (pcis, num, pci->domain, - pci->bus, pci->dev, pci->func); + attached =is_pci_in_array (pcis, num, pci);libxl_device_pci_list_free (pcis, num); rc =ERROR_INVAL ;
Signature · 1 line
2.11.0
PATCH v3 14/23 docs/man: extract documentation of PCI_SPEC_STRING from the xl.cfg manpage...
In reply to Paul DurrantFrom: Paul Durrant <[email protected]>
... and put it into a new xl-pci-configuration(5) manpage, akin to the xl-network-configration(5) and xl-disk-configuration(5) manpages.
This patch moves the content of the section verbatim. A subsequent patch will improve the documentation, once it is in its new location.
---
Cc: Ian Jackson <[email protected]>
Cc: Wei Liu <[email protected]>
--- docs/man/xl-pci-configuration.5.pod | 78 +++++++++++++++++++++++++++++++++++++ docs/man/xl.cfg.5.pod.in | 68 +------------------------------- 2 files changed, 79 insertions(+), 67 deletions(-) create mode 100644 docs/man/xl-pci-configuration.5.pod
docs/man/xl-pci-configuration.5.pod new file +78 -0
@@ -0,0 +1,78 @@ +=encoding utf8 + +=head1 NAME + +xl-pci-configuration - XL PCI Configuration Syntax + +=head1 SYNTAX + +This document specifies the format for B<PCI_SPEC_STRING> which is used by +the L<xl.cfg(5)> pci configuration option, and related L<xl(1)> commands. + +Each B<PCI_SPEC_STRING> has the form of +B<[DDDD:]BB:DD.F[@VSLOT],KEY=VALUE,KEY=VALUE,...> where: + +=over 4 + +=item B<[DDDD:]BB:DD.F> + +Identifies the PCI device from the host perspective in the domain +(B<DDDD>), Bus (B<BB>), Device (B<DD>) and Function (B<F>) syntax. This is +the same scheme as used in the output of B<lspci(1)> for the device in +question. + +Note: by default B<lspci(1)> will omit the domain (B<DDDD>) if it +is zero and it is optional here also. You may specify the function +(B<F>) as B<*> to indicate all functions. + +=item B<@VSLOT> + +Specifies the virtual slot where the guest will see this +device. This is equivalent to the B<DD> which the guest sees. In a +guest B<DDDD> and B<BB> are C<0000:00>. + +=item B<permissive=BOOLEAN> + +By default pciback only allows PV guests to write "known safe" values +into PCI configuration space, likewise QEMU (both qemu-xen and +qemu-xen-traditional) imposes the same constraint on HVM guests. +However, many devices require writes to other areas of the configuration space +in order to operate properly. This option tells the backend (pciback or QEMU) +to allow all writes to the PCI configuration space of this device by this +domain. + +B<This option should be enabled with caution:> it gives the guest much +more control over the device, which may have security or stability +implications. It is recommended to only enable this option for +trusted VMs under administrator's control. + +=item B<msitranslate=BOOLEAN> + +Specifies that MSI-INTx translation should be turned on for the PCI +device. When enabled, MSI-INTx translation will always enable MSI on +the PCI device regardless of whether the guest uses INTx or MSI. Some +device drivers, such as NVIDIA's, detect an inconsistency and do not +function when this option is enabled. Therefore the default is false (0). + +=item B<seize=BOOLEAN> + +Tells B<xl> to automatically attempt to re-assign a device to +pciback if it is not already assigned. + +B<WARNING:> If you set this option, B<xl> will gladly re-assign a critical +system device, such as a network or a disk controller being used by +dom0 without confirmation. Please use with care. + +=item B<power_mgmt=BOOLEAN> + +B<(HVM only)> Specifies that the VM should be able to program the +D0-D3hot power management states for the PCI device. The default is false (0). + +=item B<rdm_policy=STRING> + +B<(HVM/x86 only)> This is the same as the policy setting inside the B<rdm> +option but just specific to a given device. The default is "relaxed". + +Note: this would override global B<rdm> option. + +=back
docs/man/xl.cfg.5.pod.in +1 -67
74 lines not on this page · raw message
Signature · 1 line
2.11.0
PATCH v3 15/23 docs/man: improve documentation of PCI_SPEC_STRING...
In reply to Paul DurrantFrom: Paul Durrant <[email protected]>
... and prepare for adding support for non-positional parsing of 'bdf' and 'vslot' in a subsequent patch.
Also document 'BDF' as a first-class parameter type and fix the documentation to state that the default value of 'rdm_policy' is actually 'strict', not 'relaxed', as can be seen in libxl__device_pci_setdefault().
---
Cc: Ian Jackson <[email protected]>
Cc: Wei Liu <[email protected]>
--- docs/man/xl-pci-configuration.5.pod | 177 ++++++++++++++++++++++++++++++------ 1 file changed, 148 insertions(+), 29 deletions(-)
docs/man/xl-pci-configuration.5.pod +148 -29
@@ -6,32 +6,105 @@ xl-pci-configuration - XL PCI Configuration Syntax =head1 SYNTAX -This document specifies the format for B<PCI_SPEC_STRING> which is used by -the L<xl.cfg(5)> pci configuration option, and related L<xl(1)> commands. +This document specifies the format for B<BDF> and B<PCI_SPEC_STRING> which are +used by the L<xl.cfg(5)> pci configuration option, and related L<xl(1)> +commands. -Each B<PCI_SPEC_STRING> has the form of -B<[DDDD:]BB:DD.F[@VSLOT],KEY=VALUE,KEY=VALUE,...> where: +A B<BDF> has the following form: + + [DDDD:]BB:SS.F + +B<DDDD> is the domain number, B<BB> is the bus number, B<SS> is the device (or +slot) number, and B<F> is the function number. This is the same scheme as +used in the output of L<lspci(1)> for the device in question. By default +L<lspci(1)> will omit the domain (B<DDDD>) if it is zero and hence a zero +value for domain may also be omitted when specifying a B<BDF>. + +Each B<PCI_SPEC_STRING> has the one of the forms: + +=over 4 + + [<bdf>[@<vslot>,][<key>=<value>,]* + [<key>=<value>,]* + +=back + +For example, these strings are equivalent: =over 4 -=item B<[DDDD:]BB:DD.F> + 36:00.0@20,seize=1 + 36:00.0,vslot=20,seize=1 + bdf=36:00.0,vslot=20,seize=1 -Identifies the PCI device from the host perspective in the domain -(B<DDDD>), Bus (B<BB>), Device (B<DD>) and Function (B<F>) syntax. This is -the same scheme as used in the output of B<lspci(1)> for the device in -question. +=back + +More formally, the string is a series of comma-separated keyword/value +pairs, flags and positional parameters. Parameters which are not bare +keywords and which do not contain "=" symbols are assigned to the +positional parameters, in the order specified below. The positional +parameters may also be specified by name. + +Each parameter may be specified at most once, either as a positional +parameter or a named parameter. Default values apply if the parameter +is not specified, or if it is specified with an empty value (whether +positionally or explicitly). + +B<NOTE>: In context of B<xl pci-detach> (see L<xl(1)>), parameters other than +B<bdf> will be ignored. + +=head1 Positional Parameters + +=over 4 + +=item B<bdf>=I<BDF> + +=over 4 -Note: by default B<lspci(1)> will omit the domain (B<DDDD>) if it -is zero and it is optional here also. You may specify the function -(B<F>) as B<*> to indicate all functions. +=item Description -=item B<@VSLOT> +This identifies the PCI device from the host perspective. -Specifies the virtual slot where the guest will see this -device. This is equivalent to the B<DD> which the guest sees. In a -guest B<DDDD> and B<BB> are C<0000:00>. +In the context of a B<PCI_SPEC_STRING> you may specify the function (B<F>) as +B<*> to indicate all functions of a multi-function device. -=item B<permissive=BOOLEAN> +=item Default Value + +None. This parameter is mandatory as it identifies the device. + +=back + +=item B<vslot>=I<NUMBER> + +=over 4 + +=item Description + +Specifies the virtual slot (device) number where the guest will see this +device. For example, running L<lspci(1)> in a Linux guest where B<vslot> +was specified as C<8> would identify the device as C<00:08.0>. Virtual domain +and bus numbers are always 0. + +B<NOTE:> This parameter is always parsed as a hexidecimal value. + +=item Default Value + +None. This parameter is not mandatory. An available B<vslot> will be selected +if this parameter is not specified. + +=back + +=back + +=head1 Other Parameters and Flags + +=over 4 + +=item B<permissive>=I<BOOLEAN> + +=over 4 + +=item Description By default pciback only allows PV guests to write "known safe" values into PCI configuration space, likewise QEMU (both qemu-xen and
@@ -46,33 +119,79 @@ more control over the device, which may have security or stability implications. It is recommended to only enable this option for trusted VMs under administrator's control. -=item B<msitranslate=BOOLEAN> +=item Default Value + +0 + +=back + +=item B<msitranslate>=I<BOOLEAN> + +=over 4 + +=item Description Specifies that MSI-INTx translation should be turned on for the PCI device. When enabled, MSI-INTx translation will always enable MSI on -the PCI device regardless of whether the guest uses INTx or MSI. Some -device drivers, such as NVIDIA's, detect an inconsistency and do not +the PCI device regardless of whether the guest uses INTx or MSI. + +=item Default Value + +Some device drivers, such as NVIDIA's, detect an inconsistency and do not function when this option is enabled. Therefore the default is false (0). -=item B<seize=BOOLEAN> +=back + +=item B<seize>=I<BOOLEAN> + +=over 4 + +=item Description -Tells B<xl> to automatically attempt to re-assign a device to -pciback if it is not already assigned. +Tells L<xl(1)> to automatically attempt to make the device assignable to +guests if that has not already been done by the B<pci-assignable-add> +command. -B<WARNING:> If you set this option, B<xl> will gladly re-assign a critical +B<WARNING:> If you set this option, L<xl> will gladly re-assign a critical system device, such as a network or a disk controller being used by dom0 without confirmation. Please use with care. -=item B<power_mgmt=BOOLEAN> +=item Default Value + +0 + +=back + +=item B<power_mgmt>=I<BOOLEAN> + +=over 4 + +=item Description B<(HVM only)> Specifies that the VM should be able to program the -D0-D3hot power management states for the PCI device. The default is false (0). +D0-D3hot power management states for the PCI device. + +=item Default Value + +0 -=item B<rdm_policy=STRING> +=back + +=item B<rdm_policy>=I<STRING> + +=over 4 + +=item Description B<(HVM/x86 only)> This is the same as the policy setting inside the B<rdm> -option but just specific to a given device. The default is "relaxed". +option in L<xl.cfg(5)> but just specific to a given device. -Note: this would override global B<rdm> option. +B<NOTE>: This overrides the global B<rdm> option. + +=item Default Value + +"strict" + +=back =back
Signature · 1 line
2.11.0
PATCH v3 16/23 docs/man: fix xl(1) documentation for 'pci' operations
In reply to Paul DurrantFrom: Paul Durrant <[email protected]>
Currently the documentation completely fails to mention the existence of PCI_SPEC_STRING. This patch tidies things up, specifically clarifying that 'pci-assignable-add/remove' take <BDF> arguments where as 'pci-attach/detach' take <PCI_SPEC_STRING> arguments (which will be enforced in a subsequent patch).
---
Cc: Ian Jackson <[email protected]>
Cc: Wei Liu <[email protected]>
--- docs/man/xl.1.pod.in | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-)
docs/man/xl.1.pod.in +17 -11
@@ -1597,14 +1597,18 @@ List virtual network interfaces for a domain. =item B<pci-assignable-list> -List all the assignable PCI devices. +List all the B<BDF> of assignable PCI devices. See +L<xl-pci-configuration(5)> for more information. + These are devices in the system which are configured to be available for passthrough and are bound to a suitable PCI backend driver in domain 0 rather than a real driver. =item B<pci-assignable-add> I<BDF> -Make the device at PCI Bus/Device/Function BDF assignable to guests. +Make the device at B<BDF> assignable to guests. See +L<xl-pci-configuration(5)> for more information. + This will bind the device to the pciback driver and assign it to the "quarantine domain". If it is already bound to a driver, it will first be unbound, and the original driver stored so that it can be
@@ -1620,8 +1624,10 @@ being used. =item B<pci-assignable-remove> [I<-r>] I<BDF> -Make the device at PCI Bus/Device/Function BDF not assignable to -guests. This will at least unbind the device from pciback, and +Make the device at B<BDF> not assignable to guests. See +L<xl-pci-configuration(5)> for more information. + +This will at least unbind the device from pciback, and re-assign it from the "quarantine domain" back to domain 0. If the -r option is specified, it will also attempt to re-bind the device to its original driver, making it usable by Domain 0 again. If the device is
@@ -1637,15 +1643,15 @@ As always, this should only be done if you trust the guest, or are confident that the particular device you're re-assigning to dom0 will cancel all in-flight DMA on FLR. -=item B<pci-attach> I<domain-id> I<BDF> +=item B<pci-attach> I<domain-id> I<PCI_SPEC_STRING> -Hot-plug a new pass-through pci device to the specified domain. -B<BDF> is the PCI Bus/Device/Function of the physical device to pass-through. +Hot-plug a new pass-through pci device to the specified domain. See +L<xl-pci-configuration(5)> for more information. -=item B<pci-detach> [I<OPTIONS>] I<domain-id> I<BDF> +=item B<pci-detach> [I<OPTIONS>] I<domain-id> I<PCI_SPEC_STRING> -Hot-unplug a previously assigned pci device from a domain. B<BDF> is the PCI -Bus/Device/Function of the physical device to be removed from the guest domain. +Hot-unplug a pci device that was previously passed through to a domain. See +L<xl-pci-configuration(5)> for more information. B<OPTIONS>
@@ -1660,7 +1666,7 @@ even without guest domain's collaboration. =item B<pci-list> I<domain-id> -List pass-through pci devices for a domain. +List the B<BDF> of pci devices passed through to a domain. =back
Signature · 1 line
2.11.0
PATCH v3 17/23 libxl: introduce 'libxl_pci_bdf' in the idl...
In reply to Paul DurrantFrom: Paul Durrant <[email protected]>
... and use in 'libxl_device_pci'
This patch is preparatory work for restricting the type passed to functions that only require BDF information, rather than passing a 'libxl_device_pci' structure which is only partially filled. In this patch only the minimal mechanical changes necessary to deal with the structural changes are made. Subsequent patches will adjust the code to make better use of the new type.
---
Cc: George Dunlap <[email protected]>
Cc: Nick Rosbrook <[email protected]>
Cc: Ian Jackson <[email protected]>
Cc: Wei Liu <[email protected]>
Cc: Anthony PERARD <[email protected]>
--- tools/golang/xenlight/helpers.gen.go | 77 ++++++++++++------ tools/golang/xenlight/types.gen.go | 8 +- tools/include/libxl.h | 6 ++ tools/libs/light/libxl_dm.c | 8 +- tools/libs/light/libxl_internal.h | 3 +- tools/libs/light/libxl_pci.c | 148 +++++++++++++++++------------------ tools/libs/light/libxl_types.idl | 16 ++-- tools/libs/util/libxlu_pci.c | 8 +- tools/xl/xl_pci.c | 6 +- tools/xl/xl_sxp.c | 4 +- 10 files changed, 167 insertions(+), 117 deletions(-)
tools/golang/xenlight/helpers.gen.go +55 -22
@@ -1999,6 +1999,41 @@ xc.colo_checkpoint_port = C.CString(x.ColoCheckpointPort)} return nil } +// NewPciBdf returns an instance of PciBdf initialized with defaults. +func NewPciBdf() (*PciBdf, error) { +var ( +x PciBdf +xc C.libxl_pci_bdf) + +C.libxl_pci_bdf_init(&xc) +defer C.libxl_pci_bdf_dispose(&xc) + +if err := x.fromC(&xc); err != nil { +return nil, err } + +return &x, nil} + +func (x *PciBdf) fromC(xc *C.libxl_pci_bdf) error { + x.Func = byte(xc._func) +x.Dev = byte(xc.dev) +x.Bus = byte(xc.bus) +x.Domain = int(xc.domain) + + return nil} + +func (x *PciBdf) toC(xc *C.libxl_pci_bdf) (err error){defer func(){ +if err != nil{ +C.libxl_pci_bdf_dispose(xc)} +}() + +xc._func = C.uint8_t(x.Func) +xc.dev = C.uint8_t(x.Dev) +xc.bus = C.uint8_t(x.Bus) +xc.domain = C.int(x.Domain) + + return nil + } + // NewDevicePci returns an instance of DevicePci initialized with defaults. func NewDevicePci() (*DevicePci, error) { var (
@@ -2014,10 +2049,9 @@ return nil, err } return &x, nil} func (x *DevicePci) fromC(xc *C.libxl_device_pci) error { - x.Func = byte(xc._func) -x.Dev = byte(xc.dev) -x.Bus = byte(xc.bus) -x.Domain = int(xc.domain) + if err := x.Bdf.fromC(&xc.bdf);err != nil { +return fmt.Errorf("converting field Bdf: %v", err) +} x.Vdevfn = uint32(xc.vdevfn) x.VfuncMask = uint32(xc.vfunc_mask) x.Msitranslate = bool(xc.msitranslate)
@@ -2033,10 +2067,9 @@ if err != nil{ C.libxl_device_pci_dispose(xc)} }() -xc._func = C.uint8_t(x.Func) -xc.dev = C.uint8_t(x.Dev) -xc.bus = C.uint8_t(x.Bus) -xc.domain = C.int(x.Domain) +if err := x.Bdf.toC(&xc.bdf); err != nil { +return fmt.Errorf("converting field Bdf: %v", err) +} xc.vdevfn = C.uint32_t(x.Vdevfn) xc.vfunc_mask = C.uint32_t(x.VfuncMask) xc.msitranslate = C.bool(x.Msitranslate)
@@ -2766,13 +2799,13 @@ if err := x.Nics[i].fromC(&v); err != nil { return fmt.Errorf("converting field Nics: %v", err) } } } -x.Pcidevs = nil -if n := int(xc.num_pcidevs); n > 0 { -cPcidevs := (*[1<<28]C.libxl_device_pci)(unsafe.Pointer(xc.pcidevs))[:n:n] -x.Pcidevs = make([]DevicePci, n) -for i, v := range cPcidevs { -if err := x.Pcidevs[i].fromC(&v); err != nil { -return fmt.Errorf("converting field Pcidevs: %v", err) } +x.Pcis = nil +if n := int(xc.num_pcis); n > 0 { +cPcis := (*[1<<28]C.libxl_device_pci)(unsafe.Pointer(xc.pcis))[:n:n] +x.Pcis = make([]DevicePci, n) +for i, v := range cPcis { +if err := x.Pcis[i].fromC(&v); err != nil { +return fmt.Errorf("converting field Pcis: %v", err) } } } x.Rdms = nil
@@ -2922,13 +2955,13 @@ return fmt.Errorf("converting field Nics: %v", err) } } } -if numPcidevs := len(x.Pcidevs); numPcidevs > 0 { -xc.pcidevs = (*C.libxl_device_pci)(C.malloc(C.ulong(numPcidevs)*C.sizeof_libxl_device_pci)) -xc.num_pcidevs = C.int(numPcidevs) -cPcidevs := (*[1<<28]C.libxl_device_pci)(unsafe.Pointer(xc.pcidevs))[:numPcidevs:numPcidevs] -for i,v := range x.Pcidevs { -if err := v.toC(&cPcidevs[i]); err != nil { -return fmt.Errorf("converting field Pcidevs: %v", err) +if numPcis := len(x.Pcis); numPcis > 0 { +xc.pcis = (*C.libxl_device_pci)(C.malloc(C.ulong(numPcis)*C.sizeof_libxl_device_pci)) +xc.num_pcis = C.int(numPcis) +cPcis := (*[1<<28]C.libxl_device_pci)(unsafe.Pointer(xc.pcis))[:numPcis:numPcis] +for i,v := range x.Pcis { +if err := v.toC(&cPcis[i]); err != nil { +return fmt.Errorf("converting field Pcis: %v", err) } } }
tools/golang/xenlight/types.gen.go +6 -2
@@ -707,11 +707,15 @@ ColoCheckpointHost string ColoCheckpointPort string } -type DevicePci struct { +type PciBdf struct { Func byte Dev byte Bus byte Domain int +} + +type DevicePci struct { +Bdf PciBdf Vdevfn uint32 VfuncMask uint32 Msitranslate bool
@@ -896,7 +900,7 @@ CInfo DomainCreateInfo BInfo DomainBuildInfo Disks []DeviceDisk Nics []DeviceNic -Pcidevs []DevicePci +Pcis []DevicePci Rdms []DeviceRdm Dtdevs []DeviceDtdev Vfbs []DeviceVfb
tools/include/libxl.h +6 -0
@@ -464,6 +464,12 @@#define LIBXL_HAVE_DEVICE_PCI_ASSIGNABLE_LIST_FREE 1/* +* LIBXL_HAVE_PCI_BDF indicates that the 'libxl_pci_bdf' type is defined +* is embedded in the 'libxl_device_pci' type. +*/ +#define LIBXL_HAVE_PCI_BDF 1 + +/* * libxl ABI compatibility * * The only guarantee which libxl makes regarding ABI compatibility
tools/libs/light/libxl_dm.c +4 -4
@@ -472,10 +472,10 @@ int libxl__domain_device_construct_rdm(libxl__gc *gc,for (i =0 ; i < d_config->num_pcis; i++) {unsigned int n, nr_entries; - seg = d_config->pcis[i].domain; - bus = d_config->pcis[i].bus; - devfn =PCI_DEVFN (d_config->pcis[i].dev, - d_config->pcis[i].func); + seg = d_config->pcis[i].bdf.domain; + bus = d_config->pcis[i].bdf.bus; + devfn =PCI_DEVFN (d_config->pcis[i].bdf.dev, + d_config->pcis[i].bdf.func); nr_entries =0 ; rc =libxl__xc_device_get_rdm (gc,0 , seg, bus, devfn, &nr_entries, &xrdm);
tools/libs/light/libxl_internal.h +2 -1
@@ -4746,10 +4746,11 @@ void libxl__xcinfo2xlinfo(libxl_ctx *ctx,* devices have same identifier. */ #define COMPARE_DEVID (a, b) ((a)->devid == (b)->devid)#define COMPARE_DISK (a, b) (!strcmp((a)->vdev, (b)->vdev)) -#define COMPARE_PCI (a, b) ((a)->domain == (b)->domain && \ +#define COMPARE_BDF (a, b) ((a)->domain == (b)->domain && \ (a)->bus == (b)->bus && \ (a)->dev == (b)->dev && \ (a)->func == (b)->func) +#define COMPARE_PCI (a, b) COMPARE_BDF(&((a)->bdf), &((b)->bdf))#define COMPARE_USB (a, b) ((a)->ctrl == (b)->ctrl && \ (a)->port == (b)->port)#define COMPARE_USBCTRL (a, b) ((a)->devid == (b)->devid)
tools/libs/light/libxl_pci.c +74 -74
402 lines not on this page · raw message
tools/libs/light/libxl_types.idl +10 -6
@@ -769,18 +769,22 @@ libxl_device_nic = Struct("device_nic", [ ("colo_checkpoint_port", string) ]) +libxl_pci_bdf = Struct("pci_bdf", [ + ("func", uint8), + ("dev", uint8), + ("bus", uint8), + ("domain", integer), + ]) + libxl_device_pci = Struct("device_pci", [ - ("func", uint8), - ("dev", uint8), - ("bus", uint8), - ("domain", integer), - ("vdevfn", uint32), + ("bdf", libxl_pci_bdf), + ("vdevfn", uint32), ("vfunc_mask", uint32), ("msitranslate", bool), ("power_mgmt", bool), ("permissive", bool), ("seize", bool), - ("rdm_policy", libxl_rdm_reserve_policy), + ("rdm_policy", libxl_rdm_reserve_policy), ]) libxl_device_rdm = Struct("device_rdm", [
tools/libs/util/libxlu_pci.c +4 -4
@@ -27,10 +27,10 @@ static int pci_struct_fill(libxl_device_pci *pci, unsigned int domain, unsigned int bus, unsigned int dev, unsigned int func, unsigned int vdevfn) { - pci->domain = domain; - pci->bus = bus; - pci->dev = dev; - pci->func = func; + pci->bdf.domain = domain; + pci->bdf.bus = bus; + pci->bdf.dev = dev; + pci->bdf.func = func; pci->vdevfn = vdevfn;return 0 ; }
tools/xl/xl_pci.c +4 -2
@@ -34,7 +34,8 @@ static void pcilist(uint32_t domid)for (i =0 ; i < num; i++) {printf ("%02x.%01x %04x:%02x:%02x.%01x\n" , (pcis[i].vdevfn >>3 ) &0x1f , pcis[i].vdevfn &0x7 , - pcis[i].domain, pcis[i].bus, pcis[i].dev, pcis[i].func); + pcis[i].bdf.domain, pcis[i].bdf.bus, pcis[i].bdf.dev, + pcis[i].bdf.func); }libxl_device_pci_list_free (pcis, num); }
@@ -163,7 +164,8 @@ static void pciassignable_list(void)return ;for (i =0 ; i < num; i++) {printf ("%04x:%02x:%02x.%01x\n" , - pcis[i].domain, pcis[i].bus, pcis[i].dev, pcis[i].func); + pcis[i].bdf.domain, pcis[i].bdf.bus, pcis[i].bdf.dev, + pcis[i].bdf.func); }libxl_device_pci_assignable_list_free (pcis, num); }
tools/xl/xl_sxp.c +2 -2
@@ -194,8 +194,8 @@ void printf_info_sexp(int domid, libxl_domain_config *d_config, FILE *fh)fprintf (fh,"\t(device\n" );fprintf (fh,"\t\t(pci\n" );fprintf (fh,"\t\t\t(pci dev %04x:%02x:%02x.%01x@%02x)\n" , - d_config->pcis[i].domain, d_config->pcis[i].bus, - d_config->pcis[i].dev, d_config->pcis[i].func, + d_config->pcis[i].bdf.domain, d_config->pcis[i].bdf.bus, + d_config->pcis[i].bdf.dev, d_config->pcis[i].bdf.func, d_config->pcis[i].vdevfn); fprintf(fh, "\t\t\t(opts msitranslate %d power_mgmt %d)\n", d_config->pcis[i].msitranslate,
Signature · 1 line
2.11.0
PATCH v3 18/23 libxlu: introduce xlu_pci_parse_spec_string()
In reply to Paul DurrantFrom: Paul Durrant <[email protected]>
This patch largely re-writes the code to parse a PCI_SPEC_STRING and enters it via the newly introduced function. The new parser also deals with 'bdf' and 'vslot' as non-positional paramaters, as per the documentation in xl-pci-configuration(5).
The existing xlu_pci_parse_bdf() function remains, but now strictly parses BDF values. Some existing callers of xlu_pci_parse_bdf() are modified to call xlu_pci_parse_spec_string() as per the documentation in xl(1).
NOTE: Usage text in xl_cmdtable.c and error messages are also modified
appropriately.
---
Cc: Ian Jackson <[email protected]>
Cc: Wei Liu <[email protected]>
Cc: Anthony PERARD <[email protected]>
--- tools/include/libxlutil.h | 8 +- tools/libs/util/libxlu_pci.c | 354 +++++++++++++++++++++++-------------------- tools/xl/xl_cmdtable.c | 4 +- tools/xl/xl_parse.c | 4 +- tools/xl/xl_pci.c | 37 +++-- 5 files changed, 220 insertions(+), 187 deletions(-)
tools/include/libxlutil.h +7 -1
@@ -109,9 +109,15 @@ int xlu_disk_parse(XLU_Config *cfg, int nspecs, const char *const *specs,*/ /* +* PCI BDF +*/ +int xlu_pci_parse_bdf (XLU_Config *cfg,libxl_pci_bdf *bdf,const char *str); + +/* * PCI specification parsing */ -int xlu_pci_parse_bdf (XLU_Config *cfg,libxl_device_pci *pcidev,const char *str); +int xlu_pci_parse_spec_string (XLU_Config *cfg,libxl_device_pci *pci, +const char *str);/* * RDM parsing
tools/libs/util/libxlu_pci.c +191 -163
402 lines not on this page · raw message
tools/xl/xl_cmdtable.c +2 -2
@@ -90,12 +90,12 @@ struct cmd_spec cmd_table[] = { {"pci-attach" , &main_pciattach,0 ,1 ,"Insert a new pass-through pci device" , -"<Domain> <BDF> [Virtual Slot]" , +"<Domain> <PCI_SPEC_STRING>" , }, { "pci-detach", &main_pcidetach,0 ,1 ,"Remove a domain's pass-through pci device" , -"<Domain> <BDF>" , +"<Domain> <PCI_SPEC_STRING>" , }, { "pci-list", &main_pcilist, 0, 0,
tools/xl/xl_parse.c +2 -2
@@ -1487,10 +1487,10 @@ void parse_config_data(const char *config_source,* the global policy by default. */ pci->rdm_policy = b_info->u.hvm.rdm.policy; - e =xlu_pci_parse_bdf (config, pci, buf); + e =xlu_pci_parse_spec_string (config, pci, buf);if (e) {fprintf (stderr, -"unable to parse PCI BDF `%s' for passthrough\n" , +"unable to parse PCI_SPEC_STRING `%s' for passthrough\n" , buf);exit (-e); }
tools/xl/xl_pci.c +18 -19
@@ -55,7 +55,7 @@ int main_pcilist(int argc, char **argv)return 0 ; } -static int pcidetach (uint32_t domid,const char *bdf,int force) +static int pcidetach (uint32_t domid,const char *spec_string,int force) {libxl_device_pci pci;XLU_Config *config;
@@ -66,8 +66,9 @@ static int pcidetach(uint32_t domid, const char *bdf, int force) config =xlu_cfg_init (stderr,"command line" );if (!config) {perror ("xlu_cfg_inig" );exit (-1 ); } -if (xlu_pci_parse_bdf (config, &pci, bdf)) { -fprintf (stderr,"pci-detach: malformed BDF specification \"%s\"\n" , bdf); +if (xlu_pci_parse_spec_string (config, &pci, spec_string)) { +fprintf (stderr,"pci-detach: malformed PCI_SPEC_STRING \"%s\"\n" , + spec_string);exit (2 ); }if (force) {
@@ -89,7 +90,7 @@ int main_pcidetach(int argc, char **argv)uint32_t domid;int opt;int force =0 ; -const char *bdf =NULL ; +const char *spec_string =NULL ; SWITCH_FOREACH_OPT(opt, "f", NULL, "pci-detach", 2) {case 'f' :
@@ -98,15 +99,15 @@ int main_pcidetach(int argc, char **argv) } domid =find_domain (argv[optind]); - bdf = argv[optind +1 ]; + spec_string = argv[optind +1 ]; -if (pcidetach (domid, bdf, force)) +if (pcidetach (domid, spec_string, force))return EXIT_FAILURE ;return EXIT_SUCCESS ; } -static int pciattach (uint32_t domid,const char *bdf,const char *vs) +static int pciattach (uint32_t domid,const char *spec_string) {libxl_device_pci pci;XLU_Config *config;
@@ -117,8 +118,9 @@ static int pciattach(uint32_t domid, const char *bdf, const char *vs) config =xlu_cfg_init (stderr,"command line" );if (!config) {perror ("xlu_cfg_inig" );exit (-1 ); } -if (xlu_pci_parse_bdf (config, &pci, bdf)) { -fprintf (stderr,"pci-attach: malformed BDF specification \"%s\"\n" , bdf); +if (xlu_pci_parse_spec_string (config, &pci, spec_string)) { +fprintf (stderr,"pci-attach: malformed PCI_SPEC_STRING \"%s\"\n" , + spec_string);exit (2 ); }
@@ -135,19 +137,16 @@ int main_pciattach(int argc, char **argv) {uint32_t domid;int opt; -const char *bdf =NULL , *vs =NULL ; +const char *spec_string =NULL ; SWITCH_FOREACH_OPT(opt, "", NULL, "pci-attach", 2) {/* No options */ } domid =find_domain (argv[optind]); - bdf = argv[optind +1 ]; - -if (optind +1 < argc) - vs = argv[optind +2 ]; + spec_string = argv[optind +1 ]; -if (pciattach (domid, bdf, vs)) +if (pciattach (domid, spec_string))return EXIT_FAILURE ;return EXIT_SUCCESS ;
@@ -193,8 +192,8 @@ static int pciassignable_add(const char *bdf, int rebind) config =xlu_cfg_init (stderr,"command line" );if (!config) {perror ("xlu_cfg_init" );exit (-1 ); } -if (xlu_pci_parse_bdf (config, &pci, bdf)) { -fprintf (stderr,"pci-assignable-add: malformed BDF specification \"%s\"\n" , bdf); +if (xlu_pci_parse_bdf (config, &pci.bdf, bdf)) { +fprintf (stderr,"pci-assignable-add: malformed BDF \"%s\"\n" , bdf);exit (2 ); }
@@ -235,8 +234,8 @@ static int pciassignable_remove(const char *bdf, int rebind) config =xlu_cfg_init (stderr,"command line" );if (!config) {perror ("xlu_cfg_init" );exit (-1 ); } -if (xlu_pci_parse_bdf (config, &pci, bdf)) { -fprintf (stderr,"pci-assignable-remove: malformed BDF specification \"%s\"\n" , bdf); +if (xlu_pci_parse_bdf (config, &pci.bdf, bdf)) { +fprintf (stderr,"pci-assignable-remove: malformed BDF \"%s\"\n" , bdf);exit (2 ); }
Signature · 1 line
2.11.0
PATCH v3 19/23 libxl: modify libxl_device_pci_assignable_add/remove/list/list_free()...
In reply to Paul DurrantFrom: Paul Durrant <[email protected]>
... to use 'libxl_pci_bdf' rather than 'libxl_device_pci'.
This patch modifies the API and callers accordingly. It also modifies several internal functions in libxl_pci.c that support the API to also use 'libxl_pci_bdf'.
NOTE: The OCaml bindings are adjusted to contain the interface change. It
should therefore not affect compatibility with OCaml-based utilities.
---
Cc: Ian Jackson <[email protected]>
Cc: Wei Liu <[email protected]>
Cc: Christian Lindig <[email protected]>
Cc: David Scott <[email protected]>
Cc: Anthony PERARD <[email protected]>
--- tools/include/libxl.h | 15 ++- tools/libs/light/libxl_pci.c | 215 +++++++++++++++++++---------------- tools/ocaml/libs/xl/xenlight_stubs.c | 15 ++- tools/xl/xl_pci.c | 32 +++--- 4 files changed, 157 insertions(+), 120 deletions(-)
tools/include/libxl.h +11 -4
@@ -470,6 +470,13 @@#define LIBXL_HAVE_PCI_BDF 1/* +* LIBXL_HAVE_PCI_ASSIGNABLE_BDF indicates that the +* libxl_device_pci_assignable_add/remove/list/list_free() functions all +* use the 'libxl_pci_bdf' type rather than 'libxl_device_pci' type. +*/ +#define LIBXL_HAVE_PCI_ASSIGNABLE_BDF 1 + +/* * libxl ABI compatibility * * The only guarantee which libxl makes regarding ABI compatibility
@@ -2378,10 +2385,10 @@ int libxl_device_events_handler(libxl_ctx *ctx,* added or is not bound, the functions will emit a warning but return * SUCCESS. */ -int libxl_device_pci_assignable_add (libxl_ctx *ctx,libxl_device_pci *pci,int rebind); -int libxl_device_pci_assignable_remove (libxl_ctx *ctx,libxl_device_pci *pci,int rebind); -libxl_device_pci *libxl_device_pci_assignable_list (libxl_ctx *ctx,int *num); -void libxl_device_pci_assignable_list_free (libxl_device_pci *list,int num); +int libxl_device_pci_assignable_add (libxl_ctx *ctx,libxl_pci_bdf *pcibdf,int rebind); +int libxl_device_pci_assignable_remove (libxl_ctx *ctx,libxl_pci_bdf *pcibdf,int rebind); +libxl_pci_bdf *libxl_device_pci_assignable_list (libxl_ctx *ctx,int *num); +void libxl_device_pci_assignable_list_free (libxl_pci_bdf *list,int num);/* CPUID handling */ int libxl_cpuid_parse_config (libxl_cpuid_policy_list *cpuid,const char * str);
tools/libs/light/libxl_pci.c +119 -96
542 lines not on this page · raw message
tools/ocaml/libs/xl/xenlight_stubs.c +11 -4
@@ -840,7 +840,7 @@ value stub_xl_device_pci_assignable_add(value ctx, value info, value rebind)device_pci_val (CTX , &c_info, info);caml_enter_blocking_section (); - ret =libxl_device_pci_assignable_add (CTX , &c_info, c_rebind); + ret =libxl_device_pci_assignable_add (CTX , &c_info.bdf, c_rebind);caml_leave_blocking_section ();libxl_device_pci_dispose (&c_info);
@@ -861,7 +861,7 @@ value stub_xl_device_pci_assignable_remove(value ctx, value info, value rebind)device_pci_val (CTX , &c_info, info);caml_enter_blocking_section (); - ret =libxl_device_pci_assignable_remove (CTX , &c_info, c_rebind); + ret =libxl_device_pci_assignable_remove (CTX , &c_info.bdf, c_rebind);caml_leave_blocking_section ();libxl_device_pci_dispose (&c_info);
@@ -876,7 +876,7 @@ value stub_xl_device_pci_assignable_list(value ctx) {CAMLparam1 (ctx);CAMLlocal2 (list, temp); -libxl_device_pci *c_list; +libxl_pci_bdf *c_list;int i, nb;uint32_t c_domid;
@@ -889,11 +889,18 @@ value stub_xl_device_pci_assignable_list(value ctx) list = temp = Val_emptylist;for (i =0 ; i < nb; i++) { +libxl_device_pci pci; + +libxl_device_pci_init (&pci); +libxl_pci_bdf_copy (CTX , &pci.bdf, &c_list[i]); + list =caml_alloc_small (2 , Tag_cons);Field (list,0 ) =Val_int (0 );Field (list,1 ) = temp; temp = list; -Store_field (list,0 ,Val_device_pci (&c_list[i])); +Store_field (list,0 ,Val_device_pci (&pci)); + +libxl_device_pci_dispose (&pci); }libxl_device_pci_assignable_list_free (c_list, nb);
tools/xl/xl_pci.c +16 -16
@@ -154,19 +154,19 @@ int main_pciattach(int argc, char **argv)static void pciassignable_list (void ) { -libxl_device_pci *pcis; +libxl_pci_bdf *pcibdfs;int num, i; - pcis =libxl_device_pci_assignable_list (ctx, &num); + pcibdfs =libxl_device_pci_assignable_list (ctx, &num); -if ( pcis ==NULL ) +if ( pcibdfs ==NULL )return ;for (i =0 ; i < num; i++) {printf ("%04x:%02x:%02x.%01x\n" , - pcis[i].bdf.domain, pcis[i].bdf.bus, pcis[i].bdf.dev, - pcis[i].bdf.func); + pcibdfs[i].domain, pcibdfs[i].bus, pcibdfs[i].dev, + pcibdfs[i].func); } -libxl_device_pci_assignable_list_free (pcis, num); +libxl_device_pci_assignable_list_free (pcibdfs, num); }int main_pciassignable_list (int argc,char **argv)
@@ -183,24 +183,24 @@ int main_pciassignable_list(int argc, char **argv)static int pciassignable_add (const char *bdf,int rebind) { -libxl_device_pci pci; +libxl_pci_bdf pcibdf;XLU_Config *config;int r =0 ; -libxl_device_pci_init (&pci); +libxl_pci_bdf_init (&pcibdf); config =xlu_cfg_init (stderr,"command line" );if (!config) {perror ("xlu_cfg_init" );exit (-1 ); } -if (xlu_pci_parse_bdf (config, &pci.bdf, bdf)) { +if (xlu_pci_parse_bdf (config, &pcibdf, bdf)) {fprintf (stderr,"pci-assignable-add: malformed BDF \"%s\"\n" , bdf);exit (2 ); } -if (libxl_device_pci_assignable_add (ctx, &pci, rebind)) +if (libxl_device_pci_assignable_add (ctx, &pcibdf, rebind)) r =1 ; -libxl_device_pci_dispose (&pci); +libxl_pci_bdf_dispose (&pcibdf);xlu_cfg_destroy (config);return r;
@@ -225,24 +225,24 @@ int main_pciassignable_add(int argc, char **argv)static int pciassignable_remove (const char *bdf,int rebind) { -libxl_device_pci pci; +libxl_pci_bdf pcibdf;XLU_Config *config;int r =0 ; -libxl_device_pci_init (&pci); +libxl_pci_bdf_init (&pcibdf); config =xlu_cfg_init (stderr,"command line" );if (!config) {perror ("xlu_cfg_init" );exit (-1 ); } -if (xlu_pci_parse_bdf (config, &pci.bdf, bdf)) { +if (xlu_pci_parse_bdf (config, &pcibdf, bdf)) {fprintf (stderr,"pci-assignable-remove: malformed BDF \"%s\"\n" , bdf);exit (2 ); } -if (libxl_device_pci_assignable_remove (ctx, &pci, rebind)) +if (libxl_device_pci_assignable_remove (ctx, &pcibdf, rebind)) r =1 ; -libxl_device_pci_dispose (&pci); +libxl_pci_bdf_dispose (&pcibdf);xlu_cfg_destroy (config);return r;
Signature · 1 line
2.11.0
PATCH v3 20/23 docs/man: modify xl(1) in preparation for naming of assignable devices
In reply to Paul DurrantFrom: Paul Durrant <[email protected]>
A subsequent patch will introduce code to allow a name to be specified to 'xl pci-assignable-add' such that the assignable device may be referred to by than name in subsequent operations.
---
Cc: Ian Jackson <[email protected]>
Cc: Wei Liu <[email protected]>
--- docs/man/xl.1.pod.in | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)
docs/man/xl.1.pod.in +12 -7
@@ -1595,19 +1595,23 @@ List virtual network interfaces for a domain. =over 4 -=item B<pci-assignable-list> +=item B<pci-assignable-list> [I<-n>] List all the B<BDF> of assignable PCI devices. See -L<xl-pci-configuration(5)> for more information. +L<xl-pci-configuration(5)> for more information. If the -n option is +specified then any name supplied when the device was made assignable +will also be displayed. These are devices in the system which are configured to be available for passthrough and are bound to a suitable PCI backend driver in domain 0 rather than a real driver. -=item B<pci-assignable-add> I<BDF> +=item B<pci-assignable-add> [I<-n NAME>] I<BDF> Make the device at B<BDF> assignable to guests. See -L<xl-pci-configuration(5)> for more information. +L<xl-pci-configuration(5)> for more information. If the -n option is +supplied then the assignable device entry will the named with the +given B<NAME>. This will bind the device to the pciback driver and assign it to the "quarantine domain". If it is already bound to a driver, it will
@@ -1622,10 +1626,11 @@ not to do this on a device critical to domain 0's operation, such as storage controllers, network interfaces, or GPUs that are currently being used. -=item B<pci-assignable-remove> [I<-r>] I<BDF> +=item B<pci-assignable-remove> [I<-r>] I<BDF>|I<NAME> -Make the device at B<BDF> not assignable to guests. See -L<xl-pci-configuration(5)> for more information. +Make a device non-assignable to guests. The device may be identified +either by its B<BDF> or the B<NAME> supplied when the device was made +assignable. See L<xl-pci-configuration(5)> for more information. This will at least unbind the device from pciback, and re-assign it from the "quarantine domain" back to domain 0. If the -r
Signature · 1 line
2.11.0
PATCH v3 21/23 xl / libxl: support naming of assignable devices
In reply to Paul DurrantFrom: Paul Durrant <[email protected]>
This patch modifies libxl_device_pci_assignable_add() to take an optional 'name' argument, which (if supplied) is saved into xenstore and can hence be used to refer to the now-assignable BDF in subsequent operations. To facilitate this, a new libxl_device_pci_assignable_name2bdf() function is added.
The xl code is modified to allow a name to be specified in the 'pci-assignable-add' operation and also allow an option to be specified to 'pci-assignable-list' requesting that names be displayed. The latter is facilitated by a new libxl_device_pci_assignable_bdf2name() function. Finally xl 'pci-assignable-remove' is modified to that either a name or BDF can be supplied. The supplied 'identifier' is first assumed to be a name, but if libxl_device_pci_assignable_name2bdf() fails to find a matching BDF the identifier itself will be parsed as a BDF. Names my only include printable characters and may not include whitespace.
---
Cc: Ian Jackson <[email protected]>
Cc: Wei Liu <[email protected]>
Cc: Christian Lindig <[email protected]>
Cc: David Scott <[email protected]>
Cc: Anthony PERARD <[email protected]>
--- tools/include/libxl.h | 19 +++++++- tools/libs/light/libxl_pci.c | 86 +++++++++++++++++++++++++++++++++--- tools/ocaml/libs/xl/xenlight_stubs.c | 3 +- tools/xl/xl_cmdtable.c | 12 +++-- tools/xl/xl_pci.c | 84 ++++++++++++++++++++++++----------- 5 files changed, 166 insertions(+), 38 deletions(-)
tools/include/libxl.h +17 -2
@@ -477,6 +477,14 @@#define LIBXL_HAVE_PCI_ASSIGNABLE_BDF 1/* +* LIBXL_HAVE_PCI_ASSIGNABLE_NAME indicates that the +* libxl_device_pci_assignable_add() function takes a 'name' argument +* and that the libxl_device_pci_assignable_name2bdf() and +* libxl_device_pci_assignable_bdf2name() functions are defined. +*/ +#define LIBXL_HAVE_PCI_ASSIGNABLE_NAME 1 + +/* * libxl ABI compatibility * * The only guarantee which libxl makes regarding ABI compatibility
@@ -2385,11 +2393,18 @@ int libxl_device_events_handler(libxl_ctx *ctx,* added or is not bound, the functions will emit a warning but return * SUCCESS. */ -int libxl_device_pci_assignable_add (libxl_ctx *ctx,libxl_pci_bdf *pcibdf,int rebind); -int libxl_device_pci_assignable_remove (libxl_ctx *ctx,libxl_pci_bdf *pcibdf,int rebind); +int libxl_device_pci_assignable_add (libxl_ctx *ctx,libxl_pci_bdf *pcibdf, +const char *name,int rebind); +int libxl_device_pci_assignable_remove (libxl_ctx *ctx,libxl_pci_bdf *pcibdf, +int rebind);libxl_pci_bdf *libxl_device_pci_assignable_list (libxl_ctx *ctx,int *num);void libxl_device_pci_assignable_list_free (libxl_pci_bdf *list,int num); +libxl_pci_bdf *libxl_device_pci_assignable_name2bdf (libxl_ctx *ctx, +const char *name); +char *libxl_device_pci_assignable_bdf2name (libxl_ctx *ctx, +libxl_pci_bdf *pcibdf); +/* CPUID handling */ int libxl_cpuid_parse_config (libxl_cpuid_policy_list *cpuid,const char * str); int libxl_cpuid_parse_config_xend(libxl_cpuid_policy_list *cpuid,
tools/libs/light/libxl_pci.c +81 -5
136 lines not on this page · raw message
tools/ocaml/libs/xl/xenlight_stubs.c +2 -1
@@ -840,7 +840,8 @@ value stub_xl_device_pci_assignable_add(value ctx, value info, value rebind)device_pci_val (CTX , &c_info, info);caml_enter_blocking_section (); - ret =libxl_device_pci_assignable_add (CTX , &c_info.bdf, c_rebind); + ret =libxl_device_pci_assignable_add (CTX , &c_info.bdf,NULL , + c_rebind);caml_leave_blocking_section ();libxl_device_pci_dispose (&c_info);
tools/xl/xl_cmdtable.c +8 -4
@@ -105,21 +105,25 @@ struct cmd_spec cmd_table[] = { {"pci-assignable-add" , &main_pciassignable_add,0 ,1 ,"Make a device assignable for pci-passthru" , -"<BDF>" , +"[options] <BDF>" , +"-n NAME, --name=NAME Name the assignable device.\n" "-h Print this help.\n" }, { "pci-assignable-remove", &main_pciassignable_remove,0 ,1 ,"Remove a device from being assignable" , -"[options] <BDF>" , +"[options] <BDF>|NAME" ,"-h Print this help.\n" "-r Attempt to re-assign the device to the\n" -" original driver" +" original driver." }, { "pci-assignable-list", &main_pciassignable_list,0 ,0 ,"List all the assignable pci devices" , -"" , +"[options]" , +"-h Print this help.\n" +"-n, --show-names Display assignable device names where\n" +" supplied.\n" }, { "pause", &main_pause, 0, 1,
tools/xl/xl_pci.c +58 -26
152 lines not on this page · raw message
Signature · 1 line
2.11.0
PATCH v3 22/23 docs/man: modify xl-pci-configuration(5) to add 'name' field to PCI_SPEC_STRING
In reply to Paul DurrantFrom: Paul Durrant <[email protected]>
Since assignable devices can be named, a subsequent patch will support use of a PCI_SPEC_STRING containing a 'name' parameter instead of a 'bdf'. In this case the name will be used to look up the 'bdf' in the list of assignable (or assigned) devices.
---
Cc: Ian Jackson <[email protected]>
Cc: Wei Liu <[email protected]>
--- docs/man/xl-pci-configuration.5.pod | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-)
docs/man/xl-pci-configuration.5.pod +23 -2
@@ -51,7 +51,7 @@ is not specified, or if it is specified with an empty value (whether positionally or explicitly). B<NOTE>: In context of B<xl pci-detach> (see L<xl(1)>), parameters other than -B<bdf> will be ignored. +B<bdf> or B<name> will be ignored. =head1 Positional Parameters
@@ -70,7 +70,11 @@ B<*> to indicate all functions of a multi-function device. =item Default Value -None. This parameter is mandatory as it identifies the device. +None. This parameter is mandatory in its positional form. As a non-positional +parameter it is also mandatory unless a B<name> parameter is present, in +which case B<bdf> must not be present since the B<name> will be used to find +the B<bdf> in the list of assignable devices. See L<xl(1)> for more information +on naming assignable devices. =back
@@ -194,4 +198,21 @@ B<NOTE>: This overrides the global B<rdm> option. =back +=item B<name>=I<STRING> + +=over 4 + +=item Description + +This is the name given when the B<BDF> was made assignable. See L<xl(1)> for +more information on naming assignable devices. + +=item Default Value + +None. This parameter must not be present if a B<bdf> parameter is present. +If a B<bdf> parameter is not present then B<name> is mandatory as it is +required to look up the B<BDF> in the list of assignable devices. + +=back + =back
Signature · 1 line
2.11.0
PATCH v3 23/23 xl / libxl: support 'xl pci-attach/detach' by name
In reply to Paul DurrantFrom: Paul Durrant <[email protected]>
This patch adds a 'name' field into the idl for 'libxl_device_pci' and libxlu_pci_parse_spec_string() is modified to parse the new 'name' parameter of PCI_SPEC_STRING detailed in the updated documention in xl-pci-configuration(5).
If the 'name' field is non-NULL then both libxl_device_pci_add() and libxl_device_pci_remove() will use it to look up the device BDF in the list of assignable devices.
---
Cc: Ian Jackson <[email protected]>
Cc: Wei Liu <[email protected]>
Cc: Anthony PERARD <[email protected]>
--- tools/include/libxl.h | 6 ++++ tools/libs/light/libxl_pci.c | 67 +++++++++++++++++++++++++++++++++++++--- tools/libs/light/libxl_types.idl | 1 + tools/libs/util/libxlu_pci.c | 7 ++++- 4 files changed, 75 insertions(+), 6 deletions(-)
tools/include/libxl.h +6 -0
@@ -485,6 +485,12 @@#define LIBXL_HAVE_PCI_ASSIGNABLE_NAME 1/* +* LIBXL_HAVE_DEVICE_PCI_NAME indicates that the 'name' field of +* libxl_device_pci is defined. +*/ +#define LIBXL_HAVE_DEVICE_PCI_NAME 1 + +/* * libxl ABI compatibility * * The only guarantee which libxl makes regarding ABI compatibility
tools/libs/light/libxl_pci.c +62 -5
109 lines not on this page · raw message
tools/libs/light/libxl_types.idl +1 -0
@@ -778,6 +778,7 @@ libxl_pci_bdf = Struct("pci_bdf", [ libxl_device_pci = Struct("device_pci", [ ("bdf", libxl_pci_bdf), + ("name", string), ("vdevfn", uint32), ("vfunc_mask", uint32), ("msitranslate", bool),
tools/libs/util/libxlu_pci.c +6 -1
@@ -151,6 +151,7 @@ int xlu_pci_parse_spec_string(XLU_Config *cfg, libxl_device_pci *pcidev, {const char *ptr = str;bool bdf_present = false; +bool name_present = false;int ret;/* Attempt to parse 'bdf' as positional parameter */
@@ -193,6 +194,10 @@ int xlu_pci_parse_spec_string(XLU_Config *cfg, libxl_device_pci *pcidev, pcidev->power_mgmt =atoi (val); }else if (!strcmp (key,"rdm_policy" )) { ret =parse_rdm_policy (cfg, &pcidev->rdm_policy, val); + }else if (!strcmp (key,"name" )) { + name_present = true; + pcidev->name =strdup (val); +if (!pcidev->name) ret =ERROR_NOMEM ; }else {XLU__PCI_ERR (cfg,"Unknown PCI_SPEC_STRING option: %s" , key); ret =ERROR_INVAL ;
@@ -205,7 +210,7 @@ int xlu_pci_parse_spec_string(XLU_Config *cfg, libxl_device_pci *pcidev,return ret; } -if (!bdf_present) +if (!(bdf_present ^ name_present))return ERROR_INVAL ;return 0 ;
Signature · 1 line
2.11.0
Quoted 22 lines · Paul Durrant
From: Paul Durrant <[email protected]>
Paul Durrant (23):
xl / libxl: s/pcidev/pci and removeDEFINE_DEVICE_TYPE_STRUCT_X
libxl: makelibxl__device_list()work correctly forLIBXL__DEVICE_KIND_PCI... libxl: Make sure devices added by pci-attach are reflected in the config libxl: add/recover 'rdm_policy' to/from PCI backend in xenstore libxl: s/detatched/detached in libxl_pci.c libxl: remove extraneous arguments to do_pci_remove() in libxl_pci.c libxl: stop using aodev->device_config in libxl__device_pci_add()... libxl: generalise 'driver_path' xenstore access functions in libxl_pci.c libxl: remove unnecessary check from libxl__device_pci_add() libxl: remove get_all_assigned_devices() from libxl_pci.c libxl: make sure callers of libxl_device_pci_list() free the list after use libxl: add libxl_device_pci_assignable_list_free()... libxl: use COMPARE_PCI() macro is_pci_in_array()... docs/man: extract documentation of PCI_SPEC_STRING from the xl.cfg manpage...
Quoted 11 lines
docs/man: improve documentation of
PCI_SPEC_STRING... docs/man: fix xl(1) documentation for 'pci' operations
libxl: introduce 'libxl_pci_bdf' in the idl...
libxlu: introducexlu_pci_parse_spec_string()
libxl: modify
libxl_device_pci_assignable_add/remove/list/list_free()...
docs/man: modify xl(1) in preparation for naming of assignable devices xl / libxl: support naming of assignable devices
docs/man: modify xl-pci-configuration(5) to add 'name' field to
PCI_SPEC_STRING
xl / libxl: support 'xl pci-attach/detach' by name
We're trying to get the CI loop up and running. Its not emailing xen-devel yet, but has found a real error somewhere in this series.
https://gitlab.com/xen-project/patchew/xen/-/pipelines/220153571
~Andrew
Quoted 45 lines
-----Original Message-----
From: Andrew Cooper <[email protected]>
Sent: 23 November 2020 22:18
To: Paul Durrant <[email protected]>; [email protected]
Cc: Paul Durrant <[email protected]>; Anthony PERARD <[email protected]>; Christian Lindig <[email protected]>; David Scott <[email protected]>; George Dunlap <[email protected]>; Ian Jackson <[email protected]>; Nick Rosbrook <[email protected]>; Wei Liu <[email protected]>
Subject: Re: [PATCH v3 00/23] xl / libxl: named PCI pass-through devicesQuoted 22 lines · Paul Durrant
From: Paul Durrant <[email protected]>
Paul Durrant (23):
xl / libxl: s/pcidev/pci and removeDEFINE_DEVICE_TYPE_STRUCT_X
libxl: makelibxl__device_list()work correctly forLIBXL__DEVICE_KIND_PCI... libxl: Make sure devices added by pci-attach are reflected in the config libxl: add/recover 'rdm_policy' to/from PCI backend in xenstore libxl: s/detatched/detached in libxl_pci.c libxl: remove extraneous arguments to do_pci_remove() in libxl_pci.c libxl: stop using aodev->device_config in libxl__device_pci_add()... libxl: generalise 'driver_path' xenstore access functions in libxl_pci.c libxl: remove unnecessary check from libxl__device_pci_add() libxl: remove get_all_assigned_devices() from libxl_pci.c libxl: make sure callers of libxl_device_pci_list() free the list after use libxl: add libxl_device_pci_assignable_list_free()... libxl: use COMPARE_PCI() macro is_pci_in_array()... docs/man: extract documentation of PCI_SPEC_STRING from the xl.cfg manpage...Quoted 11 lines
docs/man: improve documentation of
PCI_SPEC_STRING... docs/man: fix xl(1) documentation for 'pci' operations
libxl: introduce 'libxl_pci_bdf' in the idl...
libxlu: introducexlu_pci_parse_spec_string()
libxl: modify
libxl_device_pci_assignable_add/remove/list/list_free()...
docs/man: modify xl(1) in preparation for naming of assignable devices xl / libxl: support naming of assignable devices
docs/man: modify xl-pci-configuration(5) to add 'name' field to
PCI_SPEC_STRING
xl / libxl: support 'xl pci-attach/detach' by name
Quoted 5 lines
We're trying to get the CI loop up and running. Its not emailing xen-devel yet, but has found a real error somewhere in this series.
https://gitlab.com/xen-project/patchew/xen/-/pipelines/220153571
Found it, thanks...
libxl_pci.c: In function 'libxl_device_pci_assignable_name2bdf':
libxl_pci.c:970:5: error: 'pcibdf' may be used uninitialized in this function [-Werror=maybe-uninitialized]
return pcibdf;
^Odd that my local build (debian 9.13) didn't pick it up. Will send a v4 shortly.
Paul
Quoted 1 line
~Andrew