* [PATCH v2 01/24] xl / libxl: s/pcidev/pci and remove DEFINE_DEVICE_TYPE_STRUCT_X
2020-11-10 17:51 [PATCH v2 00/24] xl / libxl: named PCI pass-through devices Paul Durrant
@ 2020-11-10 17:51 ` Paul Durrant
2020-11-10 17:51 ` [PATCH v2 02/24] libxl: use LIBXL_DEFINE_DEVICE_LIST for pci devices Paul Durrant
` (23 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Paul Durrant @ 2020-11-10 17:51 UTC (permalink / raw)
To: xen-devel; +Cc: Paul Durrant, Ian Jackson, Wei Liu, Anthony PERARD
From: Paul Durrant <pdurrant@amazon.com>
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.
Signed-off-by: Paul Durrant <pdurrant@amazon.com>
---
Cc: Ian Jackson <iwj@xenproject.org>
Cc: Wei Liu <wl@xen.org>
Cc: Anthony PERARD <anthony.perard@citrix.com>
---
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 | 26 +-
tools/xl/xl_pci.c | 68 ++--
tools/xl/xl_sxp.c | 12 +-
10 files changed, 408 insertions(+), 404 deletions(-)
diff --git a/tools/include/libxl.h b/tools/include/libxl.h
index 1ea5b4f446e8..fbe4c81ba511 100644
--- a/tools/include/libxl.h
+++ b/tools/include/libxl.h
@@ -444,6 +444,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
*
@@ -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 */
diff --git a/tools/libs/light/libxl_create.c b/tools/libs/light/libxl_create.c
index 321a13e519b5..1f5052c52033 100644
--- a/tools/libs/light/libxl_create.c
+++ b/tools/libs/light/libxl_create.c
@@ -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,
diff --git a/tools/libs/light/libxl_dm.c b/tools/libs/light/libxl_dm.c
index 3da83259c08e..8ebe1b60c9d7 100644
--- a/tools/libs/light/libxl_dm.c
+++ b/tools/libs/light/libxl_dm.c
@@ -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);
}
}
diff --git a/tools/libs/light/libxl_internal.h b/tools/libs/light/libxl_internal.h
index e26cda9b5045..3e70ff639b3c 100644
--- a/tools/libs/light/libxl_internal.h
+++ b/tools/libs/light/libxl_internal.h
@@ -1709,7 +1709,7 @@ _hidden int libxl__pci_topology_init(libxl__gc *gc,
/* from libxl_pci */
_hidden void libxl__device_pci_add(libxl__egc *egc, uint32_t domid,
- libxl_device_pci *pcidev, bool starting,
+ libxl_device_pci *pci, bool starting,
libxl__ao_device *aodev);
_hidden void libxl__device_pci_destroy_all(libxl__egc *egc, uint32_t domid,
libxl__multidev *);
@@ -3945,30 +3945,27 @@ struct libxl__device_type {
device_set_xenstore_config_fn_t set_xenstore_config;
};
-#define DEFINE_DEVICE_TYPE_STRUCT_X(name, sname, kind, ...) \
- const libxl__device_type libxl__ ## name ## _devtype = { \
- .type = LIBXL__DEVICE_KIND_ ## kind, \
- .ptr_offset = offsetof(libxl_domain_config, name ## s), \
- .num_offset = offsetof(libxl_domain_config, num_ ## name ## s), \
- .dev_elem_size = sizeof(libxl_device_ ## sname), \
- .add = libxl__add_ ## name ## s, \
- .set_default = (device_set_default_fn_t) \
- libxl__device_ ## sname ## _setdefault, \
- .to_device = (device_to_device_fn_t)libxl__device_from_ ## name, \
- .init = (device_init_fn_t)libxl_device_ ## sname ## _init, \
- .copy = (device_copy_fn_t)libxl_device_ ## sname ## _copy, \
- .dispose = (device_dispose_fn_t) \
- libxl_device_ ## sname ## _dispose, \
- .compare = (device_compare_fn_t) \
- libxl_device_ ## sname ## _compare, \
- .update_devid = (device_update_devid_fn_t) \
- libxl__device_ ## sname ## _update_devid, \
- __VA_ARGS__ \
+#define DEFINE_DEVICE_TYPE_STRUCT(name, kind, ...) \
+ const libxl__device_type libxl__ ## name ## _devtype = { \
+ .type = LIBXL__DEVICE_KIND_ ## kind, \
+ .ptr_offset = offsetof(libxl_domain_config, name ## s), \
+ .num_offset = offsetof(libxl_domain_config, num_ ## name ## s), \
+ .dev_elem_size = sizeof(libxl_device_ ## name), \
+ .add = libxl__add_ ## name ## s, \
+ .set_default = (device_set_default_fn_t) \
+ libxl__device_ ## name ## _setdefault, \
+ .to_device = (device_to_device_fn_t)libxl__device_from_ ## name, \
+ .init = (device_init_fn_t)libxl_device_ ## name ## _init, \
+ .copy = (device_copy_fn_t)libxl_device_ ## name ## _copy, \
+ .dispose = (device_dispose_fn_t) \
+ libxl_device_ ## name ## _dispose, \
+ .compare = (device_compare_fn_t) \
+ libxl_device_ ## name ## _compare, \
+ .update_devid = (device_update_devid_fn_t) \
+ libxl__device_ ## name ## _update_devid, \
+ __VA_ARGS__ \
}
-#define DEFINE_DEVICE_TYPE_STRUCT(name, kind, ...) \
- DEFINE_DEVICE_TYPE_STRUCT_X(name, name, kind, __VA_ARGS__)
-
static inline void **libxl__device_type_get_ptr(
const libxl__device_type *dt, const libxl_domain_config *d_config)
{
@@ -3995,7 +3992,7 @@ extern const libxl__device_type libxl__nic_devtype;
extern const libxl__device_type libxl__vtpm_devtype;
extern const libxl__device_type libxl__usbctrl_devtype;
extern const libxl__device_type libxl__usbdev_devtype;
-extern const libxl__device_type libxl__pcidev_devtype;
+extern const libxl__device_type libxl__pci_devtype;
extern const libxl__device_type libxl__vdispl_devtype;
extern const libxl__device_type libxl__p9_devtype;
extern const libxl__device_type libxl__pvcallsif_devtype;
diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c
index bc5843b13701..2ff1c64a3144 100644
--- a/tools/libs/light/libxl_pci.c
+++ b/tools/libs/light/libxl_pci.c
@@ -25,51 +25,51 @@
#define PCI_BDF_XSPATH "%04x-%02x-%02x-%01x"
#define PCI_PT_QDEV_ID "pci-pt-%02x_%02x.%01x"
-static unsigned int pcidev_encode_bdf(libxl_device_pci *pcidev)
+static unsigned int pci_encode_bdf(libxl_device_pci *pci)
{
unsigned int value;
- value = pcidev->domain << 16;
- value |= (pcidev->bus & 0xff) << 8;
- value |= (pcidev->dev & 0x1f) << 3;
- value |= (pcidev->func & 0x7);
+ value = pci->domain << 16;
+ value |= (pci->bus & 0xff) << 8;
+ value |= (pci->dev & 0x1f) << 3;
+ value |= (pci->func & 0x7);
return value;
}
-static void pcidev_struct_fill(libxl_device_pci *pcidev, unsigned int domain,
- unsigned int bus, unsigned int dev,
- unsigned int func, unsigned int vdevfn)
+static void 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;
}
static void libxl_create_pci_backend_device(libxl__gc *gc,
flexarray_t *back,
int num,
- const libxl_device_pci *pcidev)
+ const libxl_device_pci *pci)
{
flexarray_append(back, GCSPRINTF("key-%d", num));
- flexarray_append(back, GCSPRINTF(PCI_BDF, pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func));
+ flexarray_append(back, GCSPRINTF(PCI_BDF, pci->domain, pci->bus, pci->dev, pci->func));
flexarray_append(back, GCSPRINTF("dev-%d", num));
- flexarray_append(back, GCSPRINTF(PCI_BDF, pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func));
- if (pcidev->vdevfn)
- flexarray_append_pair(back, GCSPRINTF("vdevfn-%d", num), GCSPRINTF("%x", pcidev->vdevfn));
+ flexarray_append(back, GCSPRINTF(PCI_BDF, pci->domain, pci->bus, pci->dev, pci->func));
+ if (pci->vdevfn)
+ 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",
- pcidev->msitranslate, pcidev->power_mgmt,
- pcidev->permissive));
+ pci->msitranslate, pci->power_mgmt,
+ pci->permissive));
flexarray_append_pair(back, GCSPRINTF("state-%d", num), GCSPRINTF("%d", XenbusStateInitialising));
}
-static void libxl__device_from_pcidev(libxl__gc *gc, uint32_t domid,
- const libxl_device_pci *pcidev,
- libxl__device *device)
+static void libxl__device_from_pci(libxl__gc *gc, uint32_t domid,
+ const libxl_device_pci *pci,
+ libxl__device *device)
{
device->backend_devid = 0;
device->backend_domid = 0;
@@ -80,7 +80,7 @@ static void libxl__device_from_pcidev(libxl__gc *gc, uint32_t domid,
}
static int libxl__create_pci_backend(libxl__gc *gc, uint32_t domid,
- const libxl_device_pci *pcidev,
+ const libxl_device_pci *pci,
int num)
{
flexarray_t *front = NULL;
@@ -94,15 +94,15 @@ static int libxl__create_pci_backend(libxl__gc *gc, uint32_t domid,
LOGD(DEBUG, domid, "Creating pci backend");
/* add pci device */
- libxl__device_from_pcidev(gc, domid, pcidev, &device);
+ libxl__device_from_pci(gc, domid, pci, &device);
flexarray_append_pair(back, "frontend-id", GCSPRINTF("%d", domid));
flexarray_append_pair(back, "online", "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++, pcidev++)
- libxl_create_pci_backend_device(gc, back, i, pcidev);
+ for (i = 0; i < num; i++, pci++)
+ libxl_create_pci_backend_device(gc, back, i, pci);
flexarray_append_pair(back, "num_devs", GCSPRINTF("%d", num));
flexarray_append_pair(front, "backend-id", GCSPRINTF("%d", 0));
@@ -116,7 +116,7 @@ static int libxl__create_pci_backend(libxl__gc *gc, uint32_t domid,
static int libxl__device_pci_add_xenstore(libxl__gc *gc,
uint32_t domid,
- const libxl_device_pci *pcidev,
+ const libxl_device_pci *pci,
bool starting)
{
flexarray_t *back;
@@ -136,7 +136,7 @@ static int libxl__device_pci_add_xenstore(libxl__gc *gc,
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, pcidev, 1);
+ return libxl__create_pci_backend(gc, domid, pci, 1);
libxl_domain_type domtype = libxl__domain_type(gc, domid);
if (domtype == LIBXL_DOMAIN_TYPE_INVALID)
@@ -151,7 +151,7 @@ static int libxl__device_pci_add_xenstore(libxl__gc *gc,
LOGD(DEBUG, domid, "Adding new pci device to xenstore");
num = atoi(num_devs);
- libxl_create_pci_backend_device(gc, back, num, pcidev);
+ libxl_create_pci_backend_device(gc, back, num, pci);
flexarray_append_pair(back, "num_devs", GCSPRINTF("%d", num + 1));
if (!starting)
flexarray_append_pair(back, "state", GCSPRINTF("%d", XenbusStateReconfiguring));
@@ -170,8 +170,8 @@ static int libxl__device_pci_add_xenstore(libxl__gc *gc,
rc = libxl__get_domain_configuration(gc, domid, &d_config);
if (rc) goto out;
- device_add_domain_config(gc, &d_config, &libxl__pcidev_devtype,
- pcidev);
+ device_add_domain_config(gc, &d_config, &libxl__pci_devtype,
+ pci);
rc = libxl__dm_check_start(gc, &d_config, domid);
if (rc) goto out;
@@ -201,7 +201,7 @@ out:
return rc;
}
-static int libxl__device_pci_remove_xenstore(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev)
+static int libxl__device_pci_remove_xenstore(libxl__gc *gc, uint32_t domid, libxl_device_pci *pci)
{
libxl_ctx *ctx = libxl__gc_owner(gc);
char *be_path, *num_devs_path, *num_devs, *xsdev, *tmp, *tmppath;
@@ -231,8 +231,8 @@ static int libxl__device_pci_remove_xenstore(libxl__gc *gc, uint32_t domid, libx
unsigned int domain = 0, bus = 0, dev = 0, func = 0;
xsdev = libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/dev-%d", be_path, i));
sscanf(xsdev, PCI_BDF, &domain, &bus, &dev, &func);
- if (domain == pcidev->domain && bus == pcidev->bus &&
- pcidev->dev == dev && pcidev->func == func) {
+ if (domain == pci->domain && bus == pci->bus &&
+ pci->dev == dev && pci->func == func) {
break;
}
}
@@ -350,7 +350,7 @@ static int get_all_assigned_devices(libxl__gc *gc, libxl_device_pci **list, int
*list = realloc(*list, sizeof(libxl_device_pci) * ((*num) + 1));
if (*list == NULL)
return ERROR_NOMEM;
- pcidev_struct_fill(*list + *num, dom, bus, dev, func, 0);
+ pci_struct_fill(*list + *num, dom, bus, dev, func, 0);
(*num)++;
}
}
@@ -361,8 +361,8 @@ static int get_all_assigned_devices(libxl__gc *gc, libxl_device_pci **list, int
return 0;
}
-static int is_pcidev_in_array(libxl_device_pci *assigned, int num_assigned,
- int dom, int bus, int dev, int func)
+static int is_pci_in_array(libxl_device_pci *assigned, int num_assigned,
+ int dom, int bus, int dev, int func)
{
int i;
@@ -383,7 +383,7 @@ static int is_pcidev_in_array(libxl_device_pci *assigned, int num_assigned,
/* Write the standard BDF into the sysfs path given by sysfs_path. */
static int sysfs_write_bdf(libxl__gc *gc, const char * sysfs_path,
- libxl_device_pci *pcidev)
+ libxl_device_pci *pci)
{
int rc, fd;
char *buf;
@@ -394,8 +394,8 @@ static int sysfs_write_bdf(libxl__gc *gc, const char * sysfs_path,
return ERROR_FAIL;
}
- buf = GCSPRINTF(PCI_BDF, pcidev->domain, pcidev->bus,
- pcidev->dev, pcidev->func);
+ buf = GCSPRINTF(PCI_BDF, pci->domain, pci->bus,
+ pci->dev, pci->func);
rc = write(fd, buf, strlen(buf));
/* Annoying to have two if's, but we need the errno */
if (rc < 0)
@@ -411,7 +411,7 @@ static int sysfs_write_bdf(libxl__gc *gc, const char * sysfs_path,
libxl_device_pci *libxl_device_pci_assignable_list(libxl_ctx *ctx, int *num)
{
GC_INIT(ctx);
- libxl_device_pci *pcidevs = NULL, *new, *assigned;
+ libxl_device_pci *pcis = NULL, *new, *assigned;
struct dirent *de;
DIR *dir;
int r, num_assigned;
@@ -436,40 +436,40 @@ 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_pcidev_in_array(assigned, num_assigned, dom, bus, dev, func))
+ if (is_pci_in_array(assigned, num_assigned, dom, bus, dev, func))
continue;
- new = realloc(pcidevs, ((*num) + 1) * sizeof(*new));
+ new = realloc(pcis, ((*num) + 1) * sizeof(*new));
if (NULL == new)
continue;
- pcidevs = new;
- new = pcidevs + *num;
+ pcis = new;
+ new = pcis + *num;
memset(new, 0, sizeof(*new));
- pcidev_struct_fill(new, dom, bus, dev, func, 0);
+ pci_struct_fill(new, dom, bus, dev, func, 0);
(*num)++;
}
closedir(dir);
out:
GC_FREE;
- return pcidevs;
+ return pcis;
}
/* 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 *pcidev,
+static int sysfs_dev_unbind(libxl__gc *gc, libxl_device_pci *pci,
char **driver_path)
{
char * spath, *dp = NULL;
struct stat st;
spath = GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/driver",
- pcidev->domain,
- pcidev->bus,
- pcidev->dev,
- pcidev->func);
+ pci->domain,
+ pci->bus,
+ pci->dev,
+ pci->func);
if ( !lstat(spath, &st) ) {
/* Find the canonical path to the driver. */
dp = libxl__zalloc(gc, PATH_MAX);
@@ -483,7 +483,7 @@ static int sysfs_dev_unbind(libxl__gc *gc, libxl_device_pci *pcidev,
/* Unbind from the old driver */
spath = GCSPRINTF("%s/unbind", dp);
- if ( sysfs_write_bdf(gc, spath, pcidev) < 0 ) {
+ if ( sysfs_write_bdf(gc, spath, pci) < 0 ) {
LOGE(ERROR, "Couldn't unbind device");
return -1;
}
@@ -495,11 +495,11 @@ static int sysfs_dev_unbind(libxl__gc *gc, libxl_device_pci *pcidev,
return 0;
}
-static uint16_t sysfs_dev_get_vendor(libxl__gc *gc, libxl_device_pci *pcidev)
+static uint16_t sysfs_dev_get_vendor(libxl__gc *gc, libxl_device_pci *pci)
{
char *pci_device_vendor_path =
GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/vendor",
- pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func);
+ pci->domain, pci->bus, pci->dev, pci->func);
uint16_t read_items;
uint16_t pci_device_vendor;
@@ -507,7 +507,7 @@ static uint16_t sysfs_dev_get_vendor(libxl__gc *gc, libxl_device_pci *pcidev)
if (!f) {
LOGE(ERROR,
"pci device "PCI_BDF" does not have vendor attribute",
- pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func);
+ pci->domain, pci->bus, pci->dev, pci->func);
return 0xffff;
}
read_items = fscanf(f, "0x%hx\n", &pci_device_vendor);
@@ -515,18 +515,18 @@ static uint16_t sysfs_dev_get_vendor(libxl__gc *gc, libxl_device_pci *pcidev)
if (read_items != 1) {
LOGE(ERROR,
"cannot read vendor of pci device "PCI_BDF,
- pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func);
+ pci->domain, pci->bus, pci->dev, pci->func);
return 0xffff;
}
return pci_device_vendor;
}
-static uint16_t sysfs_dev_get_device(libxl__gc *gc, libxl_device_pci *pcidev)
+static uint16_t sysfs_dev_get_device(libxl__gc *gc, libxl_device_pci *pci)
{
char *pci_device_device_path =
GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/device",
- pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func);
+ pci->domain, pci->bus, pci->dev, pci->func);
uint16_t read_items;
uint16_t pci_device_device;
@@ -534,7 +534,7 @@ static uint16_t sysfs_dev_get_device(libxl__gc *gc, libxl_device_pci *pcidev)
if (!f) {
LOGE(ERROR,
"pci device "PCI_BDF" does not have device attribute",
- pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func);
+ pci->domain, pci->bus, pci->dev, pci->func);
return 0xffff;
}
read_items = fscanf(f, "0x%hx\n", &pci_device_device);
@@ -542,25 +542,25 @@ static uint16_t sysfs_dev_get_device(libxl__gc *gc, libxl_device_pci *pcidev)
if (read_items != 1) {
LOGE(ERROR,
"cannot read device of pci device "PCI_BDF,
- pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func);
+ pci->domain, pci->bus, pci->dev, pci->func);
return 0xffff;
}
return pci_device_device;
}
-static int sysfs_dev_get_class(libxl__gc *gc, libxl_device_pci *pcidev,
+static int sysfs_dev_get_class(libxl__gc *gc, libxl_device_pci *pci,
unsigned long *class)
{
char *pci_device_class_path = GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/class",
- pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func);
+ pci->domain, pci->bus, pci->dev, pci->func);
int read_items, ret = 0;
FILE *f = fopen(pci_device_class_path, "r");
if (!f) {
LOGE(ERROR,
"pci device "PCI_BDF" does not have class attribute",
- pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func);
+ pci->domain, pci->bus, pci->dev, pci->func);
ret = ERROR_FAIL;
goto out;
}
@@ -569,7 +569,7 @@ static int sysfs_dev_get_class(libxl__gc *gc, libxl_device_pci *pcidev,
if (read_items != 1) {
LOGE(ERROR,
"cannot read class of pci device "PCI_BDF,
- pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func);
+ pci->domain, pci->bus, pci->dev, pci->func);
ret = ERROR_FAIL;
}
@@ -588,16 +588,16 @@ bool libxl__is_igd_vga_passthru(libxl__gc *gc,
uint16_t pt_vendor, pt_device;
unsigned long class;
- for (i = 0 ; i < d_config->num_pcidevs ; i++) {
- libxl_device_pci *pcidev = &d_config->pcidevs[i];
- pt_vendor = sysfs_dev_get_vendor(gc, pcidev);
- pt_device = sysfs_dev_get_device(gc, pcidev);
+ for (i = 0 ; i < d_config->num_pcis ; i++) {
+ libxl_device_pci *pci = &d_config->pcis[i];
+ pt_vendor = sysfs_dev_get_vendor(gc, pci);
+ pt_device = sysfs_dev_get_device(gc, pci);
if (pt_vendor == 0xffff || pt_device == 0xffff ||
pt_vendor != 0x8086)
continue;
- if (sysfs_dev_get_class(gc, pcidev, &class))
+ if (sysfs_dev_get_class(gc, pci, &class))
continue;
if (class == 0x030000)
return true;
@@ -621,8 +621,8 @@ bool libxl__is_igd_vga_passthru(libxl__gc *gc,
* already exist.
*/
-/* Scan through /sys/.../pciback/slots looking for pcidev's BDF */
-static int pciback_dev_has_slot(libxl__gc *gc, libxl_device_pci *pcidev)
+/* Scan through /sys/.../pciback/slots looking for pci's BDF */
+static int pciback_dev_has_slot(libxl__gc *gc, libxl_device_pci *pci)
{
FILE *f;
int rc = 0;
@@ -635,11 +635,11 @@ static int pciback_dev_has_slot(libxl__gc *gc, libxl_device_pci *pcidev)
return ERROR_FAIL;
}
- while(fscanf(f, "%x:%x:%x.%d\n", &dom, &bus, &dev, &func)==4) {
- if(dom == pcidev->domain
- && bus == pcidev->bus
- && dev == pcidev->dev
- && func == pcidev->func) {
+ while (fscanf(f, "%x:%x:%x.%d\n", &dom, &bus, &dev, &func)==4) {
+ if (dom == pci->domain
+ && bus == pci->bus
+ && dev == pci->dev
+ && func == pci->func) {
rc = 1;
goto out;
}
@@ -649,7 +649,7 @@ out:
return rc;
}
-static int pciback_dev_is_assigned(libxl__gc *gc, libxl_device_pci *pcidev)
+static int pciback_dev_is_assigned(libxl__gc *gc, libxl_device_pci *pci)
{
char * spath;
int rc;
@@ -665,8 +665,8 @@ static int pciback_dev_is_assigned(libxl__gc *gc, libxl_device_pci *pcidev)
}
spath = GCSPRINTF(SYSFS_PCIBACK_DRIVER"/"PCI_BDF,
- pcidev->domain, pcidev->bus,
- pcidev->dev, pcidev->func);
+ pci->domain, pci->bus,
+ pci->dev, pci->func);
rc = lstat(spath, &st);
if( rc == 0 )
@@ -677,40 +677,40 @@ static int pciback_dev_is_assigned(libxl__gc *gc, libxl_device_pci *pcidev)
return -1;
}
-static int pciback_dev_assign(libxl__gc *gc, libxl_device_pci *pcidev)
+static int pciback_dev_assign(libxl__gc *gc, libxl_device_pci *pci)
{
int rc;
- if ( (rc=pciback_dev_has_slot(gc, pcidev)) < 0 ) {
+ if ( (rc = pciback_dev_has_slot(gc, pci)) < 0 ) {
LOGE(ERROR, "Error checking for pciback slot");
return ERROR_FAIL;
} else if (rc == 0) {
if ( sysfs_write_bdf(gc, SYSFS_PCIBACK_DRIVER"/new_slot",
- pcidev) < 0 ) {
+ pci) < 0 ) {
LOGE(ERROR, "Couldn't bind device to pciback!");
return ERROR_FAIL;
}
}
- if ( sysfs_write_bdf(gc, SYSFS_PCIBACK_DRIVER"/bind", pcidev) < 0 ) {
+ if ( sysfs_write_bdf(gc, SYSFS_PCIBACK_DRIVER"/bind", pci) < 0 ) {
LOGE(ERROR, "Couldn't bind device to pciback!");
return ERROR_FAIL;
}
return 0;
}
-static int pciback_dev_unassign(libxl__gc *gc, libxl_device_pci *pcidev)
+static int pciback_dev_unassign(libxl__gc *gc, libxl_device_pci *pci)
{
/* Remove from pciback */
- if ( sysfs_dev_unbind(gc, pcidev, NULL) < 0 ) {
+ if ( sysfs_dev_unbind(gc, pci, NULL) < 0 ) {
LOG(ERROR, "Couldn't unbind device!");
return ERROR_FAIL;
}
/* Remove slot if necessary */
- if ( pciback_dev_has_slot(gc, pcidev) > 0 ) {
+ if ( pciback_dev_has_slot(gc, pci) > 0 ) {
if ( sysfs_write_bdf(gc, SYSFS_PCIBACK_DRIVER"/remove_slot",
- pcidev) < 0 ) {
+ pci) < 0 ) {
LOGE(ERROR, "Couldn't remove pciback slot");
return ERROR_FAIL;
}
@@ -721,49 +721,49 @@ static int pciback_dev_unassign(libxl__gc *gc, libxl_device_pci *pcidev)
#define PCIBACK_INFO_PATH "/libxl/pciback"
static void pci_assignable_driver_path_write(libxl__gc *gc,
- libxl_device_pci *pcidev,
+ libxl_device_pci *pci,
char *driver_path)
{
char *path;
path = GCSPRINTF(PCIBACK_INFO_PATH"/"PCI_BDF_XSPATH"/driver_path",
- pcidev->domain,
- pcidev->bus,
- pcidev->dev,
- pcidev->func);
+ 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);
}
}
static char * pci_assignable_driver_path_read(libxl__gc *gc,
- libxl_device_pci *pcidev)
+ libxl_device_pci *pci)
{
return libxl__xs_read(gc, XBT_NULL,
GCSPRINTF(
PCIBACK_INFO_PATH "/" PCI_BDF_XSPATH "/driver_path",
- pcidev->domain,
- pcidev->bus,
- pcidev->dev,
- pcidev->func));
+ pci->domain,
+ pci->bus,
+ pci->dev,
+ pci->func));
}
static void pci_assignable_driver_path_remove(libxl__gc *gc,
- libxl_device_pci *pcidev)
+ libxl_device_pci *pci)
{
libxl_ctx *ctx = libxl__gc_owner(gc);
/* Remove the xenstore entry */
xs_rm(ctx->xsh, XBT_NULL,
GCSPRINTF(PCIBACK_INFO_PATH "/" PCI_BDF_XSPATH,
- pcidev->domain,
- pcidev->bus,
- pcidev->dev,
- pcidev->func) );
+ pci->domain,
+ pci->bus,
+ pci->dev,
+ pci->func) );
}
static int libxl__device_pci_assignable_add(libxl__gc *gc,
- libxl_device_pci *pcidev,
+ libxl_device_pci *pci,
int rebind)
{
libxl_ctx *ctx = libxl__gc_owner(gc);
@@ -773,10 +773,10 @@ static int libxl__device_pci_assignable_add(libxl__gc *gc,
struct stat st;
/* Local copy for convenience */
- dom = pcidev->domain;
- bus = pcidev->bus;
- dev = pcidev->dev;
- func = pcidev->func;
+ dom = pci->domain;
+ bus = pci->bus;
+ dev = pci->dev;
+ func = pci->func;
/* See if the device exists */
spath = GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF, dom, bus, dev, func);
@@ -786,7 +786,7 @@ static int libxl__device_pci_assignable_add(libxl__gc *gc,
}
/* Check to see if it's already assigned to pciback */
- rc = pciback_dev_is_assigned(gc, pcidev);
+ rc = pciback_dev_is_assigned(gc, pci);
if ( rc < 0 ) {
return ERROR_FAIL;
}
@@ -796,7 +796,7 @@ static int libxl__device_pci_assignable_add(libxl__gc *gc,
}
/* Check to see if there's already a driver that we need to unbind from */
- if ( sysfs_dev_unbind(gc, pcidev, &driver_path ) ) {
+ if ( sysfs_dev_unbind(gc, pci, &driver_path ) ) {
LOG(ERROR, "Couldn't unbind "PCI_BDF" from driver",
dom, bus, dev, func);
return ERROR_FAIL;
@@ -805,9 +805,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, pcidev, driver_path);
+ pci_assignable_driver_path_write(gc, pci, driver_path);
} else if ( (driver_path =
- pci_assignable_driver_path_read(gc, pcidev)) != NULL ) {
+ pci_assignable_driver_path_read(gc, pci)) != NULL ) {
LOG(INFO, PCI_BDF" not bound to a driver, will be rebound to %s",
dom, bus, dev, func, driver_path);
} else {
@@ -815,10 +815,10 @@ static int libxl__device_pci_assignable_add(libxl__gc *gc,
dom, bus, dev, func);
}
} else {
- pci_assignable_driver_path_remove(gc, pcidev);
+ pci_assignable_driver_path_remove(gc, pci);
}
- if ( pciback_dev_assign(gc, pcidev) ) {
+ if ( pciback_dev_assign(gc, pci) ) {
LOG(ERROR, "Couldn't bind device to pciback!");
return ERROR_FAIL;
}
@@ -829,7 +829,7 @@ quarantine:
* so always pass XEN_DOMCTL_DEV_RDM_RELAXED to avoid assignment being
* unnecessarily denied.
*/
- rc = xc_assign_device(ctx->xch, DOMID_IO, pcidev_encode_bdf(pcidev),
+ rc = xc_assign_device(ctx->xch, DOMID_IO, pci_encode_bdf(pci),
XEN_DOMCTL_DEV_RDM_RELAXED);
if ( rc < 0 ) {
LOG(ERROR, "failed to quarantine "PCI_BDF, dom, bus, dev, func);
@@ -840,7 +840,7 @@ quarantine:
}
static int libxl__device_pci_assignable_remove(libxl__gc *gc,
- libxl_device_pci *pcidev,
+ libxl_device_pci *pci,
int rebind)
{
libxl_ctx *ctx = libxl__gc_owner(gc);
@@ -848,24 +848,24 @@ static int libxl__device_pci_assignable_remove(libxl__gc *gc,
char *driver_path;
/* De-quarantine */
- rc = xc_deassign_device(ctx->xch, DOMID_IO, pcidev_encode_bdf(pcidev));
+ rc = xc_deassign_device(ctx->xch, DOMID_IO, pci_encode_bdf(pci));
if ( rc < 0 ) {
- LOG(ERROR, "failed to de-quarantine "PCI_BDF, pcidev->domain, pcidev->bus,
- pcidev->dev, pcidev->func);
+ LOG(ERROR, "failed to de-quarantine "PCI_BDF, pci->domain, pci->bus,
+ pci->dev, pci->func);
return ERROR_FAIL;
}
/* Unbind from pciback */
- if ( (rc=pciback_dev_is_assigned(gc, pcidev)) < 0 ) {
+ if ( (rc = pciback_dev_is_assigned(gc, pci)) < 0 ) {
return ERROR_FAIL;
} else if ( rc ) {
- pciback_dev_unassign(gc, pcidev);
+ pciback_dev_unassign(gc, pci);
} else {
LOG(WARN, "Not bound to pciback");
}
/* Rebind if necessary */
- driver_path = pci_assignable_driver_path_read(gc, pcidev);
+ driver_path = pci_assignable_driver_path_read(gc, pci);
if ( driver_path ) {
if ( rebind ) {
@@ -873,12 +873,12 @@ static int libxl__device_pci_assignable_remove(libxl__gc *gc,
if ( sysfs_write_bdf(gc,
GCSPRINTF("%s/bind", driver_path),
- pcidev) < 0 ) {
+ pci) < 0 ) {
LOGE(ERROR, "Couldn't bind device to %s", driver_path);
return -1;
}
- pci_assignable_driver_path_remove(gc, pcidev);
+ pci_assignable_driver_path_remove(gc, pci);
}
} else {
if ( rebind ) {
@@ -890,26 +890,26 @@ static int libxl__device_pci_assignable_remove(libxl__gc *gc,
return 0;
}
-int libxl_device_pci_assignable_add(libxl_ctx *ctx, libxl_device_pci *pcidev,
+int libxl_device_pci_assignable_add(libxl_ctx *ctx, libxl_device_pci *pci,
int rebind)
{
GC_INIT(ctx);
int rc;
- rc = libxl__device_pci_assignable_add(gc, pcidev, rebind);
+ rc = libxl__device_pci_assignable_add(gc, pci, rebind);
GC_FREE;
return rc;
}
-int libxl_device_pci_assignable_remove(libxl_ctx *ctx, libxl_device_pci *pcidev,
+int libxl_device_pci_assignable_remove(libxl_ctx *ctx, libxl_device_pci *pci,
int rebind)
{
GC_INIT(ctx);
int rc;
- rc = libxl__device_pci_assignable_remove(gc, pcidev, rebind);
+ rc = libxl__device_pci_assignable_remove(gc, pci, rebind);
GC_FREE;
return rc;
@@ -920,7 +920,7 @@ int libxl_device_pci_assignable_remove(libxl_ctx *ctx, libxl_device_pci *pcidev,
* driver. It also initialises a bit-mask of which function numbers are present
* on that device.
*/
-static int pci_multifunction_check(libxl__gc *gc, libxl_device_pci *pcidev, unsigned int *func_mask)
+static int pci_multifunction_check(libxl__gc *gc, libxl_device_pci *pci, unsigned int *func_mask)
{
struct dirent *de;
DIR *dir;
@@ -940,11 +940,11 @@ static int pci_multifunction_check(libxl__gc *gc, libxl_device_pci *pcidev, unsi
if ( sscanf(de->d_name, PCI_BDF, &dom, &bus, &dev, &func) != 4 )
continue;
- if ( pcidev->domain != dom )
+ if ( pci->domain != dom )
continue;
- if ( pcidev->bus != bus )
+ if ( pci->bus != bus )
continue;
- if ( pcidev->dev != dev )
+ if ( pci->dev != dev )
continue;
path = GCSPRINTF("%s/" PCI_BDF, SYSFS_PCIBACK_DRIVER, dom, bus, dev, func);
@@ -979,7 +979,7 @@ static int pci_ins_check(libxl__gc *gc, uint32_t domid, const char *state, void
}
static int qemu_pci_add_xenstore(libxl__gc *gc, uint32_t domid,
- libxl_device_pci *pcidev)
+ libxl_device_pci *pci)
{
libxl_ctx *ctx = libxl__gc_owner(gc);
int rc = 0;
@@ -991,15 +991,15 @@ static int qemu_pci_add_xenstore(libxl__gc *gc, uint32_t domid,
path = DEVICE_MODEL_XS_PATH(gc, dm_domid, domid, "/state");
state = libxl__xs_read(gc, XBT_NULL, path);
path = DEVICE_MODEL_XS_PATH(gc, dm_domid, domid, "/parameter");
- if (pcidev->vdevfn) {
+ if (pci->vdevfn) {
libxl__xs_printf(gc, XBT_NULL, path, PCI_BDF_VDEVFN","PCI_OPTIONS,
- pcidev->domain, pcidev->bus, pcidev->dev,
- pcidev->func, pcidev->vdevfn, pcidev->msitranslate,
- pcidev->power_mgmt);
+ pci->domain, pci->bus, pci->dev,
+ pci->func, pci->vdevfn, pci->msitranslate,
+ pci->power_mgmt);
} else {
libxl__xs_printf(gc, XBT_NULL, path, PCI_BDF","PCI_OPTIONS,
- pcidev->domain, pcidev->bus, pcidev->dev,
- pcidev->func, pcidev->msitranslate, pcidev->power_mgmt);
+ pci->domain, pci->bus, pci->dev,
+ pci->func, pci->msitranslate, pci->power_mgmt);
}
libxl__qemu_traditional_cmd(gc, domid, "pci-ins");
@@ -1010,7 +1010,7 @@ static int qemu_pci_add_xenstore(libxl__gc *gc, uint32_t domid,
path = DEVICE_MODEL_XS_PATH(gc, dm_domid, domid, "/state");
if ( rc < 0 )
LOGD(ERROR, domid, "qemu refused to add device: %s", vdevfn);
- else if ( sscanf(vdevfn, "0x%x", &pcidev->vdevfn) != 1 ) {
+ else if ( sscanf(vdevfn, "0x%x", &pci->vdevfn) != 1 ) {
LOGD(ERROR, domid, "wrong format for the vdevfn: '%s'", vdevfn);
rc = -1;
}
@@ -1054,7 +1054,7 @@ typedef struct pci_add_state {
libxl__xswait_state xswait;
libxl__ev_qmp qmp;
libxl__ev_time timeout;
- libxl_device_pci *pcidev;
+ libxl_device_pci *pci;
int pci_domid;
} pci_add_state;
@@ -1072,7 +1072,7 @@ static void pci_add_dm_done(libxl__egc *,
static void do_pci_add(libxl__egc *egc,
libxl_domid domid,
- libxl_device_pci *pcidev,
+ libxl_device_pci *pci,
pci_add_state *pas)
{
STATE_AO_GC(pas->aodev->ao);
@@ -1082,7 +1082,7 @@ static void do_pci_add(libxl__egc *egc,
/* init pci_add_state */
libxl__xswait_init(&pas->xswait);
libxl__ev_qmp_init(&pas->qmp);
- pas->pcidev = pcidev;
+ pas->pci = pci;
pas->pci_domid = domid;
libxl__ev_time_init(&pas->timeout);
@@ -1128,7 +1128,7 @@ static void pci_add_qemu_trad_watch_state_cb(libxl__egc *egc,
/* Convenience aliases */
libxl_domid domid = pas->domid;
- libxl_device_pci *pcidev = pas->pcidev;
+ libxl_device_pci *pci = pas->pci;
rc = check_qemu_running(gc, domid, xswa, rc, state);
if (rc == ERROR_NOT_READY)
@@ -1136,7 +1136,7 @@ static void pci_add_qemu_trad_watch_state_cb(libxl__egc *egc,
if (rc)
goto out;
- rc = qemu_pci_add_xenstore(gc, domid, pcidev);
+ rc = qemu_pci_add_xenstore(gc, domid, pci);
out:
pci_add_dm_done(egc, pas, rc); /* must be last */
}
@@ -1149,7 +1149,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 *pcidev = pas->pcidev;
+ libxl_device_pci *pci = pas->pci;
libxl__ev_qmp *const qmp = &pas->qmp;
rc = libxl__ev_time_register_rel(ao, &pas->timeout,
@@ -1160,14 +1160,14 @@ static void pci_add_qmp_device_add(libxl__egc *egc, pci_add_state *pas)
libxl__qmp_param_add_string(gc, &args, "driver",
"xen-pci-passthrough");
QMP_PARAMETERS_SPRINTF(&args, "id", PCI_PT_QDEV_ID,
- pcidev->bus, pcidev->dev, pcidev->func);
+ pci->bus, pci->dev, pci->func);
QMP_PARAMETERS_SPRINTF(&args, "hostaddr",
- "%04x:%02x:%02x.%01x", pcidev->domain,
- pcidev->bus, pcidev->dev, pcidev->func);
- if (pcidev->vdevfn) {
+ "%04x:%02x:%02x.%01x", pci->domain,
+ pci->bus, pci->dev, pci->func);
+ if (pci->vdevfn) {
QMP_PARAMETERS_SPRINTF(&args, "addr", "%x.%x",
- PCI_SLOT(pcidev->vdevfn),
- PCI_FUNC(pcidev->vdevfn));
+ PCI_SLOT(pci->vdevfn),
+ PCI_FUNC(pci->vdevfn));
}
/*
* Version of QEMU prior to the XSA-131 fix did not support
@@ -1179,7 +1179,7 @@ static void pci_add_qmp_device_add(libxl__egc *egc, pci_add_state *pas)
* set the permissive flag if it is true. Users of older QEMU
* have no reason to set the flag so this is ok.
*/
- if (pcidev->permissive)
+ if (pci->permissive)
libxl__qmp_param_add_bool(gc, &args, "permissive", true);
qmp->ao = pas->aodev->ao;
@@ -1230,7 +1230,7 @@ static void pci_add_qmp_query_pci_cb(libxl__egc *egc,
int dev_slot, dev_func;
/* Convenience aliases */
- libxl_device_pci *pcidev = pas->pcidev;
+ libxl_device_pci *pci = pas->pci;
if (rc) goto out;
@@ -1251,7 +1251,7 @@ static void pci_add_qmp_query_pci_cb(libxl__egc *egc,
*/
asked_id = GCSPRINTF(PCI_PT_QDEV_ID,
- pcidev->bus, pcidev->dev, pcidev->func);
+ pci->bus, pci->dev, pci->func);
for (i = 0; (bus = libxl__json_array_get(response, i)); i++) {
devices = libxl__json_map_get("devices", bus, JSON_ARRAY);
@@ -1283,7 +1283,7 @@ static void pci_add_qmp_query_pci_cb(libxl__egc *egc,
}
dev_func = libxl__json_object_get_integer(o);
- pcidev->vdevfn = PCI_DEVFN(dev_slot, dev_func);
+ pci->vdevfn = PCI_DEVFN(dev_slot, dev_func);
rc = 0;
goto out;
@@ -1331,7 +1331,7 @@ static void pci_add_dm_done(libxl__egc *egc,
/* Convenience aliases */
bool starting = pas->starting;
- libxl_device_pci *pcidev = pas->pcidev;
+ libxl_device_pci *pci = pas->pci;
bool hvm = libxl__domain_type(gc, domid) == LIBXL_DOMAIN_TYPE_HVM;
libxl__ev_qmp_dispose(gc, &pas->qmp);
@@ -1342,8 +1342,8 @@ static void pci_add_dm_done(libxl__egc *egc,
if (isstubdom)
starting = false;
- sysfs_path = GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/resource", pcidev->domain,
- pcidev->bus, pcidev->dev, pcidev->func);
+ sysfs_path = GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/resource", pci->domain,
+ pci->bus, pci->dev, pci->func);
f = fopen(sysfs_path, "r");
start = end = flags = size = 0;
irq = 0;
@@ -1383,8 +1383,8 @@ static void pci_add_dm_done(libxl__egc *egc,
}
}
fclose(f);
- sysfs_path = GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/irq", pcidev->domain,
- pcidev->bus, pcidev->dev, pcidev->func);
+ sysfs_path = GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/irq", pci->domain,
+ pci->bus, pci->dev, pci->func);
f = fopen(sysfs_path, "r");
if (f == NULL) {
LOGED(ERROR, domainid, "Couldn't open %s", sysfs_path);
@@ -1411,9 +1411,9 @@ static void pci_add_dm_done(libxl__egc *egc,
fclose(f);
/* Don't restrict writes to the PCI config space from this VM */
- if (pcidev->permissive) {
+ if (pci->permissive) {
if ( sysfs_write_bdf(gc, SYSFS_PCIBACK_DRIVER"/permissive",
- pcidev) < 0 ) {
+ pci) < 0 ) {
LOGD(ERROR, domainid, "Setting permissive for device");
rc = ERROR_FAIL;
goto out;
@@ -1422,14 +1422,14 @@ static void pci_add_dm_done(libxl__egc *egc,
out_no_irq:
if (!isstubdom) {
- if (pcidev->rdm_policy == LIBXL_RDM_RESERVE_POLICY_STRICT) {
+ if (pci->rdm_policy == LIBXL_RDM_RESERVE_POLICY_STRICT) {
flag &= ~XEN_DOMCTL_DEV_RDM_RELAXED;
- } else if (pcidev->rdm_policy != LIBXL_RDM_RESERVE_POLICY_RELAXED) {
+ } else if (pci->rdm_policy != LIBXL_RDM_RESERVE_POLICY_RELAXED) {
LOGED(ERROR, domainid, "unknown rdm check flag.");
rc = ERROR_FAIL;
goto out;
}
- r = xc_assign_device(ctx->xch, domid, pcidev_encode_bdf(pcidev), flag);
+ r = xc_assign_device(ctx->xch, domid, pci_encode_bdf(pci), flag);
if (r < 0 && (hvm || errno != ENOSYS)) {
LOGED(ERROR, domainid, "xc_assign_device failed");
rc = ERROR_FAIL;
@@ -1438,7 +1438,7 @@ out_no_irq:
}
if (!starting && !libxl_get_stubdom_id(CTX, domid))
- rc = libxl__device_pci_add_xenstore(gc, domid, pcidev, starting);
+ rc = libxl__device_pci_add_xenstore(gc, domid, pci, starting);
else
rc = 0;
out:
@@ -1493,7 +1493,7 @@ int libxl__device_pci_setdefault(libxl__gc *gc, uint32_t domid,
}
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)
{
AO_CREATE(ctx, domid, ao_how);
@@ -1504,24 +1504,24 @@ int libxl_device_pci_add(libxl_ctx *ctx, uint32_t domid,
aodev->action = LIBXL__DEVICE_ACTION_ADD;
aodev->callback = device_addrm_aocomplete;
aodev->update_json = true;
- libxl__device_pci_add(egc, domid, pcidev, false, aodev);
+ libxl__device_pci_add(egc, domid, pci, false, aodev);
return AO_INPROGRESS;
}
-static int libxl_pcidev_assignable(libxl_ctx *ctx, libxl_device_pci *pcidev)
+static int libxl_pci_assignable(libxl_ctx *ctx, libxl_device_pci *pci)
{
- libxl_device_pci *pcidevs;
+ libxl_device_pci *pcis;
int num, i;
- pcidevs = libxl_device_pci_assignable_list(ctx, &num);
+ pcis = libxl_device_pci_assignable_list(ctx, &num);
for (i = 0; i < num; i++) {
- if (pcidevs[i].domain == pcidev->domain &&
- pcidevs[i].bus == pcidev->bus &&
- pcidevs[i].dev == pcidev->dev &&
- pcidevs[i].func == pcidev->func)
+ if (pcis[i].domain == pci->domain &&
+ pcis[i].bus == pci->bus &&
+ pcis[i].dev == pci->dev &&
+ pcis[i].func == pci->func)
break;
}
- free(pcidevs);
+ free(pcis);
return i != num;
}
@@ -1535,7 +1535,7 @@ static void device_pci_add_done(libxl__egc *egc,
pci_add_state *, int rc);
void libxl__device_pci_add(libxl__egc *egc, uint32_t domid,
- libxl_device_pci *pcidev, bool starting,
+ libxl_device_pci *pci, bool starting,
libxl__ao_device *aodev)
{
STATE_AO_GC(aodev->ao);
@@ -1545,9 +1545,9 @@ void libxl__device_pci_add(libxl__egc *egc, uint32_t domid,
int stubdomid = 0;
pci_add_state *pas;
- /* Store *pcidev to be used by callbacks */
- aodev->device_config = pcidev;
- aodev->device_type = &libxl__pcidev_devtype;
+ /* Store *pci to be used by callbacks */
+ aodev->device_config = pci;
+ aodev->device_type = &libxl__pci_devtype;
GCNEW(pas);
pas->aodev = aodev;
@@ -1556,29 +1556,29 @@ void libxl__device_pci_add(libxl__egc *egc, uint32_t domid,
pas->callback = device_pci_add_stubdom_done;
if (libxl__domain_type(gc, domid) == LIBXL_DOMAIN_TYPE_HVM) {
- rc = xc_test_assign_device(ctx->xch, domid, pcidev_encode_bdf(pcidev));
+ rc = xc_test_assign_device(ctx->xch, domid, pci_encode_bdf(pci));
if (rc) {
LOGD(ERROR, domid,
"PCI device %04x:%02x:%02x.%u %s?",
- pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func,
+ pci->domain, pci->bus, pci->dev, pci->func,
errno == EOPNOTSUPP ? "cannot be assigned - no IOMMU"
: "already assigned to a different guest");
goto out;
}
}
- rc = libxl__device_pci_setdefault(gc, domid, pcidev, !starting);
+ rc = libxl__device_pci_setdefault(gc, domid, pci, !starting);
if (rc) goto out;
- if (pcidev->seize && !pciback_dev_is_assigned(gc, pcidev)) {
- rc = libxl__device_pci_assignable_add(gc, pcidev, 1);
+ if (pci->seize && !pciback_dev_is_assigned(gc, pci)) {
+ rc = libxl__device_pci_assignable_add(gc, pci, 1);
if ( rc )
goto out;
}
- if (!libxl_pcidev_assignable(ctx, pcidev)) {
+ if (!libxl_pci_assignable(ctx, pci)) {
LOGD(ERROR, domid, "PCI device %x:%x:%x.%x is not assignable",
- pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func);
+ pci->domain, pci->bus, pci->dev, pci->func);
rc = ERROR_FAIL;
goto out;
}
@@ -1589,25 +1589,25 @@ void libxl__device_pci_add(libxl__egc *egc, uint32_t domid,
"cannot determine if device is assigned, refusing to continue");
goto out;
}
- if ( is_pcidev_in_array(assigned, num_assigned, pcidev->domain,
- pcidev->bus, pcidev->dev, pcidev->func) ) {
+ 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, pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func);
+ libxl__device_pci_reset(gc, pci->domain, pci->bus, pci->dev, pci->func);
stubdomid = libxl_get_stubdom_id(ctx, domid);
if (stubdomid != 0) {
- libxl_device_pci *pcidev_s;
+ libxl_device_pci *pci_s;
- GCNEW(pcidev_s);
- libxl_device_pci_init(pcidev_s);
- libxl_device_pci_copy(CTX, pcidev_s, pcidev);
+ GCNEW(pci_s);
+ libxl_device_pci_init(pci_s);
+ libxl_device_pci_copy(CTX, pci_s, pci);
pas->callback = device_pci_add_stubdom_wait;
- do_pci_add(egc, stubdomid, pcidev_s, pas); /* must be last */
+ do_pci_add(egc, stubdomid, pci_s, pas); /* must be last */
return;
}
@@ -1664,42 +1664,42 @@ static void device_pci_add_stubdom_done(libxl__egc *egc,
/* Convenience aliases */
libxl__ao_device *aodev = pas->aodev;
libxl_domid domid = pas->domid;
- libxl_device_pci *pcidev = aodev->device_config;
+ libxl_device_pci *pci = aodev->device_config;
if (rc) goto out;
- orig_vdev = pcidev->vdevfn & ~7U;
+ orig_vdev = pci->vdevfn & ~7U;
- if ( pcidev->vfunc_mask == LIBXL_PCI_FUNC_ALL ) {
- if ( !(pcidev->vdevfn >> 3) ) {
+ if ( pci->vfunc_mask == LIBXL_PCI_FUNC_ALL ) {
+ if ( !(pci->vdevfn >> 3) ) {
LOGD(ERROR, domid, "Must specify a v-slot for multi-function devices");
rc = ERROR_INVAL;
goto out;
}
- if ( pci_multifunction_check(gc, pcidev, &pfunc_mask) ) {
+ if ( pci_multifunction_check(gc, pci, &pfunc_mask) ) {
rc = ERROR_FAIL;
goto out;
}
- pcidev->vfunc_mask &= pfunc_mask;
+ pci->vfunc_mask &= pfunc_mask;
/* so now vfunc_mask == pfunc_mask */
}else{
- pfunc_mask = (1 << pcidev->func);
+ pfunc_mask = (1 << pci->func);
}
- for(rc = 0, i = 7; i >= 0; --i) {
+ for (rc = 0, i = 7; i >= 0; --i) {
if ( (1 << i) & pfunc_mask ) {
- if ( pcidev->vfunc_mask == pfunc_mask ) {
- pcidev->func = i;
- pcidev->vdevfn = orig_vdev | i;
- }else{
+ if ( pci->vfunc_mask == pfunc_mask ) {
+ pci->func = i;
+ pci->vdevfn = orig_vdev | i;
+ } else {
/* if not passing through multiple devices in a block make
* sure that virtual function number 0 is always used otherwise
* guest won't see the device
*/
- pcidev->vdevfn = orig_vdev;
+ pci->vdevfn = orig_vdev;
}
pas->callback = device_pci_add_done;
- do_pci_add(egc, domid, pcidev, pas); /* must be last */
+ do_pci_add(egc, domid, pci, pas); /* must be last */
return;
}
}
@@ -1715,13 +1715,13 @@ 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 *pcidev = aodev->device_config;
+ libxl_device_pci *pci = aodev->device_config;
if (rc) {
LOGD(ERROR, domid,
"libxl__device_pci_add failed for "
"PCI device %x:%x:%x.%x (rc %d)",
- pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func,
+ pci->domain, pci->bus, pci->dev, pci->func,
rc);
}
aodev->rc = rc;
@@ -1733,16 +1733,16 @@ typedef struct {
libxl__ao_device *outer_aodev;
libxl_domain_config *d_config;
libxl_domid domid;
-} add_pcidevs_state;
+} add_pcis_state;
-static void add_pcidevs_done(libxl__egc *, libxl__multidev *, int rc);
+static void add_pcis_done(libxl__egc *, libxl__multidev *, int rc);
-static void libxl__add_pcidevs(libxl__egc *egc, libxl__ao *ao, uint32_t domid,
- libxl_domain_config *d_config,
- libxl__multidev *multidev)
+static void libxl__add_pcis(libxl__egc *egc, libxl__ao *ao, uint32_t domid,
+ libxl_domain_config *d_config,
+ libxl__multidev *multidev)
{
AO_GC;
- add_pcidevs_state *apds;
+ add_pcis_state *apds;
int i;
/* We need to start a new multidev in order to be able to execute
@@ -1752,23 +1752,23 @@ static void libxl__add_pcidevs(libxl__egc *egc, libxl__ao *ao, uint32_t domid,
apds->outer_aodev = libxl__multidev_prepare(multidev);
apds->d_config = d_config;
apds->domid = domid;
- apds->multidev.callback = add_pcidevs_done;
+ apds->multidev.callback = add_pcis_done;
libxl__multidev_begin(ao, &apds->multidev);
- for (i = 0; i < d_config->num_pcidevs; i++) {
+ for (i = 0; i < d_config->num_pcis; i++) {
libxl__ao_device *aodev = libxl__multidev_prepare(&apds->multidev);
- libxl__device_pci_add(egc, domid, &d_config->pcidevs[i],
+ libxl__device_pci_add(egc, domid, &d_config->pcis[i],
true, aodev);
}
libxl__multidev_prepared(egc, &apds->multidev, 0);
}
-static void add_pcidevs_done(libxl__egc *egc, libxl__multidev *multidev,
+static void add_pcis_done(libxl__egc *egc, libxl__multidev *multidev,
int rc)
{
EGC_GC;
- add_pcidevs_state *apds = CONTAINER_OF(multidev, *apds, multidev);
+ add_pcis_state *apds = CONTAINER_OF(multidev, *apds, multidev);
/* Convenience aliases */
libxl_domain_config *d_config = apds->d_config;
@@ -1777,9 +1777,9 @@ static void add_pcidevs_done(libxl__egc *egc, libxl__multidev *multidev,
if (rc) goto out;
- if (d_config->num_pcidevs > 0 && !libxl_get_stubdom_id(CTX, domid)) {
- rc = libxl__create_pci_backend(gc, domid, d_config->pcidevs,
- d_config->num_pcidevs);
+ 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;
@@ -1792,7 +1792,7 @@ out:
}
static int qemu_pci_remove_xenstore(libxl__gc *gc, uint32_t domid,
- libxl_device_pci *pcidev, int force)
+ libxl_device_pci *pci, int force)
{
libxl_ctx *ctx = libxl__gc_owner(gc);
char *state;
@@ -1804,12 +1804,12 @@ static int qemu_pci_remove_xenstore(libxl__gc *gc, uint32_t domid,
path = DEVICE_MODEL_XS_PATH(gc, dm_domid, domid, "/state");
state = libxl__xs_read(gc, XBT_NULL, path);
path = DEVICE_MODEL_XS_PATH(gc, dm_domid, domid, "/parameter");
- libxl__xs_printf(gc, XBT_NULL, path, PCI_BDF, pcidev->domain,
- pcidev->bus, pcidev->dev, pcidev->func);
+ libxl__xs_printf(gc, XBT_NULL, path, PCI_BDF, pci->domain,
+ pci->bus, pci->dev, pci->func);
/* Remove all functions at once atomically by only signalling
* device-model for function 0 */
- if ( !force && (pcidev->vdevfn & 0x7) == 0 ) {
+ if ( !force && (pci->vdevfn & 0x7) == 0 ) {
libxl__qemu_traditional_cmd(gc, domid, "pci-rem");
if (libxl__wait_for_device_model_deprecated(gc, domid, "pci-removed",
NULL, NULL, NULL) < 0) {
@@ -1830,7 +1830,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 *pcidev;
+ libxl_device_pci *pci;
bool force;
bool hvm;
unsigned int orig_vdev;
@@ -1844,7 +1844,7 @@ typedef struct pci_remove_state {
} pci_remove_state;
static void libxl__device_pci_remove_common(libxl__egc *egc,
- uint32_t domid, libxl_device_pci *pcidev, bool force,
+ uint32_t domid, libxl_device_pci *pci, bool force,
libxl__ao_device *aodev);
static void device_pci_remove_common_next(libxl__egc *egc,
pci_remove_state *prs, int rc);
@@ -1869,7 +1869,7 @@ 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 *pcidev, int force,
+ libxl_device_pci *pci, int force,
pci_remove_state *prs)
{
STATE_AO_GC(prs->aodev->ao);
@@ -1887,8 +1887,8 @@ static void do_pci_remove(libxl__egc *egc, uint32_t domid,
libxl__ptr_add(gc, assigned);
rc = ERROR_INVAL;
- if ( !is_pcidev_in_array(assigned, num, pcidev->domain,
- pcidev->bus, pcidev->dev, pcidev->func) ) {
+ if ( !is_pci_in_array(assigned, num, pci->domain,
+ pci->bus, pci->dev, pci->func) ) {
LOGD(ERROR, domainid, "PCI device not attached to this domain");
goto out_fail;
}
@@ -1917,8 +1917,8 @@ static void do_pci_remove(libxl__egc *egc, uint32_t domid,
} else {
assert(type == LIBXL_DOMAIN_TYPE_PV);
- char *sysfs_path = GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/resource", pcidev->domain,
- pcidev->bus, pcidev->dev, pcidev->func);
+ char *sysfs_path = GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/resource", pci->domain,
+ pci->bus, pci->dev, pci->func);
FILE *f = fopen(sysfs_path, "r");
unsigned int start = 0, end = 0, flags = 0, size = 0;
int irq = 0;
@@ -1953,8 +1953,8 @@ static void do_pci_remove(libxl__egc *egc, uint32_t domid,
}
fclose(f);
skip1:
- sysfs_path = GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/irq", pcidev->domain,
- pcidev->bus, pcidev->dev, pcidev->func);
+ sysfs_path = GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/irq", pci->domain,
+ pci->bus, pci->dev, pci->func);
f = fopen(sysfs_path, "r");
if (f == NULL) {
LOGED(ERROR, domainid, "Couldn't open %s", sysfs_path);
@@ -1988,7 +1988,7 @@ static void pci_remove_qemu_trad_watch_state_cb(libxl__egc *egc,
/* Convenience aliases */
libxl_domid domid = prs->domid;
- libxl_device_pci *const pcidev = prs->pcidev;
+ libxl_device_pci *const pci = prs->pci;
rc = check_qemu_running(gc, domid, xswa, rc, state);
if (rc == ERROR_NOT_READY)
@@ -1996,7 +1996,7 @@ static void pci_remove_qemu_trad_watch_state_cb(libxl__egc *egc,
if (rc)
goto out;
- rc = qemu_pci_remove_xenstore(gc, domid, pcidev, prs->force);
+ rc = qemu_pci_remove_xenstore(gc, domid, pci, prs->force);
out:
pci_remove_detatched(egc, prs, rc);
@@ -2010,7 +2010,7 @@ static void pci_remove_qmp_device_del(libxl__egc *egc,
int rc;
/* Convenience aliases */
- libxl_device_pci *const pcidev = prs->pcidev;
+ libxl_device_pci *const pci = prs->pci;
rc = libxl__ev_time_register_rel(ao, &prs->timeout,
pci_remove_timeout,
@@ -2018,7 +2018,7 @@ static void pci_remove_qmp_device_del(libxl__egc *egc,
if (rc) goto out;
QMP_PARAMETERS_SPRINTF(&args, "id", PCI_PT_QDEV_ID,
- pcidev->bus, pcidev->dev, pcidev->func);
+ pci->bus, pci->dev, pci->func);
prs->qmp.callback = pci_remove_qmp_device_del_cb;
rc = libxl__ev_qmp_send(egc, &prs->qmp, "device_del", args);
if (rc) goto out;
@@ -2080,14 +2080,14 @@ static void pci_remove_qmp_query_cb(libxl__egc *egc,
/* Convenience aliases */
libxl__ao *const ao = prs->aodev->ao;
- libxl_device_pci *const pcidev = prs->pcidev;
+ libxl_device_pci *const pci = prs->pci;
if (rc) goto out;
libxl__ev_qmp_dispose(gc, qmp);
asked_id = GCSPRINTF(PCI_PT_QDEV_ID,
- pcidev->bus, pcidev->dev, pcidev->func);
+ pci->bus, pci->dev, pci->func);
/* query-pci response:
* [{ 'devices': [ 'qdev_id': 'str', ... ], ... }]
@@ -2135,10 +2135,10 @@ 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 pcidev = prs->pcidev;
+ libxl_device_pci *const pci = prs->pci;
LOGD(WARN, prs->domid, "timed out waiting for DM to remove "
- PCI_PT_QDEV_ID, pcidev->bus, pcidev->dev, pcidev->func);
+ PCI_PT_QDEV_ID, pci->bus, pci->dev, pci->func);
/* 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
@@ -2156,7 +2156,7 @@ static void pci_remove_detatched(libxl__egc *egc,
bool isstubdom;
/* Convenience aliases */
- libxl_device_pci *const pcidev = prs->pcidev;
+ libxl_device_pci *const pci = prs->pci;
libxl_domid domid = prs->domid;
/* Cleaning QMP states ASAP */
@@ -2170,30 +2170,30 @@ static void pci_remove_detatched(libxl__egc *egc,
isstubdom = libxl_is_stubdom(CTX, domid, &domainid);
/* don't do multiple resets while some functions are still passed through */
- if ( (pcidev->vdevfn & 0x7) == 0 ) {
- libxl__device_pci_reset(gc, pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func);
+ if ((pci->vdevfn & 0x7) == 0) {
+ libxl__device_pci_reset(gc, pci->domain, pci->bus, pci->dev, pci->func);
}
if (!isstubdom) {
- rc = xc_deassign_device(CTX->xch, domid, pcidev_encode_bdf(pcidev));
+ rc = xc_deassign_device(CTX->xch, domid, pci_encode_bdf(pci));
if (rc < 0 && (prs->hvm || errno != ENOSYS))
LOGED(ERROR, domainid, "xc_deassign_device failed");
}
stubdomid = libxl_get_stubdom_id(CTX, domid);
if (stubdomid != 0) {
- libxl_device_pci *pcidev_s;
+ libxl_device_pci *pci_s;
libxl__ao_device *const stubdom_aodev = &prs->stubdom_aodev;
- GCNEW(pcidev_s);
- libxl_device_pci_init(pcidev_s);
- libxl_device_pci_copy(CTX, pcidev_s, pcidev);
+ GCNEW(pci_s);
+ libxl_device_pci_init(pci_s);
+ libxl_device_pci_copy(CTX, pci_s, pci);
libxl__prepare_ao_device(ao, stubdom_aodev);
stubdom_aodev->action = LIBXL__DEVICE_ACTION_REMOVE;
stubdom_aodev->callback = pci_remove_stubdom_done;
stubdom_aodev->update_json = prs->aodev->update_json;
- libxl__device_pci_remove_common(egc, stubdomid, pcidev_s,
+ libxl__device_pci_remove_common(egc, stubdomid, pci_s,
prs->force, stubdom_aodev);
return;
}
@@ -2219,14 +2219,14 @@ static void pci_remove_done(libxl__egc *egc,
if (rc) goto out;
- libxl__device_pci_remove_xenstore(gc, prs->domid, prs->pcidev);
+ libxl__device_pci_remove_xenstore(gc, prs->domid, prs->pci);
out:
device_pci_remove_common_next(egc, prs, rc);
}
static void libxl__device_pci_remove_common(libxl__egc *egc,
uint32_t domid,
- libxl_device_pci *pcidev,
+ libxl_device_pci *pci,
bool force,
libxl__ao_device *aodev)
{
@@ -2237,7 +2237,7 @@ static void libxl__device_pci_remove_common(libxl__egc *egc,
GCNEW(prs);
prs->aodev = aodev;
prs->domid = domid;
- prs->pcidev = pcidev;
+ prs->pci = pci;
prs->force = force;
libxl__xswait_init(&prs->xswait);
libxl__ev_qmp_init(&prs->qmp);
@@ -2247,16 +2247,16 @@ static void libxl__device_pci_remove_common(libxl__egc *egc,
libxl__ev_time_init(&prs->timeout);
libxl__ev_time_init(&prs->retry_timer);
- prs->orig_vdev = pcidev->vdevfn & ~7U;
+ prs->orig_vdev = pci->vdevfn & ~7U;
- if ( pcidev->vfunc_mask == LIBXL_PCI_FUNC_ALL ) {
- if ( pci_multifunction_check(gc, pcidev, &prs->pfunc_mask) ) {
+ if ( pci->vfunc_mask == LIBXL_PCI_FUNC_ALL ) {
+ if ( pci_multifunction_check(gc, pci, &prs->pfunc_mask) ) {
rc = ERROR_FAIL;
goto out;
}
- pcidev->vfunc_mask &= prs->pfunc_mask;
- }else{
- prs->pfunc_mask = (1 << pcidev->func);
+ pci->vfunc_mask &= prs->pfunc_mask;
+ } else {
+ prs->pfunc_mask = (1 << pci->func);
}
rc = 0;
@@ -2273,7 +2273,7 @@ static void device_pci_remove_common_next(libxl__egc *egc,
/* Convenience aliases */
libxl_domid domid = prs->domid;
- libxl_device_pci *const pcidev = prs->pcidev;
+ 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;
@@ -2284,13 +2284,13 @@ static void device_pci_remove_common_next(libxl__egc *egc,
const int i = prs->next_func;
prs->next_func--;
if ( (1 << i) & pfunc_mask ) {
- if ( pcidev->vfunc_mask == pfunc_mask ) {
- pcidev->func = i;
- pcidev->vdevfn = orig_vdev | i;
- }else{
- pcidev->vdevfn = orig_vdev;
+ if ( pci->vfunc_mask == pfunc_mask ) {
+ pci->func = i;
+ pci->vdevfn = orig_vdev | i;
+ } else {
+ pci->vdevfn = orig_vdev;
}
- do_pci_remove(egc, domid, pcidev, prs->force, prs);
+ do_pci_remove(egc, domid, pci, prs->force, prs);
return;
}
}
@@ -2306,7 +2306,7 @@ out:
}
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)
{
@@ -2318,12 +2318,12 @@ int libxl_device_pci_remove(libxl_ctx *ctx, uint32_t domid,
aodev->action = LIBXL__DEVICE_ACTION_REMOVE;
aodev->callback = device_addrm_aocomplete;
aodev->update_json = true;
- libxl__device_pci_remove_common(egc, domid, pcidev, false, aodev);
+ libxl__device_pci_remove_common(egc, domid, pci, false, aodev);
return AO_INPROGRESS;
}
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)
{
AO_CREATE(ctx, domid, ao_how);
@@ -2334,7 +2334,7 @@ int libxl_device_pci_destroy(libxl_ctx *ctx, uint32_t domid,
aodev->action = LIBXL__DEVICE_ACTION_REMOVE;
aodev->callback = device_addrm_aocomplete;
aodev->update_json = true;
- libxl__device_pci_remove_common(egc, domid, pcidev, true, aodev);
+ libxl__device_pci_remove_common(egc, domid, pci, true, aodev);
return AO_INPROGRESS;
}
@@ -2353,7 +2353,7 @@ static int libxl__device_pci_from_xs_be(libxl__gc *gc,
if (s)
vdevfn = strtol(s, (char **) NULL, 16);
- pcidev_struct_fill(pci, domain, bus, dev, func, vdevfn);
+ pci_struct_fill(pci, domain, bus, dev, func, vdevfn);
s = libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/opts-%d", be_path, nr));
if (s) {
@@ -2398,7 +2398,7 @@ libxl_device_pci *libxl_device_pci_list(libxl_ctx *ctx, uint32_t domid, int *num
GC_INIT(ctx);
char *be_path;
unsigned int n, i;
- libxl_device_pci *pcidevs = NULL;
+ libxl_device_pci *pcis = NULL;
*num = 0;
@@ -2407,28 +2407,28 @@ libxl_device_pci *libxl_device_pci_list(libxl_ctx *ctx, uint32_t domid, int *num
if (libxl__device_pci_get_num(gc, be_path, &n))
goto out;
- pcidevs = calloc(n, sizeof(libxl_device_pci));
+ pcis = calloc(n, sizeof(libxl_device_pci));
for (i = 0; i < n; i++)
- libxl__device_pci_from_xs_be(gc, be_path, i, pcidevs + i);
+ libxl__device_pci_from_xs_be(gc, be_path, i, pcis + i);
*num = n;
out:
GC_FREE;
- return pcidevs;
+ return pcis;
}
void libxl__device_pci_destroy_all(libxl__egc *egc, uint32_t domid,
libxl__multidev *multidev)
{
STATE_AO_GC(multidev->ao);
- libxl_device_pci *pcidevs;
+ libxl_device_pci *pcis;
int num, i;
- pcidevs = libxl_device_pci_list(CTX, domid, &num);
- if ( pcidevs == NULL )
+ pcis = libxl_device_pci_list(CTX, domid, &num);
+ if ( pcis == NULL )
return;
- libxl__ptr_add(gc, pcidevs);
+ libxl__ptr_add(gc, pcis);
for (i = 0; i < num; i++) {
/* Force remove on shutdown since, on HVM, qemu will not always
@@ -2436,7 +2436,7 @@ void libxl__device_pci_destroy_all(libxl__egc *egc, uint32_t domid,
* devices by the time we even get here!
*/
libxl__ao_device *aodev = libxl__multidev_prepare(multidev);
- libxl__device_pci_remove_common(egc, domid, pcidevs + i, true,
+ libxl__device_pci_remove_common(egc, domid, pcis + i, true,
aodev);
}
}
@@ -2449,13 +2449,13 @@ int libxl__grant_vga_iomem_permission(libxl__gc *gc, const uint32_t domid,
if (!libxl_defbool_val(d_config->b_info.u.hvm.gfx_passthru))
return 0;
- for (i = 0 ; i < d_config->num_pcidevs ; i++) {
+ for (i = 0 ; i < d_config->num_pcis ; i++) {
uint64_t vga_iomem_start = 0xa0000 >> XC_PAGE_SHIFT;
uint32_t stubdom_domid;
- libxl_device_pci *pcidev = &d_config->pcidevs[i];
+ libxl_device_pci *pci = &d_config->pcis[i];
unsigned long pci_device_class;
- if (sysfs_dev_get_class(gc, pcidev, &pci_device_class))
+ if (sysfs_dev_get_class(gc, pci, &pci_device_class))
continue;
if (pci_device_class != 0x030000) /* VGA class */
continue;
@@ -2494,7 +2494,7 @@ static int libxl_device_pci_compare(const libxl_device_pci *d1,
#define libxl__device_pci_update_devid NULL
-DEFINE_DEVICE_TYPE_STRUCT_X(pcidev, pci, PCI,
+DEFINE_DEVICE_TYPE_STRUCT(pci, PCI,
.get_num = libxl__device_pci_get_num,
.from_xenstore = libxl__device_pci_from_xs_be,
);
diff --git a/tools/libs/light/libxl_types.idl b/tools/libs/light/libxl_types.idl
index 9d3f05f39978..20f8dd7cfa5d 100644
--- a/tools/libs/light/libxl_types.idl
+++ b/tools/libs/light/libxl_types.idl
@@ -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")),
diff --git a/tools/libs/util/libxlu_pci.c b/tools/libs/util/libxlu_pci.c
index 12fc0b3a7fdc..1d38fffce357 100644
--- a/tools/libs/util/libxlu_pci.c
+++ b/tools/libs/util/libxlu_pci.c
@@ -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 *str
assert(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);
diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c
index cae8eb679c5a..0765780d9f0a 100644
--- a/tools/xl/xl_parse.c
+++ b/tools/xl/xl_parse.c
@@ -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;
+ libxl_device_pci *pci;
- 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;
+ 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);
}
diff --git a/tools/xl/xl_pci.c b/tools/xl/xl_pci.c
index 58345bdae213..34fcf5a4fadf 100644
--- a/tools/xl/xl_pci.c
+++ b/tools/xl/xl_pci.c
@@ -24,20 +24,20 @@
static void pcilist(uint32_t domid)
{
- libxl_device_pci *pcidevs;
+ libxl_device_pci *pcis;
int num, i;
- pcidevs = libxl_device_pci_list(ctx, domid, &num);
- if (pcidevs == NULL)
+ pcis = libxl_device_pci_list(ctx, domid, &num);
+ if (pcis == NULL)
return;
printf("Vdev Device\n");
for (i = 0; i < num; i++) {
printf("%02x.%01x %04x:%02x:%02x.%01x\n",
- (pcidevs[i].vdevfn >> 3) & 0x1f, pcidevs[i].vdevfn & 0x7,
- pcidevs[i].domain, pcidevs[i].bus, pcidevs[i].dev, pcidevs[i].func);
- libxl_device_pci_dispose(&pcidevs[i]);
+ (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(pcidevs);
+ free(pcis);
}
int main_pcilist(int argc, char **argv)
@@ -57,28 +57,28 @@ int main_pcilist(int argc, char **argv)
static int pcidetach(uint32_t domid, const char *bdf, int force)
{
- libxl_device_pci pcidev;
+ libxl_device_pci pci;
XLU_Config *config;
int r = 0;
- libxl_device_pci_init(&pcidev);
+ libxl_device_pci_init(&pci);
config = xlu_cfg_init(stderr, "command line");
if (!config) { perror("xlu_cfg_inig"); exit(-1); }
- if (xlu_pci_parse_bdf(config, &pcidev, bdf)) {
+ if (xlu_pci_parse_bdf(config, &pci, bdf)) {
fprintf(stderr, "pci-detach: malformed BDF specification \"%s\"\n", bdf);
exit(2);
}
if (force) {
- if (libxl_device_pci_destroy(ctx, domid, &pcidev, 0))
+ if (libxl_device_pci_destroy(ctx, domid, &pci, 0))
r = 1;
} else {
- if (libxl_device_pci_remove(ctx, domid, &pcidev, 0))
+ if (libxl_device_pci_remove(ctx, domid, &pci, 0))
r = 1;
}
- libxl_device_pci_dispose(&pcidev);
+ libxl_device_pci_dispose(&pci);
xlu_cfg_destroy(config);
return r;
@@ -108,24 +108,24 @@ int main_pcidetach(int argc, char **argv)
static int pciattach(uint32_t domid, const char *bdf, const char *vs)
{
- libxl_device_pci pcidev;
+ libxl_device_pci pci;
XLU_Config *config;
int r = 0;
- libxl_device_pci_init(&pcidev);
+ libxl_device_pci_init(&pci);
config = xlu_cfg_init(stderr, "command line");
if (!config) { perror("xlu_cfg_inig"); exit(-1); }
- if (xlu_pci_parse_bdf(config, &pcidev, bdf)) {
+ if (xlu_pci_parse_bdf(config, &pci, bdf)) {
fprintf(stderr, "pci-attach: malformed BDF specification \"%s\"\n", bdf);
exit(2);
}
- if (libxl_device_pci_add(ctx, domid, &pcidev, 0))
+ if (libxl_device_pci_add(ctx, domid, &pci, 0))
r = 1;
- libxl_device_pci_dispose(&pcidev);
+ libxl_device_pci_dispose(&pci);
xlu_cfg_destroy(config);
return r;
@@ -155,19 +155,19 @@ int main_pciattach(int argc, char **argv)
static void pciassignable_list(void)
{
- libxl_device_pci *pcidevs;
+ libxl_device_pci *pcis;
int num, i;
- pcidevs = libxl_device_pci_assignable_list(ctx, &num);
+ pcis = libxl_device_pci_assignable_list(ctx, &num);
- if ( pcidevs == NULL )
+ if ( pcis == NULL )
return;
for (i = 0; i < num; i++) {
printf("%04x:%02x:%02x.%01x\n",
- pcidevs[i].domain, pcidevs[i].bus, pcidevs[i].dev, pcidevs[i].func);
- libxl_device_pci_dispose(&pcidevs[i]);
+ pcis[i].domain, pcis[i].bus, pcis[i].dev, pcis[i].func);
+ libxl_device_pci_dispose(&pcis[i]);
}
- free(pcidevs);
+ free(pcis);
}
int main_pciassignable_list(int argc, char **argv)
@@ -184,24 +184,24 @@ int main_pciassignable_list(int argc, char **argv)
static int pciassignable_add(const char *bdf, int rebind)
{
- libxl_device_pci pcidev;
+ libxl_device_pci pci;
XLU_Config *config;
int r = 0;
- libxl_device_pci_init(&pcidev);
+ libxl_device_pci_init(&pci);
config = xlu_cfg_init(stderr, "command line");
if (!config) { perror("xlu_cfg_init"); exit(-1); }
- if (xlu_pci_parse_bdf(config, &pcidev, bdf)) {
+ if (xlu_pci_parse_bdf(config, &pci, bdf)) {
fprintf(stderr, "pci-assignable-add: malformed BDF specification \"%s\"\n", bdf);
exit(2);
}
- if (libxl_device_pci_assignable_add(ctx, &pcidev, rebind))
+ if (libxl_device_pci_assignable_add(ctx, &pci, rebind))
r = 1;
- libxl_device_pci_dispose(&pcidev);
+ libxl_device_pci_dispose(&pci);
xlu_cfg_destroy(config);
return r;
@@ -226,24 +226,24 @@ int main_pciassignable_add(int argc, char **argv)
static int pciassignable_remove(const char *bdf, int rebind)
{
- libxl_device_pci pcidev;
+ libxl_device_pci pci;
XLU_Config *config;
int r = 0;
- libxl_device_pci_init(&pcidev);
+ libxl_device_pci_init(&pci);
config = xlu_cfg_init(stderr, "command line");
if (!config) { perror("xlu_cfg_init"); exit(-1); }
- if (xlu_pci_parse_bdf(config, &pcidev, bdf)) {
+ if (xlu_pci_parse_bdf(config, &pci, bdf)) {
fprintf(stderr, "pci-assignable-remove: malformed BDF specification \"%s\"\n", bdf);
exit(2);
}
- if (libxl_device_pci_assignable_remove(ctx, &pcidev, rebind))
+ if (libxl_device_pci_assignable_remove(ctx, &pci, rebind))
r = 1;
- libxl_device_pci_dispose(&pcidev);
+ libxl_device_pci_dispose(&pci);
xlu_cfg_destroy(config);
return r;
diff --git a/tools/xl/xl_sxp.c b/tools/xl/xl_sxp.c
index 359a0015709e..b03e348ffb9a 100644
--- a/tools/xl/xl_sxp.c
+++ b/tools/xl/xl_sxp.c
@@ -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");
}
--
2.20.1
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH v2 02/24] libxl: use LIBXL_DEFINE_DEVICE_LIST for pci devices
2020-11-10 17:51 [PATCH v2 00/24] xl / libxl: named PCI pass-through devices Paul Durrant
2020-11-10 17:51 ` [PATCH v2 01/24] xl / libxl: s/pcidev/pci and remove DEFINE_DEVICE_TYPE_STRUCT_X Paul Durrant
@ 2020-11-10 17:51 ` Paul Durrant
2020-11-10 17:51 ` [PATCH v2 03/24] libxl: use LIBXL_DEFINE_DEVICE_LIST for nic devices Paul Durrant
` (22 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Paul Durrant @ 2020-11-10 17:51 UTC (permalink / raw)
To: xen-devel; +Cc: Paul Durrant, Ian Jackson, Wei Liu
From: Paul Durrant <pdurrant@amazon.com>
Remove open coded definition of libxl_device_pci_list().
NOTE: Using the macro also defines libxl_device_pci_list_free() so a prototype
for it is added. Subsequent patches will make used of it.
Signed-off-by: Paul Durrant <pdurrant@amazon.com>
---
Cc: Ian Jackson <iwj@xenproject.org>
Cc: Wei Liu <wl@xen.org>
---
tools/include/libxl.h | 7 +++++++
tools/libs/light/libxl_pci.c | 27 ++-------------------------
2 files changed, 9 insertions(+), 25 deletions(-)
diff --git a/tools/include/libxl.h b/tools/include/libxl.h
index fbe4c81ba511..ee52d3cf7e7e 100644
--- a/tools/include/libxl.h
+++ b/tools/include/libxl.h
@@ -451,6 +451,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
*
@@ -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
diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c
index 2ff1c64a3144..515e74fe5aae 100644
--- a/tools/libs/light/libxl_pci.c
+++ b/tools/libs/light/libxl_pci.c
@@ -2393,31 +2393,6 @@ 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)
-{
- 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;
-
- 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;
-}
-
void libxl__device_pci_destroy_all(libxl__egc *egc, uint32_t domid,
libxl__multidev *multidev)
{
@@ -2492,6 +2467,8 @@ 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 NULL
DEFINE_DEVICE_TYPE_STRUCT(pci, PCI,
--
2.20.1
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH v2 03/24] libxl: use LIBXL_DEFINE_DEVICE_LIST for nic devices
2020-11-10 17:51 [PATCH v2 00/24] xl / libxl: named PCI pass-through devices Paul Durrant
2020-11-10 17:51 ` [PATCH v2 01/24] xl / libxl: s/pcidev/pci and remove DEFINE_DEVICE_TYPE_STRUCT_X Paul Durrant
2020-11-10 17:51 ` [PATCH v2 02/24] libxl: use LIBXL_DEFINE_DEVICE_LIST for pci devices Paul Durrant
@ 2020-11-10 17:51 ` Paul Durrant
2020-11-10 17:51 ` [PATCH v2 04/24] libxl: s/detatched/detached in libxl_pci.c Paul Durrant
` (21 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Paul Durrant @ 2020-11-10 17:51 UTC (permalink / raw)
To: xen-devel; +Cc: Paul Durrant, Ian Jackson, Wei Liu
From: Paul Durrant <pdurrant@amazon.com>
Remove open-coded definitions of libxl_device_nic_list() and
libxl_device_nic_list_free().
Signed-off-by: Paul Durrant <pdurrant@amazon.com>
---
Cc: Ian Jackson <iwj@xenproject.org>
Cc: Wei Liu <wl@xen.org>
This patch is slightly tangential. I just happend to notice the inefficiency
while looking at code for various device types.
---
tools/libs/light/libxl_nic.c | 19 +------------------
1 file changed, 1 insertion(+), 18 deletions(-)
diff --git a/tools/libs/light/libxl_nic.c b/tools/libs/light/libxl_nic.c
index 0e5d120ae9a4..a44058f92951 100644
--- a/tools/libs/light/libxl_nic.c
+++ b/tools/libs/light/libxl_nic.c
@@ -403,24 +403,6 @@ static int libxl__nic_from_xenstore(libxl__gc *gc, const char *libxl_path,
return rc;
}
-libxl_device_nic *libxl_device_nic_list(libxl_ctx *ctx, uint32_t domid, int *num)
-{
- libxl_device_nic *r;
-
- GC_INIT(ctx);
-
- r = libxl__device_list(gc, &libxl__nic_devtype, domid, num);
-
- GC_FREE;
-
- return r;
-}
-
-void libxl_device_nic_list_free(libxl_device_nic* list, int num)
-{
- libxl__device_list_free(&libxl__nic_devtype, list, num);
-}
-
int libxl_device_nic_getinfo(libxl_ctx *ctx, uint32_t domid,
const libxl_device_nic *nic,
libxl_nicinfo *nicinfo)
@@ -527,6 +509,7 @@ LIBXL_DEFINE_DEVID_TO_DEVICE(nic)
LIBXL_DEFINE_DEVICE_ADD(nic)
LIBXL_DEFINE_DEVICES_ADD(nic)
LIBXL_DEFINE_DEVICE_REMOVE(nic)
+LIBXL_DEFINE_DEVICE_LIST(nic)
DEFINE_DEVICE_TYPE_STRUCT(nic, VIF,
.update_config = libxl_device_nic_update_config,
--
2.20.1
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH v2 04/24] libxl: s/detatched/detached in libxl_pci.c
2020-11-10 17:51 [PATCH v2 00/24] xl / libxl: named PCI pass-through devices Paul Durrant
` (2 preceding siblings ...)
2020-11-10 17:51 ` [PATCH v2 03/24] libxl: use LIBXL_DEFINE_DEVICE_LIST for nic devices Paul Durrant
@ 2020-11-10 17:51 ` Paul Durrant
2020-11-10 17:51 ` [PATCH v2 05/24] libxl: remove extraneous arguments to do_pci_remove() " Paul Durrant
` (20 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Paul Durrant @ 2020-11-10 17:51 UTC (permalink / raw)
To: xen-devel; +Cc: Paul Durrant, Ian Jackson, Wei Liu
From: Paul Durrant <pdurrant@amazon.com>
Simply spelling correction. Purely cosmetic fix.
Signed-off-by: Paul Durrant <pdurrant@amazon.com>
---
Cc: Ian Jackson <iwj@xenproject.org>
Cc: Wei Liu <wl@xen.org>
---
tools/libs/light/libxl_pci.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c
index 515e74fe5aae..52feac651c70 100644
--- a/tools/libs/light/libxl_pci.c
+++ b/tools/libs/light/libxl_pci.c
@@ -1861,7 +1861,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);
@@ -1975,7 +1975,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,
@@ -1999,7 +1999,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,
@@ -2025,7 +2025,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,
@@ -2048,7 +2048,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,
@@ -2064,7 +2064,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,
@@ -2124,7 +2124,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,
@@ -2143,12 +2143,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;
--
2.20.1
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH v2 05/24] libxl: remove extraneous arguments to do_pci_remove() in libxl_pci.c
2020-11-10 17:51 [PATCH v2 00/24] xl / libxl: named PCI pass-through devices Paul Durrant
` (3 preceding siblings ...)
2020-11-10 17:51 ` [PATCH v2 04/24] libxl: s/detatched/detached in libxl_pci.c Paul Durrant
@ 2020-11-10 17:51 ` Paul Durrant
2020-11-10 17:51 ` [PATCH v2 06/24] libxl: stop using aodev->device_config in libxl__device_pci_add() Paul Durrant
` (19 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Paul Durrant @ 2020-11-10 17:51 UTC (permalink / raw)
To: xen-devel; +Cc: Paul Durrant, Ian Jackson, Wei Liu
From: Paul Durrant <pdurrant@amazon.com>
Both 'domid' and 'pci' are available in 'pci_remove_state' so there is no
need to also pass them as separate arguments.
Signed-off-by: Paul Durrant <pdurrant@amazon.com>
---
Cc: Ian Jackson <iwj@xenproject.org>
Cc: Wei Liu <wl@xen.org>
---
tools/libs/light/libxl_pci.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c
index 52feac651c70..0abc679c3958 100644
--- a/tools/libs/light/libxl_pci.c
+++ b/tools/libs/light/libxl_pci.c
@@ -1868,14 +1868,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;
@@ -2272,7 +2272,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;
@@ -2290,7 +2289,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;
}
}
--
2.20.1
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH v2 06/24] libxl: stop using aodev->device_config in libxl__device_pci_add()...
2020-11-10 17:51 [PATCH v2 00/24] xl / libxl: named PCI pass-through devices Paul Durrant
` (4 preceding siblings ...)
2020-11-10 17:51 ` [PATCH v2 05/24] libxl: remove extraneous arguments to do_pci_remove() " Paul Durrant
@ 2020-11-10 17:51 ` Paul Durrant
2020-11-10 17:51 ` [PATCH v2 07/24] libxl: generalise 'driver_path' xenstore access functions in libxl_pci.c Paul Durrant
` (18 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Paul Durrant @ 2020-11-10 17:51 UTC (permalink / raw)
To: xen-devel; +Cc: Paul Durrant, Ian Jackson, Wei Liu
From: Paul Durrant <pdurrant@amazon.com>
... 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.
Signed-off-by: Paul Durrant <pdurrant@amazon.com>
---
Cc: Ian Jackson <iwj@xenproject.org>
Cc: Wei Liu <wl@xen.org>
---
tools/libs/light/libxl_pci.c | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c
index 0abc679c3958..c9f062fc2d8b 100644
--- a/tools/libs/light/libxl_pci.c
+++ b/tools/libs/light/libxl_pci.c
@@ -1055,7 +1055,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,
@@ -1072,7 +1072,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);
@@ -1082,7 +1081,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);
@@ -1545,13 +1543,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;
@@ -1605,9 +1600,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;
}
@@ -1662,9 +1658,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;
@@ -1699,7 +1694,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;
}
}
@@ -1715,7 +1710,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,
--
2.20.1
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH v2 07/24] libxl: generalise 'driver_path' xenstore access functions in libxl_pci.c
2020-11-10 17:51 [PATCH v2 00/24] xl / libxl: named PCI pass-through devices Paul Durrant
` (5 preceding siblings ...)
2020-11-10 17:51 ` [PATCH v2 06/24] libxl: stop using aodev->device_config in libxl__device_pci_add() Paul Durrant
@ 2020-11-10 17:51 ` Paul Durrant
2020-11-10 17:51 ` [PATCH v2 08/24] libxl: remove unnecessary check from libxl__device_pci_add() Paul Durrant
` (17 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Paul Durrant @ 2020-11-10 17:51 UTC (permalink / raw)
To: xen-devel; +Cc: Paul Durrant, Ian Jackson, Wei Liu
From: Paul Durrant <pdurrant@amazon.com>
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'.
Signed-off-by: Paul Durrant <pdurrant@amazon.com>
---
Cc: Ian Jackson <iwj@xenproject.org>
Cc: Wei Liu <wl@xen.org>
---
tools/libs/light/libxl_pci.c | 66 +++++++++++++++++-------------------
1 file changed, 32 insertions(+), 34 deletions(-)
diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c
index c9f062fc2d8b..fdafd2c9bafb 100644
--- a/tools/libs/light/libxl_pci.c
+++ b/tools/libs/light/libxl_pci.c
@@ -718,48 +718,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);
+}
- 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);
+
+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_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,
@@ -805,9 +803,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 {
@@ -815,7 +813,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) ) {
@@ -865,7 +863,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 ) {
@@ -878,7 +876,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 ) {
--
2.20.1
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH v2 08/24] libxl: remove unnecessary check from libxl__device_pci_add()
2020-11-10 17:51 [PATCH v2 00/24] xl / libxl: named PCI pass-through devices Paul Durrant
` (6 preceding siblings ...)
2020-11-10 17:51 ` [PATCH v2 07/24] libxl: generalise 'driver_path' xenstore access functions in libxl_pci.c Paul Durrant
@ 2020-11-10 17:51 ` Paul Durrant
2020-11-10 17:51 ` [PATCH v2 09/24] libxl: remove get_all_assigned_devices() from libxl_pci.c Paul Durrant
` (16 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Paul Durrant @ 2020-11-10 17:51 UTC (permalink / raw)
To: xen-devel; +Cc: Paul Durrant, Ian Jackson, Wei Liu
From: Paul Durrant <pdurrant@amazon.com>
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.
Signed-off-by: Paul Durrant <pdurrant@amazon.com>
---
Cc: Ian Jackson <iwj@xenproject.org>
Cc: Wei Liu <wl@xen.org>
---
tools/libs/light/libxl_pci.c | 16 +---------------
1 file changed, 1 insertion(+), 15 deletions(-)
diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c
index fdafd2c9bafb..f9f8374d7d36 100644
--- a/tools/libs/light/libxl_pci.c
+++ b/tools/libs/light/libxl_pci.c
@@ -1536,8 +1536,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;
@@ -1576,19 +1575,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);
--
2.20.1
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH v2 09/24] libxl: remove get_all_assigned_devices() from libxl_pci.c
2020-11-10 17:51 [PATCH v2 00/24] xl / libxl: named PCI pass-through devices Paul Durrant
` (7 preceding siblings ...)
2020-11-10 17:51 ` [PATCH v2 08/24] libxl: remove unnecessary check from libxl__device_pci_add() Paul Durrant
@ 2020-11-10 17:51 ` Paul Durrant
2020-11-10 17:51 ` [PATCH v2 10/24] libxl: make sure callers of libxl_device_pci_list() free the list after use Paul Durrant
` (15 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Paul Durrant @ 2020-11-10 17:51 UTC (permalink / raw)
To: xen-devel; +Cc: Paul Durrant, Ian Jackson, Wei Liu
From: Paul Durrant <pdurrant@amazon.com>
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.
Signed-off-by: Paul Durrant <pdurrant@amazon.com>
---
Cc: Ian Jackson <iwj@xenproject.org>
Cc: Wei Liu <wl@xen.org>
---
tools/libs/light/libxl_pci.c | 149 +++++++++++++----------------------
1 file changed, 55 insertions(+), 94 deletions(-)
diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c
index f9f8374d7d36..ff37dc5b5921 100644
--- a/tools/libs/light/libxl_pci.c
+++ b/tools/libs/light/libxl_pci.c
@@ -317,50 +317,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)
{
@@ -408,19 +364,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) {
@@ -436,9 +431,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;
@@ -448,6 +440,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)++;
}
@@ -718,48 +714,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)
@@ -1575,6 +1529,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);
@@ -1702,6 +1659,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);
@@ -2279,6 +2237,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);
}
--
2.20.1
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH v2 10/24] libxl: make sure callers of libxl_device_pci_list() free the list after use
2020-11-10 17:51 [PATCH v2 00/24] xl / libxl: named PCI pass-through devices Paul Durrant
` (8 preceding siblings ...)
2020-11-10 17:51 ` [PATCH v2 09/24] libxl: remove get_all_assigned_devices() from libxl_pci.c Paul Durrant
@ 2020-11-10 17:51 ` Paul Durrant
2020-11-10 17:51 ` [PATCH v2 11/24] libxl: add libxl_device_pci_assignable_list_free() Paul Durrant
` (14 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Paul Durrant @ 2020-11-10 17:51 UTC (permalink / raw)
To: xen-devel; +Cc: Paul Durrant, Ian Jackson, Wei Liu, Anthony PERARD
From: Paul Durrant <pdurrant@amazon.com>
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().
Signed-off-by: Paul Durrant <pdurrant@amazon.com>
---
Cc: Ian Jackson <iwj@xenproject.org>
Cc: Wei Liu <wl@xen.org>
Cc: Anthony PERARD <anthony.perard@citrix.com>
---
tools/libs/light/libxl_pci.c | 68 ++++++++++++++++++++----------------
tools/xl/xl_pci.c | 3 +-
2 files changed, 38 insertions(+), 33 deletions(-)
diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c
index ff37dc5b5921..a69cba793583 100644
--- a/tools/libs/light/libxl_pci.c
+++ b/tools/libs/light/libxl_pci.c
@@ -1006,7 +1006,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;
@@ -1078,7 +1078,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)
@@ -1099,7 +1099,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,
@@ -1180,7 +1180,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;
@@ -1281,7 +1281,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);
@@ -1497,7 +1497,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;
@@ -1536,12 +1539,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 */
@@ -1600,7 +1597,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;
@@ -1651,7 +1648,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,
@@ -1661,6 +1658,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);
}
@@ -1767,7 +1765,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;
@@ -1809,23 +1807,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;
}
@@ -1925,7 +1926,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)
@@ -1947,7 +1948,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,
@@ -2017,7 +2018,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;
@@ -2072,7 +2073,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);
@@ -2093,7 +2094,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 */
@@ -2156,7 +2157,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);
}
@@ -2174,7 +2175,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);
@@ -2209,7 +2213,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;
@@ -2240,6 +2244,7 @@ out:
if (!rc) pci_info_xs_remove(gc, pci, "domid");
+ libxl_device_pci_dispose(pci);
aodev->rc = rc;
aodev->callback(egc, aodev);
}
@@ -2342,7 +2347,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
@@ -2353,6 +2357,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,
diff --git a/tools/xl/xl_pci.c b/tools/xl/xl_pci.c
index 34fcf5a4fadf..7c0f102ac7b7 100644
--- a/tools/xl/xl_pci.c
+++ b/tools/xl/xl_pci.c
@@ -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)
--
2.20.1
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH v2 11/24] libxl: add libxl_device_pci_assignable_list_free()...
2020-11-10 17:51 [PATCH v2 00/24] xl / libxl: named PCI pass-through devices Paul Durrant
` (9 preceding siblings ...)
2020-11-10 17:51 ` [PATCH v2 10/24] libxl: make sure callers of libxl_device_pci_list() free the list after use Paul Durrant
@ 2020-11-10 17:51 ` Paul Durrant
2020-11-10 17:51 ` [PATCH v2 12/24] libxl: use COMPARE_PCI() macro is_pci_in_array() Paul Durrant
` (13 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Paul Durrant @ 2020-11-10 17:51 UTC (permalink / raw)
To: xen-devel
Cc: Paul Durrant, Ian Jackson, Wei Liu, Christian Lindig,
David Scott, Anthony PERARD
From: Paul Durrant <pdurrant@amazon.com>
... 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.
Signed-off-by: Paul Durrant <pdurrant@amazon.com>
---
Cc: Ian Jackson <iwj@xenproject.org>
Cc: Wei Liu <wl@xen.org>
Cc: Christian Lindig <christian.lindig@citrix.com>
Cc: David Scott <dave@recoil.org>
Cc: Anthony PERARD <anthony.perard@citrix.com>
---
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(-)
diff --git a/tools/include/libxl.h b/tools/include/libxl.h
index ee52d3cf7e7e..8225809d94a8 100644
--- a/tools/include/libxl.h
+++ b/tools/include/libxl.h
@@ -457,6 +457,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
*
@@ -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);
diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c
index a69cba793583..b87e121c4d5c 100644
--- a/tools/libs/light/libxl_pci.c
+++ b/tools/libs/light/libxl_pci.c
@@ -438,7 +438,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 */
@@ -453,6 +453,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,
@@ -1471,7 +1481,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;
}
diff --git a/tools/ocaml/libs/xl/xenlight_stubs.c b/tools/ocaml/libs/xl/xenlight_stubs.c
index 1181971da4e7..352a00134d70 100644
--- a/tools/ocaml/libs/xl/xenlight_stubs.c
+++ b/tools/ocaml/libs/xl/xenlight_stubs.c
@@ -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);
}
diff --git a/tools/xl/xl_pci.c b/tools/xl/xl_pci.c
index 7c0f102ac7b7..f71498cbb570 100644
--- a/tools/xl/xl_pci.c
+++ b/tools/xl/xl_pci.c
@@ -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)
--
2.20.1
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH v2 12/24] libxl: use COMPARE_PCI() macro is_pci_in_array()...
2020-11-10 17:51 [PATCH v2 00/24] xl / libxl: named PCI pass-through devices Paul Durrant
` (10 preceding siblings ...)
2020-11-10 17:51 ` [PATCH v2 11/24] libxl: add libxl_device_pci_assignable_list_free() Paul Durrant
@ 2020-11-10 17:51 ` Paul Durrant
2020-11-10 17:51 ` [PATCH v2 13/24] libxl: add/recover 'rdm_policy' to/from PCI backend in xenstore Paul Durrant
` (12 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Paul Durrant @ 2020-11-10 17:51 UTC (permalink / raw)
To: xen-devel; +Cc: Paul Durrant, Ian Jackson, Wei Liu
From: Paul Durrant <pdurrant@amazon.com>
... 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.
Signed-off-by: Paul Durrant <pdurrant@amazon.com>
---
Cc: Ian Jackson <iwj@xenproject.org>
Cc: Wei Liu <wl@xen.org>
---
tools/libs/light/libxl_internal.h | 7 +++---
tools/libs/light/libxl_pci.c | 38 +++++++++++--------------------
2 files changed, 17 insertions(+), 28 deletions(-)
diff --git a/tools/libs/light/libxl_internal.h b/tools/libs/light/libxl_internal.h
index 3e70ff639b3c..80d798862229 100644
--- a/tools/libs/light/libxl_internal.h
+++ b/tools/libs/light/libxl_internal.h
@@ -4744,9 +4744,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)
diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c
index b87e121c4d5c..278ebd9f561b 100644
--- a/tools/libs/light/libxl_pci.c
+++ b/tools/libs/light/libxl_pci.c
@@ -317,24 +317,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. */
@@ -1468,21 +1461,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,
@@ -1831,8 +1820,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;
--
2.20.1
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH v2 13/24] libxl: add/recover 'rdm_policy' to/from PCI backend in xenstore
2020-11-10 17:51 [PATCH v2 00/24] xl / libxl: named PCI pass-through devices Paul Durrant
` (11 preceding siblings ...)
2020-11-10 17:51 ` [PATCH v2 12/24] libxl: use COMPARE_PCI() macro is_pci_in_array() Paul Durrant
@ 2020-11-10 17:51 ` Paul Durrant
2020-11-10 17:51 ` [PATCH v2 14/24] libxl: Make sure devices added by pci-attach are reflected in the config Paul Durrant
` (11 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Paul Durrant @ 2020-11-10 17:51 UTC (permalink / raw)
To: xen-devel; +Cc: Paul Durrant, Ian Jackson, Wei Liu
From: Paul Durrant <pdurrant@amazon.com>
Other parameters, such as 'msitranslate' and 'permissive' are dealt with
but 'rdm_policy' appears to be have been completely missed.
Signed-off-by: Paul Durrant <pdurrant@amazon.com>
---
Cc: Ian Jackson <iwj@xenproject.org>
Cc: Wei Liu <wl@xen.org>
---
tools/libs/light/libxl_pci.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c
index 278ebd9f561b..06fdc50ce10c 100644
--- a/tools/libs/light/libxl_pci.c
+++ b/tools/libs/light/libxl_pci.c
@@ -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));
}
@@ -2313,6 +2313,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);
}
--
2.20.1
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH v2 14/24] libxl: Make sure devices added by pci-attach are reflected in the config
2020-11-10 17:51 [PATCH v2 00/24] xl / libxl: named PCI pass-through devices Paul Durrant
` (12 preceding siblings ...)
2020-11-10 17:51 ` [PATCH v2 13/24] libxl: add/recover 'rdm_policy' to/from PCI backend in xenstore Paul Durrant
@ 2020-11-10 17:51 ` Paul Durrant
2020-11-10 17:51 ` [PATCH v2 15/24] docs/man: extract documentation of PCI_SPEC_STRING from the xl.cfg manpage Paul Durrant
` (10 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Paul Durrant @ 2020-11-10 17:51 UTC (permalink / raw)
To: xen-devel; +Cc: Paul Durrant, Ian Jackson, Wei Liu
From: Paul Durrant <pdurrant@amazon.com>
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.
NOTE: This patch includes a whitespace in add_pcis_done().
Signed-off-by: Paul Durrant <pdurrant@amazon.com>
---
Cc: Ian Jackson <iwj@xenproject.org>
Cc: Wei Liu <wl@xen.org>
v2:
- Avoid having two completely different ways of adding devices into xenstore
---
tools/libs/light/libxl_pci.c | 71 +++++++++++-------------------------
1 file changed, 21 insertions(+), 50 deletions(-)
diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c
index 06fdc50ce10c..29a450f7e649 100644
--- a/tools/libs/light/libxl_pci.c
+++ b/tools/libs/light/libxl_pci.c
@@ -79,39 +79,18 @@ 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, uint32_t domid,
+ flexarray_t *front, flexarray_t *back)
{
- flexarray_t *front = NULL;
- flexarray_t *back = NULL;
- libxl__device device;
- int i;
-
- 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);
-
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);
-
- flexarray_append_pair(back, "num_devs", GCSPRINTF("%d", num));
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);
}
static int libxl__device_pci_add_xenstore(libxl__gc *gc,
@@ -119,7 +98,7 @@ static int libxl__device_pci_add_xenstore(libxl__gc *gc,
const libxl_device_pci *pci,
bool starting)
{
- flexarray_t *back;
+ flexarray_t *front, *back;
char *num_devs, *be_path;
int num = 0;
xs_transaction_t t = XBT_NULL;
@@ -127,16 +106,22 @@ static int libxl__device_pci_add_xenstore(libxl__gc *gc,
libxl_domain_config d_config;
libxl__flock *lock = NULL;
bool is_stubdomain = libxl_is_stubdom(CTX, domid, NULL);
+ libxl__device device;
+
+ libxl__device_from_pci(gc, domid, pci, &device);
/* Stubdomain doesn't have own config. */
if (!is_stubdomain)
libxl_domain_config_init(&d_config);
+ front = flexarray_make(gc, 16, 1);
+ back = flexarray_make(gc, 16, 1);
+
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__create_pci_backend(gc, domid, front, back);
libxl_domain_type domtype = libxl__domain_type(gc, domid);
if (domtype == LIBXL_DOMAIN_TYPE_INVALID)
@@ -147,20 +132,18 @@ static int libxl__device_pci_add_xenstore(libxl__gc *gc,
return ERROR_FAIL;
}
- 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 +153,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,7 +170,10 @@ static int libxl__device_pci_add_xenstore(libxl__gc *gc,
if (rc) goto out;
}
- libxl__xs_writev(gc, t, be_path, libxl__xs_kvs_of_flexarray(gc, back));
+ libxl__device_generic_add(gc, t, &device,
+ libxl__xs_kvs_of_flexarray(gc, back),
+ libxl__xs_kvs_of_flexarray(gc, front),
+ NULL);
rc = libxl__xs_transaction_commit(gc, &t);
if (!rc) break;
@@ -1390,7 +1377,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;
@@ -1699,28 +1686,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);
}
--
2.20.1
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH v2 15/24] docs/man: extract documentation of PCI_SPEC_STRING from the xl.cfg manpage...
2020-11-10 17:51 [PATCH v2 00/24] xl / libxl: named PCI pass-through devices Paul Durrant
` (13 preceding siblings ...)
2020-11-10 17:51 ` [PATCH v2 14/24] libxl: Make sure devices added by pci-attach are reflected in the config Paul Durrant
@ 2020-11-10 17:51 ` Paul Durrant
2020-11-10 17:51 ` [PATCH v2 16/24] docs/man: improve documentation of PCI_SPEC_STRING Paul Durrant
` (9 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Paul Durrant @ 2020-11-10 17:51 UTC (permalink / raw)
To: xen-devel; +Cc: Paul Durrant, Ian Jackson, Wei Liu
From: Paul Durrant <pdurrant@amazon.com>
... 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.
Signed-off-by: Paul Durrant <pdurrant@amazon.com>
---
Cc: Ian Jackson <iwj@xenproject.org>
Cc: Wei Liu <wl@xen.org>
---
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
diff --git a/docs/man/xl-pci-configuration.5.pod b/docs/man/xl-pci-configuration.5.pod
new file mode 100644
index 000000000000..72a27bd95dec
--- /dev/null
+++ b/docs/man/xl-pci-configuration.5.pod
@@ -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
diff --git a/docs/man/xl.cfg.5.pod.in b/docs/man/xl.cfg.5.pod.in
index 0532739c1fff..b00644e852f9 100644
--- a/docs/man/xl.cfg.5.pod.in
+++ b/docs/man/xl.cfg.5.pod.in
@@ -1101,73 +1101,7 @@ option is valid only when the B<controller> option is specified.
=item B<pci=[ "PCI_SPEC_STRING", "PCI_SPEC_STRING", ...]>
Specifies the host PCI devices to passthrough to this guest.
-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
+See L<xl-pci-configuration(5)> for more details.
=item B<pci_permissive=BOOLEAN>
--
2.20.1
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH v2 16/24] docs/man: improve documentation of PCI_SPEC_STRING...
2020-11-10 17:51 [PATCH v2 00/24] xl / libxl: named PCI pass-through devices Paul Durrant
` (14 preceding siblings ...)
2020-11-10 17:51 ` [PATCH v2 15/24] docs/man: extract documentation of PCI_SPEC_STRING from the xl.cfg manpage Paul Durrant
@ 2020-11-10 17:51 ` Paul Durrant
2020-11-10 17:51 ` [PATCH v2 17/24] docs/man: fix xl(1) documentation for 'pci' operations Paul Durrant
` (8 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Paul Durrant @ 2020-11-10 17:51 UTC (permalink / raw)
To: xen-devel; +Cc: Paul Durrant, Ian Jackson, Wei Liu
From: Paul Durrant <pdurrant@amazon.com>
... 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().
Signed-off-by: Paul Durrant <pdurrant@amazon.com>
---
Cc: Ian Jackson <iwj@xenproject.org>
Cc: Wei Liu <wl@xen.org>
---
docs/man/xl-pci-configuration.5.pod | 187 +++++++++++++++++++++++-----
1 file changed, 153 insertions(+), 34 deletions(-)
diff --git a/docs/man/xl-pci-configuration.5.pod b/docs/man/xl-pci-configuration.5.pod
index 72a27bd95dec..4dd73bc498d6 100644
--- a/docs/man/xl-pci-configuration.5.pod
+++ b/docs/man/xl-pci-configuration.5.pod
@@ -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
-=item B<[DDDD:]BB:DD.F>
+ [<bdf>[@<vslot>,][<key>=<value>,]*
+ [<key>=<value>,]*
-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
-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.
+For example, these strings are equivalent:
-=item B<@VSLOT>
+=over 4
-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>.
+ 36:00.0@20,seize=1
+ 36:00.0,vslot=20,seize=1
+ bdf=36:00.0,vslot=20,seize=1
-=item B<permissive=BOOLEAN>
+=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
+
+=item Description
+
+This identifies the PCI device from the host perspective.
+
+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 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
-Tells B<xl> to automatically attempt to re-assign a device to
-pciback if it is not already assigned.
+=item B<seize>=I<BOOLEAN>
-B<WARNING:> If you set this option, B<xl> will gladly re-assign a critical
+=over 4
+
+=item Description
+
+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, 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
-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.
+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.
+
+=item Default Value
+
+0
+
+=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 in L<xl.cfg(5)> but just specific to a given device.
+
+B<NOTE>: This overrides the global B<rdm> option.
+
+=item Default Value
+
+"strict"
+
+=back
=back
--
2.20.1
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH v2 17/24] docs/man: fix xl(1) documentation for 'pci' operations
2020-11-10 17:51 [PATCH v2 00/24] xl / libxl: named PCI pass-through devices Paul Durrant
` (15 preceding siblings ...)
2020-11-10 17:51 ` [PATCH v2 16/24] docs/man: improve documentation of PCI_SPEC_STRING Paul Durrant
@ 2020-11-10 17:51 ` Paul Durrant
2020-11-10 17:51 ` [PATCH v2 18/24] libxl: introduce 'libxl_pci_bdf' in the idl Paul Durrant
` (7 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Paul Durrant @ 2020-11-10 17:51 UTC (permalink / raw)
To: xen-devel; +Cc: Paul Durrant, Ian Jackson, Wei Liu
From: Paul Durrant <pdurrant@amazon.com>
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).
Signed-off-by: Paul Durrant <pdurrant@amazon.com>
---
Cc: Ian Jackson <iwj@xenproject.org>
Cc: Wei Liu <wl@xen.org>
---
docs/man/xl.1.pod.in | 28 +++++++++++++++++-----------
1 file changed, 17 insertions(+), 11 deletions(-)
diff --git a/docs/man/xl.1.pod.in b/docs/man/xl.1.pod.in
index f92bacfa7277..c5fbce3b5c4b 100644
--- a/docs/man/xl.1.pod.in
+++ b/docs/man/xl.1.pod.in
@@ -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
--
2.20.1
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH v2 18/24] libxl: introduce 'libxl_pci_bdf' in the idl...
2020-11-10 17:51 [PATCH v2 00/24] xl / libxl: named PCI pass-through devices Paul Durrant
` (16 preceding siblings ...)
2020-11-10 17:51 ` [PATCH v2 17/24] docs/man: fix xl(1) documentation for 'pci' operations Paul Durrant
@ 2020-11-10 17:51 ` Paul Durrant
2020-11-10 17:51 ` [PATCH v2 19/24] libxlu: introduce xlu_pci_parse_spec_string() Paul Durrant
` (6 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Paul Durrant @ 2020-11-10 17:51 UTC (permalink / raw)
To: xen-devel
Cc: Paul Durrant, George Dunlap, Nick Rosbrook, Ian Jackson, Wei Liu,
Anthony PERARD
From: Paul Durrant <pdurrant@amazon.com>
... 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.
Signed-off-by: Paul Durrant <pdurrant@amazon.com>
---
Cc: George Dunlap <george.dunlap@citrix.com>
Cc: Nick Rosbrook <rosbrookn@ainfosec.com>
Cc: Ian Jackson <iwj@xenproject.org>
Cc: Wei Liu <wl@xen.org>
Cc: Anthony PERARD <anthony.perard@citrix.com>
---
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(-)
diff --git a/tools/golang/xenlight/helpers.gen.go b/tools/golang/xenlight/helpers.gen.go
index c8605994e7fe..b7230f693c69 100644
--- a/tools/golang/xenlight/helpers.gen.go
+++ b/tools/golang/xenlight/helpers.gen.go
@@ -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)
}
}
}
diff --git a/tools/golang/xenlight/types.gen.go b/tools/golang/xenlight/types.gen.go
index b4c5df0f2c5c..bc62ae8ce9d1 100644
--- a/tools/golang/xenlight/types.gen.go
+++ b/tools/golang/xenlight/types.gen.go
@@ -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
diff --git a/tools/include/libxl.h b/tools/include/libxl.h
index 8225809d94a8..5edacccbd1da 100644
--- a/tools/include/libxl.h
+++ b/tools/include/libxl.h
@@ -463,6 +463,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
*
diff --git a/tools/libs/light/libxl_dm.c b/tools/libs/light/libxl_dm.c
index 8ebe1b60c9d7..a25bf23834a2 100644
--- a/tools/libs/light/libxl_dm.c
+++ b/tools/libs/light/libxl_dm.c
@@ -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);
diff --git a/tools/libs/light/libxl_internal.h b/tools/libs/light/libxl_internal.h
index 80d798862229..e1cb8404abab 100644
--- a/tools/libs/light/libxl_internal.h
+++ b/tools/libs/light/libxl_internal.h
@@ -4744,10 +4744,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)
diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c
index 29a450f7e649..382c10674313 100644
--- a/tools/libs/light/libxl_pci.c
+++ b/tools/libs/light/libxl_pci.c
@@ -29,10 +29,10 @@ static unsigned int pci_encode_bdf(libxl_device_pci *pci)
{
unsigned int value;
- value = pci->domain << 16;
- value |= (pci->bus & 0xff) << 8;
- value |= (pci->dev & 0x1f) << 3;
- value |= (pci->func & 0x7);
+ value = pci->bdf.domain << 16;
+ value |= (pci->bdf.bus & 0xff) << 8;
+ value |= (pci->bdf.dev & 0x1f) << 3;
+ value |= (pci->bdf.func & 0x7);
return value;
}
@@ -41,10 +41,10 @@ static void 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;
}
@@ -54,9 +54,9 @@ static void libxl_create_pci_backend_device(libxl__gc *gc,
const libxl_device_pci *pci)
{
flexarray_append(back, GCSPRINTF("key-%d", num));
- flexarray_append(back, GCSPRINTF(PCI_BDF, pci->domain, pci->bus, pci->dev, pci->func));
+ flexarray_append(back, GCSPRINTF(PCI_BDF, pci->bdf.domain, pci->bdf.bus, pci->bdf.dev, pci->bdf.func));
flexarray_append(back, GCSPRINTF("dev-%d", num));
- flexarray_append(back, GCSPRINTF(PCI_BDF, pci->domain, pci->bus, pci->dev, pci->func));
+ flexarray_append(back, GCSPRINTF(PCI_BDF, pci->bdf.domain, pci->bdf.bus, pci->bdf.dev, pci->bdf.func));
if (pci->vdevfn)
flexarray_append_pair(back, GCSPRINTF("vdevfn-%d", num), GCSPRINTF("%x", pci->vdevfn));
flexarray_append(back, GCSPRINTF("opts-%d", num));
@@ -218,8 +218,8 @@ static int libxl__device_pci_remove_xenstore(libxl__gc *gc, uint32_t domid, libx
unsigned int domain = 0, bus = 0, dev = 0, func = 0;
xsdev = libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/dev-%d", be_path, i));
sscanf(xsdev, PCI_BDF, &domain, &bus, &dev, &func);
- if (domain == pci->domain && bus == pci->bus &&
- pci->dev == dev && pci->func == func) {
+ if (domain == pci->bdf.domain && bus == pci->bdf.bus &&
+ pci->bdf.dev == dev && pci->bdf.func == func) {
break;
}
}
@@ -330,8 +330,8 @@ static int sysfs_write_bdf(libxl__gc *gc, const char * sysfs_path,
return ERROR_FAIL;
}
- buf = GCSPRINTF(PCI_BDF, pci->domain, pci->bus,
- pci->dev, pci->func);
+ buf = GCSPRINTF(PCI_BDF, pci->bdf.domain, pci->bdf.bus,
+ pci->bdf.dev, pci->bdf.func);
rc = write(fd, buf, strlen(buf));
/* Annoying to have two if's, but we need the errno */
if (rc < 0)
@@ -351,10 +351,10 @@ static char *pci_info_xs_path(libxl__gc *gc, libxl_device_pci *pci,
{
return node ?
GCSPRINTF(PCI_INFO_PATH"/"PCI_BDF_XSPATH"/%s",
- pci->domain, pci->bus, pci->dev, pci->func,
+ pci->bdf.domain, pci->bdf.bus, pci->bdf.dev, pci->bdf.func,
node) :
GCSPRINTF(PCI_INFO_PATH"/"PCI_BDF_XSPATH,
- pci->domain, pci->bus, pci->dev, pci->func);
+ pci->bdf.domain, pci->bdf.bus, pci->bdf.dev, pci->bdf.func);
}
@@ -452,10 +452,10 @@ static int sysfs_dev_unbind(libxl__gc *gc, libxl_device_pci *pci,
struct stat st;
spath = GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/driver",
- pci->domain,
- pci->bus,
- pci->dev,
- pci->func);
+ pci->bdf.domain,
+ pci->bdf.bus,
+ pci->bdf.dev,
+ pci->bdf.func);
if ( !lstat(spath, &st) ) {
/* Find the canonical path to the driver. */
dp = libxl__zalloc(gc, PATH_MAX);
@@ -485,7 +485,7 @@ static uint16_t sysfs_dev_get_vendor(libxl__gc *gc, libxl_device_pci *pci)
{
char *pci_device_vendor_path =
GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/vendor",
- pci->domain, pci->bus, pci->dev, pci->func);
+ pci->bdf.domain, pci->bdf.bus, pci->bdf.dev, pci->bdf.func);
uint16_t read_items;
uint16_t pci_device_vendor;
@@ -493,7 +493,7 @@ static uint16_t sysfs_dev_get_vendor(libxl__gc *gc, libxl_device_pci *pci)
if (!f) {
LOGE(ERROR,
"pci device "PCI_BDF" does not have vendor attribute",
- pci->domain, pci->bus, pci->dev, pci->func);
+ pci->bdf.domain, pci->bdf.bus, pci->bdf.dev, pci->bdf.func);
return 0xffff;
}
read_items = fscanf(f, "0x%hx\n", &pci_device_vendor);
@@ -501,7 +501,7 @@ static uint16_t sysfs_dev_get_vendor(libxl__gc *gc, libxl_device_pci *pci)
if (read_items != 1) {
LOGE(ERROR,
"cannot read vendor of pci device "PCI_BDF,
- pci->domain, pci->bus, pci->dev, pci->func);
+ pci->bdf.domain, pci->bdf.bus, pci->bdf.dev, pci->bdf.func);
return 0xffff;
}
@@ -512,7 +512,7 @@ static uint16_t sysfs_dev_get_device(libxl__gc *gc, libxl_device_pci *pci)
{
char *pci_device_device_path =
GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/device",
- pci->domain, pci->bus, pci->dev, pci->func);
+ pci->bdf.domain, pci->bdf.bus, pci->bdf.dev, pci->bdf.func);
uint16_t read_items;
uint16_t pci_device_device;
@@ -520,7 +520,7 @@ static uint16_t sysfs_dev_get_device(libxl__gc *gc, libxl_device_pci *pci)
if (!f) {
LOGE(ERROR,
"pci device "PCI_BDF" does not have device attribute",
- pci->domain, pci->bus, pci->dev, pci->func);
+ pci->bdf.domain, pci->bdf.bus, pci->bdf.dev, pci->bdf.func);
return 0xffff;
}
read_items = fscanf(f, "0x%hx\n", &pci_device_device);
@@ -528,7 +528,7 @@ static uint16_t sysfs_dev_get_device(libxl__gc *gc, libxl_device_pci *pci)
if (read_items != 1) {
LOGE(ERROR,
"cannot read device of pci device "PCI_BDF,
- pci->domain, pci->bus, pci->dev, pci->func);
+ pci->bdf.domain, pci->bdf.bus, pci->bdf.dev, pci->bdf.func);
return 0xffff;
}
@@ -539,14 +539,14 @@ static int sysfs_dev_get_class(libxl__gc *gc, libxl_device_pci *pci,
unsigned long *class)
{
char *pci_device_class_path = GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/class",
- pci->domain, pci->bus, pci->dev, pci->func);
+ pci->bdf.domain, pci->bdf.bus, pci->bdf.dev, pci->bdf.func);
int read_items, ret = 0;
FILE *f = fopen(pci_device_class_path, "r");
if (!f) {
LOGE(ERROR,
"pci device "PCI_BDF" does not have class attribute",
- pci->domain, pci->bus, pci->dev, pci->func);
+ pci->bdf.domain, pci->bdf.bus, pci->bdf.dev, pci->bdf.func);
ret = ERROR_FAIL;
goto out;
}
@@ -555,7 +555,7 @@ static int sysfs_dev_get_class(libxl__gc *gc, libxl_device_pci *pci,
if (read_items != 1) {
LOGE(ERROR,
"cannot read class of pci device "PCI_BDF,
- pci->domain, pci->bus, pci->dev, pci->func);
+ pci->bdf.domain, pci->bdf.bus, pci->bdf.dev, pci->bdf.func);
ret = ERROR_FAIL;
}
@@ -622,10 +622,10 @@ static int pciback_dev_has_slot(libxl__gc *gc, libxl_device_pci *pci)
}
while (fscanf(f, "%x:%x:%x.%d\n", &dom, &bus, &dev, &func)==4) {
- if (dom == pci->domain
- && bus == pci->bus
- && dev == pci->dev
- && func == pci->func) {
+ if (dom == pci->bdf.domain
+ && bus == pci->bdf.bus
+ && dev == pci->bdf.dev
+ && func == pci->bdf.func) {
rc = 1;
goto out;
}
@@ -651,8 +651,8 @@ static int pciback_dev_is_assigned(libxl__gc *gc, libxl_device_pci *pci)
}
spath = GCSPRINTF(SYSFS_PCIBACK_DRIVER"/"PCI_BDF,
- pci->domain, pci->bus,
- pci->dev, pci->func);
+ pci->bdf.domain, pci->bdf.bus,
+ pci->bdf.dev, pci->bdf.func);
rc = lstat(spath, &st);
if( rc == 0 )
@@ -715,10 +715,10 @@ static int libxl__device_pci_assignable_add(libxl__gc *gc,
struct stat st;
/* Local copy for convenience */
- dom = pci->domain;
- bus = pci->bus;
- dev = pci->dev;
- func = pci->func;
+ dom = pci->bdf.domain;
+ bus = pci->bdf.bus;
+ dev = pci->bdf.dev;
+ func = pci->bdf.func;
/* See if the device exists */
spath = GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF, dom, bus, dev, func);
@@ -792,8 +792,8 @@ static int libxl__device_pci_assignable_remove(libxl__gc *gc,
/* De-quarantine */
rc = xc_deassign_device(ctx->xch, DOMID_IO, pci_encode_bdf(pci));
if ( rc < 0 ) {
- LOG(ERROR, "failed to de-quarantine "PCI_BDF, pci->domain, pci->bus,
- pci->dev, pci->func);
+ LOG(ERROR, "failed to de-quarantine "PCI_BDF, pci->bdf.domain, pci->bdf.bus,
+ pci->bdf.dev, pci->bdf.func);
return ERROR_FAIL;
}
@@ -882,11 +882,11 @@ static int pci_multifunction_check(libxl__gc *gc, libxl_device_pci *pci, unsigne
if ( sscanf(de->d_name, PCI_BDF, &dom, &bus, &dev, &func) != 4 )
continue;
- if ( pci->domain != dom )
+ if ( pci->bdf.domain != dom )
continue;
- if ( pci->bus != bus )
+ if ( pci->bdf.bus != bus )
continue;
- if ( pci->dev != dev )
+ if ( pci->bdf.dev != dev )
continue;
path = GCSPRINTF("%s/" PCI_BDF, SYSFS_PCIBACK_DRIVER, dom, bus, dev, func);
@@ -935,13 +935,13 @@ static int qemu_pci_add_xenstore(libxl__gc *gc, uint32_t domid,
path = DEVICE_MODEL_XS_PATH(gc, dm_domid, domid, "/parameter");
if (pci->vdevfn) {
libxl__xs_printf(gc, XBT_NULL, path, PCI_BDF_VDEVFN","PCI_OPTIONS,
- pci->domain, pci->bus, pci->dev,
- pci->func, pci->vdevfn, pci->msitranslate,
+ pci->bdf.domain, pci->bdf.bus, pci->bdf.dev,
+ pci->bdf.func, pci->vdevfn, pci->msitranslate,
pci->power_mgmt);
} else {
libxl__xs_printf(gc, XBT_NULL, path, PCI_BDF","PCI_OPTIONS,
- pci->domain, pci->bus, pci->dev,
- pci->func, pci->msitranslate, pci->power_mgmt);
+ pci->bdf.domain, pci->bdf.bus, pci->bdf.dev,
+ pci->bdf.func, pci->msitranslate, pci->power_mgmt);
}
libxl__qemu_traditional_cmd(gc, domid, "pci-ins");
@@ -1100,10 +1100,10 @@ static void pci_add_qmp_device_add(libxl__egc *egc, pci_add_state *pas)
libxl__qmp_param_add_string(gc, &args, "driver",
"xen-pci-passthrough");
QMP_PARAMETERS_SPRINTF(&args, "id", PCI_PT_QDEV_ID,
- pci->bus, pci->dev, pci->func);
+ pci->bdf.bus, pci->bdf.dev, pci->bdf.func);
QMP_PARAMETERS_SPRINTF(&args, "hostaddr",
- "%04x:%02x:%02x.%01x", pci->domain,
- pci->bus, pci->dev, pci->func);
+ "%04x:%02x:%02x.%01x", pci->bdf.domain,
+ pci->bdf.bus, pci->bdf.dev, pci->bdf.func);
if (pci->vdevfn) {
QMP_PARAMETERS_SPRINTF(&args, "addr", "%x.%x",
PCI_SLOT(pci->vdevfn),
@@ -1191,7 +1191,7 @@ static void pci_add_qmp_query_pci_cb(libxl__egc *egc,
*/
asked_id = GCSPRINTF(PCI_PT_QDEV_ID,
- pci->bus, pci->dev, pci->func);
+ pci->bdf.bus, pci->bdf.dev, pci->bdf.func);
for (i = 0; (bus = libxl__json_array_get(response, i)); i++) {
devices = libxl__json_map_get("devices", bus, JSON_ARRAY);
@@ -1282,8 +1282,8 @@ static void pci_add_dm_done(libxl__egc *egc,
if (isstubdom)
starting = false;
- sysfs_path = GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/resource", pci->domain,
- pci->bus, pci->dev, pci->func);
+ sysfs_path = GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/resource", pci->bdf.domain,
+ pci->bdf.bus, pci->bdf.dev, pci->bdf.func);
f = fopen(sysfs_path, "r");
start = end = flags = size = 0;
irq = 0;
@@ -1323,8 +1323,8 @@ static void pci_add_dm_done(libxl__egc *egc,
}
}
fclose(f);
- sysfs_path = GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/irq", pci->domain,
- pci->bus, pci->dev, pci->func);
+ sysfs_path = GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/irq", pci->bdf.domain,
+ pci->bdf.bus, pci->bdf.dev, pci->bdf.func);
f = fopen(sysfs_path, "r");
if (f == NULL) {
LOGED(ERROR, domainid, "Couldn't open %s", sysfs_path);
@@ -1495,7 +1495,7 @@ void libxl__device_pci_add(libxl__egc *egc, uint32_t domid,
if (rc) {
LOGD(ERROR, domid,
"PCI device %04x:%02x:%02x.%u %s?",
- pci->domain, pci->bus, pci->dev, pci->func,
+ pci->bdf.domain, pci->bdf.bus, pci->bdf.dev, pci->bdf.func,
errno == EOPNOTSUPP ? "cannot be assigned - no IOMMU"
: "already assigned to a different guest");
goto out;
@@ -1513,7 +1513,7 @@ void libxl__device_pci_add(libxl__egc *egc, uint32_t domid,
if (!libxl_pci_assignable(ctx, pci)) {
LOGD(ERROR, domid, "PCI device %x:%x:%x.%x is not assignable",
- pci->domain, pci->bus, pci->dev, pci->func);
+ pci->bdf.domain, pci->bdf.bus, pci->bdf.dev, pci->bdf.func);
rc = ERROR_FAIL;
goto out;
}
@@ -1521,7 +1521,7 @@ void libxl__device_pci_add(libxl__egc *egc, uint32_t domid,
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);
+ libxl__device_pci_reset(gc, pci->bdf.domain, pci->bdf.bus, pci->bdf.dev, pci->bdf.func);
stubdomid = libxl_get_stubdom_id(ctx, domid);
if (stubdomid != 0) {
@@ -1602,13 +1602,13 @@ static void device_pci_add_stubdom_done(libxl__egc *egc,
pci->vfunc_mask &= pfunc_mask;
/* so now vfunc_mask == pfunc_mask */
}else{
- pfunc_mask = (1 << pci->func);
+ pfunc_mask = (1 << pci->bdf.func);
}
for (rc = 0, i = 7; i >= 0; --i) {
if ( (1 << i) & pfunc_mask ) {
if ( pci->vfunc_mask == pfunc_mask ) {
- pci->func = i;
+ pci->bdf.func = i;
pci->vdevfn = orig_vdev | i;
} else {
/* if not passing through multiple devices in a block make
@@ -1640,7 +1640,7 @@ static void device_pci_add_done(libxl__egc *egc,
LOGD(ERROR, domid,
"libxl__device_pci_add failed for "
"PCI device %x:%x:%x.%x (rc %d)",
- pci->domain, pci->bus, pci->dev, pci->func,
+ pci->bdf.domain, pci->bdf.bus, pci->bdf.dev, pci->bdf.func,
rc);
pci_info_xs_remove(gc, pci, "domid");
}
@@ -1709,8 +1709,8 @@ static int qemu_pci_remove_xenstore(libxl__gc *gc, uint32_t domid,
path = DEVICE_MODEL_XS_PATH(gc, dm_domid, domid, "/state");
state = libxl__xs_read(gc, XBT_NULL, path);
path = DEVICE_MODEL_XS_PATH(gc, dm_domid, domid, "/parameter");
- libxl__xs_printf(gc, XBT_NULL, path, PCI_BDF, pci->domain,
- pci->bus, pci->dev, pci->func);
+ libxl__xs_printf(gc, XBT_NULL, path, PCI_BDF, pci->bdf.domain,
+ pci->bdf.bus, pci->bdf.dev, pci->bdf.func);
/* Remove all functions at once atomically by only signalling
* device-model for function 0 */
@@ -1824,8 +1824,8 @@ static void do_pci_remove(libxl__egc *egc, pci_remove_state *prs)
} else {
assert(type == LIBXL_DOMAIN_TYPE_PV);
- char *sysfs_path = GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/resource", pci->domain,
- pci->bus, pci->dev, pci->func);
+ char *sysfs_path = GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/resource", pci->bdf.domain,
+ pci->bdf.bus, pci->bdf.dev, pci->bdf.func);
FILE *f = fopen(sysfs_path, "r");
unsigned int start = 0, end = 0, flags = 0, size = 0;
int irq = 0;
@@ -1860,8 +1860,8 @@ static void do_pci_remove(libxl__egc *egc, pci_remove_state *prs)
}
fclose(f);
skip1:
- sysfs_path = GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/irq", pci->domain,
- pci->bus, pci->dev, pci->func);
+ sysfs_path = GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/irq", pci->bdf.domain,
+ pci->bdf.bus, pci->bdf.dev, pci->bdf.func);
f = fopen(sysfs_path, "r");
if (f == NULL) {
LOGED(ERROR, domainid, "Couldn't open %s", sysfs_path);
@@ -1925,7 +1925,7 @@ static void pci_remove_qmp_device_del(libxl__egc *egc,
if (rc) goto out;
QMP_PARAMETERS_SPRINTF(&args, "id", PCI_PT_QDEV_ID,
- pci->bus, pci->dev, pci->func);
+ pci->bdf.bus, pci->bdf.dev, pci->bdf.func);
prs->qmp.callback = pci_remove_qmp_device_del_cb;
rc = libxl__ev_qmp_send(egc, &prs->qmp, "device_del", args);
if (rc) goto out;
@@ -1994,7 +1994,7 @@ static void pci_remove_qmp_query_cb(libxl__egc *egc,
libxl__ev_qmp_dispose(gc, qmp);
asked_id = GCSPRINTF(PCI_PT_QDEV_ID,
- pci->bus, pci->dev, pci->func);
+ pci->bdf.bus, pci->bdf.dev, pci->bdf.func);
/* query-pci response:
* [{ 'devices': [ 'qdev_id': 'str', ... ], ... }]
@@ -2045,7 +2045,7 @@ static void pci_remove_timeout(libxl__egc *egc, libxl__ev_time *ev,
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);
+ PCI_PT_QDEV_ID, pci->bdf.bus, pci->bdf.dev, pci->bdf.func);
/* 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
@@ -2078,7 +2078,7 @@ static void pci_remove_detached(libxl__egc *egc,
/* don't do multiple resets while some functions are still passed through */
if ((pci->vdevfn & 0x7) == 0) {
- libxl__device_pci_reset(gc, pci->domain, pci->bus, pci->dev, pci->func);
+ libxl__device_pci_reset(gc, pci->bdf.domain, pci->bdf.bus, pci->bdf.dev, pci->bdf.func);
}
if (!isstubdom) {
@@ -2166,7 +2166,7 @@ static void libxl__device_pci_remove_common(libxl__egc *egc,
}
pci->vfunc_mask &= prs->pfunc_mask;
} else {
- prs->pfunc_mask = (1 << pci->func);
+ prs->pfunc_mask = (1 << pci->bdf.func);
}
rc = 0;
@@ -2194,7 +2194,7 @@ static void device_pci_remove_common_next(libxl__egc *egc,
prs->next_func--;
if ( (1 << i) & pfunc_mask ) {
if ( pci->vfunc_mask == pfunc_mask ) {
- pci->func = i;
+ pci->bdf.func = i;
pci->vdevfn = orig_vdev | i;
} else {
pci->vdevfn = orig_vdev;
diff --git a/tools/libs/light/libxl_types.idl b/tools/libs/light/libxl_types.idl
index 20f8dd7cfa5d..2c441142fba6 100644
--- a/tools/libs/light/libxl_types.idl
+++ b/tools/libs/light/libxl_types.idl
@@ -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", [
diff --git a/tools/libs/util/libxlu_pci.c b/tools/libs/util/libxlu_pci.c
index 1d38fffce357..5c107f264260 100644
--- a/tools/libs/util/libxlu_pci.c
+++ b/tools/libs/util/libxlu_pci.c
@@ -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;
}
diff --git a/tools/xl/xl_pci.c b/tools/xl/xl_pci.c
index f71498cbb570..b6dc7c28401c 100644
--- a/tools/xl/xl_pci.c
+++ b/tools/xl/xl_pci.c
@@ -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);
}
diff --git a/tools/xl/xl_sxp.c b/tools/xl/xl_sxp.c
index b03e348ffb9a..95180b60df5b 100644
--- a/tools/xl/xl_sxp.c
+++ b/tools/xl/xl_sxp.c
@@ -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,
--
2.20.1
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH v2 19/24] libxlu: introduce xlu_pci_parse_spec_string()
2020-11-10 17:51 [PATCH v2 00/24] xl / libxl: named PCI pass-through devices Paul Durrant
` (17 preceding siblings ...)
2020-11-10 17:51 ` [PATCH v2 18/24] libxl: introduce 'libxl_pci_bdf' in the idl Paul Durrant
@ 2020-11-10 17:51 ` Paul Durrant
2020-11-10 17:51 ` [PATCH v2 20/24] libxl: modify libxl_device_pci_assignable_add/remove/list/list_free() Paul Durrant
` (5 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Paul Durrant @ 2020-11-10 17:51 UTC (permalink / raw)
To: xen-devel; +Cc: Paul Durrant, Ian Jackson, Wei Liu, Anthony PERARD
From: Paul Durrant <pdurrant@amazon.com>
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.
Fixes: d25cc3ec93eb ("libxl: workaround gcc 10.2 maybe-uninitialized warning")
Signed-off-by: Paul Durrant <pdurrant@amazon.com>
---
Cc: Ian Jackson <iwj@xenproject.org>
Cc: Wei Liu <wl@xen.org>
Cc: Anthony PERARD <anthony.perard@citrix.com>
---
tools/include/libxlutil.h | 8 +-
tools/libs/util/libxlu_pci.c | 374 +++++++++++++++++++----------------
tools/xl/xl_cmdtable.c | 4 +-
tools/xl/xl_parse.c | 4 +-
tools/xl/xl_pci.c | 37 ++--
5 files changed, 230 insertions(+), 197 deletions(-)
diff --git a/tools/include/libxlutil.h b/tools/include/libxlutil.h
index 92e35c546278..cdd6aab4f816 100644
--- a/tools/include/libxlutil.h
+++ b/tools/include/libxlutil.h
@@ -108,10 +108,16 @@ int xlu_disk_parse(XLU_Config *cfg, int nspecs, const char *const *specs,
* resulting disk struct is used with libxl.
*/
+/*
+ * 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
diff --git a/tools/libs/util/libxlu_pci.c b/tools/libs/util/libxlu_pci.c
index 5c107f264260..a8b6ce542736 100644
--- a/tools/libs/util/libxlu_pci.c
+++ b/tools/libs/util/libxlu_pci.c
@@ -1,5 +1,7 @@
#define _GNU_SOURCE
+#include <ctype.h>
+
#include "libxlu_internal.h"
#include "libxlu_disk_l.h"
#include "libxlu_disk_i.h"
@@ -9,185 +11,213 @@
#define XLU__PCI_ERR(_c, _x, _a...) \
if((_c) && (_c)->report) fprintf((_c)->report, _x, ##_a)
-static int hex_convert(const char *str, unsigned int *val, unsigned int mask)
+static int parse_bdf(libxl_pci_bdf *bdfp, uint32_t *vfunc_maskp,
+ const char *str, const char **endp)
{
- unsigned long ret;
- char *end;
+ const char *ptr = str;
+ unsigned int colons = 0;
+ unsigned int domain, bus, dev, func;
+ int n;
- ret = strtoul(str, &end, 16);
- if ( end == str || *end != '\0' )
- return -1;
- if ( ret & ~mask )
- return -1;
- *val = (unsigned int)ret & mask;
- return 0;
-}
-
-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->bdf.domain = domain;
- pci->bdf.bus = bus;
- pci->bdf.dev = dev;
- pci->bdf.func = func;
- pci->vdevfn = vdevfn;
- return 0;
-}
-
-#define STATE_DOMAIN 0
-#define STATE_BUS 1
-#define STATE_DEV 2
-#define STATE_FUNC 3
-#define STATE_VSLOT 4
-#define STATE_OPTIONS_K 6
-#define STATE_OPTIONS_V 7
-#define STATE_TERMINAL 8
-#define STATE_TYPE 9
-#define STATE_RDM_STRATEGY 10
-#define STATE_RESERVE_POLICY 11
-#define INVALID 0xffffffff
-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;
- char *buf2, *tok, *ptr, *end, *optkey = NULL;
-
- if ( NULL == (buf2 = ptr = strdup(str)) )
- return ERROR_NOMEM;
-
- for(tok = ptr, end = ptr + strlen(ptr) + 1; ptr < end; ptr++) {
- switch(state) {
- case STATE_DOMAIN:
- if ( *ptr == ':' ) {
- state = STATE_BUS;
- *ptr = '\0';
- if ( hex_convert(tok, &dom, 0xffff) )
- goto parse_error;
- tok = ptr + 1;
- }
- break;
- case STATE_BUS:
- if ( *ptr == ':' ) {
- state = STATE_DEV;
- *ptr = '\0';
- if ( hex_convert(tok, &bus, 0xff) )
- goto parse_error;
- tok = ptr + 1;
- }else if ( *ptr == '.' ) {
- state = STATE_FUNC;
- *ptr = '\0';
- if ( dom & ~0xff )
- goto parse_error;
- bus = dom;
- dom = 0;
- if ( hex_convert(tok, &dev, 0xff) )
- goto parse_error;
- tok = ptr + 1;
- }
- break;
- case STATE_DEV:
- if ( *ptr == '.' ) {
- state = STATE_FUNC;
- *ptr = '\0';
- if ( hex_convert(tok, &dev, 0xff) )
- goto parse_error;
- tok = ptr + 1;
- }
- break;
- case STATE_FUNC:
- if ( *ptr == '\0' || *ptr == '@' || *ptr == ',' ) {
- switch( *ptr ) {
- case '\0':
- state = STATE_TERMINAL;
- break;
- case '@':
- state = STATE_VSLOT;
- break;
- case ',':
- state = STATE_OPTIONS_K;
- break;
- }
- *ptr = '\0';
- if ( !strcmp(tok, "*") ) {
- pci->vfunc_mask = LIBXL_PCI_FUNC_ALL;
- }else{
- if ( hex_convert(tok, &func, 0x7) )
- goto parse_error;
- pci->vfunc_mask = (1 << 0);
- }
- tok = ptr + 1;
- }
- break;
- case STATE_VSLOT:
- if ( *ptr == '\0' || *ptr == ',' ) {
- state = ( *ptr == ',' ) ? STATE_OPTIONS_K : STATE_TERMINAL;
- *ptr = '\0';
- if ( hex_convert(tok, &vslot, 0xff) )
- goto parse_error;
- tok = ptr + 1;
- }
- break;
- case STATE_OPTIONS_K:
- if ( *ptr == '=' ) {
- state = STATE_OPTIONS_V;
- *ptr = '\0';
- optkey = tok;
- tok = ptr + 1;
- }
- break;
- case STATE_OPTIONS_V:
- if ( *ptr == ',' || *ptr == '\0' ) {
- state = (*ptr == ',') ? STATE_OPTIONS_K : STATE_TERMINAL;
- *ptr = '\0';
- if ( !strcmp(optkey, "msitranslate") ) {
- pci->msitranslate = atoi(tok);
- }else if ( !strcmp(optkey, "power_mgmt") ) {
- pci->power_mgmt = atoi(tok);
- }else if ( !strcmp(optkey, "permissive") ) {
- pci->permissive = atoi(tok);
- }else if ( !strcmp(optkey, "seize") ) {
- pci->seize = atoi(tok);
- } else if (!strcmp(optkey, "rdm_policy")) {
- if (!strcmp(tok, "strict")) {
- pci->rdm_policy = LIBXL_RDM_RESERVE_POLICY_STRICT;
- } else if (!strcmp(tok, "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'.",
- tok);
- goto parse_error;
- }
- } else {
- XLU__PCI_ERR(cfg, "Unknown PCI BDF option: %s", optkey);
- }
- tok = ptr + 1;
- }
- default:
- break;
- }
+ /* Count occurrences of ':' to detrmine presence/absence of the 'domain' */
+ while (isxdigit(*ptr) || *ptr == ':') {
+ if (*ptr == ':')
+ colons++;
+ ptr++;
}
- if ( tok != ptr || state != STATE_TERMINAL )
- goto parse_error;
+ ptr = str;
+ switch (colons) {
+ case 1:
+ domain = 0;
+ if (sscanf(ptr, "%x:%x.%n", &bus, &dev, &n) != 2)
+ return ERROR_INVAL;
+ break;
+ case 2:
+ if (sscanf(ptr, "%x:%x:%x.%n", &domain, &bus, &dev, &n) != 3)
+ return ERROR_INVAL;
+ break;
+ default:
+ return ERROR_INVAL;
+ }
- assert(dom != INVALID && bus != INVALID && dev != INVALID && func != INVALID);
+ if (domain > 0xffff || bus > 0xff || dev > 0x1f)
+ return ERROR_INVAL;
- /* Just a pretty way to fill in the values */
- pci_struct_fill(pci, dom, bus, dev, func, vslot << 3);
+ ptr += n;
+ if (*ptr == '*') {
+ if (!vfunc_maskp)
+ return ERROR_INVAL;
+ *vfunc_maskp = LIBXL_PCI_FUNC_ALL;
+ func = 0;
+ ptr++;
+ } else {
+ if (sscanf(ptr, "%x%n", &func, &n) != 1)
+ return ERROR_INVAL;
+ if (func > 7)
+ return ERROR_INVAL;
+ if (vfunc_maskp)
+ *vfunc_maskp = 1;
+ ptr += n;
+ }
- free(buf2);
+ bdfp->domain = domain;
+ bdfp->bus = bus;
+ bdfp->dev = dev;
+ bdfp->func = func;
+
+ if (endp)
+ *endp = ptr;
return 0;
+}
-parse_error:
- free(buf2);
- return ERROR_INVAL;
+static int parse_vslot(uint32_t *vdevfnp, const char *str, const char **endp)
+{
+ const char *ptr = str;
+ unsigned int val;
+ int n;
+
+ if (sscanf(ptr, "%x%n", &val, &n) != 1)
+ return ERROR_INVAL;
+
+ if (val > 0x1f)
+ return ERROR_INVAL;
+
+ ptr += n;
+
+ *vdevfnp = val << 3;
+
+ if (endp)
+ *endp = ptr;
+
+ return 0;
+}
+
+static int parse_key_val(char **keyp, char**valp, const char *str,
+ const char **endp)
+{
+ const char *ptr = str;
+ char *key, *val;
+
+ while (*ptr != '=' && *ptr != '\0')
+ ptr++;
+
+ if (*ptr == '\0')
+ return ERROR_INVAL;
+
+ key = strndup(str, ptr - str);
+ if (!key)
+ return ERROR_NOMEM;
+
+ str = ++ptr; /* skip '=' */
+ while (*ptr != ',' && *ptr != '\0')
+ ptr++;
+
+ val = strndup(str, ptr - str);
+ if (!val) {
+ free(key);
+ return ERROR_NOMEM;
+ }
+
+ if (*ptr == ',')
+ ptr++;
+
+ *keyp = key;
+ *valp = val;
+ *endp = ptr;
+
+ return 0;
+}
+
+static int parse_rdm_policy(XLU_Config *cfg, libxl_rdm_reserve_policy *policy,
+ const char *str)
+{
+ int ret = libxl_rdm_reserve_policy_from_string(str, policy);
+
+ if (ret)
+ XLU__PCI_ERR(cfg, "Unknown RDM policy: %s", str);
+
+ return ret;
+}
+
+int xlu_pci_parse_bdf(XLU_Config *cfg, libxl_pci_bdf *bdf, const char *str)
+{
+ return parse_bdf(bdf, NULL, str, NULL);
+}
+
+int xlu_pci_parse_spec_string(XLU_Config *cfg, libxl_device_pci *pcidev,
+ const char *str)
+{
+ const char *ptr = str;
+ bool bdf_present = false;
+ int ret;
+
+ /* Attempt to parse 'bdf' as positional parameter */
+ ret = parse_bdf(&pcidev->bdf, &pcidev->vfunc_mask, ptr, &ptr);
+ if (!ret) {
+ bdf_present = true;
+
+ /* Check whether 'vslot' if present */
+ if (*ptr == '@') {
+ ret = parse_vslot(&pcidev->vdevfn, ++ptr, &ptr);
+ if (ret)
+ return ret;
+ }
+ if (*ptr == ',')
+ ptr++;
+ else if (*ptr != '\0')
+ return ERROR_INVAL;
+ }
+
+ /* Parse the rest as 'key=val' pairs */
+ while (*ptr != '\0') {
+ char *key, *val;
+
+ ret = parse_key_val(&key, &val, ptr, &ptr);
+ if (ret)
+ return ret;
+
+ if (!strcmp(key, "bdf")) {
+ ret = parse_bdf(&pcidev->bdf, &pcidev->vfunc_mask, val, NULL);
+ bdf_present = !ret;
+ } else if (!strcmp(key, "vslot")) {
+ ret = parse_vslot(&pcidev->vdevfn, val, NULL);
+ } else if (!strcmp(key, "permissive")) {
+ pcidev->permissive = atoi(val);
+ } else if (!strcmp(key, "msitranslate")) {
+ pcidev->msitranslate = atoi(val);
+ } else if (!strcmp(key, "seize")) {
+ pcidev->seize= atoi(val);
+ } else if (!strcmp(key, "power_mgmt")) {
+ pcidev->power_mgmt = atoi(val);
+ } else if (!strcmp(key, "rdm_policy")) {
+ ret = parse_rdm_policy(cfg, &pcidev->rdm_policy, val);
+ } else {
+ XLU__PCI_ERR(cfg, "Unknown PCI_SPEC_STRING option: %s", key);
+ ret = ERROR_INVAL;
+ }
+
+ free(key);
+ free(val);
+
+ if (ret)
+ return ret;
+ }
+
+ if (!bdf_present)
+ return ERROR_INVAL;
+
+ return 0;
}
int xlu_rdm_parse(XLU_Config *cfg, libxl_rdm_reserve *rdm, const char *str)
{
+#define STATE_TYPE 0
+#define STATE_RDM_STRATEGY 1
+#define STATE_RESERVE_POLICY 2
+#define STATE_TERMINAL 3
+
unsigned state = STATE_TYPE;
char *buf2, *tok, *ptr, *end;
@@ -227,15 +257,8 @@ int xlu_rdm_parse(XLU_Config *cfg, libxl_rdm_reserve *rdm, const char *str)
if (*ptr == ',' || *ptr == '\0') {
state = *ptr == ',' ? STATE_TYPE : STATE_TERMINAL;
*ptr = '\0';
- if (!strcmp(tok, "strict")) {
- rdm->policy = LIBXL_RDM_RESERVE_POLICY_STRICT;
- } else if (!strcmp(tok, "relaxed")) {
- rdm->policy = LIBXL_RDM_RESERVE_POLICY_RELAXED;
- } else {
- XLU__PCI_ERR(cfg, "Unknown RDM property policy value: %s",
- tok);
+ if (!parse_rdm_policy(cfg, &rdm->policy, tok))
goto parse_error;
- }
tok = ptr + 1;
}
default:
@@ -253,6 +276,11 @@ int xlu_rdm_parse(XLU_Config *cfg, libxl_rdm_reserve *rdm, const char *str)
parse_error:
free(buf2);
return ERROR_INVAL;
+
+#undef STATE_TYPE
+#undef STATE_RDM_STRATEGY
+#undef STATE_RESERVE_POLICY
+#undef STATE_TERMINAL
}
/*
diff --git a/tools/xl/xl_cmdtable.c b/tools/xl/xl_cmdtable.c
index 7da6c1b927bb..2ee0c4967334 100644
--- a/tools/xl/xl_cmdtable.c
+++ b/tools/xl/xl_cmdtable.c
@@ -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,
diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c
index 0765780d9f0a..6a4703e745c9 100644
--- a/tools/xl/xl_parse.c
+++ b/tools/xl/xl_parse.c
@@ -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);
}
diff --git a/tools/xl/xl_pci.c b/tools/xl/xl_pci.c
index b6dc7c28401c..9c24496cb2dd 100644
--- a/tools/xl/xl_pci.c
+++ b/tools/xl/xl_pci.c
@@ -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];
+ spec_string = argv[optind + 1];
- if (optind + 1 < argc)
- vs = argv[optind + 2];
-
- 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);
}
--
2.20.1
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH v2 20/24] libxl: modify libxl_device_pci_assignable_add/remove/list/list_free()...
2020-11-10 17:51 [PATCH v2 00/24] xl / libxl: named PCI pass-through devices Paul Durrant
` (18 preceding siblings ...)
2020-11-10 17:51 ` [PATCH v2 19/24] libxlu: introduce xlu_pci_parse_spec_string() Paul Durrant
@ 2020-11-10 17:51 ` Paul Durrant
2020-11-10 17:51 ` [PATCH v2 21/24] docs/man: modify xl(1) in preparation for naming of assignable devices Paul Durrant
` (4 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Paul Durrant @ 2020-11-10 17:51 UTC (permalink / raw)
To: xen-devel
Cc: Paul Durrant, Christian Lindig, Ian Jackson, Wei Liu,
David Scott, Anthony PERARD
From: Paul Durrant <pdurrant@amazon.com>
... 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.
Signed-off-by: Paul Durrant <pdurrant@amazon.com>
Acked-by: Christian Lindig <christian.lindig@citrix.com>
---
Cc: Ian Jackson <iwj@xenproject.org>
Cc: Wei Liu <wl@xen.org>
Cc: David Scott <dave@recoil.org>
Cc: Anthony PERARD <anthony.perard@citrix.com>
---
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(-)
diff --git a/tools/include/libxl.h b/tools/include/libxl.h
index 5edacccbd1da..5703fdf367c5 100644
--- a/tools/include/libxl.h
+++ b/tools/include/libxl.h
@@ -469,6 +469,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
*
@@ -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);
diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c
index 382c10674313..d436e0a42b0c 100644
--- a/tools/libs/light/libxl_pci.c
+++ b/tools/libs/light/libxl_pci.c
@@ -25,26 +25,33 @@
#define PCI_BDF_XSPATH "%04x-%02x-%02x-%01x"
#define PCI_PT_QDEV_ID "pci-pt-%02x_%02x.%01x"
-static unsigned int pci_encode_bdf(libxl_device_pci *pci)
+static unsigned int pci_encode_bdf(libxl_pci_bdf *pcibdf)
{
unsigned int value;
- value = pci->bdf.domain << 16;
- value |= (pci->bdf.bus & 0xff) << 8;
- value |= (pci->bdf.dev & 0x1f) << 3;
- value |= (pci->bdf.func & 0x7);
+ value = pcibdf->domain << 16;
+ value |= (pcibdf->bus & 0xff) << 8;
+ value |= (pcibdf->dev & 0x1f) << 3;
+ value |= (pcibdf->func & 0x7);
return value;
}
+static void pcibdf_struct_fill(libxl_pci_bdf *pcibdf, unsigned int domain,
+ unsigned int bus, unsigned int dev,
+ unsigned int func)
+{
+ pcibdf->domain = domain;
+ pcibdf->bus = bus;
+ pcibdf->dev = dev;
+ pcibdf->func = func;
+}
+
static void pci_struct_fill(libxl_device_pci *pci, unsigned int domain,
unsigned int bus, unsigned int dev,
unsigned int func, unsigned int vdevfn)
{
- pci->bdf.domain = domain;
- pci->bdf.bus = bus;
- pci->bdf.dev = dev;
- pci->bdf.func = func;
+ pcibdf_struct_fill(&pci->bdf, domain, bus, dev, func);
pci->vdevfn = vdevfn;
}
@@ -318,8 +325,8 @@ static bool is_pci_in_array(libxl_device_pci *pcis, int num,
}
/* Write the standard BDF into the sysfs path given by sysfs_path. */
-static int sysfs_write_bdf(libxl__gc *gc, const char * sysfs_path,
- libxl_device_pci *pci)
+static int sysfs_write_bdf(libxl__gc *gc, const char *sysfs_path,
+ libxl_pci_bdf *pcibdf)
{
int rc, fd;
char *buf;
@@ -330,8 +337,8 @@ static int sysfs_write_bdf(libxl__gc *gc, const char * sysfs_path,
return ERROR_FAIL;
}
- buf = GCSPRINTF(PCI_BDF, pci->bdf.domain, pci->bdf.bus,
- pci->bdf.dev, pci->bdf.func);
+ buf = GCSPRINTF(PCI_BDF, pcibdf->domain, pcibdf->bus,
+ pcibdf->dev, pcibdf->func);
rc = write(fd, buf, strlen(buf));
/* Annoying to have two if's, but we need the errno */
if (rc < 0)
@@ -346,22 +353,22 @@ static int sysfs_write_bdf(libxl__gc *gc, const char * sysfs_path,
#define PCI_INFO_PATH "/libxl/pci"
-static char *pci_info_xs_path(libxl__gc *gc, libxl_device_pci *pci,
+static char *pci_info_xs_path(libxl__gc *gc, libxl_pci_bdf *pcibdf,
const char *node)
{
return node ?
GCSPRINTF(PCI_INFO_PATH"/"PCI_BDF_XSPATH"/%s",
- pci->bdf.domain, pci->bdf.bus, pci->bdf.dev, pci->bdf.func,
+ pcibdf->domain, pcibdf->bus, pcibdf->dev, pcibdf->func,
node) :
GCSPRINTF(PCI_INFO_PATH"/"PCI_BDF_XSPATH,
- pci->bdf.domain, pci->bdf.bus, pci->bdf.dev, pci->bdf.func);
+ pcibdf->domain, pcibdf->bus, pcibdf->dev, pcibdf->func);
}
-static int pci_info_xs_write(libxl__gc *gc, libxl_device_pci *pci,
+static int pci_info_xs_write(libxl__gc *gc, libxl_pci_bdf *pcibdf,
const char *node, const char *val)
{
- char *path = pci_info_xs_path(gc, pci, node);
+ char *path = pci_info_xs_path(gc, pcibdf, 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);
@@ -369,28 +376,28 @@ static int pci_info_xs_write(libxl__gc *gc, libxl_device_pci *pci,
return rc;
}
-static char *pci_info_xs_read(libxl__gc *gc, libxl_device_pci *pci,
+static char *pci_info_xs_read(libxl__gc *gc, libxl_pci_bdf *pcibdf,
const char *node)
{
- char *path = pci_info_xs_path(gc, pci, node);
+ char *path = pci_info_xs_path(gc, pcibdf, node);
return libxl__xs_read(gc, XBT_NULL, path);
}
-static void pci_info_xs_remove(libxl__gc *gc, libxl_device_pci *pci,
+static void pci_info_xs_remove(libxl__gc *gc, libxl_pci_bdf *pcibdf,
const char *node)
{
- char *path = pci_info_xs_path(gc, pci, node);
+ char *path = pci_info_xs_path(gc, pcibdf, 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)
+libxl_pci_bdf *libxl_device_pci_assignable_list(libxl_ctx *ctx, int *num)
{
GC_INIT(ctx);
- libxl_device_pci *pcis = NULL, *new;
+ libxl_pci_bdf *pcibdfs = NULL, *new;
struct dirent *de;
DIR *dir;
@@ -411,15 +418,15 @@ 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;
- new = realloc(pcis, ((*num) + 1) * sizeof(*new));
+ new = realloc(pcibdfs, ((*num) + 1) * sizeof(*new));
if (NULL == new)
continue;
- pcis = new;
- new = pcis + *num;
+ pcibdfs = new;
+ new = pcibdfs + *num;
- libxl_device_pci_init(new);
- pci_struct_fill(new, dom, bus, dev, func, 0);
+ libxl_pci_bdf_init(new);
+ pcibdf_struct_fill(new, dom, bus, dev, func);
if (pci_info_xs_read(gc, new, "domid")) /* already assigned */
continue;
@@ -430,32 +437,32 @@ libxl_device_pci *libxl_device_pci_assignable_list(libxl_ctx *ctx, int *num)
closedir(dir);
out:
GC_FREE;
- return pcis;
+ return pcibdfs;
}
-void libxl_device_pci_assignable_list_free(libxl_device_pci *list, int num)
+void libxl_device_pci_assignable_list_free(libxl_pci_bdf *list, int num)
{
int i;
for (i = 0; i < num; i++)
- libxl_device_pci_dispose(&list[i]);
+ libxl_pci_bdf_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,
+static int sysfs_dev_unbind(libxl__gc *gc, libxl_pci_bdf *pcibdf,
char **driver_path)
{
char * spath, *dp = NULL;
struct stat st;
spath = GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/driver",
- pci->bdf.domain,
- pci->bdf.bus,
- pci->bdf.dev,
- pci->bdf.func);
+ pcibdf->domain,
+ pcibdf->bus,
+ pcibdf->dev,
+ pcibdf->func);
if ( !lstat(spath, &st) ) {
/* Find the canonical path to the driver. */
dp = libxl__zalloc(gc, PATH_MAX);
@@ -469,7 +476,7 @@ static int sysfs_dev_unbind(libxl__gc *gc, libxl_device_pci *pci,
/* Unbind from the old driver */
spath = GCSPRINTF("%s/unbind", dp);
- if ( sysfs_write_bdf(gc, spath, pci) < 0 ) {
+ if ( sysfs_write_bdf(gc, spath, pcibdf) < 0 ) {
LOGE(ERROR, "Couldn't unbind device");
return -1;
}
@@ -607,8 +614,8 @@ bool libxl__is_igd_vga_passthru(libxl__gc *gc,
* already exist.
*/
-/* Scan through /sys/.../pciback/slots looking for pci's BDF */
-static int pciback_dev_has_slot(libxl__gc *gc, libxl_device_pci *pci)
+/* Scan through /sys/.../pciback/slots looking for BDF */
+static int pciback_dev_has_slot(libxl__gc *gc, libxl_pci_bdf *pcibdf)
{
FILE *f;
int rc = 0;
@@ -621,11 +628,11 @@ static int pciback_dev_has_slot(libxl__gc *gc, libxl_device_pci *pci)
return ERROR_FAIL;
}
- while (fscanf(f, "%x:%x:%x.%d\n", &dom, &bus, &dev, &func)==4) {
- if (dom == pci->bdf.domain
- && bus == pci->bdf.bus
- && dev == pci->bdf.dev
- && func == pci->bdf.func) {
+ while (fscanf(f, "%x:%x:%x.%d\n", &dom, &bus, &dev, &func) == 4) {
+ if (dom == pcibdf->domain
+ && bus == pcibdf->bus
+ && dev == pcibdf->dev
+ && func == pcibdf->func) {
rc = 1;
goto out;
}
@@ -635,7 +642,7 @@ out:
return rc;
}
-static int pciback_dev_is_assigned(libxl__gc *gc, libxl_device_pci *pci)
+static int pciback_dev_is_assigned(libxl__gc *gc, libxl_pci_bdf *pcibdf)
{
char * spath;
int rc;
@@ -651,8 +658,8 @@ static int pciback_dev_is_assigned(libxl__gc *gc, libxl_device_pci *pci)
}
spath = GCSPRINTF(SYSFS_PCIBACK_DRIVER"/"PCI_BDF,
- pci->bdf.domain, pci->bdf.bus,
- pci->bdf.dev, pci->bdf.func);
+ pcibdf->domain, pcibdf->bus,
+ pcibdf->dev, pcibdf->func);
rc = lstat(spath, &st);
if( rc == 0 )
@@ -663,40 +670,40 @@ static int pciback_dev_is_assigned(libxl__gc *gc, libxl_device_pci *pci)
return -1;
}
-static int pciback_dev_assign(libxl__gc *gc, libxl_device_pci *pci)
+static int pciback_dev_assign(libxl__gc *gc, libxl_pci_bdf *pcibdf)
{
int rc;
- if ( (rc = pciback_dev_has_slot(gc, pci)) < 0 ) {
+ if ( (rc = pciback_dev_has_slot(gc, pcibdf)) < 0 ) {
LOGE(ERROR, "Error checking for pciback slot");
return ERROR_FAIL;
} else if (rc == 0) {
if ( sysfs_write_bdf(gc, SYSFS_PCIBACK_DRIVER"/new_slot",
- pci) < 0 ) {
+ pcibdf) < 0 ) {
LOGE(ERROR, "Couldn't bind device to pciback!");
return ERROR_FAIL;
}
}
- if ( sysfs_write_bdf(gc, SYSFS_PCIBACK_DRIVER"/bind", pci) < 0 ) {
+ if ( sysfs_write_bdf(gc, SYSFS_PCIBACK_DRIVER"/bind", pcibdf) < 0 ) {
LOGE(ERROR, "Couldn't bind device to pciback!");
return ERROR_FAIL;
}
return 0;
}
-static int pciback_dev_unassign(libxl__gc *gc, libxl_device_pci *pci)
+static int pciback_dev_unassign(libxl__gc *gc, libxl_pci_bdf *pcibdf)
{
/* Remove from pciback */
- if ( sysfs_dev_unbind(gc, pci, NULL) < 0 ) {
+ if ( sysfs_dev_unbind(gc, pcibdf, NULL) < 0 ) {
LOG(ERROR, "Couldn't unbind device!");
return ERROR_FAIL;
}
/* Remove slot if necessary */
- if ( pciback_dev_has_slot(gc, pci) > 0 ) {
+ if ( pciback_dev_has_slot(gc, pcibdf) > 0 ) {
if ( sysfs_write_bdf(gc, SYSFS_PCIBACK_DRIVER"/remove_slot",
- pci) < 0 ) {
+ pcibdf) < 0 ) {
LOGE(ERROR, "Couldn't remove pciback slot");
return ERROR_FAIL;
}
@@ -705,7 +712,7 @@ static int pciback_dev_unassign(libxl__gc *gc, libxl_device_pci *pci)
}
static int libxl__device_pci_assignable_add(libxl__gc *gc,
- libxl_device_pci *pci,
+ libxl_pci_bdf *pcibdf,
int rebind)
{
libxl_ctx *ctx = libxl__gc_owner(gc);
@@ -715,10 +722,10 @@ static int libxl__device_pci_assignable_add(libxl__gc *gc,
struct stat st;
/* Local copy for convenience */
- dom = pci->bdf.domain;
- bus = pci->bdf.bus;
- dev = pci->bdf.dev;
- func = pci->bdf.func;
+ dom = pcibdf->domain;
+ bus = pcibdf->bus;
+ dev = pcibdf->dev;
+ func = pcibdf->func;
/* See if the device exists */
spath = GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF, dom, bus, dev, func);
@@ -728,7 +735,7 @@ static int libxl__device_pci_assignable_add(libxl__gc *gc,
}
/* Check to see if it's already assigned to pciback */
- rc = pciback_dev_is_assigned(gc, pci);
+ rc = pciback_dev_is_assigned(gc, pcibdf);
if ( rc < 0 ) {
return ERROR_FAIL;
}
@@ -738,7 +745,7 @@ static int libxl__device_pci_assignable_add(libxl__gc *gc,
}
/* Check to see if there's already a driver that we need to unbind from */
- if ( sysfs_dev_unbind(gc, pci, &driver_path ) ) {
+ if ( sysfs_dev_unbind(gc, pcibdf, &driver_path ) ) {
LOG(ERROR, "Couldn't unbind "PCI_BDF" from driver",
dom, bus, dev, func);
return ERROR_FAIL;
@@ -747,9 +754,9 @@ static int libxl__device_pci_assignable_add(libxl__gc *gc,
/* Store driver_path for rebinding to dom0 */
if ( rebind ) {
if ( driver_path ) {
- pci_info_xs_write(gc, pci, "driver_path", driver_path);
+ pci_info_xs_write(gc, pcibdf, "driver_path", driver_path);
} else if ( (driver_path =
- pci_info_xs_read(gc, pci, "driver_path")) != NULL ) {
+ pci_info_xs_read(gc, pcibdf, "driver_path")) != NULL ) {
LOG(INFO, PCI_BDF" not bound to a driver, will be rebound to %s",
dom, bus, dev, func, driver_path);
} else {
@@ -757,10 +764,10 @@ static int libxl__device_pci_assignable_add(libxl__gc *gc,
dom, bus, dev, func);
}
} else {
- pci_info_xs_remove(gc, pci, "driver_path");
+ pci_info_xs_remove(gc, pcibdf, "driver_path");
}
- if ( pciback_dev_assign(gc, pci) ) {
+ if ( pciback_dev_assign(gc, pcibdf) ) {
LOG(ERROR, "Couldn't bind device to pciback!");
return ERROR_FAIL;
}
@@ -771,7 +778,7 @@ quarantine:
* so always pass XEN_DOMCTL_DEV_RDM_RELAXED to avoid assignment being
* unnecessarily denied.
*/
- rc = xc_assign_device(ctx->xch, DOMID_IO, pci_encode_bdf(pci),
+ rc = xc_assign_device(ctx->xch, DOMID_IO, pci_encode_bdf(pcibdf),
XEN_DOMCTL_DEV_RDM_RELAXED);
if ( rc < 0 ) {
LOG(ERROR, "failed to quarantine "PCI_BDF, dom, bus, dev, func);
@@ -782,7 +789,7 @@ quarantine:
}
static int libxl__device_pci_assignable_remove(libxl__gc *gc,
- libxl_device_pci *pci,
+ libxl_pci_bdf *pcibdf,
int rebind)
{
libxl_ctx *ctx = libxl__gc_owner(gc);
@@ -790,24 +797,24 @@ static int libxl__device_pci_assignable_remove(libxl__gc *gc,
char *driver_path;
/* De-quarantine */
- rc = xc_deassign_device(ctx->xch, DOMID_IO, pci_encode_bdf(pci));
+ rc = xc_deassign_device(ctx->xch, DOMID_IO, pci_encode_bdf(pcibdf));
if ( rc < 0 ) {
- LOG(ERROR, "failed to de-quarantine "PCI_BDF, pci->bdf.domain, pci->bdf.bus,
- pci->bdf.dev, pci->bdf.func);
+ LOG(ERROR, "failed to de-quarantine "PCI_BDF, pcibdf->domain,
+ pcibdf->bus, pcibdf->dev, pcibdf->func);
return ERROR_FAIL;
}
/* Unbind from pciback */
- if ( (rc = pciback_dev_is_assigned(gc, pci)) < 0 ) {
+ if ( (rc = pciback_dev_is_assigned(gc, pcibdf)) < 0 ) {
return ERROR_FAIL;
} else if ( rc ) {
- pciback_dev_unassign(gc, pci);
+ pciback_dev_unassign(gc, pcibdf);
} else {
LOG(WARN, "Not bound to pciback");
}
/* Rebind if necessary */
- driver_path = pci_info_xs_read(gc, pci, "driver_path");
+ driver_path = pci_info_xs_read(gc, pcibdf, "driver_path");
if ( driver_path ) {
if ( rebind ) {
@@ -815,12 +822,12 @@ static int libxl__device_pci_assignable_remove(libxl__gc *gc,
if ( sysfs_write_bdf(gc,
GCSPRINTF("%s/bind", driver_path),
- pci) < 0 ) {
+ pcibdf) < 0 ) {
LOGE(ERROR, "Couldn't bind device to %s", driver_path);
return -1;
}
- pci_info_xs_remove(gc, pci, "driver_path");
+ pci_info_xs_remove(gc, pcibdf, "driver_path");
}
} else {
if ( rebind ) {
@@ -832,26 +839,26 @@ static int libxl__device_pci_assignable_remove(libxl__gc *gc,
return 0;
}
-int libxl_device_pci_assignable_add(libxl_ctx *ctx, libxl_device_pci *pci,
+int libxl_device_pci_assignable_add(libxl_ctx *ctx, libxl_pci_bdf *pcibdf,
int rebind)
{
GC_INIT(ctx);
int rc;
- rc = libxl__device_pci_assignable_add(gc, pci, rebind);
+ rc = libxl__device_pci_assignable_add(gc, pcibdf, rebind);
GC_FREE;
return rc;
}
-int libxl_device_pci_assignable_remove(libxl_ctx *ctx, libxl_device_pci *pci,
+int libxl_device_pci_assignable_remove(libxl_ctx *ctx, libxl_pci_bdf *pcibdf,
int rebind)
{
GC_INIT(ctx);
int rc;
- rc = libxl__device_pci_assignable_remove(gc, pci, rebind);
+ rc = libxl__device_pci_assignable_remove(gc, pcibdf, rebind);
GC_FREE;
return rc;
@@ -1353,7 +1360,7 @@ static void pci_add_dm_done(libxl__egc *egc,
/* Don't restrict writes to the PCI config space from this VM */
if (pci->permissive) {
if ( sysfs_write_bdf(gc, SYSFS_PCIBACK_DRIVER"/permissive",
- pci) < 0 ) {
+ &pci->bdf) < 0 ) {
LOGD(ERROR, domainid, "Setting permissive for device");
rc = ERROR_FAIL;
goto out;
@@ -1369,7 +1376,8 @@ out_no_irq:
rc = ERROR_FAIL;
goto out;
}
- r = xc_assign_device(ctx->xch, domid, pci_encode_bdf(pci), flag);
+ r = xc_assign_device(ctx->xch, domid, pci_encode_bdf(&pci->bdf),
+ flag);
if (r < 0 && (hvm || errno != ENOSYS)) {
LOGED(ERROR, domainid, "xc_assign_device failed");
rc = ERROR_FAIL;
@@ -1448,15 +1456,28 @@ int libxl_device_pci_add(libxl_ctx *ctx, uint32_t domid,
return AO_INPROGRESS;
}
-static bool libxl_pci_assignable(libxl_ctx *ctx, libxl_device_pci *pci)
+static int is_bdf_in_array(libxl_pci_bdf *pcibdfs, int num,
+ libxl_pci_bdf *pcibdf)
{
- libxl_device_pci *pcis;
+ int i;
+
+ for(i = 0; i < num; i++) {
+ if (COMPARE_BDF(pcibdf, &pcibdfs[i]))
+ break;
+ }
+
+ return i < num;
+}
+
+static bool is_bdf_assignable(libxl_ctx *ctx, libxl_pci_bdf *pcibdf)
+{
+ libxl_pci_bdf *pcibdfs;
int num;
bool assignable;
- pcis = libxl_device_pci_assignable_list(ctx, &num);
- assignable = is_pci_in_array(pcis, num, pci);
- libxl_device_pci_assignable_list_free(pcis, num);
+ pcibdfs = libxl_device_pci_assignable_list(ctx, &num);
+ assignable = is_bdf_in_array(pcibdfs, num, pcibdf);
+ libxl_device_pci_assignable_list_free(pcibdfs, num);
return assignable;
}
@@ -1491,7 +1512,8 @@ void libxl__device_pci_add(libxl__egc *egc, uint32_t domid,
pas->callback = device_pci_add_stubdom_done;
if (libxl__domain_type(gc, domid) == LIBXL_DOMAIN_TYPE_HVM) {
- rc = xc_test_assign_device(ctx->xch, domid, pci_encode_bdf(pci));
+ rc = xc_test_assign_device(ctx->xch, domid,
+ pci_encode_bdf(&pci->bdf));
if (rc) {
LOGD(ERROR, domid,
"PCI device %04x:%02x:%02x.%u %s?",
@@ -1505,20 +1527,20 @@ void libxl__device_pci_add(libxl__egc *egc, uint32_t domid,
rc = libxl__device_pci_setdefault(gc, domid, pci, !starting);
if (rc) goto out;
- if (pci->seize && !pciback_dev_is_assigned(gc, pci)) {
- rc = libxl__device_pci_assignable_add(gc, pci, 1);
+ if (pci->seize && !pciback_dev_is_assigned(gc, &pci->bdf)) {
+ rc = libxl__device_pci_assignable_add(gc, &pci->bdf, 1);
if ( rc )
goto out;
}
- if (!libxl_pci_assignable(ctx, pci)) {
+ if (!is_bdf_assignable(ctx, &pci->bdf)) {
LOGD(ERROR, domid, "PCI device %x:%x:%x.%x is not assignable",
pci->bdf.domain, pci->bdf.bus, pci->bdf.dev, pci->bdf.func);
rc = ERROR_FAIL;
goto out;
}
- rc = pci_info_xs_write(gc, pci, "domid", GCSPRINTF("%u", domid));
+ rc = pci_info_xs_write(gc, &pci->bdf, "domid", GCSPRINTF("%u", domid));
if (rc) goto out;
libxl__device_pci_reset(gc, pci->bdf.domain, pci->bdf.bus, pci->bdf.dev, pci->bdf.func);
@@ -1642,7 +1664,7 @@ static void device_pci_add_done(libxl__egc *egc,
"PCI device %x:%x:%x.%x (rc %d)",
pci->bdf.domain, pci->bdf.bus, pci->bdf.dev, pci->bdf.func,
rc);
- pci_info_xs_remove(gc, pci, "domid");
+ pci_info_xs_remove(gc, &pci->bdf, "domid");
}
libxl_device_pci_dispose(pci);
aodev->rc = rc;
@@ -2082,7 +2104,8 @@ static void pci_remove_detached(libxl__egc *egc,
}
if (!isstubdom) {
- rc = xc_deassign_device(CTX->xch, domid, pci_encode_bdf(pci));
+ rc = xc_deassign_device(CTX->xch, domid,
+ pci_encode_bdf(&pci->bdf));
if (rc < 0 && (prs->hvm || errno != ENOSYS))
LOGED(ERROR, domainid, "xc_deassign_device failed");
}
@@ -2211,7 +2234,7 @@ out:
libxl__ev_time_deregister(gc, &prs->timeout);
libxl__ev_time_deregister(gc, &prs->retry_timer);
- if (!rc) pci_info_xs_remove(gc, pci, "domid");
+ if (!rc) pci_info_xs_remove(gc, &pci->bdf, "domid");
libxl_device_pci_dispose(pci);
aodev->rc = rc;
diff --git a/tools/ocaml/libs/xl/xenlight_stubs.c b/tools/ocaml/libs/xl/xenlight_stubs.c
index 352a00134d70..2388f238697c 100644
--- a/tools/ocaml/libs/xl/xenlight_stubs.c
+++ b/tools/ocaml/libs/xl/xenlight_stubs.c
@@ -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);
diff --git a/tools/xl/xl_pci.c b/tools/xl/xl_pci.c
index 9c24496cb2dd..37708b4eb14d 100644
--- a/tools/xl/xl_pci.c
+++ b/tools/xl/xl_pci.c
@@ -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;
--
2.20.1
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH v2 21/24] docs/man: modify xl(1) in preparation for naming of assignable devices
2020-11-10 17:51 [PATCH v2 00/24] xl / libxl: named PCI pass-through devices Paul Durrant
` (19 preceding siblings ...)
2020-11-10 17:51 ` [PATCH v2 20/24] libxl: modify libxl_device_pci_assignable_add/remove/list/list_free() Paul Durrant
@ 2020-11-10 17:51 ` Paul Durrant
2020-11-10 17:51 ` [PATCH v2 22/24] xl / libxl: support " Paul Durrant
` (3 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Paul Durrant @ 2020-11-10 17:51 UTC (permalink / raw)
To: xen-devel; +Cc: Paul Durrant, Ian Jackson, Wei Liu
From: Paul Durrant <pdurrant@amazon.com>
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.
Signed-off-by: Paul Durrant <pdurrant@amazon.com>
---
Cc: Ian Jackson <iwj@xenproject.org>
Cc: Wei Liu <wl@xen.org>
---
docs/man/xl.1.pod.in | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/docs/man/xl.1.pod.in b/docs/man/xl.1.pod.in
index c5fbce3b5c4b..0822a5842835 100644
--- a/docs/man/xl.1.pod.in
+++ b/docs/man/xl.1.pod.in
@@ -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
--
2.20.1
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH v2 22/24] xl / libxl: support naming of assignable devices
2020-11-10 17:51 [PATCH v2 00/24] xl / libxl: named PCI pass-through devices Paul Durrant
` (20 preceding siblings ...)
2020-11-10 17:51 ` [PATCH v2 21/24] docs/man: modify xl(1) in preparation for naming of assignable devices Paul Durrant
@ 2020-11-10 17:51 ` Paul Durrant
2020-11-10 17:51 ` [PATCH v2 23/24] docs/man: modify xl-pci-configuration(5) to add 'name' field to PCI_SPEC_STRING Paul Durrant
` (2 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Paul Durrant @ 2020-11-10 17:51 UTC (permalink / raw)
To: xen-devel
Cc: Paul Durrant, Ian Jackson, Wei Liu, Christian Lindig,
David Scott, Anthony PERARD
From: Paul Durrant <pdurrant@amazon.com>
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.
Signed-off-by: Paul Durrant <pdurrant@amazon.com>
---
Cc: Ian Jackson <iwj@xenproject.org>
Cc: Wei Liu <wl@xen.org>
Cc: Christian Lindig <christian.lindig@citrix.com>
Cc: David Scott <dave@recoil.org>
Cc: Anthony PERARD <anthony.perard@citrix.com>
---
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 | 80 ++++++++++++++++++--------
5 files changed, 164 insertions(+), 36 deletions(-)
diff --git a/tools/include/libxl.h b/tools/include/libxl.h
index 5703fdf367c5..4025d3a3d437 100644
--- a/tools/include/libxl.h
+++ b/tools/include/libxl.h
@@ -476,6 +476,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
*
@@ -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,
diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c
index d436e0a42b0c..a789ade036fa 100644
--- a/tools/libs/light/libxl_pci.c
+++ b/tools/libs/light/libxl_pci.c
@@ -713,6 +713,7 @@ static int pciback_dev_unassign(libxl__gc *gc, libxl_pci_bdf *pcibdf)
static int libxl__device_pci_assignable_add(libxl__gc *gc,
libxl_pci_bdf *pcibdf,
+ const char *name,
int rebind)
{
libxl_ctx *ctx = libxl__gc_owner(gc);
@@ -721,6 +722,23 @@ static int libxl__device_pci_assignable_add(libxl__gc *gc,
int rc;
struct stat st;
+ /* Sanitise any name that was passed */
+ if (name) {
+ unsigned int i, n = strlen(name);
+
+ if (n > 64) { /* Reasonable upper bound on name length */
+ LOG(ERROR, "Name too long");
+ return ERROR_FAIL;
+ }
+
+ for (i = 0; i < n; i++) {
+ if (!isgraph(name[i])) {
+ LOG(ERROR, "Names may only include printable characters");
+ return ERROR_FAIL;
+ }
+ }
+ }
+
/* Local copy for convenience */
dom = pcibdf->domain;
bus = pcibdf->bus;
@@ -741,7 +759,7 @@ static int libxl__device_pci_assignable_add(libxl__gc *gc,
}
if ( rc ) {
LOG(WARN, PCI_BDF" already assigned to pciback", dom, bus, dev, func);
- goto quarantine;
+ goto name;
}
/* Check to see if there's already a driver that we need to unbind from */
@@ -772,7 +790,12 @@ static int libxl__device_pci_assignable_add(libxl__gc *gc,
return ERROR_FAIL;
}
-quarantine:
+name:
+ if (name)
+ pci_info_xs_write(gc, pcibdf, "name", name);
+ else
+ pci_info_xs_remove(gc, pcibdf, "name");
+
/*
* DOMID_IO is just a sentinel domain, without any actual mappings,
* so always pass XEN_DOMCTL_DEV_RDM_RELAXED to avoid assignment being
@@ -836,16 +859,18 @@ static int libxl__device_pci_assignable_remove(libxl__gc *gc,
}
}
+ pci_info_xs_remove(gc, pcibdf, "name");
+
return 0;
}
int libxl_device_pci_assignable_add(libxl_ctx *ctx, libxl_pci_bdf *pcibdf,
- int rebind)
+ const char *name, int rebind)
{
GC_INIT(ctx);
int rc;
- rc = libxl__device_pci_assignable_add(gc, pcibdf, rebind);
+ rc = libxl__device_pci_assignable_add(gc, pcibdf, name, rebind);
GC_FREE;
return rc;
@@ -864,6 +889,57 @@ int libxl_device_pci_assignable_remove(libxl_ctx *ctx, libxl_pci_bdf *pcibdf,
return rc;
}
+libxl_pci_bdf *libxl_device_pci_assignable_name2bdf(libxl_ctx *ctx,
+ const char *name)
+{
+ GC_INIT(ctx);
+ char **bdfs;
+ libxl_pci_bdf *pcibdf;
+ unsigned int i, n;
+
+ bdfs = libxl__xs_directory(gc, XBT_NULL, PCI_INFO_PATH, &n);
+ if (!n)
+ goto out;
+
+ pcibdf = calloc(1, sizeof(*pcibdf));
+ if (!pcibdf)
+ goto out;
+
+ for (i = 0; i < n; i++) {
+ unsigned dom, bus, dev, func;
+ const char *tmp;
+
+ if (sscanf(bdfs[i], PCI_BDF_XSPATH, &dom, &bus, &dev, &func) != 4)
+ continue;
+
+ pcibdf_struct_fill(pcibdf, dom, bus, dev, func);
+
+ tmp = pci_info_xs_read(gc, pcibdf, "name");
+ if (tmp && !strcmp(tmp, name))
+ goto out;
+ }
+
+ free(pcibdf);
+ pcibdf = NULL;
+
+out:
+ GC_FREE;
+ return pcibdf;
+}
+
+char *libxl_device_pci_assignable_bdf2name(libxl_ctx *ctx,
+ libxl_pci_bdf *pcibdf)
+{
+ GC_INIT(ctx);
+ char *name = NULL, *tmp = pci_info_xs_read(gc, pcibdf, "name");
+
+ if (tmp)
+ name = strdup(tmp);
+
+ GC_FREE;
+ return name;
+}
+
/*
* This function checks that all functions of a device are bound to pciback
* driver. It also initialises a bit-mask of which function numbers are present
@@ -1528,7 +1604,7 @@ void libxl__device_pci_add(libxl__egc *egc, uint32_t domid,
if (rc) goto out;
if (pci->seize && !pciback_dev_is_assigned(gc, &pci->bdf)) {
- rc = libxl__device_pci_assignable_add(gc, &pci->bdf, 1);
+ rc = libxl__device_pci_assignable_add(gc, &pci->bdf, NULL, 1);
if ( rc )
goto out;
}
diff --git a/tools/ocaml/libs/xl/xenlight_stubs.c b/tools/ocaml/libs/xl/xenlight_stubs.c
index 2388f238697c..96bb4655e0b1 100644
--- a/tools/ocaml/libs/xl/xenlight_stubs.c
+++ b/tools/ocaml/libs/xl/xenlight_stubs.c
@@ -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);
diff --git a/tools/xl/xl_cmdtable.c b/tools/xl/xl_cmdtable.c
index 2ee0c4967334..9e9aa448e2a6 100644
--- a/tools/xl/xl_cmdtable.c
+++ b/tools/xl/xl_cmdtable.c
@@ -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,
diff --git a/tools/xl/xl_pci.c b/tools/xl/xl_pci.c
index 37708b4eb14d..f1b58b39762a 100644
--- a/tools/xl/xl_pci.c
+++ b/tools/xl/xl_pci.c
@@ -152,7 +152,7 @@ int main_pciattach(int argc, char **argv)
return EXIT_SUCCESS;
}
-static void pciassignable_list(void)
+static void pciassignable_list(bool show_names)
{
libxl_pci_bdf *pcibdfs;
int num, i;
@@ -162,9 +162,15 @@ static void pciassignable_list(void)
if ( pcibdfs == NULL )
return;
for (i = 0; i < num; i++) {
- printf("%04x:%02x:%02x.%01x\n",
- pcibdfs[i].domain, pcibdfs[i].bus, pcibdfs[i].dev,
- pcibdfs[i].func);
+ libxl_pci_bdf *pcibdf = &pcibdfs[i];
+ char *name = show_names ?
+ libxl_device_pci_assignable_bdf2name(ctx, pcibdf) : NULL;
+
+ printf("%04x:%02x:%02x.%01x %s\n",
+ pcibdf->domain, pcibdf->bus, pcibdf->dev, pcibdf->func,
+ name ?: "");
+
+ free(name);
}
libxl_device_pci_assignable_list_free(pcibdfs, num);
}
@@ -172,16 +178,23 @@ static void pciassignable_list(void)
int main_pciassignable_list(int argc, char **argv)
{
int opt;
+ static struct option opts[] = {
+ {"show-names", 0, 0, 'n'},
+ COMMON_LONG_OPTS
+ };
+ bool show_names = false;
- SWITCH_FOREACH_OPT(opt, "", NULL, "pci-assignable-list", 0) {
- /* No options */
+ SWITCH_FOREACH_OPT(opt, "n", opts, "pci-assignable-list", 0) {
+ case 'n':
+ show_names = true;
+ break;
}
- pciassignable_list();
+ pciassignable_list(show_names);
return 0;
}
-static int pciassignable_add(const char *bdf, int rebind)
+static int pciassignable_add(const char *bdf, const char *name, int rebind)
{
libxl_pci_bdf pcibdf;
XLU_Config *config;
@@ -197,7 +210,7 @@ static int pciassignable_add(const char *bdf, int rebind)
exit(2);
}
- if (libxl_device_pci_assignable_add(ctx, &pcibdf, rebind))
+ if (libxl_device_pci_assignable_add(ctx, &pcibdf, name, rebind))
r = 1;
libxl_pci_bdf_dispose(&pcibdf);
@@ -210,39 +223,58 @@ int main_pciassignable_add(int argc, char **argv)
{
int opt;
const char *bdf = NULL;
+ static struct option opts[] = {
+ {"name", 1, 0, 'n'},
+ COMMON_LONG_OPTS
+ };
+ const char *name = NULL;
- SWITCH_FOREACH_OPT(opt, "", NULL, "pci-assignable-add", 1) {
- /* No options */
+ SWITCH_FOREACH_OPT(opt, "n:", opts, "pci-assignable-add", 0) {
+ case 'n':
+ name = optarg;
+ break;
}
bdf = argv[optind];
- if (pciassignable_add(bdf, 1))
+ if (pciassignable_add(bdf, name, 1))
return EXIT_FAILURE;
return EXIT_SUCCESS;
}
-static int pciassignable_remove(const char *bdf, int rebind)
+static int pciassignable_remove(const char *ident, int rebind)
{
- libxl_pci_bdf pcibdf;
+ libxl_pci_bdf *pcibdf;
XLU_Config *config;
int r = 0;
- 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, &pcibdf, bdf)) {
- fprintf(stderr, "pci-assignable-remove: malformed BDF \"%s\"\n", bdf);
- exit(2);
+ pcibdf = libxl_device_pci_assignable_name2bdf(ctx, ident);
+ if (!pcibdf) {
+ pcibdf = calloc(1, sizeof(*pcibdf));
+
+ if (!pcibdf) {
+ fprintf(stderr,
+ "pci-assignable-remove: failed to allocate memory\n");
+ exit(2);
+ }
+
+ libxl_pci_bdf_init(pcibdf);
+ if (xlu_pci_parse_bdf(config, pcibdf, ident)) {
+ fprintf(stderr,
+ "pci-assignable-remove: malformed BDF '%s'\n", ident);
+ exit(2);
+ }
}
- if (libxl_device_pci_assignable_remove(ctx, &pcibdf, rebind))
+ if (libxl_device_pci_assignable_remove(ctx, pcibdf, rebind))
r = 1;
- libxl_pci_bdf_dispose(&pcibdf);
+ libxl_pci_bdf_dispose(pcibdf);
+ free(pcibdf);
xlu_cfg_destroy(config);
return r;
@@ -251,7 +283,7 @@ static int pciassignable_remove(const char *bdf, int rebind)
int main_pciassignable_remove(int argc, char **argv)
{
int opt;
- const char *bdf = NULL;
+ const char *ident = NULL;
int rebind = 0;
SWITCH_FOREACH_OPT(opt, "r", NULL, "pci-assignable-remove", 1) {
@@ -260,9 +292,9 @@ int main_pciassignable_remove(int argc, char **argv)
break;
}
- bdf = argv[optind];
+ ident = argv[optind];
- if (pciassignable_remove(bdf, rebind))
+ if (pciassignable_remove(ident, rebind))
return EXIT_FAILURE;
return EXIT_SUCCESS;
--
2.20.1
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH v2 23/24] docs/man: modify xl-pci-configuration(5) to add 'name' field to PCI_SPEC_STRING
2020-11-10 17:51 [PATCH v2 00/24] xl / libxl: named PCI pass-through devices Paul Durrant
` (21 preceding siblings ...)
2020-11-10 17:51 ` [PATCH v2 22/24] xl / libxl: support " Paul Durrant
@ 2020-11-10 17:51 ` Paul Durrant
2020-11-10 17:51 ` [PATCH v2 24/24] xl / libxl: support 'xl pci-attach/detach' by name Paul Durrant
2020-11-16 10:33 ` [PATCH v2 00/24] xl / libxl: named PCI pass-through devices Oleksandr Andrushchenko
24 siblings, 0 replies; 27+ messages in thread
From: Paul Durrant @ 2020-11-10 17:51 UTC (permalink / raw)
To: xen-devel; +Cc: Paul Durrant, Ian Jackson, Wei Liu
From: Paul Durrant <pdurrant@amazon.com>
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.
Signed-off-by: Paul Durrant <pdurrant@amazon.com>
---
Cc: Ian Jackson <iwj@xenproject.org>
Cc: Wei Liu <wl@xen.org>
---
docs/man/xl-pci-configuration.5.pod | 25 +++++++++++++++++++++++--
1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/docs/man/xl-pci-configuration.5.pod b/docs/man/xl-pci-configuration.5.pod
index 4dd73bc498d6..db3360307cbd 100644
--- a/docs/man/xl-pci-configuration.5.pod
+++ b/docs/man/xl-pci-configuration.5.pod
@@ -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
--
2.20.1
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH v2 24/24] xl / libxl: support 'xl pci-attach/detach' by name
2020-11-10 17:51 [PATCH v2 00/24] xl / libxl: named PCI pass-through devices Paul Durrant
` (22 preceding siblings ...)
2020-11-10 17:51 ` [PATCH v2 23/24] docs/man: modify xl-pci-configuration(5) to add 'name' field to PCI_SPEC_STRING Paul Durrant
@ 2020-11-10 17:51 ` Paul Durrant
2020-11-16 10:33 ` [PATCH v2 00/24] xl / libxl: named PCI pass-through devices Oleksandr Andrushchenko
24 siblings, 0 replies; 27+ messages in thread
From: Paul Durrant @ 2020-11-10 17:51 UTC (permalink / raw)
To: xen-devel; +Cc: Paul Durrant, Ian Jackson, Wei Liu, Anthony PERARD
From: Paul Durrant <pdurrant@amazon.com>
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.
Signed-off-by: Paul Durrant <pdurrant@amazon.com>
---
Cc: Ian Jackson <iwj@xenproject.org>
Cc: Wei Liu <wl@xen.org>
Cc: Anthony PERARD <anthony.perard@citrix.com>
---
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(-)
diff --git a/tools/include/libxl.h b/tools/include/libxl.h
index 4025d3a3d437..5b55a2015533 100644
--- a/tools/include/libxl.h
+++ b/tools/include/libxl.h
@@ -484,6 +484,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
*
diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c
index a789ade036fa..8dfbcf8d390d 100644
--- a/tools/libs/light/libxl_pci.c
+++ b/tools/libs/light/libxl_pci.c
@@ -60,6 +60,10 @@ static void libxl_create_pci_backend_device(libxl__gc *gc,
int num,
const libxl_device_pci *pci)
{
+ if (pci->name) {
+ flexarray_append(back, GCSPRINTF("name-%d", num));
+ flexarray_append(back, GCSPRINTF("%s", pci->name));
+ }
flexarray_append(back, GCSPRINTF("key-%d", num));
flexarray_append(back, GCSPRINTF(PCI_BDF, pci->bdf.domain, pci->bdf.bus, pci->bdf.dev, pci->bdf.func));
flexarray_append(back, GCSPRINTF("dev-%d", num));
@@ -252,6 +256,7 @@ retry_transaction:
retry_transaction2:
t = xs_transaction_start(ctx->xsh);
+ xs_rm(ctx->xsh, t, GCSPRINTF("%s/name-%d", be_path, i));
xs_rm(ctx->xsh, t, GCSPRINTF("%s/state-%d", be_path, i));
xs_rm(ctx->xsh, t, GCSPRINTF("%s/key-%d", be_path, i));
xs_rm(ctx->xsh, t, GCSPRINTF("%s/dev-%d", be_path, i));
@@ -290,6 +295,12 @@ retry_transaction2:
xs_write(ctx->xsh, t, GCSPRINTF("%s/vdevfn-%d", be_path, j - 1), tmp, strlen(tmp));
xs_rm(ctx->xsh, t, tmppath);
}
+ tmppath = GCSPRINTF("%s/name-%d", be_path, j);
+ tmp = libxl__xs_read(gc, t, tmppath);
+ if (tmp) {
+ xs_write(ctx->xsh, t, GCSPRINTF("%s/name-%d", be_path, j - 1), tmp, strlen(tmp));
+ xs_rm(ctx->xsh, t, tmppath);
+ }
}
if (!xs_transaction_end(ctx->xsh, t, 0))
if (errno == EAGAIN)
@@ -1587,6 +1598,23 @@ void libxl__device_pci_add(libxl__egc *egc, uint32_t domid,
pas->starting = starting;
pas->callback = device_pci_add_stubdom_done;
+ if (pci->name) {
+ libxl_pci_bdf *pcibdf =
+ libxl_device_pci_assignable_name2bdf(CTX, pci->name);
+
+ if (!pcibdf) {
+ rc = ERROR_FAIL;
+ goto out;
+ }
+
+ LOGD(DETAIL, domid, "'%s' -> %04x:%02x:%02x.%u", pci->name,
+ pcibdf->domain, pcibdf->bus, pcibdf->dev, pcibdf->func);
+
+ libxl_pci_bdf_copy(CTX, &pci->bdf, pcibdf);
+ libxl_pci_bdf_dispose(pcibdf);
+ free(pcibdf);
+ }
+
if (libxl__domain_type(gc, domid) == LIBXL_DOMAIN_TYPE_HVM) {
rc = xc_test_assign_device(ctx->xch, domid,
pci_encode_bdf(&pci->bdf));
@@ -1735,11 +1763,19 @@ static void device_pci_add_done(libxl__egc *egc,
libxl_device_pci *pci = &pas->pci;
if (rc) {
- LOGD(ERROR, domid,
- "libxl__device_pci_add failed for "
- "PCI device %x:%x:%x.%x (rc %d)",
- pci->bdf.domain, pci->bdf.bus, pci->bdf.dev, pci->bdf.func,
- rc);
+ if (pci->name) {
+ LOGD(ERROR, domid,
+ "libxl__device_pci_add failed for "
+ "PCI device '%s' (rc %d)",
+ pci->name,
+ rc);
+ } else {
+ LOGD(ERROR, domid,
+ "libxl__device_pci_add failed for "
+ "PCI device %x:%x:%x.%x (rc %d)",
+ pci->bdf.domain, pci->bdf.bus, pci->bdf.dev, pci->bdf.func,
+ rc);
+ }
pci_info_xs_remove(gc, &pci->bdf, "domid");
}
libxl_device_pci_dispose(pci);
@@ -2256,6 +2292,23 @@ static void libxl__device_pci_remove_common(libxl__egc *egc,
libxl__ev_time_init(&prs->timeout);
libxl__ev_time_init(&prs->retry_timer);
+ if (pci->name) {
+ libxl_pci_bdf *pcibdf =
+ libxl_device_pci_assignable_name2bdf(CTX, pci->name);
+
+ if (!pcibdf) {
+ rc = ERROR_FAIL;
+ goto out;
+ }
+
+ LOGD(DETAIL, domid, "'%s' -> %04x:%02x:%02x.%u", pci->name,
+ pcibdf->domain, pcibdf->bus, pcibdf->dev, pcibdf->func);
+
+ libxl_pci_bdf_copy(CTX, &prs->pci.bdf, pcibdf);
+ libxl_pci_bdf_dispose(pcibdf);
+ free(pcibdf);
+ }
+
prs->orig_vdev = pci->vdevfn & ~7U;
if ( pci->vfunc_mask == LIBXL_PCI_FUNC_ALL ) {
@@ -2390,6 +2443,10 @@ static int libxl__device_pci_from_xs_be(libxl__gc *gc,
} while ((p = strtok_r(NULL, ",=", &saveptr)) != NULL);
}
+ s = libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/name-%d", be_path, nr));
+ if (s)
+ pci->name = strdup(s);
+
return 0;
}
diff --git a/tools/libs/light/libxl_types.idl b/tools/libs/light/libxl_types.idl
index 2c441142fba6..44bad36f1c4c 100644
--- a/tools/libs/light/libxl_types.idl
+++ b/tools/libs/light/libxl_types.idl
@@ -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),
diff --git a/tools/libs/util/libxlu_pci.c b/tools/libs/util/libxlu_pci.c
index a8b6ce542736..543a1f80e99e 100644
--- a/tools/libs/util/libxlu_pci.c
+++ b/tools/libs/util/libxlu_pci.c
@@ -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;
--
2.20.1
^ permalink raw reply related [flat|nested] 27+ messages in thread* Re: [PATCH v2 00/24] xl / libxl: named PCI pass-through devices
2020-11-10 17:51 [PATCH v2 00/24] xl / libxl: named PCI pass-through devices Paul Durrant
` (23 preceding siblings ...)
2020-11-10 17:51 ` [PATCH v2 24/24] xl / libxl: support 'xl pci-attach/detach' by name Paul Durrant
@ 2020-11-16 10:33 ` Oleksandr Andrushchenko
2020-11-17 19:46 ` Paul Durrant
24 siblings, 1 reply; 27+ messages in thread
From: Oleksandr Andrushchenko @ 2020-11-16 10:33 UTC (permalink / raw)
To: Paul Durrant, xen-devel
Cc: Paul Durrant, Anthony PERARD, Christian Lindig, David Scott,
George Dunlap, Ian Jackson, Nick Rosbrook, Wei Liu
Hi, Paul!
On 11/10/20 7:51 PM, Paul Durrant wrote:
> From: Paul Durrant <pdurrant@amazon.com>
>
> Paul Durrant (24):
> xl / libxl: s/pcidev/pci and remove DEFINE_DEVICE_TYPE_STRUCT_X
> libxl: use LIBXL_DEFINE_DEVICE_LIST for pci devices
> libxl: use LIBXL_DEFINE_DEVICE_LIST for nic devices
> 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()...
> libxl: add/recover 'rdm_policy' to/from PCI backend in xenstore
> libxl: Make sure devices added by pci-attach are reflected in the
> config
> 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_dm.c | 18 +-
> tools/libs/light/libxl_internal.h | 53 +-
> tools/libs/light/libxl_nic.c | 19 +-
> tools/libs/light/libxl_pci.c | 1030 ++++++++++++++------------
> tools/libs/light/libxl_types.idl | 19 +-
> tools/libs/util/libxlu_pci.c | 379 +++++-----
> tools/ocaml/libs/xl/xenlight_stubs.c | 19 +-
> tools/xl/xl_cmdtable.c | 16 +-
> tools/xl/xl_parse.c | 28 +-
> tools/xl/xl_pci.c | 159 ++--
> tools/xl/xl_sxp.c | 12 +-
> 19 files changed, 1308 insertions(+), 935 deletions(-)
> create mode 100644 docs/man/xl-pci-configuration.5.pod
Patches 1-18:
Reviewed-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
(I'll probably review more later as time allows).
I would like to ask the respective maintainers to look at this series as, in the light of the
upcoming changes for ARM PCI passthrough, these changes greatly help in adapting the
code for ARM
Thank you,
Oleksandr
> ---
> Cc: Anthony PERARD <anthony.perard@citrix.com>
> Cc: Christian Lindig <christian.lindig@citrix.com>
> Cc: David Scott <dave@recoil.org>
> Cc: George Dunlap <george.dunlap@citrix.com>
> Cc: Ian Jackson <iwj@xenproject.org>
> Cc: Nick Rosbrook <rosbrookn@ainfosec.com>
> Cc: Wei Liu <wl@xen.org>
^ permalink raw reply [flat|nested] 27+ messages in thread* RE: [PATCH v2 00/24] xl / libxl: named PCI pass-through devices
2020-11-16 10:33 ` [PATCH v2 00/24] xl / libxl: named PCI pass-through devices Oleksandr Andrushchenko
@ 2020-11-17 19:46 ` Paul Durrant
0 siblings, 0 replies; 27+ messages in thread
From: Paul Durrant @ 2020-11-17 19:46 UTC (permalink / raw)
To: 'Oleksandr Andrushchenko', xen-devel
Cc: 'Paul Durrant', 'Anthony PERARD',
'Christian Lindig', 'David Scott',
'George Dunlap', 'Ian Jackson',
'Nick Rosbrook', 'Wei Liu'
> -----Original Message-----
> From: Oleksandr Andrushchenko <Oleksandr_Andrushchenko@epam.com>
> Sent: 16 November 2020 10:34
> To: Paul Durrant <paul@xen.org>; xen-devel@lists.xenproject.org
> Cc: Paul Durrant <pdurrant@amazon.com>; Anthony PERARD <anthony.perard@citrix.com>; Christian Lindig
> <christian.lindig@citrix.com>; David Scott <dave@recoil.org>; George Dunlap
> <george.dunlap@citrix.com>; Ian Jackson <iwj@xenproject.org>; Nick Rosbrook <rosbrookn@ainfosec.com>;
> Wei Liu <wl@xen.org>
> Subject: Re: [PATCH v2 00/24] xl / libxl: named PCI pass-through devices
>
> Hi, Paul!
>
> On 11/10/20 7:51 PM, Paul Durrant wrote:
> > From: Paul Durrant <pdurrant@amazon.com>
> >
> > Paul Durrant (24):
> > xl / libxl: s/pcidev/pci and remove DEFINE_DEVICE_TYPE_STRUCT_X
> > libxl: use LIBXL_DEFINE_DEVICE_LIST for pci devices
> > libxl: use LIBXL_DEFINE_DEVICE_LIST for nic devices
> > 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()...
> > libxl: add/recover 'rdm_policy' to/from PCI backend in xenstore
> > libxl: Make sure devices added by pci-attach are reflected in the
> > config
> > 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_dm.c | 18 +-
> > tools/libs/light/libxl_internal.h | 53 +-
> > tools/libs/light/libxl_nic.c | 19 +-
> > tools/libs/light/libxl_pci.c | 1030 ++++++++++++++------------
> > tools/libs/light/libxl_types.idl | 19 +-
> > tools/libs/util/libxlu_pci.c | 379 +++++-----
> > tools/ocaml/libs/xl/xenlight_stubs.c | 19 +-
> > tools/xl/xl_cmdtable.c | 16 +-
> > tools/xl/xl_parse.c | 28 +-
> > tools/xl/xl_pci.c | 159 ++--
> > tools/xl/xl_sxp.c | 12 +-
> > 19 files changed, 1308 insertions(+), 935 deletions(-)
> > create mode 100644 docs/man/xl-pci-configuration.5.pod
>
> Patches 1-18:
>
> Reviewed-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
>
> (I'll probably review more later as time allows).
>
>
> I would like to ask the respective maintainers to look at this series as, in the light of the
>
> upcoming changes for ARM PCI passthrough, these changes greatly help in adapting the
>
> code for ARM
>
FWIW, I believe there is still an issue in one of the patches (probably patch #14) which has caused problems for pass-through of multiple devices. I will debug that in the next couple of days and post v3.
Paul
> Thank you,
>
> Oleksandr
>
> > ---
> > Cc: Anthony PERARD <anthony.perard@citrix.com>
> > Cc: Christian Lindig <christian.lindig@citrix.com>
> > Cc: David Scott <dave@recoil.org>
> > Cc: George Dunlap <george.dunlap@citrix.com>
> > Cc: Ian Jackson <iwj@xenproject.org>
> > Cc: Nick Rosbrook <rosbrookn@ainfosec.com>
> > Cc: Wei Liu <wl@xen.org>
^ permalink raw reply [flat|nested] 27+ messages in thread