From nobody Thu May 2 00:14:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1607455875; cv=none; d=zohomail.com; s=zohoarc; b=jfLv6EVVejpFQ3ZERMfN3JknwDHQR02wkHeRK781IGdOTJc6sgwoA0twJQAZnPz+v3/MvfRAmn6qNSHBpnqJSVIWhMTxV3FukVQDbjG7Vs7qodKbXc6/KZmmOoySi7N2u4n0BbmYPFZ1Mo8DARvaxVVqbLG/brHxZ9puit7BFBk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607455875; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=cBR0cFUJiqGdqAnzx98TGoc+XReo3bFMnFXG44K2vPM=; b=ZC5RprnaYTMowm7qe5Zhbf0/k2r+EaGu1A5TyG7wru3qJDiov+Yq9h0kUE5wUsgWRZ9owbfNhx4ou8gjs0uYjwkyiPdSEvtU/WZDqGJ6OZ4UDKY74TlACPZq2dj1qQEBfIrVuDY0aotC85ZP/no8wrr4rlRwd6aeEmYTw+Pvwn8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1607455875566460.86219530763526; Tue, 8 Dec 2020 11:31:15 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.47684.84392 (Exim 4.92) (envelope-from ) id 1kmihA-0000fS-BV; Tue, 08 Dec 2020 19:30:44 +0000 Received: by outflank-mailman (output) from mailman id 47684.84392; Tue, 08 Dec 2020 19:30:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmihA-0000fJ-89; Tue, 08 Dec 2020 19:30:44 +0000 Received: by outflank-mailman (input) for mailman id 47684; Tue, 08 Dec 2020 19:30:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmih8-0000eq-OR for xen-devel@lists.xenproject.org; Tue, 08 Dec 2020 19:30:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmih7-0007L7-Ex; Tue, 08 Dec 2020 19:30:41 +0000 Received: from host86-183-162-145.range86-183.btcentralplus.com ([86.183.162.145] helo=desktop.home) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kmih6-0001p0-Ux; Tue, 08 Dec 2020 19:30:41 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=cBR0cFUJiqGdqAnzx98TGoc+XReo3bFMnFXG44K2vPM=; b=tuoNXXfrttWvfUtiK4TwNMNvrE LLLNzG1ChqgqU8TPEZNhkVHVjDPII1xPjeR8fXVnbsxEU9P7rZOvgQ2FD7sJ/sSfmaquMYNF3ZnPY OW3jBIYJo8PO6vA/RjCA/xmLi5alI85hs1QWQOC82GR5wF72FYwOofHyUZY6d0P3i81c=; From: Paul Durrant To: xen-devel@lists.xenproject.org Cc: Paul Durrant , Ian Jackson , Wei Liu , Anthony PERARD Subject: [PATCH v6 01/25] libxl: s/pcidev/pci and remove DEFINE_DEVICE_TYPE_STRUCT_X Date: Tue, 8 Dec 2020 19:30:09 +0000 Message-Id: <20201208193033.11306-2-paul@xen.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201208193033.11306-1-paul@xen.org> References: <20201208193033.11306-1-paul@xen.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @xen.org) Content-Type: text/plain; charset="utf-8" From: Paul Durrant 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 becau= se of this duality. This patch purges use of 'pcidev' from the libxl internal code, but unfortunately the 'pcidevs' and 'num_pcidevs' fields in 'libxl_domain_confi= g' are part of the API and need to be retained to avoid breaking callers, particularly libvirt. DEFINE_DEVICE_TYPE_STRUCT_X is still removed to avoid the special case in libxl_pci.c but DEFINE_DEVICE_TYPE_STRUCT is given an extra 'array' argument which is used to identify the fields in 'libxl_domain_config' relating to the device type. 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 Acked-by: Wei Liu --- Cc: Ian Jackson Cc: Wei Liu Cc: Anthony PERARD v6: - Avoid name changes in 'libxl_domain_config' - Defer xl changes to a subsequent patch v5: - Minor cosmetic fix --- tools/include/libxl.h | 10 +- tools/libs/light/libxl_9pfs.c | 2 +- tools/libs/light/libxl_console.c | 2 +- tools/libs/light/libxl_create.c | 4 +- tools/libs/light/libxl_disk.c | 2 +- tools/libs/light/libxl_internal.h | 29 +- tools/libs/light/libxl_nic.c | 2 +- tools/libs/light/libxl_pci.c | 570 +++++++++++++++--------------- tools/libs/light/libxl_pvcalls.c | 2 +- tools/libs/light/libxl_usb.c | 4 +- tools/libs/light/libxl_vdispl.c | 2 +- tools/libs/light/libxl_vkb.c | 2 +- tools/libs/light/libxl_vsnd.c | 2 +- tools/libs/light/libxl_vtpm.c | 2 +- tools/libs/util/libxlu_pci.c | 36 +- 15 files changed, 334 insertions(+), 337 deletions(-) diff --git a/tools/include/libxl.h b/tools/include/libxl.h index eaffccb30f37..733263522bd9 100644 --- a/tools/include/libxl.h +++ b/tools/include/libxl.h @@ -2307,15 +2307,15 @@ int libxl_device_pvcallsif_destroy(libxl_ctx *ctx, = uint32_t domid, =20 /* 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; =20 @@ -2359,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 *pcid= ev, int rebind); -int libxl_device_pci_assignable_remove(libxl_ctx *ctx, libxl_device_pci *p= cidev, 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 *p= ci, int rebind); libxl_device_pci *libxl_device_pci_assignable_list(libxl_ctx *ctx, int *nu= m); =20 /* CPUID handling */ diff --git a/tools/libs/light/libxl_9pfs.c b/tools/libs/light/libxl_9pfs.c index e5c41e9a2524..5ab0d3aa21b0 100644 --- a/tools/libs/light/libxl_9pfs.c +++ b/tools/libs/light/libxl_9pfs.c @@ -45,7 +45,7 @@ static LIBXL_DEFINE_DEVICE_FROM_TYPE(p9) =20 LIBXL_DEFINE_DEVICE_REMOVE(p9) =20 -DEFINE_DEVICE_TYPE_STRUCT(p9, 9PFS, +DEFINE_DEVICE_TYPE_STRUCT(p9, 9PFS, p9s, .skip_attach =3D 1, .set_xenstore_config =3D (device_set_xenstore_config_fn_t) libxl__set_xenstore_p9, diff --git a/tools/libs/light/libxl_console.c b/tools/libs/light/libxl_cons= ole.c index 047d23d7ae78..d8b2bc546582 100644 --- a/tools/libs/light/libxl_console.c +++ b/tools/libs/light/libxl_console.c @@ -725,7 +725,7 @@ static LIBXL_DEFINE_DEVICE_FROM_TYPE(vfb) /* vfb */ LIBXL_DEFINE_DEVICE_REMOVE(vfb) =20 -DEFINE_DEVICE_TYPE_STRUCT(vfb, VFB, +DEFINE_DEVICE_TYPE_STRUCT(vfb, VFB, vfbs, .skip_attach =3D 1, .set_xenstore_config =3D (device_set_xenstore_config_fn_t) libxl__set_xenstore_vfb, diff --git a/tools/libs/light/libxl_create.c b/tools/libs/light/libxl_creat= e.c index 321a13e519b5..86f4a8369d35 100644 --- a/tools/libs/light/libxl_create.c +++ b/tools/libs/light/libxl_create.c @@ -1809,7 +1809,7 @@ out: #define libxl__device_from_dtdev NULL #define libxl__device_dtdev_setdefault NULL #define libxl__device_dtdev_update_devid NULL -static DEFINE_DEVICE_TYPE_STRUCT(dtdev, NONE); +static DEFINE_DEVICE_TYPE_STRUCT(dtdev, NONE, dtdevs); =20 const libxl__device_type *device_type_tbl[] =3D { &libxl__disk_devtype, @@ -1817,7 +1817,7 @@ const libxl__device_type *device_type_tbl[] =3D { &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_disk.c b/tools/libs/light/libxl_disk.c index de183e0fb082..411ffeaca6ce 100644 --- a/tools/libs/light/libxl_disk.c +++ b/tools/libs/light/libxl_disk.c @@ -1374,7 +1374,7 @@ LIBXL_DEFINE_DEVICE_LIST(disk) =20 #define libxl__device_disk_update_devid NULL =20 -DEFINE_DEVICE_TYPE_STRUCT(disk, VBD, +DEFINE_DEVICE_TYPE_STRUCT(disk, VBD, disks, .merge =3D libxl_device_disk_merge, .dm_needed =3D libxl_device_disk_dm_needed, .from_xenstore =3D (device_from_xenstore_fn_t)libxl__disk_from_xenstor= e, diff --git a/tools/libs/light/libxl_internal.h b/tools/libs/light/libxl_int= ernal.h index e26cda9b5045..c2c5a9b92673 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 */ =20 _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; }; =20 -#define DEFINE_DEVICE_TYPE_STRUCT_X(name, sname, kind, ...) = \ +#define DEFINE_DEVICE_TYPE_STRUCT(name, kind, array, ...) = \ const libxl__device_type libxl__ ## name ## _devtype =3D { = \ - .type =3D LIBXL__DEVICE_KIND_ ## kind, = \ - .ptr_offset =3D offsetof(libxl_domain_config, name ## s), = \ - .num_offset =3D offsetof(libxl_domain_config, num_ ## name ## s= ), \ - .dev_elem_size =3D sizeof(libxl_device_ ## sname), = \ + .type =3D LIBXL__DEVICE_KIND_ ## kind, = \ + .ptr_offset =3D offsetof(libxl_domain_config, array), = \ + .num_offset =3D offsetof(libxl_domain_config, num_ ## array), = \ + .dev_elem_size =3D sizeof(libxl_device_ ## name), = \ .add =3D libxl__add_ ## name ## s, = \ .set_default =3D (device_set_default_fn_t) = \ - libxl__device_ ## sname ## _setdefault, = \ + libxl__device_ ## name ## _setdefault, = \ .to_device =3D (device_to_device_fn_t)libxl__device_from_ ## n= ame, \ - .init =3D (device_init_fn_t)libxl_device_ ## sname ## _in= it, \ - .copy =3D (device_copy_fn_t)libxl_device_ ## sname ## _co= py, \ + .init =3D (device_init_fn_t)libxl_device_ ## name ## _ini= t, \ + .copy =3D (device_copy_fn_t)libxl_device_ ## name ## _cop= y, \ .dispose =3D (device_dispose_fn_t) = \ - libxl_device_ ## sname ## _dispose, = \ + libxl_device_ ## name ## _dispose, = \ .compare =3D (device_compare_fn_t) = \ - libxl_device_ ## sname ## _compare, = \ + libxl_device_ ## name ## _compare, = \ .update_devid =3D (device_update_devid_fn_t) = \ - libxl__device_ ## sname ## _update_devid, = \ + libxl__device_ ## name ## _update_devid, = \ __VA_ARGS__ = \ } =20 -#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_nic.c b/tools/libs/light/libxl_nic.c index 0e5d120ae9a4..144e9e23e198 100644 --- a/tools/libs/light/libxl_nic.c +++ b/tools/libs/light/libxl_nic.c @@ -528,7 +528,7 @@ LIBXL_DEFINE_DEVICE_ADD(nic) LIBXL_DEFINE_DEVICES_ADD(nic) LIBXL_DEFINE_DEVICE_REMOVE(nic) =20 -DEFINE_DEVICE_TYPE_STRUCT(nic, VIF, +DEFINE_DEVICE_TYPE_STRUCT(nic, VIF, nics, .update_config =3D libxl_device_nic_update_config, .from_xenstore =3D (device_from_xenstore_fn_t)libxl__nic_from_xenstore, .set_xenstore_config =3D (device_set_xenstore_config_fn_t) diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c index bc5843b13701..3340076d2cb3 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" =20 -static unsigned int pcidev_encode_bdf(libxl_device_pci *pcidev) +static unsigned int pci_encode_bdf(libxl_device_pci *pci) { unsigned int value; =20 - value =3D pcidev->domain << 16; - value |=3D (pcidev->bus & 0xff) << 8; - value |=3D (pcidev->dev & 0x1f) << 3; - value |=3D (pcidev->func & 0x7); + value =3D pci->domain << 16; + value |=3D (pci->bus & 0xff) << 8; + value |=3D (pci->dev & 0x1f) << 3; + value |=3D (pci->func & 0x7); =20 return value; } =20 -static void pcidev_struct_fill(libxl_device_pci *pcidev, unsigned int doma= in, - 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 =3D domain; - pcidev->bus =3D bus; - pcidev->dev =3D dev; - pcidev->func =3D func; - pcidev->vdevfn =3D vdevfn; + pci->domain =3D domain; + pci->bus =3D bus; + pci->dev =3D dev; + pci->func =3D func; + pci->vdevfn =3D vdevfn; } =20 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=3D%d,power_mgmt=3D%d,permissive=3D%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)); } =20 -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 =3D 0; device->backend_domid =3D 0; @@ -80,7 +80,7 @@ static void libxl__device_from_pcidev(libxl__gc *gc, uint= 32_t domid, } =20 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 =3D NULL; @@ -94,15 +94,15 @@ static int libxl__create_pci_backend(libxl__gc *gc, uin= t32_t domid, LOGD(DEBUG, domid, "Creating pci backend"); =20 /* add pci device */ - libxl__device_from_pcidev(gc, domid, pcidev, &device); + libxl__device_from_pci(gc, domid, pci, &device); =20 flexarray_append_pair(back, "frontend-id", GCSPRINTF("%d", domid)); flexarray_append_pair(back, "online", "1"); flexarray_append_pair(back, "state", GCSPRINTF("%d", XenbusStateInitia= lising)); flexarray_append_pair(back, "domain", libxl__domid_to_name(gc, domid)); =20 - for (i =3D 0; i < num; i++, pcidev++) - libxl_create_pci_backend_device(gc, back, i, pcidev); + for (i =3D 0; i < num; i++, pci++) + libxl_create_pci_backend_device(gc, back, i, pci); =20 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, uin= t32_t domid, =20 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 =3D 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); =20 libxl_domain_type domtype =3D libxl__domain_type(gc, domid); if (domtype =3D=3D LIBXL_DOMAIN_TYPE_INVALID) @@ -151,7 +151,7 @@ static int libxl__device_pci_add_xenstore(libxl__gc *gc, =20 LOGD(DEBUG, domid, "Adding new pci device to xenstore"); num =3D 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", XenbusStateRe= configuring)); @@ -170,8 +170,8 @@ static int libxl__device_pci_add_xenstore(libxl__gc *gc, rc =3D libxl__get_domain_configuration(gc, domid, &d_config); if (rc) goto out; =20 - device_add_domain_config(gc, &d_config, &libxl__pcidev_devtype, - pcidev); + device_add_domain_config(gc, &d_config, &libxl__pci_devtype, + pci); =20 rc =3D libxl__dm_check_start(gc, &d_config, domid); if (rc) goto out; @@ -201,7 +201,7 @@ out: return rc; } =20 -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 =3D 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 =3D 0, bus =3D 0, dev =3D 0, func =3D 0; xsdev =3D libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/dev-%d", be_p= ath, i)); sscanf(xsdev, PCI_BDF, &domain, &bus, &dev, &func); - if (domain =3D=3D pcidev->domain && bus =3D=3D pcidev->bus && - pcidev->dev =3D=3D dev && pcidev->func =3D=3D func) { + if (domain =3D=3D pci->domain && bus =3D=3D pci->bus && + pci->dev =3D=3D dev && pci->func =3D=3D func) { break; } } @@ -350,7 +350,7 @@ static int get_all_assigned_devices(libxl__gc *gc, libx= l_device_pci **list, int *list =3D realloc(*list, sizeof(libxl_device_pci) * ((= *num) + 1)); if (*list =3D=3D 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, libx= l_device_pci **list, int return 0; } =20 -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; =20 @@ -383,7 +383,7 @@ static int is_pcidev_in_array(libxl_device_pci *assigne= d, int num_assigned, =20 /* 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; } =20 - buf =3D GCSPRINTF(PCI_BDF, pcidev->domain, pcidev->bus, - pcidev->dev, pcidev->func); + buf =3D GCSPRINTF(PCI_BDF, pci->domain, pci->bus, + pci->dev, pci->func); rc =3D 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 *nu= m) { GC_INIT(ctx); - libxl_device_pci *pcidevs =3D NULL, *new, *assigned; + libxl_device_pci *pcis =3D NULL, *new, *assigned; struct dirent *de; DIR *dir; int r, num_assigned; @@ -436,40 +436,40 @@ libxl_device_pci *libxl_device_pci_assignable_list(li= bxl_ctx *ctx, int *num) if (sscanf(de->d_name, PCI_BDF, &dom, &bus, &dev, &func) !=3D 4) continue; =20 - 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; =20 - new =3D realloc(pcidevs, ((*num) + 1) * sizeof(*new)); + new =3D realloc(pcis, ((*num) + 1) * sizeof(*new)); if (NULL =3D=3D new) continue; =20 - pcidevs =3D new; - new =3D pcidevs + *num; + pcis =3D new; + new =3D pcis + *num; =20 memset(new, 0, sizeof(*new)); - pcidev_struct_fill(new, dom, bus, dev, func, 0); + pci_struct_fill(new, dom, bus, dev, func, 0); (*num)++; } =20 closedir(dir); out: GC_FREE; - return pcidevs; + return pcis; } =20 /* Unbind device from its current driver, if any. If driver_path is non-N= ULL, * 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 =3D NULL; struct stat st; =20 spath =3D 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 =3D libxl__zalloc(gc, PATH_MAX); @@ -483,7 +483,7 @@ static int sysfs_dev_unbind(libxl__gc *gc, libxl_device= _pci *pcidev, =20 /* Unbind from the old driver */ spath =3D 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_devi= ce_pci *pcidev, return 0; } =20 -static uint16_t sysfs_dev_get_vendor(libxl__gc *gc, libxl_device_pci *pcid= ev) +static uint16_t sysfs_dev_get_vendor(libxl__gc *gc, libxl_device_pci *pci) { char *pci_device_vendor_path =3D GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/vendor", - pcidev->domain, pcidev->bus, pcidev->dev, pcidev->fu= nc); + pci->domain, pci->bus, pci->dev, pci->func); uint16_t read_items; uint16_t pci_device_vendor; =20 @@ -507,7 +507,7 @@ static uint16_t sysfs_dev_get_vendor(libxl__gc *gc, lib= xl_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 =3D fscanf(f, "0x%hx\n", &pci_device_vendor); @@ -515,18 +515,18 @@ static uint16_t sysfs_dev_get_vendor(libxl__gc *gc, l= ibxl_device_pci *pcidev) if (read_items !=3D 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; } =20 return pci_device_vendor; } =20 -static uint16_t sysfs_dev_get_device(libxl__gc *gc, libxl_device_pci *pcid= ev) +static uint16_t sysfs_dev_get_device(libxl__gc *gc, libxl_device_pci *pci) { char *pci_device_device_path =3D GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/device", - pcidev->domain, pcidev->bus, pcidev->dev, pcidev->fu= nc); + pci->domain, pci->bus, pci->dev, pci->func); uint16_t read_items; uint16_t pci_device_device; =20 @@ -534,7 +534,7 @@ static uint16_t sysfs_dev_get_device(libxl__gc *gc, lib= xl_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 =3D fscanf(f, "0x%hx\n", &pci_device_device); @@ -542,25 +542,25 @@ static uint16_t sysfs_dev_get_device(libxl__gc *gc, l= ibxl_device_pci *pcidev) if (read_items !=3D 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; } =20 return pci_device_device; } =20 -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 =3D GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/cla= ss", - pcidev->domain, pcidev->bus, pcidev->dev, pcidev->fun= c); + pci->domain, pci->bus, pci->dev, pci->func); int read_items, ret =3D 0; =20 FILE *f =3D 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 =3D ERROR_FAIL; goto out; } @@ -569,7 +569,7 @@ static int sysfs_dev_get_class(libxl__gc *gc, libxl_dev= ice_pci *pcidev, if (read_items !=3D 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 =3D ERROR_FAIL; } =20 @@ -589,15 +589,15 @@ bool libxl__is_igd_vga_passthru(libxl__gc *gc, unsigned long class; =20 for (i =3D 0 ; i < d_config->num_pcidevs ; i++) { - libxl_device_pci *pcidev =3D &d_config->pcidevs[i]; - pt_vendor =3D sysfs_dev_get_vendor(gc, pcidev); - pt_device =3D sysfs_dev_get_device(gc, pcidev); + libxl_device_pci *pci =3D &d_config->pcidevs[i]; + pt_vendor =3D sysfs_dev_get_vendor(gc, pci); + pt_device =3D sysfs_dev_get_device(gc, pci); =20 if (pt_vendor =3D=3D 0xffff || pt_device =3D=3D 0xffff || pt_vendor !=3D 0x8086) continue; =20 - if (sysfs_dev_get_class(gc, pcidev, &class)) + if (sysfs_dev_get_class(gc, pci, &class)) continue; if (class =3D=3D 0x030000) return true; @@ -621,8 +621,8 @@ bool libxl__is_igd_vga_passthru(libxl__gc *gc, * already exist. */ =20 -/* 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 =3D 0; @@ -635,11 +635,11 @@ static int pciback_dev_has_slot(libxl__gc *gc, libxl_= device_pci *pcidev) return ERROR_FAIL; } =20 - while(fscanf(f, "%x:%x:%x.%d\n", &dom, &bus, &dev, &func)=3D=3D4) { - if(dom =3D=3D pcidev->domain - && bus =3D=3D pcidev->bus - && dev =3D=3D pcidev->dev - && func =3D=3D pcidev->func) { + while (fscanf(f, "%x:%x:%x.%d\n", &dom, &bus, &dev, &func) =3D=3D 4) { + if (dom =3D=3D pci->domain + && bus =3D=3D pci->bus + && dev =3D=3D pci->dev + && func =3D=3D pci->func) { rc =3D 1; goto out; } @@ -649,7 +649,7 @@ out: return rc; } =20 -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) } =20 spath =3D GCSPRINTF(SYSFS_PCIBACK_DRIVER"/"PCI_BDF, - pcidev->domain, pcidev->bus, - pcidev->dev, pcidev->func); + pci->domain, pci->bus, + pci->dev, pci->func); rc =3D lstat(spath, &st); =20 if( rc =3D=3D 0 ) @@ -677,40 +677,40 @@ static int pciback_dev_is_assigned(libxl__gc *gc, lib= xl_device_pci *pcidev) return -1; } =20 -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; =20 - if ( (rc=3Dpciback_dev_has_slot(gc, pcidev)) < 0 ) { + if ( (rc =3D pciback_dev_has_slot(gc, pci)) < 0 ) { LOGE(ERROR, "Error checking for pciback slot"); return ERROR_FAIL; } else if (rc =3D=3D 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; } } =20 - 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; } =20 -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; } =20 /* 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" =20 static void pci_assignable_driver_path_write(libxl__gc *gc, - libxl_device_pci *pcidev, + libxl_device_pci *pci, char *driver_path) { char *path; =20 path =3D 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); } } =20 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_p= ath", - pcidev->domain, - pcidev->bus, - pcidev->dev, - pcidev->func)); + pci->domain, + pci->bus, + pci->dev, + pci->func)); } =20 static void pci_assignable_driver_path_remove(libxl__gc *gc, - libxl_device_pci *pcidev) + libxl_device_pci *pci) { libxl_ctx *ctx =3D libxl__gc_owner(gc); =20 /* 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) ); } =20 static int libxl__device_pci_assignable_add(libxl__gc *gc, - libxl_device_pci *pcidev, + libxl_device_pci *pci, int rebind) { libxl_ctx *ctx =3D libxl__gc_owner(gc); @@ -773,10 +773,10 @@ static int libxl__device_pci_assignable_add(libxl__gc= *gc, struct stat st; =20 /* Local copy for convenience */ - dom =3D pcidev->domain; - bus =3D pcidev->bus; - dev =3D pcidev->dev; - func =3D pcidev->func; + dom =3D pci->domain; + bus =3D pci->bus; + dev =3D pci->dev; + func =3D pci->func; =20 /* See if the device exists */ spath =3D GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF, dom, bus, dev, func); @@ -786,7 +786,7 @@ static int libxl__device_pci_assignable_add(libxl__gc *= gc, } =20 /* Check to see if it's already assigned to pciback */ - rc =3D pciback_dev_is_assigned(gc, pcidev); + rc =3D 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, } =20 /* Check to see if there's already a driver that we need to unbind fro= m */ - 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 =3D - pci_assignable_driver_path_read(gc, pcidev)) !=3D NUL= L ) { + pci_assignable_driver_path_read(gc, pci)) !=3D 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); } =20 - 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 =3D xc_assign_device(ctx->xch, DOMID_IO, pcidev_encode_bdf(pcidev), + rc =3D 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: } =20 static int libxl__device_pci_assignable_remove(libxl__gc *gc, - libxl_device_pci *pcidev, + libxl_device_pci *pci, int rebind) { libxl_ctx *ctx =3D libxl__gc_owner(gc); @@ -848,24 +848,24 @@ static int libxl__device_pci_assignable_remove(libxl_= _gc *gc, char *driver_path; =20 /* De-quarantine */ - rc =3D xc_deassign_device(ctx->xch, DOMID_IO, pcidev_encode_bdf(pcidev= )); + rc =3D xc_deassign_device(ctx->xch, DOMID_IO, pci_encode_bdf(pci)); if ( rc < 0 ) { - LOG(ERROR, "failed to de-quarantine "PCI_BDF, pcidev->domain, pcid= ev->bus, - pcidev->dev, pcidev->func); + LOG(ERROR, "failed to de-quarantine "PCI_BDF, pci->domain, pci->bu= s, + pci->dev, pci->func); return ERROR_FAIL; } =20 /* Unbind from pciback */ - if ( (rc=3Dpciback_dev_is_assigned(gc, pcidev)) < 0 ) { + if ( (rc =3D 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"); } =20 /* Rebind if necessary */ - driver_path =3D pci_assignable_driver_path_read(gc, pcidev); + driver_path =3D pci_assignable_driver_path_read(gc, pci); =20 if ( driver_path ) { if ( rebind ) { @@ -873,12 +873,12 @@ static int libxl__device_pci_assignable_remove(libxl_= _gc *gc, =20 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; } =20 - 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; } =20 -int libxl_device_pci_assignable_add(libxl_ctx *ctx, libxl_device_pci *pcid= ev, +int libxl_device_pci_assignable_add(libxl_ctx *ctx, libxl_device_pci *pci, int rebind) { GC_INIT(ctx); int rc; =20 - rc =3D libxl__device_pci_assignable_add(gc, pcidev, rebind); + rc =3D libxl__device_pci_assignable_add(gc, pci, rebind); =20 GC_FREE; return rc; } =20 =20 -int libxl_device_pci_assignable_remove(libxl_ctx *ctx, libxl_device_pci *p= cidev, +int libxl_device_pci_assignable_remove(libxl_ctx *ctx, libxl_device_pci *p= ci, int rebind) { GC_INIT(ctx); int rc; =20 - rc =3D libxl__device_pci_assignable_remove(gc, pcidev, rebind); + rc =3D libxl__device_pci_assignable_remove(gc, pci, rebind); =20 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 pr= esent * 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, u= nsigned int *func_mask) { struct dirent *de; DIR *dir; @@ -940,11 +940,11 @@ static int pci_multifunction_check(libxl__gc *gc, lib= xl_device_pci *pcidev, unsi =20 if ( sscanf(de->d_name, PCI_BDF, &dom, &bus, &dev, &func) !=3D 4 ) continue; - if ( pcidev->domain !=3D dom ) + if ( pci->domain !=3D dom ) continue; - if ( pcidev->bus !=3D bus ) + if ( pci->bus !=3D bus ) continue; - if ( pcidev->dev !=3D dev ) + if ( pci->dev !=3D dev ) continue; =20 path =3D 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 } =20 static int qemu_pci_add_xenstore(libxl__gc *gc, uint32_t domid, - libxl_device_pci *pcidev) + libxl_device_pci *pci) { libxl_ctx *ctx =3D libxl__gc_owner(gc); int rc =3D 0; @@ -991,15 +991,15 @@ static int qemu_pci_add_xenstore(libxl__gc *gc, uint3= 2_t domid, path =3D DEVICE_MODEL_XS_PATH(gc, dm_domid, domid, "/state"); state =3D libxl__xs_read(gc, XBT_NULL, path); path =3D 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->msitranslat= e, - 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); } =20 libxl__qemu_traditional_cmd(gc, domid, "pci-ins"); @@ -1010,7 +1010,7 @@ static int qemu_pci_add_xenstore(libxl__gc *gc, uint3= 2_t domid, path =3D 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) !=3D 1 ) { + else if ( sscanf(vdevfn, "0x%x", &pci->vdevfn) !=3D 1 ) { LOGD(ERROR, domid, "wrong format for the vdevfn: '%s'", vdevfn); rc =3D -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; =20 @@ -1072,7 +1072,7 @@ static void pci_add_dm_done(libxl__egc *, =20 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 =3D pcidev; + pas->pci =3D pci; pas->pci_domid =3D domid; libxl__ev_time_init(&pas->timeout); =20 @@ -1128,7 +1128,7 @@ static void pci_add_qemu_trad_watch_state_cb(libxl__e= gc *egc, =20 /* Convenience aliases */ libxl_domid domid =3D pas->domid; - libxl_device_pci *pcidev =3D pas->pcidev; + libxl_device_pci *pci =3D pas->pci; =20 rc =3D check_qemu_running(gc, domid, xswa, rc, state); if (rc =3D=3D ERROR_NOT_READY) @@ -1136,7 +1136,7 @@ static void pci_add_qemu_trad_watch_state_cb(libxl__e= gc *egc, if (rc) goto out; =20 - rc =3D qemu_pci_add_xenstore(gc, domid, pcidev); + rc =3D 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, p= ci_add_state *pas) =20 /* Convenience aliases */ libxl_domid domid =3D pas->domid; - libxl_device_pci *pcidev =3D pas->pcidev; + libxl_device_pci *pci =3D pas->pci; libxl__ev_qmp *const qmp =3D &pas->qmp; =20 rc =3D 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, p= ci_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); =20 qmp->ao =3D pas->aodev->ao; @@ -1230,7 +1230,7 @@ static void pci_add_qmp_query_pci_cb(libxl__egc *egc, int dev_slot, dev_func; =20 /* Convenience aliases */ - libxl_device_pci *pcidev =3D pas->pcidev; + libxl_device_pci *pci =3D pas->pci; =20 if (rc) goto out; =20 @@ -1251,7 +1251,7 @@ static void pci_add_qmp_query_pci_cb(libxl__egc *egc, */ =20 asked_id =3D GCSPRINTF(PCI_PT_QDEV_ID, - pcidev->bus, pcidev->dev, pcidev->func); + pci->bus, pci->dev, pci->func); =20 for (i =3D 0; (bus =3D libxl__json_array_get(response, i)); i++) { devices =3D 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 =3D libxl__json_object_get_integer(o); =20 - pcidev->vdevfn =3D PCI_DEVFN(dev_slot, dev_func); + pci->vdevfn =3D PCI_DEVFN(dev_slot, dev_func); =20 rc =3D 0; goto out; @@ -1331,7 +1331,7 @@ static void pci_add_dm_done(libxl__egc *egc, =20 /* Convenience aliases */ bool starting =3D pas->starting; - libxl_device_pci *pcidev =3D pas->pcidev; + libxl_device_pci *pci =3D pas->pci; bool hvm =3D libxl__domain_type(gc, domid) =3D=3D LIBXL_DOMAIN_TYPE_HV= M; =20 libxl__ev_qmp_dispose(gc, &pas->qmp); @@ -1342,8 +1342,8 @@ static void pci_add_dm_done(libxl__egc *egc, if (isstubdom) starting =3D false; =20 - sysfs_path =3D GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/resource", pcidev->d= omain, - pcidev->bus, pcidev->dev, pcidev->func); + sysfs_path =3D GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/resource", pci->doma= in, + pci->bus, pci->dev, pci->func); f =3D fopen(sysfs_path, "r"); start =3D end =3D flags =3D size =3D 0; irq =3D 0; @@ -1383,8 +1383,8 @@ static void pci_add_dm_done(libxl__egc *egc, } } fclose(f); - sysfs_path =3D GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/irq", pcidev->domain, - pcidev->bus, pcidev->dev, pcidev->func); + sysfs_path =3D GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/irq", pci->domain, + pci->bus, pci->dev, pci->func); f =3D fopen(sysfs_path, "r"); if (f =3D=3D 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); =20 /* 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 =3D ERROR_FAIL; goto out; @@ -1422,14 +1422,14 @@ static void pci_add_dm_done(libxl__egc *egc, =20 out_no_irq: if (!isstubdom) { - if (pcidev->rdm_policy =3D=3D LIBXL_RDM_RESERVE_POLICY_STRICT) { + if (pci->rdm_policy =3D=3D LIBXL_RDM_RESERVE_POLICY_STRICT) { flag &=3D ~XEN_DOMCTL_DEV_RDM_RELAXED; - } else if (pcidev->rdm_policy !=3D LIBXL_RDM_RESERVE_POLICY_RELAXE= D) { + } else if (pci->rdm_policy !=3D LIBXL_RDM_RESERVE_POLICY_RELAXED) { LOGED(ERROR, domainid, "unknown rdm check flag."); rc =3D ERROR_FAIL; goto out; } - r =3D xc_assign_device(ctx->xch, domid, pcidev_encode_bdf(pcidev),= flag); + r =3D xc_assign_device(ctx->xch, domid, pci_encode_bdf(pci), flag); if (r < 0 && (hvm || errno !=3D ENOSYS)) { LOGED(ERROR, domainid, "xc_assign_device failed"); rc =3D ERROR_FAIL; @@ -1438,7 +1438,7 @@ out_no_irq: } =20 if (!starting && !libxl_get_stubdom_id(CTX, domid)) - rc =3D libxl__device_pci_add_xenstore(gc, domid, pcidev, starting); + rc =3D libxl__device_pci_add_xenstore(gc, domid, pci, starting); else rc =3D 0; out: @@ -1493,7 +1493,7 @@ int libxl__device_pci_setdefault(libxl__gc *gc, uint3= 2_t domid, } =20 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 d= omid, aodev->action =3D LIBXL__DEVICE_ACTION_ADD; aodev->callback =3D device_addrm_aocomplete; aodev->update_json =3D true; - libxl__device_pci_add(egc, domid, pcidev, false, aodev); + libxl__device_pci_add(egc, domid, pci, false, aodev); return AO_INPROGRESS; } =20 -static int libxl_pcidev_assignable(libxl_ctx *ctx, libxl_device_pci *pcide= v) +static int libxl_pci_assignable(libxl_ctx *ctx, libxl_device_pci *pci) { - libxl_device_pci *pcidevs; + libxl_device_pci *pcis; int num, i; =20 - pcidevs =3D libxl_device_pci_assignable_list(ctx, &num); + pcis =3D libxl_device_pci_assignable_list(ctx, &num); for (i =3D 0; i < num; i++) { - if (pcidevs[i].domain =3D=3D pcidev->domain && - pcidevs[i].bus =3D=3D pcidev->bus && - pcidevs[i].dev =3D=3D pcidev->dev && - pcidevs[i].func =3D=3D pcidev->func) + if (pcis[i].domain =3D=3D pci->domain && + pcis[i].bus =3D=3D pci->bus && + pcis[i].dev =3D=3D pci->dev && + pcis[i].func =3D=3D pci->func) break; } - free(pcidevs); + free(pcis); return i !=3D num; } =20 @@ -1535,7 +1535,7 @@ static void device_pci_add_done(libxl__egc *egc, pci_add_state *, int rc); =20 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 =3D 0; pci_add_state *pas; =20 - /* Store *pcidev to be used by callbacks */ - aodev->device_config =3D pcidev; - aodev->device_type =3D &libxl__pcidev_devtype; + /* Store *pci to be used by callbacks */ + aodev->device_config =3D pci; + aodev->device_type =3D &libxl__pci_devtype; =20 GCNEW(pas); pas->aodev =3D aodev; @@ -1556,29 +1556,29 @@ void libxl__device_pci_add(libxl__egc *egc, uint32_= t domid, pas->callback =3D device_pci_add_stubdom_done; =20 if (libxl__domain_type(gc, domid) =3D=3D LIBXL_DOMAIN_TYPE_HVM) { - rc =3D xc_test_assign_device(ctx->xch, domid, pcidev_encode_bdf(pc= idev)); + rc =3D 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 =3D=3D EOPNOTSUPP ? "cannot be assigned - no IOMMU" : "already assigned to a different guest"); goto out; } } =20 - rc =3D libxl__device_pci_setdefault(gc, domid, pcidev, !starting); + rc =3D libxl__device_pci_setdefault(gc, domid, pci, !starting); if (rc) goto out; =20 - if (pcidev->seize && !pciback_dev_is_assigned(gc, pcidev)) { - rc =3D libxl__device_pci_assignable_add(gc, pcidev, 1); + if (pci->seize && !pciback_dev_is_assigned(gc, pci)) { + rc =3D libxl__device_pci_assignable_add(gc, pci, 1); if ( rc ) goto out; } =20 - 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 =3D 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 =3D ERROR_FAIL; goto out; } =20 - 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= ); =20 stubdomid =3D libxl_get_stubdom_id(ctx, domid); if (stubdomid !=3D 0) { - libxl_device_pci *pcidev_s; + libxl_device_pci *pci_s; =20 - 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 =3D device_pci_add_stubdom_wait; =20 - do_pci_add(egc, stubdomid, pcidev_s, pas); /* must be last */ + do_pci_add(egc, stubdomid, pci_s, pas); /* must be last */ return; } =20 @@ -1664,42 +1664,42 @@ static void device_pci_add_stubdom_done(libxl__egc = *egc, /* Convenience aliases */ libxl__ao_device *aodev =3D pas->aodev; libxl_domid domid =3D pas->domid; - libxl_device_pci *pcidev =3D aodev->device_config; + libxl_device_pci *pci =3D aodev->device_config; =20 if (rc) goto out; =20 - orig_vdev =3D pcidev->vdevfn & ~7U; + orig_vdev =3D pci->vdevfn & ~7U; =20 - if ( pcidev->vfunc_mask =3D=3D LIBXL_PCI_FUNC_ALL ) { - if ( !(pcidev->vdevfn >> 3) ) { + if ( pci->vfunc_mask =3D=3D LIBXL_PCI_FUNC_ALL ) { + if ( !(pci->vdevfn >> 3) ) { LOGD(ERROR, domid, "Must specify a v-slot for multi-function d= evices"); rc =3D ERROR_INVAL; goto out; } - if ( pci_multifunction_check(gc, pcidev, &pfunc_mask) ) { + if ( pci_multifunction_check(gc, pci, &pfunc_mask) ) { rc =3D ERROR_FAIL; goto out; } - pcidev->vfunc_mask &=3D pfunc_mask; + pci->vfunc_mask &=3D pfunc_mask; /* so now vfunc_mask =3D=3D pfunc_mask */ }else{ - pfunc_mask =3D (1 << pcidev->func); + pfunc_mask =3D (1 << pci->func); } =20 - for(rc =3D 0, i =3D 7; i >=3D 0; --i) { + for (rc =3D 0, i =3D 7; i >=3D 0; --i) { if ( (1 << i) & pfunc_mask ) { - if ( pcidev->vfunc_mask =3D=3D pfunc_mask ) { - pcidev->func =3D i; - pcidev->vdevfn =3D orig_vdev | i; - }else{ + if ( pci->vfunc_mask =3D=3D pfunc_mask ) { + pci->func =3D i; + pci->vdevfn =3D orig_vdev | i; + } else { /* if not passing through multiple devices in a block make * sure that virtual function number 0 is always used othe= rwise * guest won't see the device */ - pcidev->vdevfn =3D orig_vdev; + pci->vdevfn =3D orig_vdev; } pas->callback =3D 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 =3D pas->aodev; libxl_domid domid =3D pas->domid; - libxl_device_pci *pcidev =3D aodev->device_config; + libxl_device_pci *pci =3D aodev->device_config; =20 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 =3D 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; =20 -static void add_pcidevs_done(libxl__egc *, libxl__multidev *, int rc); +static void add_pcis_done(libxl__egc *, libxl__multidev *, int rc); =20 -static void libxl__add_pcidevs(libxl__egc *egc, libxl__ao *ao, uint32_t do= mid, - 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; =20 /* We need to start a new multidev in order to be able to execute @@ -1752,7 +1752,7 @@ static void libxl__add_pcidevs(libxl__egc *egc, libxl= __ao *ao, uint32_t domid, apds->outer_aodev =3D libxl__multidev_prepare(multidev); apds->d_config =3D d_config; apds->domid =3D domid; - apds->multidev.callback =3D add_pcidevs_done; + apds->multidev.callback =3D add_pcis_done; libxl__multidev_begin(ao, &apds->multidev); =20 for (i =3D 0; i < d_config->num_pcidevs; i++) { @@ -1764,11 +1764,11 @@ static void libxl__add_pcidevs(libxl__egc *egc, lib= xl__ao *ao, uint32_t domid, libxl__multidev_prepared(egc, &apds->multidev, 0); } =20 -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 =3D CONTAINER_OF(multidev, *apds, multidev); + add_pcis_state *apds =3D CONTAINER_OF(multidev, *apds, multidev); =20 /* Convenience aliases */ libxl_domain_config *d_config =3D apds->d_config; @@ -1779,7 +1779,7 @@ static void add_pcidevs_done(libxl__egc *egc, libxl__= multidev *multidev, =20 if (d_config->num_pcidevs > 0 && !libxl_get_stubdom_id(CTX, domid)) { rc =3D libxl__create_pci_backend(gc, domid, d_config->pcidevs, - d_config->num_pcidevs); + d_config->num_pcidevs); if (rc < 0) { LOGD(ERROR, domid, "libxl_create_pci_backend failed: %d", rc); goto out; @@ -1792,7 +1792,7 @@ out: } =20 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 =3D libxl__gc_owner(gc); char *state; @@ -1804,12 +1804,12 @@ static int qemu_pci_remove_xenstore(libxl__gc *gc, = uint32_t domid, path =3D DEVICE_MODEL_XS_PATH(gc, dm_domid, domid, "/state"); state =3D libxl__xs_read(gc, XBT_NULL, path); path =3D 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); =20 /* Remove all functions at once atomically by only signalling * device-model for function 0 */ - if ( !force && (pcidev->vdevfn & 0x7) =3D=3D 0 ) { + if ( !force && (pci->vdevfn & 0x7) =3D=3D 0 ) { libxl__qemu_traditional_cmd(gc, domid, "pci-rem"); if (libxl__wait_for_device_model_deprecated(gc, domid, "pci-remove= d", NULL, NULL, NULL) < 0) { @@ -1830,7 +1830,7 @@ static int qemu_pci_remove_xenstore(libxl__gc *gc, ui= nt32_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; =20 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); =20 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 d= omid, libxl__ptr_add(gc, assigned); =20 rc =3D 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 d= omid, } else { assert(type =3D=3D LIBXL_DOMAIN_TYPE_PV); =20 - char *sysfs_path =3D GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/resource",= pcidev->domain, - pcidev->bus, pcidev->dev, pcidev->fun= c); + char *sysfs_path =3D GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/resource",= pci->domain, + pci->bus, pci->dev, pci->func); FILE *f =3D fopen(sysfs_path, "r"); unsigned int start =3D 0, end =3D 0, flags =3D 0, size =3D 0; int irq =3D 0; @@ -1953,8 +1953,8 @@ static void do_pci_remove(libxl__egc *egc, uint32_t d= omid, } fclose(f); skip1: - sysfs_path =3D GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/irq", pcidev->do= main, - pcidev->bus, pcidev->dev, pcidev->func); + sysfs_path =3D GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/irq", pci->domai= n, + pci->bus, pci->dev, pci->func); f =3D fopen(sysfs_path, "r"); if (f =3D=3D 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, =20 /* Convenience aliases */ libxl_domid domid =3D prs->domid; - libxl_device_pci *const pcidev =3D prs->pcidev; + libxl_device_pci *const pci =3D prs->pci; =20 rc =3D check_qemu_running(gc, domid, xswa, rc, state); if (rc =3D=3D ERROR_NOT_READY) @@ -1996,7 +1996,7 @@ static void pci_remove_qemu_trad_watch_state_cb(libxl= __egc *egc, if (rc) goto out; =20 - rc =3D qemu_pci_remove_xenstore(gc, domid, pcidev, prs->force); + rc =3D qemu_pci_remove_xenstore(gc, domid, pci, prs->force); =20 out: pci_remove_detatched(egc, prs, rc); @@ -2010,7 +2010,7 @@ static void pci_remove_qmp_device_del(libxl__egc *egc, int rc; =20 /* Convenience aliases */ - libxl_device_pci *const pcidev =3D prs->pcidev; + libxl_device_pci *const pci =3D prs->pci; =20 rc =3D 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; =20 QMP_PARAMETERS_SPRINTF(&args, "id", PCI_PT_QDEV_ID, - pcidev->bus, pcidev->dev, pcidev->func); + pci->bus, pci->dev, pci->func); prs->qmp.callback =3D pci_remove_qmp_device_del_cb; rc =3D 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, =20 /* Convenience aliases */ libxl__ao *const ao =3D prs->aodev->ao; - libxl_device_pci *const pcidev =3D prs->pcidev; + libxl_device_pci *const pci =3D prs->pci; =20 if (rc) goto out; =20 libxl__ev_qmp_dispose(gc, qmp); =20 asked_id =3D GCSPRINTF(PCI_PT_QDEV_ID, - pcidev->bus, pcidev->dev, pcidev->func); + pci->bus, pci->dev, pci->func); =20 /* query-pci response: * [{ 'devices': [ 'qdev_id': 'str', ... ], ... }] @@ -2135,10 +2135,10 @@ static void pci_remove_timeout(libxl__egc *egc, lib= xl__ev_time *ev, pci_remove_state *prs =3D CONTAINER_OF(ev, *prs, timeout); =20 /* Convenience aliases */ - libxl_device_pci *const pcidev =3D prs->pcidev; + libxl_device_pci *const pci =3D prs->pci; =20 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); =20 /* If we timed out, we might still want to keep destroying the device * (when force=3D=3Dtrue), so let the next function decide what to do = on @@ -2156,7 +2156,7 @@ static void pci_remove_detatched(libxl__egc *egc, bool isstubdom; =20 /* Convenience aliases */ - libxl_device_pci *const pcidev =3D prs->pcidev; + libxl_device_pci *const pci =3D prs->pci; libxl_domid domid =3D prs->domid; =20 /* Cleaning QMP states ASAP */ @@ -2170,30 +2170,30 @@ static void pci_remove_detatched(libxl__egc *egc, isstubdom =3D libxl_is_stubdom(CTX, domid, &domainid); =20 /* don't do multiple resets while some functions are still passed thro= ugh */ - if ( (pcidev->vdevfn & 0x7) =3D=3D 0 ) { - libxl__device_pci_reset(gc, pcidev->domain, pcidev->bus, pcidev->d= ev, pcidev->func); + if ((pci->vdevfn & 0x7) =3D=3D 0) { + libxl__device_pci_reset(gc, pci->domain, pci->bus, pci->dev, pci->= func); } =20 if (!isstubdom) { - rc =3D xc_deassign_device(CTX->xch, domid, pcidev_encode_bdf(pcide= v)); + rc =3D xc_deassign_device(CTX->xch, domid, pci_encode_bdf(pci)); if (rc < 0 && (prs->hvm || errno !=3D ENOSYS)) LOGED(ERROR, domainid, "xc_deassign_device failed"); } =20 stubdomid =3D libxl_get_stubdom_id(CTX, domid); if (stubdomid !=3D 0) { - libxl_device_pci *pcidev_s; + libxl_device_pci *pci_s; libxl__ao_device *const stubdom_aodev =3D &prs->stubdom_aodev; =20 - 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); =20 libxl__prepare_ao_device(ao, stubdom_aodev); stubdom_aodev->action =3D LIBXL__DEVICE_ACTION_REMOVE; stubdom_aodev->callback =3D pci_remove_stubdom_done; stubdom_aodev->update_json =3D 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, =20 if (rc) goto out; =20 - 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); } =20 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__eg= c *egc, GCNEW(prs); prs->aodev =3D aodev; prs->domid =3D domid; - prs->pcidev =3D pcidev; + prs->pci =3D pci; prs->force =3D 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); =20 - prs->orig_vdev =3D pcidev->vdevfn & ~7U; + prs->orig_vdev =3D pci->vdevfn & ~7U; =20 - if ( pcidev->vfunc_mask =3D=3D LIBXL_PCI_FUNC_ALL ) { - if ( pci_multifunction_check(gc, pcidev, &prs->pfunc_mask) ) { + if ( pci->vfunc_mask =3D=3D LIBXL_PCI_FUNC_ALL ) { + if ( pci_multifunction_check(gc, pci, &prs->pfunc_mask) ) { rc =3D ERROR_FAIL; goto out; } - pcidev->vfunc_mask &=3D prs->pfunc_mask; - }else{ - prs->pfunc_mask =3D (1 << pcidev->func); + pci->vfunc_mask &=3D prs->pfunc_mask; + } else { + prs->pfunc_mask =3D (1 << pci->func); } =20 rc =3D 0; @@ -2273,7 +2273,7 @@ static void device_pci_remove_common_next(libxl__egc = *egc, =20 /* Convenience aliases */ libxl_domid domid =3D prs->domid; - libxl_device_pci *const pcidev =3D prs->pcidev; + libxl_device_pci *const pci =3D prs->pci; libxl__ao_device *const aodev =3D prs->aodev; const unsigned int pfunc_mask =3D prs->pfunc_mask; const unsigned int orig_vdev =3D prs->orig_vdev; @@ -2284,13 +2284,13 @@ static void device_pci_remove_common_next(libxl__eg= c *egc, const int i =3D prs->next_func; prs->next_func--; if ( (1 << i) & pfunc_mask ) { - if ( pcidev->vfunc_mask =3D=3D pfunc_mask ) { - pcidev->func =3D i; - pcidev->vdevfn =3D orig_vdev | i; - }else{ - pcidev->vdevfn =3D orig_vdev; + if ( pci->vfunc_mask =3D=3D pfunc_mask ) { + pci->func =3D i; + pci->vdevfn =3D orig_vdev | i; + } else { + pci->vdevfn =3D 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: } =20 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) =20 { @@ -2318,12 +2318,12 @@ int libxl_device_pci_remove(libxl_ctx *ctx, uint32_= t domid, aodev->action =3D LIBXL__DEVICE_ACTION_REMOVE; aodev->callback =3D device_addrm_aocomplete; aodev->update_json =3D true; - libxl__device_pci_remove_common(egc, domid, pcidev, false, aodev); + libxl__device_pci_remove_common(egc, domid, pci, false, aodev); return AO_INPROGRESS; } =20 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 =3D LIBXL__DEVICE_ACTION_REMOVE; aodev->callback =3D device_addrm_aocomplete; aodev->update_json =3D true; - libxl__device_pci_remove_common(egc, domid, pcidev, true, aodev); + libxl__device_pci_remove_common(egc, domid, pci, true, aodev); return AO_INPROGRESS; } =20 @@ -2353,7 +2353,7 @@ static int libxl__device_pci_from_xs_be(libxl__gc *gc, if (s) vdevfn =3D strtol(s, (char **) NULL, 16); =20 - pcidev_struct_fill(pci, domain, bus, dev, func, vdevfn); + pci_struct_fill(pci, domain, bus, dev, func, vdevfn); =20 s =3D 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 *ct= x, uint32_t domid, int *num GC_INIT(ctx); char *be_path; unsigned int n, i; - libxl_device_pci *pcidevs =3D NULL; + libxl_device_pci *pcis =3D NULL; =20 *num =3D 0; =20 @@ -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; =20 - pcidevs =3D calloc(n, sizeof(libxl_device_pci)); + pcis =3D calloc(n, sizeof(libxl_device_pci)); =20 for (i =3D 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); =20 *num =3D n; out: GC_FREE; - return pcidevs; + return pcis; } =20 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; =20 - pcidevs =3D libxl_device_pci_list(CTX, domid, &num); - if ( pcidevs =3D=3D NULL ) + pcis =3D libxl_device_pci_list(CTX, domid, &num); + if ( pcis =3D=3D NULL ) return; - libxl__ptr_add(gc, pcidevs); + libxl__ptr_add(gc, pcis); =20 for (i =3D 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, u= int32_t domid, * devices by the time we even get here! */ libxl__ao_device *aodev =3D 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); } } @@ -2452,10 +2452,10 @@ int libxl__grant_vga_iomem_permission(libxl__gc *gc= , const uint32_t domid, for (i =3D 0 ; i < d_config->num_pcidevs ; i++) { uint64_t vga_iomem_start =3D 0xa0000 >> XC_PAGE_SHIFT; uint32_t stubdom_domid; - libxl_device_pci *pcidev =3D &d_config->pcidevs[i]; + libxl_device_pci *pci =3D &d_config->pcidevs[i]; unsigned long pci_device_class; =20 - 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 !=3D 0x030000) /* VGA class */ continue; @@ -2494,7 +2494,7 @@ static int libxl_device_pci_compare(const libxl_devic= e_pci *d1, =20 #define libxl__device_pci_update_devid NULL =20 -DEFINE_DEVICE_TYPE_STRUCT_X(pcidev, pci, PCI, +DEFINE_DEVICE_TYPE_STRUCT(pci, PCI, pcidevs, .get_num =3D libxl__device_pci_get_num, .from_xenstore =3D libxl__device_pci_from_xs_be, ); diff --git a/tools/libs/light/libxl_pvcalls.c b/tools/libs/light/libxl_pvca= lls.c index 870318e71618..1fbedf651c2c 100644 --- a/tools/libs/light/libxl_pvcalls.c +++ b/tools/libs/light/libxl_pvcalls.c @@ -34,4 +34,4 @@ static LIBXL_DEFINE_DEVICE_FROM_TYPE(pvcallsif) =20 LIBXL_DEFINE_DEVICE_REMOVE(pvcallsif) =20 -DEFINE_DEVICE_TYPE_STRUCT(pvcallsif, PVCALLS); +DEFINE_DEVICE_TYPE_STRUCT(pvcallsif, PVCALLS, pvcallsifs); diff --git a/tools/libs/light/libxl_usb.c b/tools/libs/light/libxl_usb.c index 171bb044394e..c5ae59681c91 100644 --- a/tools/libs/light/libxl_usb.c +++ b/tools/libs/light/libxl_usb.c @@ -2139,7 +2139,7 @@ void libxl_device_usbdev_list_free(libxl_device_usbde= v *list, int nr) =20 LIBXL_DEFINE_DEVID_TO_DEVICE(usbctrl) LIBXL_DEFINE_DEVICE_LIST(usbctrl) -DEFINE_DEVICE_TYPE_STRUCT(usbctrl, VUSB, +DEFINE_DEVICE_TYPE_STRUCT(usbctrl, VUSB, usbctrls, .from_xenstore =3D (device_from_xenstore_fn_t)libxl__usbctrl_from_xens= tore, .dm_needed =3D libxl_device_usbctrl_dm_needed ); @@ -2147,7 +2147,7 @@ DEFINE_DEVICE_TYPE_STRUCT(usbctrl, VUSB, #define libxl__device_from_usbdev NULL #define libxl__device_usbdev_update_devid NULL =20 -DEFINE_DEVICE_TYPE_STRUCT(usbdev, VUSB); +DEFINE_DEVICE_TYPE_STRUCT(usbdev, VUSB, usbdevs); =20 /* * Local variables: diff --git a/tools/libs/light/libxl_vdispl.c b/tools/libs/light/libxl_vdisp= l.c index 8ddc8940e9ff..60427c76c2d1 100644 --- a/tools/libs/light/libxl_vdispl.c +++ b/tools/libs/light/libxl_vdispl.c @@ -206,7 +206,7 @@ LIBXL_DEFINE_DEVICE_ADD(vdispl) LIBXL_DEFINE_DEVICE_REMOVE(vdispl) LIBXL_DEFINE_DEVICE_LIST(vdispl) =20 -DEFINE_DEVICE_TYPE_STRUCT(vdispl, VDISPL, +DEFINE_DEVICE_TYPE_STRUCT(vdispl, VDISPL, vdispls, .update_config =3D (device_update_config_fn_t)libxl__update_config_vdi= spl, .from_xenstore =3D (device_from_xenstore_fn_t)libxl__vdispl_from_xenst= ore, .set_xenstore_config =3D (device_set_xenstore_config_fn_t) diff --git a/tools/libs/light/libxl_vkb.c b/tools/libs/light/libxl_vkb.c index 4c44a813c11a..bb88059f93c3 100644 --- a/tools/libs/light/libxl_vkb.c +++ b/tools/libs/light/libxl_vkb.c @@ -336,7 +336,7 @@ static LIBXL_DEFINE_UPDATE_DEVID(vkb) LIBXL_DEFINE_DEVICE_LIST(vkb) LIBXL_DEFINE_DEVICE_REMOVE(vkb) =20 -DEFINE_DEVICE_TYPE_STRUCT(vkb, VKBD, +DEFINE_DEVICE_TYPE_STRUCT(vkb, VKBD, vkbs, .skip_attach =3D 1, .dm_needed =3D libxl__device_vkb_dm_needed, .set_xenstore_config =3D (device_set_xenstore_config_fn_t) diff --git a/tools/libs/light/libxl_vsnd.c b/tools/libs/light/libxl_vsnd.c index 0bc5f6dbb19f..bb7942bbc991 100644 --- a/tools/libs/light/libxl_vsnd.c +++ b/tools/libs/light/libxl_vsnd.c @@ -670,7 +670,7 @@ LIBXL_DEFINE_DEVICE_ADD(vsnd) LIBXL_DEFINE_DEVICE_REMOVE(vsnd) LIBXL_DEFINE_DEVICE_LIST(vsnd) =20 -DEFINE_DEVICE_TYPE_STRUCT(vsnd, VSND, +DEFINE_DEVICE_TYPE_STRUCT(vsnd, VSND, vsnds, .update_config =3D (device_update_config_fn_t) libxl__update_config_vs= nd, .from_xenstore =3D (device_from_xenstore_fn_t) libxl__vsnd_from_xensto= re, .set_xenstore_config =3D (device_set_xenstore_config_fn_t) diff --git a/tools/libs/light/libxl_vtpm.c b/tools/libs/light/libxl_vtpm.c index dd00b267bbf0..0148c572d444 100644 --- a/tools/libs/light/libxl_vtpm.c +++ b/tools/libs/light/libxl_vtpm.c @@ -231,7 +231,7 @@ LIBXL_DEFINE_DEVICE_ADD(vtpm) LIBXL_DEFINE_DEVICE_REMOVE(vtpm) LIBXL_DEFINE_DEVICE_LIST(vtpm) =20 -DEFINE_DEVICE_TYPE_STRUCT(vtpm, VTPM, +DEFINE_DEVICE_TYPE_STRUCT(vtpm, VTPM, vtpms, .update_config =3D libxl_device_vtpm_update_config, .from_xenstore =3D (device_from_xenstore_fn_t)libxl__vtpm_from_xenstor= e, .set_xenstore_config =3D (device_set_xenstore_config_fn_t) 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 *v= al, unsigned int mask) return 0; } =20 -static int pcidev_struct_fill(libxl_device_pci *pcidev, unsigned int domai= n, - 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 =3D domain; - pcidev->bus =3D bus; - pcidev->dev =3D dev; - pcidev->func =3D func; - pcidev->vdevfn =3D vdevfn; + pci->domain =3D domain; + pci->bus =3D bus; + pci->dev =3D dev; + pci->func =3D func; + pci->vdevfn =3D vdevfn; return 0; } =20 @@ -47,7 +47,7 @@ static int pcidev_struct_fill(libxl_device_pci *pcidev, u= nsigned 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 cha= r *str) +int xlu_pci_parse_bdf(XLU_Config *cfg, libxl_device_pci *pci, const char *= str) { unsigned state =3D STATE_DOMAIN; unsigned dom =3D INVALID, bus =3D INVALID, dev =3D INVALID, func =3D I= NVALID, vslot =3D 0; @@ -110,11 +110,11 @@ int xlu_pci_parse_bdf(XLU_Config *cfg, libxl_device_p= ci *pcidev, const char *str } *ptr =3D '\0'; if ( !strcmp(tok, "*") ) { - pcidev->vfunc_mask =3D LIBXL_PCI_FUNC_ALL; + pci->vfunc_mask =3D LIBXL_PCI_FUNC_ALL; }else{ if ( hex_convert(tok, &func, 0x7) ) goto parse_error; - pcidev->vfunc_mask =3D (1 << 0); + pci->vfunc_mask =3D (1 << 0); } tok =3D ptr + 1; } @@ -141,18 +141,18 @@ int xlu_pci_parse_bdf(XLU_Config *cfg, libxl_device_p= ci *pcidev, const char *str state =3D (*ptr =3D=3D ',') ? STATE_OPTIONS_K : STATE_TERM= INAL; *ptr =3D '\0'; if ( !strcmp(optkey, "msitranslate") ) { - pcidev->msitranslate =3D atoi(tok); + pci->msitranslate =3D atoi(tok); }else if ( !strcmp(optkey, "power_mgmt") ) { - pcidev->power_mgmt =3D atoi(tok); + pci->power_mgmt =3D atoi(tok); }else if ( !strcmp(optkey, "permissive") ) { - pcidev->permissive =3D atoi(tok); + pci->permissive =3D atoi(tok); }else if ( !strcmp(optkey, "seize") ) { - pcidev->seize =3D atoi(tok); + pci->seize =3D atoi(tok); } else if (!strcmp(optkey, "rdm_policy")) { if (!strcmp(tok, "strict")) { - pcidev->rdm_policy =3D LIBXL_RDM_RESERVE_POLICY_ST= RICT; + pci->rdm_policy =3D LIBXL_RDM_RESERVE_POLICY_STRIC= T; } else if (!strcmp(tok, "relaxed")) { - pcidev->rdm_policy =3D LIBXL_RDM_RESERVE_POLICY_RE= LAXED; + pci->rdm_policy =3D LIBXL_RDM_RESERVE_POLICY_RELAX= ED; } else { XLU__PCI_ERR(cfg, "%s is not an valid PCI RDM prop= erty" " 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 !=3D INVALID && bus !=3D INVALID && dev !=3D INVALID && fun= c !=3D INVALID); =20 /* 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); =20 free(buf2); =20 --=20 2.20.1 From nobody Thu May 2 00:14:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1607455872; cv=none; d=zohomail.com; s=zohoarc; b=O7VBm0InSvvXeAvbZEko1z7BMxqt1iKMqD3Zsq+cD1pMoKqDqXkXh4qJHckmo8fGUjFAR9bmR1Twe+Wa/6yfad4iE1umSIuAuwTHCofH/0oTi3JO40INFkUWMvkoiB7eYJJ0q+VGc4b9JYdDScCe5UI/Lt/mbjpMsEoOPDZLMAc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607455872; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=riw3MyToWucKYseT/Zi4z6kwfCRW/U/hR5lNoqu9wNw=; b=G82q1nVwL7BqX84c1ailwZ8mh5rqMU9U8sd/SsQfhnKqvP63Tvv+AKEYtygv6IELIzicXJl6WoErqf/m0hFG6s0mCC8vqbYvVtrELKubWEhOoeZ8YDtzL5wA7gTfwAl4xrStJc5owGw+wWW0qvEXM/v4zREyjPZMRyZd7xLZc8A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1607455872790821.4784250421127; Tue, 8 Dec 2020 11:31:12 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.47685.84400 (Exim 4.92) (envelope-from ) id 1kmihA-0000g8-S4; Tue, 08 Dec 2020 19:30:44 +0000 Received: by outflank-mailman (output) from mailman id 47685.84400; Tue, 08 Dec 2020 19:30:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmihA-0000fm-GA; Tue, 08 Dec 2020 19:30:44 +0000 Received: by outflank-mailman (input) for mailman id 47685; Tue, 08 Dec 2020 19:30:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmih9-0000f4-8j for xen-devel@lists.xenproject.org; Tue, 08 Dec 2020 19:30:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmih8-0007LB-BI; Tue, 08 Dec 2020 19:30:42 +0000 Received: from host86-183-162-145.range86-183.btcentralplus.com ([86.183.162.145] helo=desktop.home) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kmih8-0001p0-2Y; Tue, 08 Dec 2020 19:30:42 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=riw3MyToWucKYseT/Zi4z6kwfCRW/U/hR5lNoqu9wNw=; b=wM0QsmSD20dySYYbE3Jg39hB0c OInlEuQXAzvj69pClMJ3pA9VryqeWHC5CxOyUUB7C6XqEkGKktQ064sQVqwCqJt162B91W5cOKz1z 8Td0Vp47SoA75TW9lvTDagv/x7DmCjKvjddBYFa9YHbE+Ud+h2sMbiHrmz2vTN1V821g=; From: Paul Durrant To: xen-devel@lists.xenproject.org Cc: Paul Durrant , Ian Jackson , Wei Liu , Anthony PERARD Subject: [PATCH v6 02/25] xl: s/pcidev/pci where possible Date: Tue, 8 Dec 2020 19:30:10 +0000 Message-Id: <20201208193033.11306-3-paul@xen.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201208193033.11306-1-paul@xen.org> References: <20201208193033.11306-1-paul@xen.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @xen.org) Content-Type: text/plain; charset="utf-8" From: Paul Durrant To improve naming consistency, replaces occurrences of 'pcidev' with 'pci'. The only remaining use of the term should be in relation to 'libxl_domain_config' where there are fields named 'pcidevs' and 'num_pcide= vs'. Purely cosmetic. No functional change. Signed-off-by: Paul Durrant Acked-by: Wei Liu --- Cc: Ian Jackson Cc: Wei Liu Cc: Anthony PERARD v6: - New in v6 (split out from "xl / libxl: s/pcidev/pci and remove DEFINE_DEVICE_TYPE_STRUCT_X") --- tools/xl/xl_parse.c | 22 +++++++-------- tools/xl/xl_pci.c | 68 ++++++++++++++++++++++----------------------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c index cae8eb679c5a..4ebf39620ae7 100644 --- a/tools/xl/xl_parse.c +++ b/tools/xl/xl_parse.c @@ -1473,21 +1473,21 @@ void parse_config_data(const char *config_source, d_config->num_pcidevs =3D 0; d_config->pcidevs =3D NULL; for(i =3D 0; (buf =3D xlu_cfg_get_listitem (pcis, i)) !=3D NULL; i= ++) { - libxl_device_pci *pcidev; - - pcidev =3D ARRAY_EXTEND_INIT_NODEVID(d_config->pcidevs, - d_config->num_pcidevs, - libxl_device_pci_init); - pcidev->msitranslate =3D pci_msitranslate; - pcidev->power_mgmt =3D pci_power_mgmt; - pcidev->permissive =3D pci_permissive; - pcidev->seize =3D pci_seize; + libxl_device_pci *pci; + + pci =3D ARRAY_EXTEND_INIT_NODEVID(d_config->pcidevs, + d_config->num_pcidevs, + libxl_device_pci_init); + pci->msitranslate =3D pci_msitranslate; + pci->power_mgmt =3D pci_power_mgmt; + pci->permissive =3D pci_permissive; + pci->seize =3D pci_seize; /* * Like other pci option, the per-device policy always follows * the global policy by default. */ - pcidev->rdm_policy =3D b_info->u.hvm.rdm.policy; - e =3D xlu_pci_parse_bdf(config, pcidev, buf); + pci->rdm_policy =3D b_info->u.hvm.rdm.policy; + e =3D xlu_pci_parse_bdf(config, pci, buf); if (e) { fprintf(stderr, "unable to parse PCI BDF `%s' for passthrough\n", 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 @@ =20 static void pcilist(uint32_t domid) { - libxl_device_pci *pcidevs; + libxl_device_pci *pcis; int num, i; =20 - pcidevs =3D libxl_device_pci_list(ctx, domid, &num); - if (pcidevs =3D=3D NULL) + pcis =3D libxl_device_pci_list(ctx, domid, &num); + if (pcis =3D=3D NULL) return; printf("Vdev Device\n"); for (i =3D 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); } =20 int main_pcilist(int argc, char **argv) @@ -57,28 +57,28 @@ int main_pcilist(int argc, char **argv) =20 static int pcidetach(uint32_t domid, const char *bdf, int force) { - libxl_device_pci pcidev; + libxl_device_pci pci; XLU_Config *config; int r =3D 0; =20 - libxl_device_pci_init(&pcidev); + libxl_device_pci_init(&pci); =20 config =3D xlu_cfg_init(stderr, "command line"); if (!config) { perror("xlu_cfg_inig"); exit(-1); } =20 - 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 =3D 1; } else { - if (libxl_device_pci_remove(ctx, domid, &pcidev, 0)) + if (libxl_device_pci_remove(ctx, domid, &pci, 0)) r =3D 1; } =20 - libxl_device_pci_dispose(&pcidev); + libxl_device_pci_dispose(&pci); xlu_cfg_destroy(config); =20 return r; @@ -108,24 +108,24 @@ int main_pcidetach(int argc, char **argv) =20 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 =3D 0; =20 - libxl_device_pci_init(&pcidev); + libxl_device_pci_init(&pci); =20 config =3D xlu_cfg_init(stderr, "command line"); if (!config) { perror("xlu_cfg_inig"); exit(-1); } =20 - 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); } =20 - if (libxl_device_pci_add(ctx, domid, &pcidev, 0)) + if (libxl_device_pci_add(ctx, domid, &pci, 0)) r =3D 1; =20 - libxl_device_pci_dispose(&pcidev); + libxl_device_pci_dispose(&pci); xlu_cfg_destroy(config); =20 return r; @@ -155,19 +155,19 @@ int main_pciattach(int argc, char **argv) =20 static void pciassignable_list(void) { - libxl_device_pci *pcidevs; + libxl_device_pci *pcis; int num, i; =20 - pcidevs =3D libxl_device_pci_assignable_list(ctx, &num); + pcis =3D libxl_device_pci_assignable_list(ctx, &num); =20 - if ( pcidevs =3D=3D NULL ) + if ( pcis =3D=3D NULL ) return; for (i =3D 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); } =20 int main_pciassignable_list(int argc, char **argv) @@ -184,24 +184,24 @@ int main_pciassignable_list(int argc, char **argv) =20 static int pciassignable_add(const char *bdf, int rebind) { - libxl_device_pci pcidev; + libxl_device_pci pci; XLU_Config *config; int r =3D 0; =20 - libxl_device_pci_init(&pcidev); + libxl_device_pci_init(&pci); =20 config =3D xlu_cfg_init(stderr, "command line"); if (!config) { perror("xlu_cfg_init"); exit(-1); } =20 - 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); } =20 - if (libxl_device_pci_assignable_add(ctx, &pcidev, rebind)) + if (libxl_device_pci_assignable_add(ctx, &pci, rebind)) r =3D 1; =20 - libxl_device_pci_dispose(&pcidev); + libxl_device_pci_dispose(&pci); xlu_cfg_destroy(config); =20 return r; @@ -226,24 +226,24 @@ int main_pciassignable_add(int argc, char **argv) =20 static int pciassignable_remove(const char *bdf, int rebind) { - libxl_device_pci pcidev; + libxl_device_pci pci; XLU_Config *config; int r =3D 0; =20 - libxl_device_pci_init(&pcidev); + libxl_device_pci_init(&pci); =20 config =3D xlu_cfg_init(stderr, "command line"); if (!config) { perror("xlu_cfg_init"); exit(-1); } =20 - if (xlu_pci_parse_bdf(config, &pcidev, bdf)) { + if (xlu_pci_parse_bdf(config, &pci, bdf)) { fprintf(stderr, "pci-assignable-remove: malformed BDF specificatio= n \"%s\"\n", bdf); exit(2); } =20 - if (libxl_device_pci_assignable_remove(ctx, &pcidev, rebind)) + if (libxl_device_pci_assignable_remove(ctx, &pci, rebind)) r =3D 1; =20 - libxl_device_pci_dispose(&pcidev); + libxl_device_pci_dispose(&pci); xlu_cfg_destroy(config); =20 return r; --=20 2.20.1 From nobody Thu May 2 00:14:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1607455873; cv=none; d=zohomail.com; s=zohoarc; b=GyMJuv1xHWARg3sWnGAcG6/Skc2lZ8H8ngOUa11Ik7wFrt22wnTwWbKzshN1dEvzEAEAkCbVblxQ8jkKLwUaxuaK1mEV71xAQsNqwWVcfivfUGHv0MPCjRZ/IaF3CVGrqgtxkcMmoZt2ke8RdgrZB9es3+Wem4bZmOQ3O8V7+ZM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607455873; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ksPadBrGqHahICVt3GhGrqsoWKZBYE1bmDQJ3Zcn3LQ=; b=UbKh/N46EhlUmAeXHTfI8xluOXrz/QbOp290YGY3mO1onZGpqatD/LvDjU9br9Dvy9L3qlMv/XW1LuJW5MkqoDKawYDUSDXPKwfM2so8BI1I4QrSEnnw0Q+n+NG1L+Ojm4nuJHTMIhX6I4EC36A7lfxf4FB/2cxwqiLliq1u+1Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1607455873050182.52058106748564; Tue, 8 Dec 2020 11:31:13 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.47686.84415 (Exim 4.92) (envelope-from ) id 1kmihC-0000iu-6Q; Tue, 08 Dec 2020 19:30:46 +0000 Received: by outflank-mailman (output) from mailman id 47686.84415; Tue, 08 Dec 2020 19:30:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmihC-0000ii-2H; Tue, 08 Dec 2020 19:30:46 +0000 Received: by outflank-mailman (input) for mailman id 47686; Tue, 08 Dec 2020 19:30:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmihA-0000fk-F1 for xen-devel@lists.xenproject.org; Tue, 08 Dec 2020 19:30:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmih9-0007LM-AX; Tue, 08 Dec 2020 19:30:43 +0000 Received: from host86-183-162-145.range86-183.btcentralplus.com ([86.183.162.145] helo=desktop.home) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kmih9-0001p0-2U; Tue, 08 Dec 2020 19:30:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=ksPadBrGqHahICVt3GhGrqsoWKZBYE1bmDQJ3Zcn3LQ=; b=5Z/dwt9+QRVw8sUtsbwUS3/Y/7 VL75Y2FmpZXqSRzR2TYjR+IufvJqWkCxE8uVgGcDBlzsPtZfbQ2FTYVOxVIToPsAbuBxAc6pYbQtF i4FX0TzBbZvEtwyFgWMHh9DXhKjaiM6s+px+WOmY8azThfL8/rM4YuMfVsdBckM2vqUQ=; From: Paul Durrant To: xen-devel@lists.xenproject.org Cc: Paul Durrant , Oleksandr Andrushchenko , Wei Liu , Ian Jackson , Anthony PERARD Subject: [PATCH v6 03/25] libxl: make libxl__device_list() work correctly for LIBXL__DEVICE_KIND_PCI... Date: Tue, 8 Dec 2020 19:30:11 +0000 Message-Id: <20201208193033.11306-4-paul@xen.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201208193033.11306-1-paul@xen.org> References: <20201208193033.11306-1-paul@xen.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @xen.org) Content-Type: text/plain; charset="utf-8" From: Paul Durrant ... devices. Currently there is an assumption built into libxl__device_list() that device backends are fully enumarated under the '/libxl' path in xenstore. This is not the case for PCI backend devices, which are only properly enumerated under '/local/domain/0/backend'. This patch adds a new get_path() method to libxl__device_type to allow a backend implementation (such as PCI) to specify the xenstore path where devices are enumerated and modifies libxl__device_list() to use this method if it is available. Also, if the get_num() method is defined then the from_xenstore() method expects to be passed the backend path without the de= vice number concatenated, so this issue is also rectified. Having made libxl__device_list() work correctly, this patch removes the open-coded libxl_pci_device_pci_list() in favour of an evaluation of the LIBXL_DEFINE_DEVICE_LIST() macro. This has the side-effect of also defining libxl_pci_device_pci_list_free() which will be used in subsequent patches. Signed-off-by: Paul Durrant Reviewed-by: Oleksandr Andrushchenko Acked-by: Wei Liu --- Cc: Ian Jackson Cc: Anthony PERARD v3: - New in v3 (replacing "libxl: use LIBXL_DEFINE_DEVICE_LIST for pci device= s") --- tools/include/libxl.h | 7 ++++ tools/libs/light/libxl_device.c | 66 ++++++++++++++++--------------- tools/libs/light/libxl_internal.h | 2 + tools/libs/light/libxl_pci.c | 29 ++++---------- 4 files changed, 52 insertions(+), 52 deletions(-) diff --git a/tools/include/libxl.h b/tools/include/libxl.h index 733263522bd9..bb7fc893fc13 100644 --- a/tools/include/libxl.h +++ b/tools/include/libxl.h @@ -451,6 +451,12 @@ */ #define LIBXL_HAVE_VIRIDIAN_EX_PROCESSOR_MASKS 1 =20 +/* + * 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, =20 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); =20 /* * Turns the current process into a backend device service daemon diff --git a/tools/libs/light/libxl_device.c b/tools/libs/light/libxl_devic= e.c index e081faf9a94e..ac173a043d31 100644 --- a/tools/libs/light/libxl_device.c +++ b/tools/libs/light/libxl_device.c @@ -2011,7 +2011,7 @@ void *libxl__device_list(libxl__gc *gc, const libxl__= device_type *dt, void *r =3D NULL; void *list =3D NULL; void *item =3D NULL; - char *libxl_path; + char *path; char **dir =3D NULL; unsigned int ndirs =3D 0; unsigned int ndevs =3D 0; @@ -2019,42 +2019,46 @@ void *libxl__device_list(libxl__gc *gc, const libxl= __device_type *dt, =20 *num =3D 0; =20 - libxl_path =3D GCSPRINTF("%s/device/%s", - libxl__xs_libxl_path(gc, domid), - libxl__device_kind_to_string(dt->type)); - - dir =3D libxl__xs_directory(gc, XBT_NULL, libxl_path, &ndirs); + if (dt->get_path) { + rc =3D dt->get_path(gc, domid, &path); + if (rc) goto out; + } else { + path =3D GCSPRINTF("%s/device/%s", + libxl__xs_libxl_path(gc, domid), + libxl__device_kind_to_string(dt->type)); + } =20 - if (dir && ndirs) { - if (dt->get_num) { - if (ndirs !=3D 1) { - LOGD(ERROR, domid, "multiple entries in %s\n", libxl_path); - rc =3D ERROR_FAIL; - goto out; - } - rc =3D dt->get_num(gc, GCSPRINTF("%s/%s", libxl_path, *dir), &= ndevs); - if (rc) goto out; - } else { + if (dt->get_num) { + rc =3D dt->get_num(gc, path, &ndevs); + if (rc) goto out; + } else { + dir =3D libxl__xs_directory(gc, XBT_NULL, path, &ndirs); + if (dir && ndirs) ndevs =3D ndirs; - } - list =3D libxl__malloc(NOGC, dt->dev_elem_size * ndevs); - item =3D list; + } =20 - while (*num < ndevs) { - dt->init(item); + if (!ndevs) + return NULL; =20 - if (dt->from_xenstore) { - int nr =3D dt->get_num ? *num : atoi(*dir); - char *device_libxl_path =3D GCSPRINTF("%s/%s", libxl_path,= *dir); - rc =3D dt->from_xenstore(gc, device_libxl_path, nr, item); - if (rc) goto out; - } + list =3D libxl__malloc(NOGC, dt->dev_elem_size * ndevs); + item =3D list; =20 - item =3D (uint8_t *)item + dt->dev_elem_size; - ++(*num); - if (!dt->get_num) - ++dir; + while (*num < ndevs) { + dt->init(item); + + if (dt->from_xenstore) { + int nr =3D dt->get_num ? *num : atoi(*dir); + char *device_path =3D dt->get_num ? path : + GCSPRINTF("%s/%d", path, nr); + + rc =3D dt->from_xenstore(gc, device_path, nr, item); + if (rc) goto out; } + + item =3D (uint8_t *)item + dt->dev_elem_size; + ++(*num); + if (!dt->get_num) + ++dir; } =20 r =3D list; diff --git a/tools/libs/light/libxl_internal.h b/tools/libs/light/libxl_int= ernal.h index c2c5a9b92673..d0c23def3c3e 100644 --- a/tools/libs/light/libxl_internal.h +++ b/tools/libs/light/libxl_internal.h @@ -3917,6 +3917,7 @@ typedef int (*device_dm_needed_fn_t)(void *, unsigned= ); typedef void (*device_update_config_fn_t)(libxl__gc *, void *, void *); typedef int (*device_update_devid_fn_t)(libxl__gc *, uint32_t, void *); typedef int (*device_get_num_fn_t)(libxl__gc *, const char *, unsigned int= *); +typedef int (*device_get_path_fn_t)(libxl__gc *, uint32_t, char **); typedef int (*device_from_xenstore_fn_t)(libxl__gc *, const char *, libxl_devid, void *); typedef int (*device_set_xenstore_config_fn_t)(libxl__gc *, uint32_t, void= *, @@ -3941,6 +3942,7 @@ struct libxl__device_type { device_update_config_fn_t update_config; device_update_devid_fn_t update_devid; device_get_num_fn_t get_num; + device_get_path_fn_t get_path; device_from_xenstore_fn_t from_xenstore; device_set_xenstore_config_fn_t set_xenstore_config; }; diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c index 3340076d2cb3..d536702ac420 100644 --- a/tools/libs/light/libxl_pci.c +++ b/tools/libs/light/libxl_pci.c @@ -2393,29 +2393,13 @@ static int libxl__device_pci_get_num(libxl__gc *gc,= const char *be_path, return rc; } =20 -libxl_device_pci *libxl_device_pci_list(libxl_ctx *ctx, uint32_t domid, in= t *num) +static int libxl__device_pci_get_path(libxl__gc *gc, uint32_t domid, + char **path) { - GC_INIT(ctx); - char *be_path; - unsigned int n, i; - libxl_device_pci *pcis =3D NULL; - - *num =3D 0; - - be_path =3D libxl__domain_device_backend_path(gc, 0, domid, 0, - LIBXL__DEVICE_KIND_PCI); - if (libxl__device_pci_get_num(gc, be_path, &n)) - goto out; + *path =3D libxl__domain_device_backend_path(gc, 0, domid, 0, + LIBXL__DEVICE_KIND_PCI); =20 - pcis =3D calloc(n, sizeof(libxl_device_pci)); - - for (i =3D 0; i < n; i++) - libxl__device_pci_from_xs_be(gc, be_path, i, pcis + i); - - *num =3D n; -out: - GC_FREE; - return pcis; + return 0; } =20 void libxl__device_pci_destroy_all(libxl__egc *egc, uint32_t domid, @@ -2492,10 +2476,13 @@ static int libxl_device_pci_compare(const libxl_dev= ice_pci *d1, return COMPARE_PCI(d1, d2); } =20 +LIBXL_DEFINE_DEVICE_LIST(pci) + #define libxl__device_pci_update_devid NULL =20 DEFINE_DEVICE_TYPE_STRUCT(pci, PCI, pcidevs, .get_num =3D libxl__device_pci_get_num, + .get_path =3D libxl__device_pci_get_path, .from_xenstore =3D libxl__device_pci_from_xs_be, ); =20 --=20 2.20.1 From nobody Thu May 2 00:14:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1607455872; cv=none; d=zohomail.com; s=zohoarc; b=Yraq3Tkxnh3wtZCzIROVkL0Wbmclxf+Us0vl1WbwnuL3NtX4KtLpJMryt6RNAd/GuQ+Y2Zb98Njpr3mtZN+cVoTahEiVwRzePLLBUtEryUIfuvhqYiMDRUIunDMtQsJNz8ygoL7f5ig2vbWM8RNF8fTjrBEBiePXDw/I+bZRSyU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607455872; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=yn6sZWxU4vwNPVA8AP0gTT6bc+30jY0cMASuBOO950E=; b=ZN9x5DMd6qWnLF6tLHMOAZPIGT6DQZ/rKM6H0NEYYYaLiSxlZeCVVbT0aXA+rzGbIHjFcCoemX8jz1wqN0reMgMxpbf1jKXURCuO6TSOnIk6//ZGg5oqPuC2LrQ4Bbw6VCkJPw+st8fsU82HRKKRE3mSODQvbKY0MSy433y43LA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1607455872783216.93541555281308; Tue, 8 Dec 2020 11:31:12 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.47687.84422 (Exim 4.92) (envelope-from ) id 1kmihC-0000js-RC; Tue, 08 Dec 2020 19:30:46 +0000 Received: by outflank-mailman (output) from mailman id 47687.84422; Tue, 08 Dec 2020 19:30:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmihC-0000jV-FT; Tue, 08 Dec 2020 19:30:46 +0000 Received: by outflank-mailman (input) for mailman id 47687; Tue, 08 Dec 2020 19:30:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmihB-0000hS-7X for xen-devel@lists.xenproject.org; Tue, 08 Dec 2020 19:30:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmihA-0007LS-CX; Tue, 08 Dec 2020 19:30:44 +0000 Received: from host86-183-162-145.range86-183.btcentralplus.com ([86.183.162.145] helo=desktop.home) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kmihA-0001p0-2c; Tue, 08 Dec 2020 19:30:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=yn6sZWxU4vwNPVA8AP0gTT6bc+30jY0cMASuBOO950E=; b=jSHjQYLlHY8No67/nBbY1YL4Pg ygXhvNw18was+IXO269HFAbyYQt93yKwuqwXRsSaGudIOToIptj6/mO0gTqX8coTLsLvSJiehDvdB IoYNzrf5AuLYGiKZi/jdR6Ui5M6kYFeAYo+vZRG+3knTK3Z4ELeOG98QcaBvQW5UBoLA=; From: Paul Durrant To: xen-devel@lists.xenproject.org Cc: Paul Durrant , Oleksandr Andrushchenko , Wei Liu , Ian Jackson , Anthony PERARD Subject: [PATCH v6 04/25] libxl: Make sure devices added by pci-attach are reflected in the config Date: Tue, 8 Dec 2020 19:30:12 +0000 Message-Id: <20201208193033.11306-5-paul@xen.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201208193033.11306-1-paul@xen.org> References: <20201208193033.11306-1-paul@xen.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @xen.org) Content-Type: text/plain; charset="utf-8" From: Paul Durrant 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 obser= ved by running 'xl list -l' after adding a single device: the device will be missing. This patch fixes the problem and adds a DEBUG log line to allow easy verification that the domain configuration is being modified. Also, the use of libxl__device_generic_add() is dropped as it leads to a confusing situat= ion where only partial backend information is written under the xenstore '/libxl' path. For LIBXL__DEVICE_KIND_PCI devices the only definitive information in xenstore is under '/local/domain/0/backend' (the '0' being hard-coded). NOTE: This patch includes a whitespace in add_pcis_done(). Signed-off-by: Paul Durrant Reviewed-by: Oleksandr Andrushchenko Acked-by: Wei Liu --- Cc: Ian Jackson Cc: Anthony PERARD v3: - Revert some changes form v2 as there is confusion over use of the libxl and backend xenstore paths which needs to be fixed v2: - Avoid having two completely different ways of adding devices into xensto= re --- tools/libs/light/libxl_pci.c | 87 +++++++++++++++++++----------------- 1 file changed, 45 insertions(+), 42 deletions(-) diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c index d536702ac420..3f85f0d7620e 100644 --- a/tools/libs/light/libxl_pci.c +++ b/tools/libs/light/libxl_pci.c @@ -79,39 +79,55 @@ static void libxl__device_from_pci(libxl__gc *gc, uint3= 2_t domid, device->kind =3D LIBXL__DEVICE_KIND_PCI; } =20 -static int libxl__create_pci_backend(libxl__gc *gc, uint32_t domid, - const libxl_device_pci *pci, - int num) +static void libxl__create_pci_backend(libxl__gc *gc, xs_transaction_t t, + uint32_t domid, const libxl_device_p= ci *pci) { - flexarray_t *front =3D NULL; - flexarray_t *back =3D NULL; - libxl__device device; - int i; + libxl_ctx *ctx =3D libxl__gc_owner(gc); + flexarray_t *front, *back; + char *fe_path, *be_path; + struct xs_permissions fe_perms[2], be_perms[2]; + + LOGD(DEBUG, domid, "Creating pci backend"); =20 front =3D flexarray_make(gc, 16, 1); back =3D flexarray_make(gc, 16, 1); =20 - LOGD(DEBUG, domid, "Creating pci backend"); - - /* add pci device */ - libxl__device_from_pci(gc, domid, pci, &device); + fe_path =3D libxl__domain_device_frontend_path(gc, domid, 0, + LIBXL__DEVICE_KIND_PCI); + be_path =3D libxl__domain_device_backend_path(gc, 0, domid, 0, + LIBXL__DEVICE_KIND_PCI); =20 + flexarray_append_pair(back, "frontend", fe_path); flexarray_append_pair(back, "frontend-id", GCSPRINTF("%d", domid)); - flexarray_append_pair(back, "online", "1"); + flexarray_append_pair(back, "online", GCSPRINTF("%d", 1)); flexarray_append_pair(back, "state", GCSPRINTF("%d", XenbusStateInitia= lising)); flexarray_append_pair(back, "domain", libxl__domid_to_name(gc, domid)); =20 - for (i =3D 0; i < num; i++, pci++) - libxl_create_pci_backend_device(gc, back, i, pci); + be_perms[0].id =3D 0; + be_perms[0].perms =3D XS_PERM_NONE; + be_perms[1].id =3D domid; + be_perms[1].perms =3D XS_PERM_READ; + + xs_rm(ctx->xsh, t, be_path); + xs_mkdir(ctx->xsh, t, be_path); + xs_set_permissions(ctx->xsh, t, be_path, be_perms, + ARRAY_SIZE(be_perms)); + libxl__xs_writev(gc, t, be_path, libxl__xs_kvs_of_flexarray(gc, back)); =20 - flexarray_append_pair(back, "num_devs", GCSPRINTF("%d", num)); + flexarray_append_pair(front, "backend", be_path); flexarray_append_pair(front, "backend-id", GCSPRINTF("%d", 0)); flexarray_append_pair(front, "state", GCSPRINTF("%d", XenbusStateIniti= alising)); =20 - return libxl__device_generic_add(gc, XBT_NULL, &device, - libxl__xs_kvs_of_flexarray(gc, back), - libxl__xs_kvs_of_flexarray(gc, front), - NULL); + fe_perms[0].id =3D domid; + fe_perms[0].perms =3D XS_PERM_NONE; + fe_perms[1].id =3D 0; + fe_perms[1].perms =3D XS_PERM_READ; + + xs_rm(ctx->xsh, t, fe_path); + xs_mkdir(ctx->xsh, t, fe_path); + xs_set_permissions(ctx->xsh, t, fe_path, + fe_perms, ARRAY_SIZE(fe_perms)); + libxl__xs_writev(gc, t, fe_path, libxl__xs_kvs_of_flexarray(gc, front)= ); } =20 static int libxl__device_pci_add_xenstore(libxl__gc *gc, @@ -135,8 +151,6 @@ static int libxl__device_pci_add_xenstore(libxl__gc *gc, be_path =3D libxl__domain_device_backend_path(gc, 0, domid, 0, LIBXL__DEVICE_KIND_PCI); num_devs =3D libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/num_devs", be_= path)); - if (!num_devs) - return libxl__create_pci_backend(gc, domid, pci, 1); =20 libxl_domain_type domtype =3D libxl__domain_type(gc, domid); if (domtype =3D=3D LIBXL_DOMAIN_TYPE_INVALID) @@ -150,17 +164,17 @@ static int libxl__device_pci_add_xenstore(libxl__gc *= gc, back =3D flexarray_make(gc, 16, 1); =20 LOGD(DEBUG, domid, "Adding new pci device to xenstore"); - num =3D atoi(num_devs); + num =3D 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", XenbusStateRe= configuring)); =20 /* * Stubdomin config is derived from its target domain, it doesn't have * its own file. */ - if (!is_stubdomain) { + if (!is_stubdomain && !starting) { lock =3D libxl__lock_domain_userdata(gc, domid); if (!lock) { rc =3D ERROR_LOCK_FAIL; @@ -170,6 +184,7 @@ static int libxl__device_pci_add_xenstore(libxl__gc *gc, rc =3D libxl__get_domain_configuration(gc, domid, &d_config); if (rc) goto out; =20 + LOGD(DEBUG, domid, "Adding new pci device to config"); device_add_domain_config(gc, &d_config, &libxl__pci_devtype, pci); =20 @@ -186,6 +201,10 @@ static int libxl__device_pci_add_xenstore(libxl__gc *g= c, if (rc) goto out; } =20 + /* This is the first device, so create the backend */ + if (!num_devs) + libxl__create_pci_backend(gc, t, domid, pci); + libxl__xs_writev(gc, t, be_path, libxl__xs_kvs_of_flexarray(gc, ba= ck)); =20 rc =3D libxl__xs_transaction_commit(gc, &t); @@ -1437,7 +1456,7 @@ out_no_irq: } } =20 - if (!starting && !libxl_get_stubdom_id(CTX, domid)) + if (!libxl_get_stubdom_id(CTX, domid)) rc =3D libxl__device_pci_add_xenstore(gc, domid, pci, starting); else rc =3D 0; @@ -1765,28 +1784,12 @@ static void libxl__add_pcis(libxl__egc *egc, libxl_= _ao *ao, uint32_t domid, } =20 static void add_pcis_done(libxl__egc *egc, libxl__multidev *multidev, - int rc) + int rc) { EGC_GC; add_pcis_state *apds =3D CONTAINER_OF(multidev, *apds, multidev); - - /* Convenience aliases */ - libxl_domain_config *d_config =3D apds->d_config; - libxl_domid domid =3D apds->domid; libxl__ao_device *aodev =3D apds->outer_aodev; =20 - if (rc) goto out; - - if (d_config->num_pcidevs > 0 && !libxl_get_stubdom_id(CTX, domid)) { - rc =3D libxl__create_pci_backend(gc, domid, d_config->pcidevs, - d_config->num_pcidevs); - if (rc < 0) { - LOGD(ERROR, domid, "libxl_create_pci_backend failed: %d", rc); - goto out; - } - } - -out: aodev->rc =3D rc; aodev->callback(egc, aodev); } --=20 2.20.1 From nobody Thu May 2 00:14:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1607455872; cv=none; d=zohomail.com; s=zohoarc; b=FmUhfSJcv8PJmOtxVUeWCYq3NweuQH1lUq4UvhkMMasmNaxrfofZMMH1k4G3FVpByIROVZK51f7y+2gHF9vGWqMw98ps8XU5lfjtHatdv6sxtSgze2i7vzDLmEG24uBL8dzH+/Z9UXs83ETLytyfXAvznBoxqFmqWKX2lbm9dbY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607455872; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=GW8F74uuKnBsl/QhgvU4YWCjBsqUt8SG+nfW/x6vTeU=; b=D9gdtvx3AE9FNpZ9IYVeyHWnaLJx+Akl4iLJBruh8/j/mqWApBNRP3/NDqzaG9bwf5XYuQQHYMSJnidhIyMYtHK7vKVWMRvj5sQV3F/I56+HqBIHmxbCZyjKAayRrG+AfLKgLGcZ6wZGPGtTx6GBMr6QUsRjkhaQpIw7gsrSSME= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1607455872888106.41290925816554; Tue, 8 Dec 2020 11:31:12 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.47688.84440 (Exim 4.92) (envelope-from ) id 1kmihF-0000tN-AO; Tue, 08 Dec 2020 19:30:49 +0000 Received: by outflank-mailman (output) from mailman id 47688.84440; Tue, 08 Dec 2020 19:30:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmihF-0000tE-3d; Tue, 08 Dec 2020 19:30:49 +0000 Received: by outflank-mailman (input) for mailman id 47688; Tue, 08 Dec 2020 19:30:46 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmihC-0000j9-9G for xen-devel@lists.xenproject.org; Tue, 08 Dec 2020 19:30:46 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmihB-0007Lc-9h; Tue, 08 Dec 2020 19:30:45 +0000 Received: from host86-183-162-145.range86-183.btcentralplus.com ([86.183.162.145] helo=desktop.home) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kmihB-0001p0-1c; Tue, 08 Dec 2020 19:30:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=GW8F74uuKnBsl/QhgvU4YWCjBsqUt8SG+nfW/x6vTeU=; b=qzD4mITNZ6VcGw1+bulyKQf8t2 UbzOveql4qDDGq0xkUmFTBMO5yVsDrzhD1Dbg3RNl8xUbIlT1XjvWCbb9Gj9ry7rtHCIYYKPa/VS5 +AzrFzoGUy7ThoppnCBlecRBqJUnx38nx8qv1SSLQ+0RyvrJnTZ139Rm74CadnkOTh1M=; From: Paul Durrant To: xen-devel@lists.xenproject.org Cc: Paul Durrant , Oleksandr Andrushchenko , Wei Liu , Ian Jackson Subject: [PATCH v6 05/25] libxl: add/recover 'rdm_policy' to/from PCI backend in xenstore Date: Tue, 8 Dec 2020 19:30:13 +0000 Message-Id: <20201208193033.11306-6-paul@xen.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201208193033.11306-1-paul@xen.org> References: <20201208193033.11306-1-paul@xen.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @xen.org) Content-Type: text/plain; charset="utf-8" From: Paul Durrant 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 Reviewed-by: Oleksandr Andrushchenko Acked-by: Wei Liu --- Cc: Ian Jackson --- 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 3f85f0d7620e..2a5a4db976e1 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=3D%d,power_mgmt=3D%d,permissive=3D%d= ", - pci->msitranslate, pci->power_mgmt, - pci->permissive)); + GCSPRINTF("msitranslate=3D%d,power_mgmt=3D%d,permissive=3D%d= ,rdm_policy=3D%s", + pci->msitranslate, pci->power_mgmt, + pci->permissive, libxl_rdm_reserve_policy_to_strin= g(pci->rdm_policy))); flexarray_append_pair(back, GCSPRINTF("state-%d", num), GCSPRINTF("%d"= , XenbusStateInitialising)); } =20 @@ -2374,6 +2374,9 @@ static int libxl__device_pci_from_xs_be(libxl__gc *gc, } else if (!strcmp(p, "permissive")) { p =3D strtok_r(NULL, ",=3D", &saveptr); pci->permissive =3D atoi(p); + } else if (!strcmp(p, "rdm_policy")) { + p =3D strtok_r(NULL, ",=3D", &saveptr); + libxl_rdm_reserve_policy_from_string(p, &pci->rdm_policy); } } while ((p =3D strtok_r(NULL, ",=3D", &saveptr)) !=3D NULL); } --=20 2.20.1 From nobody Thu May 2 00:14:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1607455872; cv=none; d=zohomail.com; s=zohoarc; b=fve9dxCHlZHiX2iLKs9WqLk5Z+TTWOD3+iVxT9Pszhrwer98OK43LXtoXhySLc2JDypiXciCVQp5ctsPo9VCgbTRAjW2j5YEuti8ZAaMLlRBnhxK2ae0WgyR5WIr4zD8EhL0AUanJB2SJEo8E/oI98JGfd5VyV3vk9/A1HoxmNY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607455872; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YuOQecAixX1DjK13kmE19J965kCqYu/hcSuqKjMtAqY=; b=O7Wy83gxACPvuEWq/8SBmiQ8KKq6W7qtqcEBgbgtf1qRcRAu5LCGapb3g7K3++lPhmOazydvIguvHDd5mlwhfsk6QYTtz1vdGdAT1I22Rboyr7+t51GjWbyJeCUplGfk80OttBsQmFCUufxAS93zv0U1psVFplrmWLzAI/kUz/c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1607455872724486.78680994984904; Tue, 8 Dec 2020 11:31:12 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.47689.84448 (Exim 4.92) (envelope-from ) id 1kmihG-0000uU-08; Tue, 08 Dec 2020 19:30:50 +0000 Received: by outflank-mailman (output) from mailman id 47689.84448; Tue, 08 Dec 2020 19:30:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmihF-0000tz-Gd; Tue, 08 Dec 2020 19:30:49 +0000 Received: by outflank-mailman (input) for mailman id 47689; Tue, 08 Dec 2020 19:30:47 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmihC-0000kU-Sx for xen-devel@lists.xenproject.org; Tue, 08 Dec 2020 19:30:46 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmihC-0007Lh-74; Tue, 08 Dec 2020 19:30:46 +0000 Received: from host86-183-162-145.range86-183.btcentralplus.com ([86.183.162.145] helo=desktop.home) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kmihB-0001p0-Uy; Tue, 08 Dec 2020 19:30:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=YuOQecAixX1DjK13kmE19J965kCqYu/hcSuqKjMtAqY=; b=ZjepG28HskRGPgNyU9ReEbUrfH bsBGI58ATPqvc8xl3v4h4TBileodAWIsoOAcZ+E/ok1yAu2a7EPJSLlPnmnngAxPnInSpgYPLdORs 51aY7EIk6ZzBp19zzylYrYCo5Jk10/omKgEAun7EOs9RR8rOHKOJ64Mb36/znbhyOV7c=; From: Paul Durrant To: xen-devel@lists.xenproject.org Cc: Paul Durrant , Oleksandr Andrushchenko , Wei Liu , Ian Jackson Subject: [PATCH v6 06/25] libxl: s/detatched/detached in libxl_pci.c Date: Tue, 8 Dec 2020 19:30:14 +0000 Message-Id: <20201208193033.11306-7-paul@xen.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201208193033.11306-1-paul@xen.org> References: <20201208193033.11306-1-paul@xen.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @xen.org) Content-Type: text/plain; charset="utf-8" From: Paul Durrant Simply spelling correction. Purely cosmetic fix. Signed-off-by: Paul Durrant Reviewed-by: Oleksandr Andrushchenko Acked-by: Wei Liu --- Cc: Ian Jackson --- 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 2a5a4db976e1..b6d3bd29b718 100644 --- a/tools/libs/light/libxl_pci.c +++ b/tools/libs/light/libxl_pci.c @@ -1864,7 +1864,7 @@ static void pci_remove_qmp_query_cb(libxl__egc *egc, libxl__ev_qmp *qmp, const libxl__json_object *response, int rc); static void pci_remove_timeout(libxl__egc *egc, libxl__ev_time *ev, const struct timeval *requested_abs, int rc); -static void pci_remove_detatched(libxl__egc *egc, +static void pci_remove_detached(libxl__egc *egc, pci_remove_state *prs, int rc); static void pci_remove_stubdom_done(libxl__egc *egc, libxl__ao_device *aodev); @@ -1978,7 +1978,7 @@ skip1: skip_irq: rc =3D 0; out_fail: - pci_remove_detatched(egc, prs, rc); /* must be last */ + pci_remove_detached(egc, prs, rc); /* must be last */ } =20 static void pci_remove_qemu_trad_watch_state_cb(libxl__egc *egc, @@ -2002,7 +2002,7 @@ static void pci_remove_qemu_trad_watch_state_cb(libxl= __egc *egc, rc =3D qemu_pci_remove_xenstore(gc, domid, pci, prs->force); =20 out: - pci_remove_detatched(egc, prs, rc); + pci_remove_detached(egc, prs, rc); } =20 static void pci_remove_qmp_device_del(libxl__egc *egc, @@ -2028,7 +2028,7 @@ static void pci_remove_qmp_device_del(libxl__egc *egc, return; =20 out: - pci_remove_detatched(egc, prs, rc); + pci_remove_detached(egc, prs, rc); } =20 static void pci_remove_qmp_device_del_cb(libxl__egc *egc, @@ -2051,7 +2051,7 @@ static void pci_remove_qmp_device_del_cb(libxl__egc *= egc, return; =20 out: - pci_remove_detatched(egc, prs, rc); + pci_remove_detached(egc, prs, rc); } =20 static void pci_remove_qmp_retry_timer_cb(libxl__egc *egc, libxl__ev_time = *ev, @@ -2067,7 +2067,7 @@ static void pci_remove_qmp_retry_timer_cb(libxl__egc = *egc, libxl__ev_time *ev, return; =20 out: - pci_remove_detatched(egc, prs, rc); + pci_remove_detached(egc, prs, rc); } =20 static void pci_remove_qmp_query_cb(libxl__egc *egc, @@ -2127,7 +2127,7 @@ static void pci_remove_qmp_query_cb(libxl__egc *egc, } =20 out: - pci_remove_detatched(egc, prs, rc); /* must be last */ + pci_remove_detached(egc, prs, rc); /* must be last */ } =20 static void pci_remove_timeout(libxl__egc *egc, libxl__ev_time *ev, @@ -2146,12 +2146,12 @@ static void pci_remove_timeout(libxl__egc *egc, lib= xl__ev_time *ev, /* If we timed out, we might still want to keep destroying the device * (when force=3D=3Dtrue), so let the next function decide what to do = on * error */ - pci_remove_detatched(egc, prs, rc); + pci_remove_detached(egc, prs, rc); } =20 -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 =3D 0; --=20 2.20.1 From nobody Thu May 2 00:14:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1607455872; cv=none; d=zohomail.com; s=zohoarc; b=Ar9wRc4LF1SRZ4tqRvmcO6BRSYO3kfkgmQuZq+MQh67FdNlSQ88iWo05BsB5ZNna8aP/4yDzVwUd/PSLb9fmETeCdcFyvLJpsGr+v7sJ3RyG2c+PzqUZs0RvLIm0e4Qd+bhQZclKhFLw+YXCwNsR/dX8T025RTLRVLioWkGq9Ro= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607455872; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=PWEJza/r2oRNQ2L9vbvH4x3sSK+2PBgCX1brH2xdXO4=; b=HUZyk0uGB+yNaKPgXecyeJJpS/mzaY42mKgnzH67fnYKHObuGnIQNG0s2He0RmJ36f3IKwfiwVGKVUMDc6nNKK+9RQLfZ9Wy9U9mQUmxjMlSuB5aPqvm29VhjYJrlNcqLWlMGCJAvzrZINL8uSj/2nKIYPJaF5sgcTCFt6TT5zI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1607455872772350.3400940171348; Tue, 8 Dec 2020 11:31:12 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.47690.84455 (Exim 4.92) (envelope-from ) id 1kmihG-0000wY-Mp; Tue, 08 Dec 2020 19:30:50 +0000 Received: by outflank-mailman (output) from mailman id 47690.84455; Tue, 08 Dec 2020 19:30:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmihG-0000vx-90; Tue, 08 Dec 2020 19:30:50 +0000 Received: by outflank-mailman (input) for mailman id 47690; Tue, 08 Dec 2020 19:30:47 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmihD-0000me-Rc for xen-devel@lists.xenproject.org; Tue, 08 Dec 2020 19:30:47 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmihD-0007Lr-3J; Tue, 08 Dec 2020 19:30:47 +0000 Received: from host86-183-162-145.range86-183.btcentralplus.com ([86.183.162.145] helo=desktop.home) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kmihC-0001p0-S0; Tue, 08 Dec 2020 19:30:47 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=PWEJza/r2oRNQ2L9vbvH4x3sSK+2PBgCX1brH2xdXO4=; b=HHKbrMRjImxkQgQAxgoYtuuAkK GipesqIQm+HUBkbFZ8A2LveyGLCka5/dk0P4VFfDelXj/oY5rSbcNdQaZ6LxehkQYxCk7yl3WY76/ CEfiVCKdmDPagpOjOIz8lfJQ8aWhXhXk/f+HaTB65qP1FbGWWrB8tacX7ULuBUtDatOo=; From: Paul Durrant To: xen-devel@lists.xenproject.org Cc: Paul Durrant , Oleksandr Andrushchenko , Wei Liu , Ian Jackson Subject: [PATCH v6 07/25] libxl: remove extraneous arguments to do_pci_remove() in libxl_pci.c Date: Tue, 8 Dec 2020 19:30:15 +0000 Message-Id: <20201208193033.11306-8-paul@xen.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201208193033.11306-1-paul@xen.org> References: <20201208193033.11306-1-paul@xen.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @xen.org) Content-Type: text/plain; charset="utf-8" From: Paul Durrant 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 Reviewed-by: Oleksandr Andrushchenko Acked-by: Wei Liu --- Cc: Ian Jackson --- 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 b6d3bd29b718..bcc4d2ef9686 100644 --- a/tools/libs/light/libxl_pci.c +++ b/tools/libs/light/libxl_pci.c @@ -1871,14 +1871,14 @@ static void pci_remove_stubdom_done(libxl__egc *egc, static void pci_remove_done(libxl__egc *egc, pci_remove_state *prs, int rc); =20 -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 =3D libxl__gc_owner(gc); libxl_device_pci *assigned; + uint32_t domid =3D prs->domid; libxl_domain_type type =3D libxl__domain_type(gc, domid); + libxl_device_pci *pci =3D prs->pci; int rc, num; uint32_t domainid =3D domid; =20 @@ -2275,7 +2275,6 @@ static void device_pci_remove_common_next(libxl__egc = *egc, EGC_GC; =20 /* Convenience aliases */ - libxl_domid domid =3D prs->domid; libxl_device_pci *const pci =3D prs->pci; libxl__ao_device *const aodev =3D prs->aodev; const unsigned int pfunc_mask =3D prs->pfunc_mask; @@ -2293,7 +2292,7 @@ static void device_pci_remove_common_next(libxl__egc = *egc, } else { pci->vdevfn =3D orig_vdev; } - do_pci_remove(egc, domid, pci, prs->force, prs); + do_pci_remove(egc, prs); return; } } --=20 2.20.1 From nobody Thu May 2 00:14:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1607455885; cv=none; d=zohomail.com; s=zohoarc; b=TXZrytb0YuLJneQPe8DjO+2YDFlr2fVLXPW5gcRaGXqJcLGZJMdO4VyN3/pioGug+x3N2kNjJVPKAUQbPk6vIZPB1Vxpud9d7jkLYyvW3bhZsCwzOjflMnm6drBKbPGksAGEWOIKPP6T+UYTCmfCgkoLuI9BsSkMvsdMe19rP/E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607455885; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+dD0y2vMDsFbroYpFk5v6m+aYVM8RV4tZrBb3da8/jw=; b=al4zT5pSPw/a1POX9+P3O54VEyOQhUgQWJ5TnqmfilfgwjxekaqpR2GZDZ5XGGqtFXlArsRr3oMj53EzN18Y+qWV3OzNM7tQ8qEcdp9q+RGiM1Fv2K42fCBYAXhDrw3813nUpKU8yc2h0vwCRIFJyABhs0h214TNk7HJv7ZJUIo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1607455877062930.236237003075; Tue, 8 Dec 2020 11:31:17 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.47691.84467 (Exim 4.92) (envelope-from ) id 1kmihH-0000yf-M3; Tue, 08 Dec 2020 19:30:51 +0000 Received: by outflank-mailman (output) from mailman id 47691.84467; Tue, 08 Dec 2020 19:30:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmihH-0000yD-22; Tue, 08 Dec 2020 19:30:51 +0000 Received: by outflank-mailman (input) for mailman id 47691; Tue, 08 Dec 2020 19:30:48 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmihE-0000sP-Lu for xen-devel@lists.xenproject.org; Tue, 08 Dec 2020 19:30:48 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmihE-0007M1-0G; Tue, 08 Dec 2020 19:30:48 +0000 Received: from host86-183-162-145.range86-183.btcentralplus.com ([86.183.162.145] helo=desktop.home) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kmihD-0001p0-Os; Tue, 08 Dec 2020 19:30:47 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=+dD0y2vMDsFbroYpFk5v6m+aYVM8RV4tZrBb3da8/jw=; b=TlA2ilgu/AUIE/KCSL4zXASUlb WxqaveG4IPdmWcdkPTk0st60CuH58cBDtw9D9m0JueDWcNFL7eXBlxm3+BPhjuXJfA1bE37bgsAzR 3WMBgWS5wjZ4pjtLgMH7xq0CBZkHppZAUONPZc6rMO7vX4oqieQDp6dH0Tc0+UAPgXKY=; From: Paul Durrant To: xen-devel@lists.xenproject.org Cc: Paul Durrant , Oleksandr Andrushchenko , Wei Liu , Ian Jackson Subject: [PATCH v6 08/25] libxl: stop using aodev->device_config in libxl__device_pci_add()... Date: Tue, 8 Dec 2020 19:30:16 +0000 Message-Id: <20201208193033.11306-9-paul@xen.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201208193033.11306-1-paul@xen.org> References: <20201208193033.11306-1-paul@xen.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @xen.org) Content-Type: text/plain; charset="utf-8" From: Paul Durrant ... 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 Reviewed-by: Oleksandr Andrushchenko Acked-by: Wei Liu --- Cc: Ian Jackson --- 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 bcc4d2ef9686..be2145222d2b 100644 --- a/tools/libs/light/libxl_pci.c +++ b/tools/libs/light/libxl_pci.c @@ -1074,7 +1074,7 @@ typedef struct pci_add_state { libxl__ev_qmp qmp; libxl__ev_time timeout; libxl_device_pci *pci; - int pci_domid; + libxl_domid pci_domid; } pci_add_state; =20 static void pci_add_qemu_trad_watch_state_cb(libxl__egc *egc, @@ -1091,7 +1091,6 @@ static void pci_add_dm_done(libxl__egc *, =20 static void do_pci_add(libxl__egc *egc, libxl_domid domid, - libxl_device_pci *pci, pci_add_state *pas) { STATE_AO_GC(pas->aodev->ao); @@ -1101,7 +1100,6 @@ static void do_pci_add(libxl__egc *egc, /* init pci_add_state */ libxl__xswait_init(&pas->xswait); libxl__ev_qmp_init(&pas->qmp); - pas->pci =3D pci; pas->pci_domid =3D domid; libxl__ev_time_init(&pas->timeout); =20 @@ -1564,13 +1562,10 @@ void libxl__device_pci_add(libxl__egc *egc, uint32_= t domid, int stubdomid =3D 0; pci_add_state *pas; =20 - /* Store *pci to be used by callbacks */ - aodev->device_config =3D pci; - aodev->device_type =3D &libxl__pci_devtype; - GCNEW(pas); pas->aodev =3D aodev; pas->domid =3D domid; + pas->pci =3D pci; pas->starting =3D starting; pas->callback =3D device_pci_add_stubdom_done; =20 @@ -1624,9 +1619,10 @@ void libxl__device_pci_add(libxl__egc *egc, uint32_t= domid, GCNEW(pci_s); libxl_device_pci_init(pci_s); libxl_device_pci_copy(CTX, pci_s, pci); + pas->pci =3D pci_s; pas->callback =3D device_pci_add_stubdom_wait; =20 - do_pci_add(egc, stubdomid, pci_s, pas); /* must be last */ + do_pci_add(egc, stubdomid, pas); /* must be last */ return; } =20 @@ -1681,9 +1677,8 @@ static void device_pci_add_stubdom_done(libxl__egc *e= gc, int i; =20 /* Convenience aliases */ - libxl__ao_device *aodev =3D pas->aodev; libxl_domid domid =3D pas->domid; - libxl_device_pci *pci =3D aodev->device_config; + libxl_device_pci *pci =3D pas->pci; =20 if (rc) goto out; =20 @@ -1718,7 +1713,7 @@ static void device_pci_add_stubdom_done(libxl__egc *e= gc, pci->vdevfn =3D orig_vdev; } pas->callback =3D device_pci_add_done; - do_pci_add(egc, domid, pci, pas); /* must be last */ + do_pci_add(egc, domid, pas); /* must be last */ return; } } @@ -1734,7 +1729,7 @@ static void device_pci_add_done(libxl__egc *egc, EGC_GC; libxl__ao_device *aodev =3D pas->aodev; libxl_domid domid =3D pas->domid; - libxl_device_pci *pci =3D aodev->device_config; + libxl_device_pci *pci =3D pas->pci; =20 if (rc) { LOGD(ERROR, domid, --=20 2.20.1 From nobody Thu May 2 00:14:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1607455877; cv=none; d=zohomail.com; s=zohoarc; b=g0/2PbhsmOTd1wmJLG3dqeJT+aYg4NNGatnRy2jzVisHzZyPgvv5tqTxtQnvrPWw1PwFaklqGbBif+kw76bkLUa6e5hvWkPHE2dUkXp/1eqcpY0HxJgVnnCfm4qLtiFjhagt0kzUmkaAWMxNTP2RdCxNdhf9ON896WDhZdTo3q0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607455877; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=qfopx7cHG4X0r38QiGo2Y3baRSgtNBNUsNc3slBAJGc=; b=bpjYeOpVNSIeyPx/xCocF7+o9S3hH93ifRHmQXkkclR6nh26iMWQ/VLWwmFgjoPfMtqO74/Q653V/GuDTCYIrillGR8IoN5LSrfzx/DKm9bZXSq0DNYNaULcsXExLAgnGuFK90is0geOFFTQzLI8tYXMvTY3O+JUC+701jn0bwg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1607455877836964.7434507082356; Tue, 8 Dec 2020 11:31:17 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.47693.84477 (Exim 4.92) (envelope-from ) id 1kmihI-00010l-F9; Tue, 08 Dec 2020 19:30:52 +0000 Received: by outflank-mailman (output) from mailman id 47693.84477; Tue, 08 Dec 2020 19:30:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmihH-00010B-RL; Tue, 08 Dec 2020 19:30:51 +0000 Received: by outflank-mailman (input) for mailman id 47693; Tue, 08 Dec 2020 19:30:49 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmihF-0000uZ-LD for xen-devel@lists.xenproject.org; Tue, 08 Dec 2020 19:30:49 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmihE-0007M8-TL; Tue, 08 Dec 2020 19:30:48 +0000 Received: from host86-183-162-145.range86-183.btcentralplus.com ([86.183.162.145] helo=desktop.home) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kmihE-0001p0-Ll; Tue, 08 Dec 2020 19:30:48 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=qfopx7cHG4X0r38QiGo2Y3baRSgtNBNUsNc3slBAJGc=; b=epy8WCO/EMUg3ERX120HlUtRxV e51MAG3gYoC6ld9I8Lm1yxpGnIJJBP1xpBgk539KL14P1qVuhn0eWdbZoiMK+OU6lqIOiDbvtVWcj QNKGvmeQc4NPdHn96KeCDnkt5GE15HyuRsV3v8n8QKy8BEyw4ny0k4Lqc4HspeHUnIQg=; From: Paul Durrant To: xen-devel@lists.xenproject.org Cc: Paul Durrant , Oleksandr Andrushchenko , Wei Liu , Ian Jackson Subject: [PATCH v6 09/25] libxl: generalise 'driver_path' xenstore access functions in libxl_pci.c Date: Tue, 8 Dec 2020 19:30:17 +0000 Message-Id: <20201208193033.11306-10-paul@xen.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201208193033.11306-1-paul@xen.org> References: <20201208193033.11306-1-paul@xen.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @xen.org) Content-Type: text/plain; charset="utf-8" From: Paul Durrant 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 Reviewed-by: Oleksandr Andrushchenko Acked-by: Wei Liu --- Cc: Ian Jackson --- 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 be2145222d2b..78ee641e9aa8 100644 --- a/tools/libs/light/libxl_pci.c +++ b/tools/libs/light/libxl_pci.c @@ -737,48 +737,46 @@ static int pciback_dev_unassign(libxl__gc *gc, libxl_= device_pci *pci) return 0; } =20 -#define PCIBACK_INFO_PATH "/libxl/pciback" +#define PCI_INFO_PATH "/libxl/pci" =20 -static void pci_assignable_driver_path_write(libxl__gc *gc, - libxl_device_pci *pci, - char *driver_path) +static char *pci_info_xs_path(libxl__gc *gc, libxl_device_pci *pci, + const char *node) { - char *path; + return node ? + GCSPRINTF(PCI_INFO_PATH"/"PCI_BDF_XSPATH"/%s", + pci->domain, pci->bus, pci->dev, pci->func, + node) : + GCSPRINTF(PCI_INFO_PATH"/"PCI_BDF_XSPATH, + pci->domain, pci->bus, pci->dev, pci->func); +} + + +static void pci_info_xs_write(libxl__gc *gc, libxl_device_pci *pci, + const char *node, const char *val) +{ + char *path =3D pci_info_xs_path(gc, pci, node); =20 - path =3D GCSPRINTF(PCIBACK_INFO_PATH"/"PCI_BDF_XSPATH"/driver_path", - pci->domain, - pci->bus, - pci->dev, - pci->func); - if ( libxl__xs_printf(gc, XBT_NULL, path, "%s", driver_path) < 0 ) { - LOGE(WARN, "Write of %s to node %s failed.", driver_path, path); + if ( libxl__xs_printf(gc, XBT_NULL, path, "%s", val) < 0 ) { + LOGE(WARN, "Write of %s to node %s failed.", val, path); } } =20 -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_p= ath", - pci->domain, - pci->bus, - pci->dev, - pci->func)); + char *path =3D pci_info_xs_path(gc, pci, node); + + return libxl__xs_read(gc, XBT_NULL, path); } =20 -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 =3D pci_info_xs_path(gc, pci, node); libxl_ctx *ctx =3D libxl__gc_owner(gc); =20 /* 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); } =20 static int libxl__device_pci_assignable_add(libxl__gc *gc, @@ -824,9 +822,9 @@ static int libxl__device_pci_assignable_add(libxl__gc *= gc, /* Store driver_path for rebinding to dom0 */ if ( rebind ) { if ( driver_path ) { - pci_assignable_driver_path_write(gc, pci, driver_path); + pci_info_xs_write(gc, pci, "driver_path", driver_path); } else if ( (driver_path =3D - pci_assignable_driver_path_read(gc, pci)) !=3D NULL )= { + pci_info_xs_read(gc, pci, "driver_path")) !=3D NULL )= { LOG(INFO, PCI_BDF" not bound to a driver, will be rebound to %= s", dom, bus, dev, func, driver_path); } else { @@ -834,7 +832,7 @@ static int libxl__device_pci_assignable_add(libxl__gc *= gc, dom, bus, dev, func); } } else { - pci_assignable_driver_path_remove(gc, pci); + pci_info_xs_remove(gc, pci, "driver_path"); } =20 if ( pciback_dev_assign(gc, pci) ) { @@ -884,7 +882,7 @@ static int libxl__device_pci_assignable_remove(libxl__g= c *gc, } =20 /* Rebind if necessary */ - driver_path =3D pci_assignable_driver_path_read(gc, pci); + driver_path =3D pci_info_xs_read(gc, pci, "driver_path"); =20 if ( driver_path ) { if ( rebind ) { @@ -897,7 +895,7 @@ static int libxl__device_pci_assignable_remove(libxl__g= c *gc, return -1; } =20 - pci_assignable_driver_path_remove(gc, pci); + pci_info_xs_remove(gc, pci, "driver_path"); } } else { if ( rebind ) { --=20 2.20.1 From nobody Thu May 2 00:14:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1607457671; cv=none; d=zohomail.com; s=zohoarc; b=XYIXIlRIPVMVQ2jJw+d4soEDqW4g0QowOzs+qKvWl8zXrYcSGF+ToNJ5IylJzQT8yUKvCAH/S0H9Y23auqrALL74/rG1EEcUcA7ADLmS+FJpGLiytccX8vyoHTQg0vKB4/YiF0TGnUdnQszW97xgNIiFZrXasfW5P1st3y0RnFU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607457671; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HD4e8QIuOJKsoYEaJ78yCnUJ89s+VAB/WU9F9pKuq1c=; b=oHIxh8i5VBsLO/m9w2chfbvmviNYKjv+OXH6WdvskSTKVqfzlNxT8fre4nSavkGCvY7ExCJIqLmw+w6vJ91PnFI4geZHWbtw+RyZuE/HgVTW65iwWY0Rj1Nvot2WvyiSJzYHGNWOLXYRvvOkpMhAW7mgovTI4xJpHj5HNgQ6/Hg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1607457671173119.46794156705369; Tue, 8 Dec 2020 12:01:11 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.47763.84531 (Exim 4.92) (envelope-from ) id 1kmjAG-0004rX-8A; Tue, 08 Dec 2020 20:00:48 +0000 Received: by outflank-mailman (output) from mailman id 47763.84531; Tue, 08 Dec 2020 20:00:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAG-0004rL-0v; Tue, 08 Dec 2020 20:00:48 +0000 Received: by outflank-mailman (input) for mailman id 47763; Tue, 08 Dec 2020 20:00:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAD-0004on-Jh for xen-devel@lists.xenproject.org; Tue, 08 Dec 2020 20:00:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAC-00086I-QG; Tue, 08 Dec 2020 20:00:44 +0000 Received: from host86-183-162-145.range86-183.btcentralplus.com ([86.183.162.145] helo=desktop.home) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kmihF-0001p0-Id; Tue, 08 Dec 2020 19:30:49 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=HD4e8QIuOJKsoYEaJ78yCnUJ89s+VAB/WU9F9pKuq1c=; b=OGMBKZ0qbSoolNUERAOJgtRPOy dfRNLmBTJFWj59NT7iboNV42XgSRmilKYne8uoC9ZCA3ePsZW1i6p0zmN+XwlADfWJvnzK8X+UYoh a+XlICCQsQktAQZ2av3UyCTpie/ybWp1QEWiemrnUs+jvqg+3QgUcQ+u7AGH2HcYFmBg=; From: Paul Durrant To: xen-devel@lists.xenproject.org Cc: Paul Durrant , Oleksandr Andrushchenko , Wei Liu , Ian Jackson Subject: [PATCH v6 10/25] libxl: remove unnecessary check from libxl__device_pci_add() Date: Tue, 8 Dec 2020 19:30:18 +0000 Message-Id: <20201208193033.11306-11-paul@xen.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201208193033.11306-1-paul@xen.org> References: <20201208193033.11306-1-paul@xen.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @xen.org) Content-Type: text/plain; charset="utf-8" From: Paul Durrant 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 Reviewed-by: Oleksandr Andrushchenko Acked-by: Wei Liu --- Cc: Ian Jackson --- 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 78ee641e9aa8..0c2ab5075d9f 100644 --- a/tools/libs/light/libxl_pci.c +++ b/tools/libs/light/libxl_pci.c @@ -1555,8 +1555,7 @@ void libxl__device_pci_add(libxl__egc *egc, uint32_t = domid, { STATE_AO_GC(aodev->ao); libxl_ctx *ctx =3D libxl__gc_owner(gc); - libxl_device_pci *assigned; - int num_assigned, rc; + int rc; int stubdomid =3D 0; pci_add_state *pas; =20 @@ -1595,19 +1594,6 @@ void libxl__device_pci_add(libxl__egc *egc, uint32_t= domid, goto out; } =20 - rc =3D 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 =3D ERROR_FAIL; - goto out; - } - libxl__device_pci_reset(gc, pci->domain, pci->bus, pci->dev, pci->func= ); =20 stubdomid =3D libxl_get_stubdom_id(ctx, domid); --=20 2.20.1 From nobody Thu May 2 00:14:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1607457979; cv=none; d=zohomail.com; s=zohoarc; b=ldO1xNH2nimG33+I0X2T3N0jB1eTju4cAjzRKrUhcY9bg2dzvagE7MLlUlFrK1Qugte2IsJliG3XJq+04Y/iMtq4fW2nW9GWAnL5qlACWY/nDbsUMZToGeQnzUAKKVcP/ggzm3jpelifKhqdov1yvjcVP31a5hZkWSQiUxg7f6I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607457979; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=mETAd4vIPWNeYGaK2+L7Uc2zER+2iOz4jTch2pcWZyo=; b=TDTqDxd/uqmUnedZyHxfaS5V/VrTtfbkeYrd9EdfdkeF5mIgDUG6NXczVFc/gQ+G0C8rThdV2osRS98lF77bNKmXjqwcV0qJIqhpNUzxCKSda0UxnH3WcKIcL5AWAfo2FJYen2NRn3dWDiGkU0qheuol2b+Kcg/swiVSJYGiUBk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1607457979439777.80141444031; Tue, 8 Dec 2020 12:06:19 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.47764.84552 (Exim 4.92) (envelope-from ) id 1kmjAH-0004un-9d; Tue, 08 Dec 2020 20:00:49 +0000 Received: by outflank-mailman (output) from mailman id 47764.84552; Tue, 08 Dec 2020 20:00:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAG-0004u8-Rp; Tue, 08 Dec 2020 20:00:48 +0000 Received: by outflank-mailman (input) for mailman id 47764; Tue, 08 Dec 2020 20:00:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAD-0004om-Jh for xen-devel@lists.xenproject.org; Tue, 08 Dec 2020 20:00:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAC-00086E-M8; Tue, 08 Dec 2020 20:00:44 +0000 Received: from host86-183-162-145.range86-183.btcentralplus.com ([86.183.162.145] helo=desktop.home) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kmihG-0001p0-HU; Tue, 08 Dec 2020 19:30:50 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=mETAd4vIPWNeYGaK2+L7Uc2zER+2iOz4jTch2pcWZyo=; b=uSDziSntLinJRXwNiYTgCG14So 58d/DJEnitRUouxI7dR/h1d0ifqQtZBZi5yJQjz8Zl+8f5m8kZ+r+vIsvNYbAHq4zvXyzQdwViLwg toDLCf2MCdKsMvMyfYvphnzWed9jwIhG/M9GtsISHPO1+FGCJCU7hUQs3mj3e7csqKx8=; From: Paul Durrant To: xen-devel@lists.xenproject.org Cc: Paul Durrant , Oleksandr Andrushchenko , Wei Liu , Ian Jackson Subject: [PATCH v6 11/25] libxl: remove get_all_assigned_devices() from libxl_pci.c Date: Tue, 8 Dec 2020 19:30:19 +0000 Message-Id: <20201208193033.11306-12-paul@xen.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201208193033.11306-1-paul@xen.org> References: <20201208193033.11306-1-paul@xen.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @xen.org) Content-Type: text/plain; charset="utf-8" From: Paul Durrant 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 Reviewed-by: Oleksandr Andrushchenko Acked-by: Wei Liu --- Cc: Ian Jackson --- 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 0c2ab5075d9f..37a6ec9eb443 100644 --- a/tools/libs/light/libxl_pci.c +++ b/tools/libs/light/libxl_pci.c @@ -336,50 +336,6 @@ retry_transaction2: return 0; } =20 -static int get_all_assigned_devices(libxl__gc *gc, libxl_device_pci **list= , int *num) -{ - char **domlist; - unsigned int nd =3D 0, i; - - *list =3D NULL; - *num =3D 0; - - domlist =3D libxl__xs_directory(gc, XBT_NULL, "/local/domain", &nd); - for(i =3D 0; i < nd; i++) { - char *path, *num_devs; - - path =3D GCSPRINTF("/local/domain/0/backend/%s/%s/0/num_devs", - libxl__device_kind_to_string(LIBXL__DEVICE_KIND_P= CI), - domlist[i]); - num_devs =3D libxl__xs_read(gc, XBT_NULL, path); - if ( num_devs ) { - int ndev =3D atoi(num_devs), j; - char *devpath, *bdf; - - for(j =3D 0; j < ndev; j++) { - devpath =3D GCSPRINTF("/local/domain/0/backend/%s/%s/0/dev= -%u", - libxl__device_kind_to_string(LIBXL__DE= VICE_KIND_PCI), - domlist[i], j); - bdf =3D libxl__xs_read(gc, XBT_NULL, devpath); - if ( bdf ) { - unsigned dom, bus, dev, func; - if ( sscanf(bdf, PCI_BDF, &dom, &bus, &dev, &func) != =3D 4 ) - continue; - - *list =3D realloc(*list, sizeof(libxl_device_pci) * ((= *num) + 1)); - if (*list =3D=3D NULL) - return ERROR_NOMEM; - pci_struct_fill(*list + *num, dom, bus, dev, func, 0); - (*num)++; - } - } - } - } - libxl__ptr_add(gc, *list); - - return 0; -} - static int is_pci_in_array(libxl_device_pci *assigned, int num_assigned, int dom, int bus, int dev, int func) { @@ -427,19 +383,58 @@ static int sysfs_write_bdf(libxl__gc *gc, const char = * sysfs_path, return 0; } =20 +#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 =3D pci_info_xs_path(gc, pci, node); + int rc =3D 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 =3D 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 =3D pci_info_xs_path(gc, pci, node); + libxl_ctx *ctx =3D 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 *nu= m) { GC_INIT(ctx); - libxl_device_pci *pcis =3D NULL, *new, *assigned; + libxl_device_pci *pcis =3D NULL, *new; struct dirent *de; DIR *dir; - int r, num_assigned; =20 *num =3D 0; =20 - r =3D get_all_assigned_devices(gc, &assigned, &num_assigned); - if (r) goto out; - dir =3D opendir(SYSFS_PCIBACK_DRIVER); if (NULL =3D=3D dir) { if (errno =3D=3D ENOENT) { @@ -455,9 +450,6 @@ libxl_device_pci *libxl_device_pci_assignable_list(libx= l_ctx *ctx, int *num) if (sscanf(de->d_name, PCI_BDF, &dom, &bus, &dev, &func) !=3D 4) continue; =20 - if (is_pci_in_array(assigned, num_assigned, dom, bus, dev, func)) - continue; - new =3D realloc(pcis, ((*num) + 1) * sizeof(*new)); if (NULL =3D=3D new) continue; @@ -467,6 +459,10 @@ libxl_device_pci *libxl_device_pci_assignable_list(lib= xl_ctx *ctx, int *num) =20 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)++; } =20 @@ -737,48 +733,6 @@ static int pciback_dev_unassign(libxl__gc *gc, libxl_d= evice_pci *pci) return 0; } =20 -#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 =3D 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 =3D 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 =3D pci_info_xs_path(gc, pci, node); - libxl_ctx *ctx =3D libxl__gc_owner(gc); - - /* Remove the xenstore entry */ - xs_rm(ctx->xsh, XBT_NULL, path); -} - static int libxl__device_pci_assignable_add(libxl__gc *gc, libxl_device_pci *pci, int rebind) @@ -1594,6 +1548,9 @@ void libxl__device_pci_add(libxl__egc *egc, uint32_t = domid, goto out; } =20 + rc =3D 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= ); =20 stubdomid =3D libxl_get_stubdom_id(ctx, domid); @@ -1721,6 +1678,7 @@ static void device_pci_add_done(libxl__egc *egc, "PCI device %x:%x:%x.%x (rc %d)", pci->domain, pci->bus, pci->dev, pci->func, rc); + pci_info_xs_remove(gc, pci, "domid"); } aodev->rc =3D rc; aodev->callback(egc, aodev); @@ -2282,6 +2240,9 @@ out: libxl__xswait_stop(gc, &prs->xswait); libxl__ev_time_deregister(gc, &prs->timeout); libxl__ev_time_deregister(gc, &prs->retry_timer); + + if (!rc) pci_info_xs_remove(gc, pci, "domid"); + aodev->rc =3D rc; aodev->callback(egc, aodev); } --=20 2.20.1 From nobody Thu May 2 00:14:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1607457892; cv=none; d=zohomail.com; s=zohoarc; b=gLXt2VSazYeGveUY8u0ZJmxwGPA9j0dyWb/INxIatReopNKwSahs9WXoiPdq3O8GtkSgQht719BttjUEUxI96rbs7d6tEGT5tWyF5KszME2aO2WV7GdrPxI9zEW1mueSzcgCwgOKGyrUWF1DL8vgtwLGZtiWefH4Md2iS5/YUbw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607457892; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=JrM/ntLiiP2bhtck3185mew5Px47koc4HiV7GFFcjR4=; b=cNYJJo+EscHoqPFfchdQz9eIxrx9/erp+ENZLdBQET1sroGcibc/m9rEbB+kPTlM167E1u4T5gmvfPwMCivLabT8mOKjLeiUhlbAXZFZJFfD5OeUeIYpG0ikWL1kLIbEceggQLvLs+HXp0rMnkUmZyWi6DuQSqeu8gdiG2a/pmQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1607457892817267.6229748598322; Tue, 8 Dec 2020 12:04:52 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.47771.84640 (Exim 4.92) (envelope-from ) id 1kmjAO-0005IJ-Pf; Tue, 08 Dec 2020 20:00:56 +0000 Received: by outflank-mailman (output) from mailman id 47771.84640; Tue, 08 Dec 2020 20:00:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAO-0005H0-3E; Tue, 08 Dec 2020 20:00:56 +0000 Received: by outflank-mailman (input) for mailman id 47771; Tue, 08 Dec 2020 20:00:46 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAE-0004ph-0u for xen-devel@lists.xenproject.org; Tue, 08 Dec 2020 20:00:46 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAD-00086U-2S; Tue, 08 Dec 2020 20:00:45 +0000 Received: from host86-183-162-145.range86-183.btcentralplus.com ([86.183.162.145] helo=desktop.home) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kmihH-0001p0-Hc; Tue, 08 Dec 2020 19:30:51 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=JrM/ntLiiP2bhtck3185mew5Px47koc4HiV7GFFcjR4=; b=RCxDmlYtfDlShoJNgqqQhGRC/K +EC9OxNj1OESZtWMkku0W0BCNiG3fiDS+PpE7+U4FGTwePL+hbhe6knMyxcWCokvstCCXrigXzZWO BElmxg2gL4mcomUqNVz62xHeUus2qDuk9uA8nF1OLBAvW7W/QqBwNAkFmrJZAmxkhCrc=; From: Paul Durrant To: xen-devel@lists.xenproject.org Cc: Paul Durrant , Oleksandr Andrushchenko , Wei Liu , Ian Jackson , Anthony PERARD Subject: [PATCH v6 12/25] libxl: make sure callers of libxl_device_pci_list() free the list after use Date: Tue, 8 Dec 2020 19:30:20 +0000 Message-Id: <20201208193033.11306-13-paul@xen.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201208193033.11306-1-paul@xen.org> References: <20201208193033.11306-1-paul@xen.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @xen.org) Content-Type: text/plain; charset="utf-8" From: Paul Durrant A previous patch introduced libxl_device_pci_list_free() which should be us= ed 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 Reviewed-by: Oleksandr Andrushchenko Acked-by: Wei Liu --- Cc: Ian Jackson Cc: Anthony PERARD --- 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 37a6ec9eb443..c555f3ed29c4 100644 --- a/tools/libs/light/libxl_pci.c +++ b/tools/libs/light/libxl_pci.c @@ -1025,7 +1025,7 @@ typedef struct pci_add_state { libxl__xswait_state xswait; libxl__ev_qmp qmp; libxl__ev_time timeout; - libxl_device_pci *pci; + libxl_device_pci pci; libxl_domid pci_domid; } pci_add_state; =20 @@ -1097,7 +1097,7 @@ static void pci_add_qemu_trad_watch_state_cb(libxl__e= gc *egc, =20 /* Convenience aliases */ libxl_domid domid =3D pas->domid; - libxl_device_pci *pci =3D pas->pci; + libxl_device_pci *pci =3D &pas->pci; =20 rc =3D check_qemu_running(gc, domid, xswa, rc, state); if (rc =3D=3D ERROR_NOT_READY) @@ -1118,7 +1118,7 @@ static void pci_add_qmp_device_add(libxl__egc *egc, p= ci_add_state *pas) =20 /* Convenience aliases */ libxl_domid domid =3D pas->domid; - libxl_device_pci *pci =3D pas->pci; + libxl_device_pci *pci =3D &pas->pci; libxl__ev_qmp *const qmp =3D &pas->qmp; =20 rc =3D libxl__ev_time_register_rel(ao, &pas->timeout, @@ -1199,7 +1199,7 @@ static void pci_add_qmp_query_pci_cb(libxl__egc *egc, int dev_slot, dev_func; =20 /* Convenience aliases */ - libxl_device_pci *pci =3D pas->pci; + libxl_device_pci *pci =3D &pas->pci; =20 if (rc) goto out; =20 @@ -1300,7 +1300,7 @@ static void pci_add_dm_done(libxl__egc *egc, =20 /* Convenience aliases */ bool starting =3D pas->starting; - libxl_device_pci *pci =3D pas->pci; + libxl_device_pci *pci =3D &pas->pci; bool hvm =3D libxl__domain_type(gc, domid) =3D=3D LIBXL_DOMAIN_TYPE_HV= M; =20 libxl__ev_qmp_dispose(gc, &pas->qmp); @@ -1516,7 +1516,10 @@ void libxl__device_pci_add(libxl__egc *egc, uint32_t= domid, GCNEW(pas); pas->aodev =3D aodev; pas->domid =3D domid; - pas->pci =3D pci; + + libxl_device_pci_copy(CTX, &pas->pci, pci); + pci =3D &pas->pci; + pas->starting =3D starting; pas->callback =3D device_pci_add_stubdom_done; =20 @@ -1555,12 +1558,6 @@ void libxl__device_pci_add(libxl__egc *egc, uint32_t= domid, =20 stubdomid =3D libxl_get_stubdom_id(ctx, domid); if (stubdomid !=3D 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 =3D pci_s; pas->callback =3D device_pci_add_stubdom_wait; =20 do_pci_add(egc, stubdomid, pas); /* must be last */ @@ -1619,7 +1616,7 @@ static void device_pci_add_stubdom_done(libxl__egc *e= gc, =20 /* Convenience aliases */ libxl_domid domid =3D pas->domid; - libxl_device_pci *pci =3D pas->pci; + libxl_device_pci *pci =3D &pas->pci; =20 if (rc) goto out; =20 @@ -1670,7 +1667,7 @@ static void device_pci_add_done(libxl__egc *egc, EGC_GC; libxl__ao_device *aodev =3D pas->aodev; libxl_domid domid =3D pas->domid; - libxl_device_pci *pci =3D pas->pci; + libxl_device_pci *pci =3D &pas->pci; =20 if (rc) { LOGD(ERROR, domid, @@ -1680,6 +1677,7 @@ static void device_pci_add_done(libxl__egc *egc, rc); pci_info_xs_remove(gc, pci, "domid"); } + libxl_device_pci_dispose(pci); aodev->rc =3D rc; aodev->callback(egc, aodev); } @@ -1770,7 +1768,7 @@ static int qemu_pci_remove_xenstore(libxl__gc *gc, ui= nt32_t domid, typedef struct pci_remove_state { libxl__ao_device *aodev; libxl_domid domid; - libxl_device_pci *pci; + libxl_device_pci pci; bool force; bool hvm; unsigned int orig_vdev; @@ -1812,23 +1810,26 @@ static void do_pci_remove(libxl__egc *egc, pci_remo= ve_state *prs) { STATE_AO_GC(prs->aodev->ao); libxl_ctx *ctx =3D libxl__gc_owner(gc); - libxl_device_pci *assigned; + libxl_device_pci *pcis; + bool attached; uint32_t domid =3D prs->domid; libxl_domain_type type =3D libxl__domain_type(gc, domid); - libxl_device_pci *pci =3D prs->pci; + libxl_device_pci *pci =3D &prs->pci; int rc, num; uint32_t domainid =3D domid; =20 - assigned =3D libxl_device_pci_list(ctx, domid, &num); - if (assigned =3D=3D NULL) { + pcis =3D libxl_device_pci_list(ctx, domid, &num); + if (!pcis) { rc =3D ERROR_FAIL; goto out_fail; } - libxl__ptr_add(gc, assigned); + + attached =3D is_pci_in_array(pcis, num, pci->domain, + pci->bus, pci->dev, pci->func); + libxl_device_pci_list_free(pcis, num); =20 rc =3D ERROR_INVAL; - if ( !is_pci_in_array(assigned, num, pci->domain, - pci->bus, pci->dev, pci->func) ) { + if (!attached) { LOGD(ERROR, domainid, "PCI device not attached to this domain"); goto out_fail; } @@ -1928,7 +1929,7 @@ static void pci_remove_qemu_trad_watch_state_cb(libxl= __egc *egc, =20 /* Convenience aliases */ libxl_domid domid =3D prs->domid; - libxl_device_pci *const pci =3D prs->pci; + libxl_device_pci *const pci =3D &prs->pci; =20 rc =3D check_qemu_running(gc, domid, xswa, rc, state); if (rc =3D=3D ERROR_NOT_READY) @@ -1950,7 +1951,7 @@ static void pci_remove_qmp_device_del(libxl__egc *egc, int rc; =20 /* Convenience aliases */ - libxl_device_pci *const pci =3D prs->pci; + libxl_device_pci *const pci =3D &prs->pci; =20 rc =3D libxl__ev_time_register_rel(ao, &prs->timeout, pci_remove_timeout, @@ -2020,7 +2021,7 @@ static void pci_remove_qmp_query_cb(libxl__egc *egc, =20 /* Convenience aliases */ libxl__ao *const ao =3D prs->aodev->ao; - libxl_device_pci *const pci =3D prs->pci; + libxl_device_pci *const pci =3D &prs->pci; =20 if (rc) goto out; =20 @@ -2075,7 +2076,7 @@ static void pci_remove_timeout(libxl__egc *egc, libxl= __ev_time *ev, pci_remove_state *prs =3D CONTAINER_OF(ev, *prs, timeout); =20 /* Convenience aliases */ - libxl_device_pci *const pci =3D prs->pci; + libxl_device_pci *const pci =3D &prs->pci; =20 LOGD(WARN, prs->domid, "timed out waiting for DM to remove " PCI_PT_QDEV_ID, pci->bus, pci->dev, pci->func); @@ -2096,7 +2097,7 @@ static void pci_remove_detached(libxl__egc *egc, bool isstubdom; =20 /* Convenience aliases */ - libxl_device_pci *const pci =3D prs->pci; + libxl_device_pci *const pci =3D &prs->pci; libxl_domid domid =3D prs->domid; =20 /* Cleaning QMP states ASAP */ @@ -2159,7 +2160,7 @@ static void pci_remove_done(libxl__egc *egc, =20 if (rc) goto out; =20 - libxl__device_pci_remove_xenstore(gc, prs->domid, prs->pci); + libxl__device_pci_remove_xenstore(gc, prs->domid, &prs->pci); out: device_pci_remove_common_next(egc, prs, rc); } @@ -2177,7 +2178,10 @@ static void libxl__device_pci_remove_common(libxl__e= gc *egc, GCNEW(prs); prs->aodev =3D aodev; prs->domid =3D domid; - prs->pci =3D pci; + + libxl_device_pci_copy(CTX, &prs->pci, pci); + pci =3D &prs->pci; + prs->force =3D force; libxl__xswait_init(&prs->xswait); libxl__ev_qmp_init(&prs->qmp); @@ -2212,7 +2216,7 @@ static void device_pci_remove_common_next(libxl__egc = *egc, EGC_GC; =20 /* Convenience aliases */ - libxl_device_pci *const pci =3D prs->pci; + libxl_device_pci *const pci =3D &prs->pci; libxl__ao_device *const aodev =3D prs->aodev; const unsigned int pfunc_mask =3D prs->pfunc_mask; const unsigned int orig_vdev =3D prs->orig_vdev; @@ -2243,6 +2247,7 @@ out: =20 if (!rc) pci_info_xs_remove(gc, pci, "domid"); =20 + libxl_device_pci_dispose(pci); aodev->rc =3D rc; aodev->callback(egc, aodev); } @@ -2357,7 +2362,6 @@ void libxl__device_pci_destroy_all(libxl__egc *egc, u= int32_t domid, pcis =3D libxl_device_pci_list(CTX, domid, &num); if ( pcis =3D=3D NULL ) return; - libxl__ptr_add(gc, pcis); =20 for (i =3D 0; i < num; i++) { /* Force remove on shutdown since, on HVM, qemu will not always @@ -2368,6 +2372,8 @@ void libxl__device_pci_destroy_all(libxl__egc *egc, u= int32_t domid, libxl__device_pci_remove_common(egc, domid, pcis + i, true, aodev); } + + libxl_device_pci_list_free(pcis, num); } =20 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); } =20 int main_pcilist(int argc, char **argv) --=20 2.20.1 From nobody Thu May 2 00:14:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1607457690; cv=none; d=zohomail.com; s=zohoarc; b=Kuz/NJGGCsV6rl12SXH+/1gloi8ETlZasdM1eeD7VHTd5IUhUkcCVmRdJR6orqIYr2EHXJ7ti/dwOIc/+r1ouLvYS9G56E8kRxKZ3Zhd9OSuE1ODdknFx6HsUAl8ftQ2GAKC/kPQgTDRUkh4oKtw91dtAi1e0c9QkFA+IAFEAEI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607457690; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=PZJi1U8a34pSfhTO2q4+cuqPY9geRRKGfVIRW15UroI=; b=jxpscquEFJIcc0mArniuBr+4XNzQN7XcDHSqxg4gUYtD+eFcndzkUkK5KnNZe7xiuqItJ0mnvuMnUesRui4/GgA5rnUKxPsPJBhmyHhP0SwhsOrMtqLQTUUZusc34nHCZ2rCZbK8qk5DLX5Or+7l3LdYDRn0mWqQmJDW1dyoBQQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1607457688808226.39191990924098; Tue, 8 Dec 2020 12:01:28 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.47775.84686 (Exim 4.92) (envelope-from ) id 1kmjAY-0005gw-AD; Tue, 08 Dec 2020 20:01:06 +0000 Received: by outflank-mailman (output) from mailman id 47775.84686; Tue, 08 Dec 2020 20:01:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAW-0005eB-7S; Tue, 08 Dec 2020 20:01:04 +0000 Received: by outflank-mailman (input) for mailman id 47775; Tue, 08 Dec 2020 20:00:46 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAE-0004q3-Dy for xen-devel@lists.xenproject.org; Tue, 08 Dec 2020 20:00:46 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAD-00086u-Cf; Tue, 08 Dec 2020 20:00:45 +0000 Received: from host86-183-162-145.range86-183.btcentralplus.com ([86.183.162.145] helo=desktop.home) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kmihI-0001p0-OB; Tue, 08 Dec 2020 19:30:52 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=PZJi1U8a34pSfhTO2q4+cuqPY9geRRKGfVIRW15UroI=; b=gRN6xCPXtJ2xw8uXlgs41t8/qA OGyie0rMQo/kmVJNkvWVylob56XwJbii0GH7t2xx1Oa1KIo8VNNU+mRxiVzbHg8cqRuWgEmLuEMpD yfT7rlkW1vsdFl5cdIwblPjHnesoVFUtPsK2T1dm/s+kLfqu2DgGSeaCzYCCYTh0+rBY=; From: Paul Durrant To: xen-devel@lists.xenproject.org Cc: Paul Durrant , Christian Lindig , Oleksandr Andrushchenko , Wei Liu , Ian Jackson , David Scott , Anthony PERARD Subject: [PATCH v6 13/25] libxl: add libxl_device_pci_assignable_list_free()... Date: Tue, 8 Dec 2020 19:30:21 +0000 Message-Id: <20201208193033.11306-14-paul@xen.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201208193033.11306-1-paul@xen.org> References: <20201208193033.11306-1-paul@xen.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @xen.org) Content-Type: text/plain; charset="utf-8" From: Paul Durrant ... 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 implementa= tion 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 Acked-by: Christian Lindig Reviewed-by: Oleksandr Andrushchenko Acked-by: Wei Liu --- Cc: Ian Jackson Cc: David Scott Cc: Anthony PERARD --- 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 bb7fc893fc13..3433c950f9aa 100644 --- a/tools/include/libxl.h +++ b/tools/include/libxl.h @@ -457,6 +457,12 @@ */ #define LIBXL_HAVE_DEVICE_PCI_LIST_FREE 1 =20 +/* + * 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 *p= ci, int rebind); libxl_device_pci *libxl_device_pci_assignable_list(libxl_ctx *ctx, int *nu= m); +void libxl_device_pci_assignable_list_free(libxl_device_pci *list, int num= ); =20 /* CPUID handling */ int libxl_cpuid_parse_config(libxl_cpuid_policy_list *cpuid, const char* s= tr); diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c index c555f3ed29c4..2a594e432855 100644 --- a/tools/libs/light/libxl_pci.c +++ b/tools/libs/light/libxl_pci.c @@ -457,7 +457,7 @@ libxl_device_pci *libxl_device_pci_assignable_list(libx= l_ctx *ctx, int *num) pcis =3D new; new =3D pcis + *num; =20 - memset(new, 0, sizeof(*new)); + libxl_device_pci_init(new); pci_struct_fill(new, dom, bus, dev, func, 0); =20 if (pci_info_xs_read(gc, new, "domid")) /* already assigned */ @@ -472,6 +472,16 @@ out: return pcis; } =20 +void libxl_device_pci_assignable_list_free(libxl_device_pci *list, int num) +{ + int i; + + for (i =3D 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-N= ULL, * store the path to the original driver in it. */ static int sysfs_dev_unbind(libxl__gc *gc, libxl_device_pci *pci, @@ -1490,7 +1500,7 @@ static int libxl_pci_assignable(libxl_ctx *ctx, libxl= _device_pci *pci) pcis[i].func =3D=3D pci->func) break; } - free(pcis); + libxl_device_pci_assignable_list_free(pcis, num); return i !=3D num; } =20 diff --git a/tools/ocaml/libs/xl/xenlight_stubs.c b/tools/ocaml/libs/xl/xen= light_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) =3D temp; temp =3D 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); =20 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 =3D 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); } =20 int main_pciassignable_list(int argc, char **argv) --=20 2.20.1 From nobody Thu May 2 00:14:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1607457672; cv=none; d=zohomail.com; s=zohoarc; b=F3ZuHPdKApQe458PDkw6HUAm6pw0yGu07/xw532VcwC19g/DyqTl13Pe19Tsufk5wowwv1CLSuN6uyBiP/Jf9s0RaTb4QoJ1IVtSpc05IuLOZyxqjV9gY+Hlmxc0MbOESSJcDa/JxcR1AHjaOUhI32OvyYV941JewtAujybiTVg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607457672; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=A0Hhjl7MiFPC/iDK9UOxUI+73tMCfqzZ/Aivp/KDVnE=; b=df+gE3VB53TzDvxuq/IDLf9A9pJhqVaDazNTcHO41j1GKq1c0/sbBC7/N+Ti1Uvaqk0W0EAPslrZT61vkvcDGAftznLiazbTXF3CkQvX8pM91z+hYffTUeYrVm3F/GIfCiMHtwIKtXrgi0xTXPh5IVwvrLgp89NDGNDXMWGEEIQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1607457671974909.6838652969042; Tue, 8 Dec 2020 12:01:11 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.47768.84601 (Exim 4.92) (envelope-from ) id 1kmjAK-00053v-Ij; Tue, 08 Dec 2020 20:00:52 +0000 Received: by outflank-mailman (output) from mailman id 47768.84601; Tue, 08 Dec 2020 20:00:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAJ-00052y-N6; Tue, 08 Dec 2020 20:00:51 +0000 Received: by outflank-mailman (input) for mailman id 47768; Tue, 08 Dec 2020 20:00:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAD-0004pR-Th for xen-devel@lists.xenproject.org; Tue, 08 Dec 2020 20:00:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAD-00086k-7e; Tue, 08 Dec 2020 20:00:45 +0000 Received: from host86-183-162-145.range86-183.btcentralplus.com ([86.183.162.145] helo=desktop.home) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kmihJ-0001p0-L0; Tue, 08 Dec 2020 19:30:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=A0Hhjl7MiFPC/iDK9UOxUI+73tMCfqzZ/Aivp/KDVnE=; b=mpknZnVJCJAfLM1qs5QMogrnah vv6OSjolmpFU92XRwCjW4WEA2AcKwT+6rM6rS953b+tNMKW4+8OiHBsR4Yv+W3mhRR448FMMjTp7s lklqfldBYb84KLt8bGJjOR9rjWI4Gv7amFbWhqVjppiTJIL08kUM6lLabyxIIXbRFCjs=; From: Paul Durrant To: xen-devel@lists.xenproject.org Cc: Paul Durrant , Oleksandr Andrushchenko , Wei Liu , Ian Jackson Subject: [PATCH v6 14/25] libxl: use COMPARE_PCI() macro is_pci_in_array()... Date: Tue, 8 Dec 2020 19:30:22 +0000 Message-Id: <20201208193033.11306-15-paul@xen.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201208193033.11306-1-paul@xen.org> References: <20201208193033.11306-1-paul@xen.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @xen.org) Content-Type: text/plain; charset="utf-8" From: Paul Durrant ... 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() rat= her 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 Reviewed-by: Oleksandr Andrushchenko Acked-by: Wei Liu --- Cc: Ian Jackson --- 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_int= ernal.h index d0c23def3c3e..c79523ba9248 100644 --- a/tools/libs/light/libxl_internal.h +++ b/tools/libs/light/libxl_internal.h @@ -4746,9 +4746,10 @@ void libxl__xcinfo2xlinfo(libxl_ctx *ctx, * devices have same identifier. */ #define COMPARE_DEVID(a, b) ((a)->devid =3D=3D (b)->devid) #define COMPARE_DISK(a, b) (!strcmp((a)->vdev, (b)->vdev)) -#define COMPARE_PCI(a, b) ((a)->func =3D=3D (b)->func && \ - (a)->bus =3D=3D (b)->bus && \ - (a)->dev =3D=3D (b)->dev) +#define COMPARE_PCI(a, b) ((a)->domain =3D=3D (b)->domain && \ + (a)->bus =3D=3D (b)->bus && \ + (a)->dev =3D=3D (b)->dev && \ + (a)->func =3D=3D (b)->func) #define COMPARE_USB(a, b) ((a)->ctrl =3D=3D (b)->ctrl && \ (a)->port =3D=3D (b)->port) #define COMPARE_USBCTRL(a, b) ((a)->devid =3D=3D (b)->devid) diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c index 2a594e432855..74c2196ae339 100644 --- a/tools/libs/light/libxl_pci.c +++ b/tools/libs/light/libxl_pci.c @@ -336,24 +336,17 @@ retry_transaction2: return 0; } =20 -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; =20 - for(i =3D 0; i < num_assigned; i++) { - if ( assigned[i].domain !=3D dom ) - continue; - if ( assigned[i].bus !=3D bus ) - continue; - if ( assigned[i].dev !=3D dev ) - continue; - if ( assigned[i].func !=3D func ) - continue; - return 1; + for (i =3D 0; i < num; i++) { + if (COMPARE_PCI(pci, &pcis[i])) + break; } =20 - return 0; + return i < num; } =20 /* Write the standard BDF into the sysfs path given by sysfs_path. */ @@ -1487,21 +1480,17 @@ int libxl_device_pci_add(libxl_ctx *ctx, uint32_t d= omid, return AO_INPROGRESS; } =20 -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; =20 pcis =3D libxl_device_pci_assignable_list(ctx, &num); - for (i =3D 0; i < num; i++) { - if (pcis[i].domain =3D=3D pci->domain && - pcis[i].bus =3D=3D pci->bus && - pcis[i].dev =3D=3D pci->dev && - pcis[i].func =3D=3D pci->func) - break; - } + assignable =3D is_pci_in_array(pcis, num, pci); libxl_device_pci_assignable_list_free(pcis, num); - return i !=3D num; + + return assignable; } =20 static void device_pci_add_stubdom_wait(libxl__egc *egc, @@ -1834,8 +1823,7 @@ static void do_pci_remove(libxl__egc *egc, pci_remove= _state *prs) goto out_fail; } =20 - attached =3D is_pci_in_array(pcis, num, pci->domain, - pci->bus, pci->dev, pci->func); + attached =3D is_pci_in_array(pcis, num, pci); libxl_device_pci_list_free(pcis, num); =20 rc =3D ERROR_INVAL; --=20 2.20.1 From nobody Thu May 2 00:14:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1607457673; cv=none; d=zohomail.com; s=zohoarc; b=LrHMinYDnC2GTspFj/JglGPlzJWp3kGrVTy7fULpdmLsI4LknQG8wwO1XX0Q5jJBdhbg7gLqn24gPCsXd4eSAxxjCXRFjoCtOuA67wBFuo2fxTXL6uynOV9Unq2x9X7XJTyTzvIjMjIK3BDVEZJO9tnb734IpwFArn12mNDjKHM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607457673; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UhlxfGmI/aEuEJYbZvO+wCWpWg3W+k9Y3YHBgam9bbQ=; b=eJ61tEzhamFSs7QC07pGcdR2XvB40dvRFLK+FpzNoY9qxgkGKyYACIWySfUB1y1Q4ShQVOdFz65Rl2iYyKzWGVgc4pYuLg/0O8J3W51qLwhuGU9h3tHsuizKfcG7e3B1S5LqbwE4lAp/qBd+eHkdDm/89UFXMMqCy3w17sgaQx8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1607457673830514.8051302591812; Tue, 8 Dec 2020 12:01:13 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.47770.84622 (Exim 4.92) (envelope-from ) id 1kmjAM-0005A2-NT; Tue, 08 Dec 2020 20:00:54 +0000 Received: by outflank-mailman (output) from mailman id 47770.84622; Tue, 08 Dec 2020 20:00:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAL-00059Y-Oc; Tue, 08 Dec 2020 20:00:53 +0000 Received: by outflank-mailman (input) for mailman id 47770; Tue, 08 Dec 2020 20:00:46 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAE-0004pY-01 for xen-devel@lists.xenproject.org; Tue, 08 Dec 2020 20:00:46 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAD-00086a-3y; Tue, 08 Dec 2020 20:00:45 +0000 Received: from host86-183-162-145.range86-183.btcentralplus.com ([86.183.162.145] helo=desktop.home) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kmihK-0001p0-Hr; Tue, 08 Dec 2020 19:30:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=UhlxfGmI/aEuEJYbZvO+wCWpWg3W+k9Y3YHBgam9bbQ=; b=F/WcsDkRt8mlAXrlFtOscwsnHx rUnmrIHMRw331u/FS2GTWJ3Eo7GPC0/q0ojoisBBfAWMxsE6mnNoCLgR/m7cJja0IvJrMATQdqq+f GxFm5tv93YUJIgH8P+4nzE0iwh/w2rZHIP1t/W3tiW99Q8P62p9280RIqnsyHQ6sb/Io=; From: Paul Durrant To: xen-devel@lists.xenproject.org Cc: Paul Durrant , Oleksandr Andrushchenko , Wei Liu , Ian Jackson Subject: [PATCH v6 15/25] docs/man: extract documentation of PCI_SPEC_STRING from the xl.cfg manpage... Date: Tue, 8 Dec 2020 19:30:23 +0000 Message-Id: <20201208193033.11306-16-paul@xen.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201208193033.11306-1-paul@xen.org> References: <20201208193033.11306-1-paul@xen.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @xen.org) Content-Type: text/plain; charset="utf-8" From: Paul Durrant ... 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 Reviewed-by: Oleksandr Andrushchenko Acked-by: Wei Liu --- Cc: Ian Jackson --- 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-configur= ation.5.pod new file mode 100644 index 000000000000..72a27bd95dec --- /dev/null +++ b/docs/man/xl-pci-configuration.5.pod @@ -0,0 +1,78 @@ +=3Dencoding utf8 + +=3Dhead1 NAME + +xl-pci-configuration - XL PCI Configuration Syntax + +=3Dhead1 SYNTAX + +This document specifies the format for B which is used by +the L pci configuration option, and related L commands. + +Each B has the form of +B<[DDDD:]BB:DD.F[@VSLOT],KEY=3DVALUE,KEY=3DVALUE,...> where: + +=3Dover 4 + +=3Ditem B<[DDDD:]BB:DD.F> + +Identifies the PCI device from the host perspective in the domain +(B), Bus (B), Device (B
) and Function (B) syntax. This is +the same scheme as used in the output of B for the device in +question. + +Note: by default B will omit the domain (B) if it +is zero and it is optional here also. You may specify the function +(B) as B<*> to indicate all functions. + +=3Ditem B<@VSLOT> + +Specifies the virtual slot where the guest will see this +device. This is equivalent to the B
which the guest sees. In a +guest B and B are C<0000:00>. + +=3Ditem B + +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 s= pace +in order to operate properly. This option tells the backend (pciback or Q= EMU) +to allow all writes to the PCI configuration space of this device by this +domain. + +B 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. + +=3Ditem B + +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). + +=3Ditem B + +Tells B to automatically attempt to re-assign a device to +pciback if it is not already assigned. + +B If you set this option, B 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. + +=3Ditem B + +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). + +=3Ditem B + +B<(HVM/x86 only)> This is the same as the policy setting inside the B +option but just specific to a given device. The default is "relaxed". + +Note: this would override global B option. + +=3Dback diff --git a/docs/man/xl.cfg.5.pod.in b/docs/man/xl.cfg.5.pod.in index 12201a7e5461..c8e017f950de 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 option i= s specified. =3Ditem B =20 Specifies the host PCI devices to passthrough to this guest. -Each B has the form of -B<[DDDD:]BB:DD.F[@VSLOT],KEY=3DVALUE,KEY=3DVALUE,...> where: - -=3Dover 4 - -=3Ditem B<[DDDD:]BB:DD.F> - -Identifies the PCI device from the host perspective in the domain -(B), Bus (B), Device (B
) and Function (B) syntax. This is -the same scheme as used in the output of B for the device in -question. - -Note: by default B will omit the domain (B) if it -is zero and it is optional here also. You may specify the function -(B) as B<*> to indicate all functions. - -=3Ditem B<@VSLOT> - -Specifies the virtual slot where the guest will see this -device. This is equivalent to the B
which the guest sees. In a -guest B and B are C<0000:00>. - -=3Ditem B - -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 s= pace -in order to operate properly. This option tells the backend (pciback or Q= EMU) -to allow all writes to the PCI configuration space of this device by this -domain. - -B 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. - -=3Ditem B - -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). - -=3Ditem B - -Tells B to automatically attempt to re-assign a device to -pciback if it is not already assigned. - -B If you set this option, B 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. - -=3Ditem B - -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). - -=3Ditem B - -B<(HVM/x86 only)> This is the same as the policy setting inside the B -option but just specific to a given device. The default is "relaxed". - -Note: this would override global B option. - -=3Dback +See L for more details. =20 =3Ditem B =20 --=20 2.20.1 From nobody Thu May 2 00:14:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1607457672; cv=none; d=zohomail.com; s=zohoarc; b=hrUzKgPjnk4MkWOORnMF6Oio2jUglSVNqOypXO2NSUkrWTcWhj/0JwMyIsb46Wpgs+VxcmPY/vUwE81YmXuU5gAJ7vRUoRX9crr/PnpQxoJZ8RjmSZlp3yVX8lrlLifnUYg+mWrAKhHPp0rdBXP8gTFL8PdAExoAAvXVDOkKw88= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607457672; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Kp5JHM/PcDPgoyQFpS4CPrVmdU0OAzBzGq/q/o/48HU=; b=knGzCqGC/ruNwtu73TD3xH9MB7XwiwzzhBXhHymV1iArrJ1Okg/edNe5dk4IWEONLfx29tq25S+EBHt9MamJTWHb/K1vw6WoeymiXXeEOMqkAK++PZPpNtdLBSwbMDLj4uPyFaTryG264l+8IR+5/DLFj6YUFJu+4z2ZEUkdrIw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1607457672338959.8425797792246; Tue, 8 Dec 2020 12:01:12 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.47760.84512 (Exim 4.92) (envelope-from ) id 1kmjAE-0004qE-IA; Tue, 08 Dec 2020 20:00:46 +0000 Received: by outflank-mailman (output) from mailman id 47760.84512; Tue, 08 Dec 2020 20:00:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAE-0004q2-EX; Tue, 08 Dec 2020 20:00:46 +0000 Received: by outflank-mailman (input) for mailman id 47760; Tue, 08 Dec 2020 20:00:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAD-0004oq-Iz for xen-devel@lists.xenproject.org; Tue, 08 Dec 2020 20:00:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAC-00086G-Nq; Tue, 08 Dec 2020 20:00:44 +0000 Received: from host86-183-162-145.range86-183.btcentralplus.com ([86.183.162.145] helo=desktop.home) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kmihL-0001p0-BW; Tue, 08 Dec 2020 19:30:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=Kp5JHM/PcDPgoyQFpS4CPrVmdU0OAzBzGq/q/o/48HU=; b=RwuXlpVlGqqwSfs9ckruZrDqFD c7NWlIYHncocBbwbUaf7sSbkXzqOZiFW5VsVz3PrS6OiqyckaYsi/KW5Z+v9bPqm05nHRVE2uKQnx pP1OR8hKo4CSiBDHjvE3K7nbIX/GFrLm7g9w3jENbMvRX5PEU4EwBTmN47EOXHcKCxCY=; From: Paul Durrant To: xen-devel@lists.xenproject.org Cc: Paul Durrant , Wei Liu , Ian Jackson Subject: [PATCH v6 16/25] docs/man: improve documentation of PCI_SPEC_STRING... Date: Tue, 8 Dec 2020 19:30:24 +0000 Message-Id: <20201208193033.11306-17-paul@xen.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201208193033.11306-1-paul@xen.org> References: <20201208193033.11306-1-paul@xen.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @xen.org) Content-Type: text/plain; charset="utf-8" From: Paul Durrant ... 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 documentati= on 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 Acked-by: Wei Liu --- Cc: Ian Jackson --- docs/man/xl-pci-configuration.5.pod | 177 +++++++++++++++++++++++----- 1 file changed, 148 insertions(+), 29 deletions(-) diff --git a/docs/man/xl-pci-configuration.5.pod b/docs/man/xl-pci-configur= ation.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 =20 =3Dhead1 SYNTAX =20 -This document specifies the format for B which is used by -the L pci configuration option, and related L commands. +This document specifies the format for B and B which= are +used by the L pci configuration option, and related L +commands. =20 -Each B has the form of -B<[DDDD:]BB:DD.F[@VSLOT],KEY=3DVALUE,KEY=3DVALUE,...> where: +A B has the following form: + + [DDDD:]BB:SS.F + +B is the domain number, B is the bus number, B is the device= (or +slot) number, and B is the function number. This is the same scheme as +used in the output of L for the device in question. By default +L will omit the domain (B) if it is zero and hence a zero +value for domain may also be omitted when specifying a B. + +Each B has the one of the forms: + +=3Dover 4 + + [[@,][=3D,]* + [=3D,]* + +=3Dback + +For example, these strings are equivalent: =20 =3Dover 4 =20 -=3Ditem B<[DDDD:]BB:DD.F> + 36:00.0@20,seize=3D1 + 36:00.0,vslot=3D20,seize=3D1 + bdf=3D36:00.0,vslot=3D20,seize=3D1 =20 -Identifies the PCI device from the host perspective in the domain -(B), Bus (B), Device (B
) and Function (B) syntax. This is -the same scheme as used in the output of B for the device in -question. +=3Dback + +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 "=3D" 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: In context of B (see L), parameters other t= han +B will be ignored. + +=3Dhead1 Positional Parameters + +=3Dover 4 + +=3Ditem B=3DI + +=3Dover 4 =20 -Note: by default B will omit the domain (B) if it -is zero and it is optional here also. You may specify the function -(B) as B<*> to indicate all functions. +=3Ditem Description =20 -=3Ditem B<@VSLOT> +This identifies the PCI device from the host perspective. =20 -Specifies the virtual slot where the guest will see this -device. This is equivalent to the B
which the guest sees. In a -guest B and B are C<0000:00>. +In the context of a B you may specify the function (B)= as +B<*> to indicate all functions of a multi-function device. =20 -=3Ditem B +=3Ditem Default Value + +None. This parameter is mandatory as it identifies the device. + +=3Dback + +=3Ditem B=3DI + +=3Dover 4 + +=3Ditem Description + +Specifies the virtual slot (device) number where the guest will see this +device. For example, running L in a Linux guest where B +was specified as C<8> would identify the device as C<00:08.0>. Virtual dom= ain +and bus numbers are always 0. + +B This parameter is always parsed as a hexidecimal value. + +=3Ditem Default Value + +None. This parameter is not mandatory. An available B will be selec= ted +if this parameter is not specified. + +=3Dback + +=3Dback + +=3Dhead1 Other Parameters and Flags + +=3Dover 4 + +=3Ditem B=3DI + +=3Dover 4 + +=3Ditem Description =20 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. =20 -=3Ditem B +=3Ditem Default Value + +0 + +=3Dback + +=3Ditem B=3DI + +=3Dover 4 + +=3Ditem Description =20 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. + +=3Ditem 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). =20 -=3Ditem B +=3Dback + +=3Ditem B=3DI + +=3Dover 4 + +=3Ditem Description =20 -Tells B to automatically attempt to re-assign a device to -pciback if it is not already assigned. +Tells L to automatically attempt to make the device assignable to +guests if that has not already been done by the B +command. =20 -B If you set this option, B will gladly re-assign a critical +B If you set this option, L 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. =20 -=3Ditem B +=3Ditem Default Value + +0 + +=3Dback + +=3Ditem B=3DI + +=3Dover 4 + +=3Ditem Description =20 B<(HVM only)> Specifies that the VM should be able to program the -D0-D3hot power management states for the PCI device. The default is false = (0). +D0-D3hot power management states for the PCI device. + +=3Ditem Default Value + +0 =20 -=3Ditem B +=3Dback + +=3Ditem B=3DI + +=3Dover 4 + +=3Ditem Description =20 B<(HVM/x86 only)> This is the same as the policy setting inside the B -option but just specific to a given device. The default is "relaxed". +option in L but just specific to a given device. =20 -Note: this would override global B option. +B: This overrides the global B option. + +=3Ditem Default Value + +"strict" + +=3Dback =20 =3Dback --=20 2.20.1 From nobody Thu May 2 00:14:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1607457671; cv=none; d=zohomail.com; s=zohoarc; b=badlPTez/d/Vfr3VMl4Bw9WhnJssVXiaD7wk/00dWEmJIPJTpHlUc2dAdE3hAXb/Udy/xKsBd4zVMab+L6/aMx21gdpT6phZUD1xgnLYe1oK75X4YpEy2mRoLlKKbtelKBkYxi1E7RR/k5UOipOMeBpiyb6YyclZ18DAFt5idBY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607457671; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BBwaFwKiybbCIqgc9tMzuIzX22z57wEbmB7dmgtI4NU=; b=cPonNuGa1GLswyW+uJ23rs+/sSofND2LwyEAmRDzBrnH+xopJl77jfXGJkHiXbGhNi3+RukK+JDykTsOrSK4tWsj+S6gBvFJP8gf04vZzAEEzndj7nk5UzlzDMBhnGUiYjvN9TPsyRkGWdL/yKGHuOhonagncaMvE2brddG6j4o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1607457671035873.1569947969806; Tue, 8 Dec 2020 12:01:11 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.47765.84562 (Exim 4.92) (envelope-from ) id 1kmjAH-0004wt-Sa; Tue, 08 Dec 2020 20:00:49 +0000 Received: by outflank-mailman (output) from mailman id 47765.84562; Tue, 08 Dec 2020 20:00:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAH-0004wL-Dl; Tue, 08 Dec 2020 20:00:49 +0000 Received: by outflank-mailman (input) for mailman id 47765; Tue, 08 Dec 2020 20:00:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAD-0004p5-Kg for xen-devel@lists.xenproject.org; Tue, 08 Dec 2020 20:00:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAC-00086K-Rj; Tue, 08 Dec 2020 20:00:44 +0000 Received: from host86-183-162-145.range86-183.btcentralplus.com ([86.183.162.145] helo=desktop.home) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kmihM-0001p0-56; Tue, 08 Dec 2020 19:30:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=BBwaFwKiybbCIqgc9tMzuIzX22z57wEbmB7dmgtI4NU=; b=Mqeq+2l/Zz1BLnK4Q0P079EKns h8ldMBHO1UCEvz0JlDZ2OPbBjkD6rB+dRT2/K9bCLOtqFdZfbmXG+48LSmO2DDMQJJqGEVlD22SBW 4LX8VtzScFEsUv4h2pfot21Hz1ESVMSveqpMMot7crI19OavCeM9GXrEjFcngOtp1aP4=; From: Paul Durrant To: xen-devel@lists.xenproject.org Cc: Paul Durrant , Wei Liu , Ian Jackson Subject: [PATCH v6 17/25] docs/man: fix xl(1) documentation for 'pci' operations Date: Tue, 8 Dec 2020 19:30:25 +0000 Message-Id: <20201208193033.11306-18-paul@xen.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201208193033.11306-1-paul@xen.org> References: <20201208193033.11306-1-paul@xen.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @xen.org) Content-Type: text/plain; charset="utf-8" From: Paul Durrant 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 arguments where as 'pci-attach/detac= h' take arguments (which will be enforced in a subsequent patch). Signed-off-by: Paul Durrant Acked-by: Wei Liu --- Cc: Ian Jackson --- 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 eaa72faad6a0..af31d2b5727a 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. =20 =3Ditem B =20 -List all the assignable PCI devices. +List all the B of assignable PCI devices. See +L 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. =20 =3Ditem B I =20 -Make the device at PCI Bus/Device/Function BDF assignable to guests. +Make the device at B assignable to guests. See +L 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. =20 =3Ditem B [I<-r>] I =20 -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 not assignable to guests. See +L 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 th= e guest, or are confident that the particular device you're re-assigning to dom0 will cancel all in-flight DMA on FLR. =20 -=3Ditem B I I +=3Ditem B I I =20 -Hot-plug a new pass-through pci device to the specified domain. -B is the PCI Bus/Device/Function of the physical device to pass-throu= gh. +Hot-plug a new pass-through pci device to the specified domain. See +L for more information. =20 -=3Ditem B [I] I I +=3Ditem B [I] I I =20 -Hot-unplug a previously assigned pci device from a domain. B is the P= CI -Bus/Device/Function of the physical device to be removed from the guest do= main. +Hot-unplug a pci device that was previously passed through to a domain. See +L for more information. =20 B =20 @@ -1660,7 +1666,7 @@ even without guest domain's collaboration. =20 =3Ditem B I =20 -List pass-through pci devices for a domain. +List the B of pci devices passed through to a domain. =20 =3Dback =20 --=20 2.20.1 From nobody Thu May 2 00:14:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1607457983; cv=none; d=zohomail.com; s=zohoarc; b=GWUEViV/WF1X2qtrpGrc7pyb4Wb0+ljwn0xMyzoNRDFTQ0ghytxk5OXFABxDr+RtsPProwZMw46KS8AfJNa9yCozzQboXrS8i4powholZkvT/zoGzTFBTTE3EmgCHapL0CrV0p9liPWwtlAXBOFXNqaa5X0lDTmGH3DtNmHsplU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607457983; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Wxee7ELAusJoPC2cWRtRIQj+DNuLoWUQ2nWiFDbzG0c=; b=NzXWN9qXNfsgB1eyVfmdOU0gCuakESYp3EcLHztqU5Lr+hKGjhGKOoIBlji+F9M0Kyt4bBGD+YhiZ6CTZ72wgkJp47VMLLJjFduB5zZMS6FY98OoHGVE4jr4wZDCyU/tt+oR2KNVgn+UC4TxXpUdwMV+tBrBdzg1iH/G36c7LaU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTP id 16074579832841010.3191227572867; Tue, 8 Dec 2020 12:06:23 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.47773.84650 (Exim 4.92) (envelope-from ) id 1kmjAQ-0005Lp-BU; Tue, 08 Dec 2020 20:00:58 +0000 Received: by outflank-mailman (output) from mailman id 47773.84650; Tue, 08 Dec 2020 20:00:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAP-0005KF-5W; Tue, 08 Dec 2020 20:00:57 +0000 Received: by outflank-mailman (input) for mailman id 47773; Tue, 08 Dec 2020 20:00:46 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAE-0004po-3P for xen-devel@lists.xenproject.org; Tue, 08 Dec 2020 20:00:46 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAD-00086e-64; Tue, 08 Dec 2020 20:00:45 +0000 Received: from host86-183-162-145.range86-183.btcentralplus.com ([86.183.162.145] helo=desktop.home) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kmihN-0001p0-8H; Tue, 08 Dec 2020 19:30:57 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=Wxee7ELAusJoPC2cWRtRIQj+DNuLoWUQ2nWiFDbzG0c=; b=njfoDHmu0sHSS5TVFN7SN+OU0+ dO69fOdH/OMwDX0GzTiPgMODjAdM62p+guiCZ5Qsar1y4p9Xfd91GKIixzM5nIjbKlns0s+kxW0dL 9XLFYkD8Q8rZHuTE/NDMAYP+P6dQQmm2tTkf1z4pKrAYRssRVYUspkHSSpN8BVnzQl4I=; From: Paul Durrant To: xen-devel@lists.xenproject.org Cc: Paul Durrant , Wei Liu , Nick Rosbrook , George Dunlap , Ian Jackson , Anthony PERARD Subject: [PATCH v6 18/25] libxl: introduce 'libxl_pci_bdf' in the idl... Date: Tue, 8 Dec 2020 19:30:26 +0000 Message-Id: <20201208193033.11306-19-paul@xen.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201208193033.11306-1-paul@xen.org> References: <20201208193033.11306-1-paul@xen.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @xen.org) Content-Type: text/plain; charset="utf-8" From: Paul Durrant ... 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 Acked-by: Wei Liu Acked-by: Nick Rosbrook --- Cc: George Dunlap Cc: Ian Jackson Cc: Anthony PERARD --- 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/h= elpers.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 =3D C.CString(x.ColoCheckpoi= ntPort)} return nil } =20 +// 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 :=3D x.fromC(&xc); err !=3D nil { +return nil, err } + +return &x, nil} + +func (x *PciBdf) fromC(xc *C.libxl_pci_bdf) error { + x.Func =3D byte(xc._func) +x.Dev =3D byte(xc.dev) +x.Bus =3D byte(xc.bus) +x.Domain =3D int(xc.domain) + + return nil} + +func (x *PciBdf) toC(xc *C.libxl_pci_bdf) (err error){defer func(){ +if err !=3D nil{ +C.libxl_pci_bdf_dispose(xc)} +}() + +xc._func =3D C.uint8_t(x.Func) +xc.dev =3D C.uint8_t(x.Dev) +xc.bus =3D C.uint8_t(x.Bus) +xc.domain =3D 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} =20 func (x *DevicePci) fromC(xc *C.libxl_device_pci) error { - x.Func =3D byte(xc._func) -x.Dev =3D byte(xc.dev) -x.Bus =3D byte(xc.bus) -x.Domain =3D int(xc.domain) + if err :=3D x.Bdf.fromC(&xc.bdf);err !=3D nil { +return fmt.Errorf("converting field Bdf: %v", err) +} x.Vdevfn =3D uint32(xc.vdevfn) x.VfuncMask =3D uint32(xc.vfunc_mask) x.Msitranslate =3D bool(xc.msitranslate) @@ -2033,10 +2067,9 @@ if err !=3D nil{ C.libxl_device_pci_dispose(xc)} }() =20 -xc._func =3D C.uint8_t(x.Func) -xc.dev =3D C.uint8_t(x.Dev) -xc.bus =3D C.uint8_t(x.Bus) -xc.domain =3D C.int(x.Domain) +if err :=3D x.Bdf.toC(&xc.bdf); err !=3D nil { +return fmt.Errorf("converting field Bdf: %v", err) +} xc.vdevfn =3D C.uint32_t(x.Vdevfn) xc.vfunc_mask =3D C.uint32_t(x.VfuncMask) xc.msitranslate =3D C.bool(x.Msitranslate) @@ -2766,13 +2799,13 @@ if err :=3D x.Nics[i].fromC(&v); err !=3D nil { return fmt.Errorf("converting field Nics: %v", err) } } } -x.Pcidevs =3D nil -if n :=3D int(xc.num_pcidevs); n > 0 { -cPcidevs :=3D (*[1<<28]C.libxl_device_pci)(unsafe.Pointer(xc.pcidevs))[:n:= n] -x.Pcidevs =3D make([]DevicePci, n) -for i, v :=3D range cPcidevs { -if err :=3D x.Pcidevs[i].fromC(&v); err !=3D nil { -return fmt.Errorf("converting field Pcidevs: %v", err) } +x.Pcis =3D nil +if n :=3D int(xc.num_pcis); n > 0 { +cPcis :=3D (*[1<<28]C.libxl_device_pci)(unsafe.Pointer(xc.pcis))[:n:n] +x.Pcis =3D make([]DevicePci, n) +for i, v :=3D range cPcis { +if err :=3D x.Pcis[i].fromC(&v); err !=3D nil { +return fmt.Errorf("converting field Pcis: %v", err) } } } x.Rdms =3D nil @@ -2922,13 +2955,13 @@ return fmt.Errorf("converting field Nics: %v", err) } } } -if numPcidevs :=3D len(x.Pcidevs); numPcidevs > 0 { -xc.pcidevs =3D (*C.libxl_device_pci)(C.malloc(C.ulong(numPcidevs)*C.sizeof= _libxl_device_pci)) -xc.num_pcidevs =3D C.int(numPcidevs) -cPcidevs :=3D (*[1<<28]C.libxl_device_pci)(unsafe.Pointer(xc.pcidevs))[:nu= mPcidevs:numPcidevs] -for i,v :=3D range x.Pcidevs { -if err :=3D v.toC(&cPcidevs[i]); err !=3D nil { -return fmt.Errorf("converting field Pcidevs: %v", err) +if numPcis :=3D len(x.Pcis); numPcis > 0 { +xc.pcis =3D (*C.libxl_device_pci)(C.malloc(C.ulong(numPcis)*C.sizeof_libxl= _device_pci)) +xc.num_pcis =3D C.int(numPcis) +cPcis :=3D (*[1<<28]C.libxl_device_pci)(unsafe.Pointer(xc.pcis))[:numPcis:= numPcis] +for i,v :=3D range x.Pcis { +if err :=3D v.toC(&cPcis[i]); err !=3D nil { +return fmt.Errorf("converting field Pcis: %v", err) } } } diff --git a/tools/golang/xenlight/types.gen.go b/tools/golang/xenlight/typ= es.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 } =20 -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 3433c950f9aa..1fa4c5806df9 100644 --- a/tools/include/libxl.h +++ b/tools/include/libxl.h @@ -463,6 +463,12 @@ */ #define LIBXL_HAVE_DEVICE_PCI_ASSIGNABLE_LIST_FREE 1 =20 +/* + * 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 3da83259c08e..1b951b09201e 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 =3D 0; i < d_config->num_pcidevs; i++) { unsigned int n, nr_entries; =20 - seg =3D d_config->pcidevs[i].domain; - bus =3D d_config->pcidevs[i].bus; - devfn =3D PCI_DEVFN(d_config->pcidevs[i].dev, - d_config->pcidevs[i].func); + seg =3D d_config->pcidevs[i].bdf.domain; + bus =3D d_config->pcidevs[i].bdf.bus; + devfn =3D PCI_DEVFN(d_config->pcidevs[i].bdf.dev, + d_config->pcidevs[i].bdf.func); nr_entries =3D 0; rc =3D 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_int= ernal.h index c79523ba9248..6be7b12e4cb7 100644 --- a/tools/libs/light/libxl_internal.h +++ b/tools/libs/light/libxl_internal.h @@ -4746,10 +4746,11 @@ void libxl__xcinfo2xlinfo(libxl_ctx *ctx, * devices have same identifier. */ #define COMPARE_DEVID(a, b) ((a)->devid =3D=3D (b)->devid) #define COMPARE_DISK(a, b) (!strcmp((a)->vdev, (b)->vdev)) -#define COMPARE_PCI(a, b) ((a)->domain =3D=3D (b)->domain && \ +#define COMPARE_BDF(a, b) ((a)->domain =3D=3D (b)->domain && \ (a)->bus =3D=3D (b)->bus && \ (a)->dev =3D=3D (b)->dev && \ (a)->func =3D=3D (b)->func) +#define COMPARE_PCI(a, b) COMPARE_BDF(&((a)->bdf), &((b)->bdf)) #define COMPARE_USB(a, b) ((a)->ctrl =3D=3D (b)->ctrl && \ (a)->port =3D=3D (b)->port) #define COMPARE_USBCTRL(a, b) ((a)->devid =3D=3D (b)->devid) diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c index 74c2196ae339..6b14f0f29ef8 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 *pc= i) { unsigned int value; =20 - value =3D pci->domain << 16; - value |=3D (pci->bus & 0xff) << 8; - value |=3D (pci->dev & 0x1f) << 3; - value |=3D (pci->func & 0x7); + value =3D pci->bdf.domain << 16; + value |=3D (pci->bdf.bus & 0xff) << 8; + value |=3D (pci->bdf.dev & 0x1f) << 3; + value |=3D (pci->bdf.func & 0x7); =20 return value; } @@ -41,10 +41,10 @@ static void pci_struct_fill(libxl_device_pci *pci, unsi= gned int domain, unsigned int bus, unsigned int dev, unsigned int func, unsigned int vdevfn) { - pci->domain =3D domain; - pci->bus =3D bus; - pci->dev =3D dev; - pci->func =3D func; + pci->bdf.domain =3D domain; + pci->bdf.bus =3D bus; + pci->bdf.dev =3D dev; + pci->bdf.func =3D func; pci->vdevfn =3D vdevfn; } =20 @@ -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.bu= s, 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.bu= s, 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)); @@ -250,8 +250,8 @@ static int libxl__device_pci_remove_xenstore(libxl__gc = *gc, uint32_t domid, libx unsigned int domain =3D 0, bus =3D 0, dev =3D 0, func =3D 0; xsdev =3D libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/dev-%d", be_p= ath, i)); sscanf(xsdev, PCI_BDF, &domain, &bus, &dev, &func); - if (domain =3D=3D pci->domain && bus =3D=3D pci->bus && - pci->dev =3D=3D dev && pci->func =3D=3D func) { + if (domain =3D=3D pci->bdf.domain && bus =3D=3D pci->bdf.bus && + pci->bdf.dev =3D=3D dev && pci->bdf.func =3D=3D func) { break; } } @@ -362,8 +362,8 @@ static int sysfs_write_bdf(libxl__gc *gc, const char * = sysfs_path, return ERROR_FAIL; } =20 - buf =3D GCSPRINTF(PCI_BDF, pci->domain, pci->bus, - pci->dev, pci->func); + buf =3D GCSPRINTF(PCI_BDF, pci->bdf.domain, pci->bdf.bus, + pci->bdf.dev, pci->bdf.func); rc =3D write(fd, buf, strlen(buf)); /* Annoying to have two if's, but we need the errno */ if (rc < 0) @@ -383,10 +383,10 @@ static char *pci_info_xs_path(libxl__gc *gc, libxl_de= vice_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.fu= nc, 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.fu= nc); } =20 =20 @@ -484,10 +484,10 @@ static int sysfs_dev_unbind(libxl__gc *gc, libxl_devi= ce_pci *pci, struct stat st; =20 spath =3D 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 =3D libxl__zalloc(gc, PATH_MAX); @@ -517,7 +517,7 @@ static uint16_t sysfs_dev_get_vendor(libxl__gc *gc, lib= xl_device_pci *pci) { char *pci_device_vendor_path =3D 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->bd= f.func); uint16_t read_items; uint16_t pci_device_vendor; =20 @@ -525,7 +525,7 @@ static uint16_t sysfs_dev_get_vendor(libxl__gc *gc, lib= xl_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 =3D fscanf(f, "0x%hx\n", &pci_device_vendor); @@ -533,7 +533,7 @@ static uint16_t sysfs_dev_get_vendor(libxl__gc *gc, lib= xl_device_pci *pci) if (read_items !=3D 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; } =20 @@ -544,7 +544,7 @@ static uint16_t sysfs_dev_get_device(libxl__gc *gc, lib= xl_device_pci *pci) { char *pci_device_device_path =3D 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->bd= f.func); uint16_t read_items; uint16_t pci_device_device; =20 @@ -552,7 +552,7 @@ static uint16_t sysfs_dev_get_device(libxl__gc *gc, lib= xl_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 =3D fscanf(f, "0x%hx\n", &pci_device_device); @@ -560,7 +560,7 @@ static uint16_t sysfs_dev_get_device(libxl__gc *gc, lib= xl_device_pci *pci) if (read_items !=3D 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; } =20 @@ -571,14 +571,14 @@ static int sysfs_dev_get_class(libxl__gc *gc, libxl_d= evice_pci *pci, unsigned long *class) { char *pci_device_class_path =3D GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/cla= ss", - pci->domain, pci->bus, pci->dev, pci->func); + pci->bdf.domain, pci->bdf.bus, pci->bdf.dev, pci->bdf= .func); int read_items, ret =3D 0; =20 FILE *f =3D 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 =3D ERROR_FAIL; goto out; } @@ -587,7 +587,7 @@ static int sysfs_dev_get_class(libxl__gc *gc, libxl_dev= ice_pci *pci, if (read_items !=3D 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 =3D ERROR_FAIL; } =20 @@ -654,10 +654,10 @@ static int pciback_dev_has_slot(libxl__gc *gc, libxl_= device_pci *pci) } =20 while (fscanf(f, "%x:%x:%x.%d\n", &dom, &bus, &dev, &func) =3D=3D 4) { - if (dom =3D=3D pci->domain - && bus =3D=3D pci->bus - && dev =3D=3D pci->dev - && func =3D=3D pci->func) { + if (dom =3D=3D pci->bdf.domain + && bus =3D=3D pci->bdf.bus + && dev =3D=3D pci->bdf.dev + && func =3D=3D pci->bdf.func) { rc =3D 1; goto out; } @@ -683,8 +683,8 @@ static int pciback_dev_is_assigned(libxl__gc *gc, libxl= _device_pci *pci) } =20 spath =3D 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 =3D lstat(spath, &st); =20 if( rc =3D=3D 0 ) @@ -747,10 +747,10 @@ static int libxl__device_pci_assignable_add(libxl__gc= *gc, struct stat st; =20 /* Local copy for convenience */ - dom =3D pci->domain; - bus =3D pci->bus; - dev =3D pci->dev; - func =3D pci->func; + dom =3D pci->bdf.domain; + bus =3D pci->bdf.bus; + dev =3D pci->bdf.dev; + func =3D pci->bdf.func; =20 /* See if the device exists */ spath =3D GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF, dom, bus, dev, func); @@ -824,8 +824,8 @@ static int libxl__device_pci_assignable_remove(libxl__g= c *gc, /* De-quarantine */ rc =3D 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->bu= s, - 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; } =20 @@ -914,11 +914,11 @@ static int pci_multifunction_check(libxl__gc *gc, lib= xl_device_pci *pci, unsigne =20 if ( sscanf(de->d_name, PCI_BDF, &dom, &bus, &dev, &func) !=3D 4 ) continue; - if ( pci->domain !=3D dom ) + if ( pci->bdf.domain !=3D dom ) continue; - if ( pci->bus !=3D bus ) + if ( pci->bdf.bus !=3D bus ) continue; - if ( pci->dev !=3D dev ) + if ( pci->bdf.dev !=3D dev ) continue; =20 path =3D GCSPRINTF("%s/" PCI_BDF, SYSFS_PCIBACK_DRIVER, dom, bus, = dev, func); @@ -967,13 +967,13 @@ static int qemu_pci_add_xenstore(libxl__gc *gc, uint3= 2_t domid, path =3D 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= ); } =20 libxl__qemu_traditional_cmd(gc, domid, "pci-ins"); @@ -1132,10 +1132,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), @@ -1223,7 +1223,7 @@ static void pci_add_qmp_query_pci_cb(libxl__egc *egc, */ =20 asked_id =3D GCSPRINTF(PCI_PT_QDEV_ID, - pci->bus, pci->dev, pci->func); + pci->bdf.bus, pci->bdf.dev, pci->bdf.func); =20 for (i =3D 0; (bus =3D libxl__json_array_get(response, i)); i++) { devices =3D libxl__json_map_get("devices", bus, JSON_ARRAY); @@ -1314,8 +1314,8 @@ static void pci_add_dm_done(libxl__egc *egc, if (isstubdom) starting =3D false; =20 - sysfs_path =3D GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/resource", pci->doma= in, - pci->bus, pci->dev, pci->func); + sysfs_path =3D GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/resource", pci->bdf.= domain, + pci->bdf.bus, pci->bdf.dev, pci->bdf.func); f =3D fopen(sysfs_path, "r"); start =3D end =3D flags =3D size =3D 0; irq =3D 0; @@ -1355,8 +1355,8 @@ static void pci_add_dm_done(libxl__egc *egc, } } fclose(f); - sysfs_path =3D GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/irq", pci->domain, - pci->bus, pci->dev, pci->func); + sysfs_path =3D GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/irq", pci->bdf.domai= n, + pci->bdf.bus, pci->bdf.dev, pci->bdf.func); f =3D fopen(sysfs_path, "r"); if (f =3D=3D NULL) { LOGED(ERROR, domainid, "Couldn't open %s", sysfs_path); @@ -1527,7 +1527,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.fun= c, errno =3D=3D EOPNOTSUPP ? "cannot be assigned - no IOMMU" : "already assigned to a different guest"); goto out; @@ -1545,7 +1545,7 @@ void libxl__device_pci_add(libxl__egc *egc, uint32_t = domid, =20 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 =3D ERROR_FAIL; goto out; } @@ -1553,7 +1553,7 @@ void libxl__device_pci_add(libxl__egc *egc, uint32_t = domid, rc =3D pci_info_xs_write(gc, pci, "domid", GCSPRINTF("%u", domid)); if (rc) goto out; =20 - 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.de= v, pci->bdf.func); =20 stubdomid =3D libxl_get_stubdom_id(ctx, domid); if (stubdomid !=3D 0) { @@ -1634,13 +1634,13 @@ static void device_pci_add_stubdom_done(libxl__egc = *egc, pci->vfunc_mask &=3D pfunc_mask; /* so now vfunc_mask =3D=3D pfunc_mask */ }else{ - pfunc_mask =3D (1 << pci->func); + pfunc_mask =3D (1 << pci->bdf.func); } =20 for (rc =3D 0, i =3D 7; i >=3D 0; --i) { if ( (1 << i) & pfunc_mask ) { if ( pci->vfunc_mask =3D=3D pfunc_mask ) { - pci->func =3D i; + pci->bdf.func =3D i; pci->vdevfn =3D orig_vdev | i; } else { /* if not passing through multiple devices in a block make @@ -1672,7 +1672,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"); } @@ -1741,8 +1741,8 @@ static int qemu_pci_remove_xenstore(libxl__gc *gc, ui= nt32_t domid, path =3D DEVICE_MODEL_XS_PATH(gc, dm_domid, domid, "/state"); state =3D libxl__xs_read(gc, XBT_NULL, path); path =3D 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); =20 /* Remove all functions at once atomically by only signalling * device-model for function 0 */ @@ -1856,8 +1856,8 @@ static void do_pci_remove(libxl__egc *egc, pci_remove= _state *prs) } else { assert(type =3D=3D LIBXL_DOMAIN_TYPE_PV); =20 - char *sysfs_path =3D GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/resource",= pci->domain, - pci->bus, pci->dev, pci->func); + char *sysfs_path =3D GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/resource",= pci->bdf.domain, + pci->bdf.bus, pci->bdf.dev, pci->bdf.= func); FILE *f =3D fopen(sysfs_path, "r"); unsigned int start =3D 0, end =3D 0, flags =3D 0, size =3D 0; int irq =3D 0; @@ -1892,8 +1892,8 @@ static void do_pci_remove(libxl__egc *egc, pci_remove= _state *prs) } fclose(f); skip1: - sysfs_path =3D GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/irq", pci->domai= n, - pci->bus, pci->dev, pci->func); + sysfs_path =3D GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/irq", pci->bdf.d= omain, + pci->bdf.bus, pci->bdf.dev, pci->bdf.func); f =3D fopen(sysfs_path, "r"); if (f =3D=3D NULL) { LOGED(ERROR, domainid, "Couldn't open %s", sysfs_path); @@ -1957,7 +1957,7 @@ static void pci_remove_qmp_device_del(libxl__egc *egc, if (rc) goto out; =20 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 =3D pci_remove_qmp_device_del_cb; rc =3D libxl__ev_qmp_send(egc, &prs->qmp, "device_del", args); if (rc) goto out; @@ -2026,7 +2026,7 @@ static void pci_remove_qmp_query_cb(libxl__egc *egc, libxl__ev_qmp_dispose(gc, qmp); =20 asked_id =3D GCSPRINTF(PCI_PT_QDEV_ID, - pci->bus, pci->dev, pci->func); + pci->bdf.bus, pci->bdf.dev, pci->bdf.func); =20 /* query-pci response: * [{ 'devices': [ 'qdev_id': 'str', ... ], ... }] @@ -2077,7 +2077,7 @@ static void pci_remove_timeout(libxl__egc *egc, libxl= __ev_time *ev, libxl_device_pci *const pci =3D &prs->pci; =20 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); =20 /* If we timed out, we might still want to keep destroying the device * (when force=3D=3Dtrue), so let the next function decide what to do = on @@ -2110,7 +2110,7 @@ static void pci_remove_detached(libxl__egc *egc, =20 /* don't do multiple resets while some functions are still passed thro= ugh */ if ((pci->vdevfn & 0x7) =3D=3D 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->bd= f.dev, pci->bdf.func); } =20 if (!isstubdom) { @@ -2198,7 +2198,7 @@ static void libxl__device_pci_remove_common(libxl__eg= c *egc, } pci->vfunc_mask &=3D prs->pfunc_mask; } else { - prs->pfunc_mask =3D (1 << pci->func); + prs->pfunc_mask =3D (1 << pci->bdf.func); } =20 rc =3D 0; @@ -2226,7 +2226,7 @@ static void device_pci_remove_common_next(libxl__egc = *egc, prs->next_func--; if ( (1 << i) & pfunc_mask ) { if ( pci->vfunc_mask =3D=3D pfunc_mask ) { - pci->func =3D i; + pci->bdf.func =3D i; pci->vdevfn =3D orig_vdev | i; } else { pci->vdevfn =3D orig_vdev; diff --git a/tools/libs/light/libxl_types.idl b/tools/libs/light/libxl_type= s.idl index 05324736b744..21a2cf5c1c9b 100644 --- a/tools/libs/light/libxl_types.idl +++ b/tools/libs/light/libxl_types.idl @@ -770,18 +770,22 @@ libxl_device_nic =3D Struct("device_nic", [ ("colo_checkpoint_port", string) ]) =20 +libxl_pci_bdf =3D Struct("pci_bdf", [ + ("func", uint8), + ("dev", uint8), + ("bus", uint8), + ("domain", integer), + ]) + libxl_device_pci =3D 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), ]) =20 libxl_device_rdm =3D 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, unsig= ned int domain, unsigned int bus, unsigned int dev, unsigned int func, unsigned int vdevfn) { - pci->domain =3D domain; - pci->bus =3D bus; - pci->dev =3D dev; - pci->func =3D func; + pci->bdf.domain =3D domain; + pci->bdf.bus =3D bus; + pci->bdf.dev =3D dev; + pci->bdf.func =3D func; pci->vdevfn =3D 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 =3D 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 =3D 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 359a0015709e..dc49fb7d5074 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->pcidevs[i].domain, d_config->pcidevs[i].bus, - d_config->pcidevs[i].dev, d_config->pcidevs[i].func, + d_config->pcidevs[i].bdf.domain, d_config->pcidevs[i].bdf.b= us, + d_config->pcidevs[i].bdf.dev, d_config->pcidevs[i].bdf.func, d_config->pcidevs[i].vdevfn); fprintf(fh, "\t\t\t(opts msitranslate %d power_mgmt %d)\n", d_config->pcidevs[i].msitranslate, --=20 2.20.1 From nobody Thu May 2 00:14:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1607457684; cv=none; d=zohomail.com; s=zohoarc; b=fsNjXKGUNFiR304XjlvYj21lSCl5KTRmTCcGKADbcH+8VdFrDB3jTrSkhv57zdddY1MMq+gtiIT117VVPpnsk3doUxLzTrqQdjHM+gKTFACC7CVnKbbA9MVDDQzGDDqVZB+A8Tx91YF1HMSKIYBSkKZ1jaZqbCRE9rIMJGjZ5oI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607457684; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5mcnUE0XX/ukJnV9lmREapDDysj6tEKU6ydDwPaupNM=; b=N4cbS3emuig4yaY68+URzFQvTfqFdeIrVh1nv50MxlvlF7jMjCtrjnrEuDR5cjqWvgIiR5cdJevgX1+J7Wfa9fM/pZtMjIO8sOsYKQkyS+rw8+Q5TT9a5OePo4JoOu9njLm/n6fnINW7PJFCrVeBXI8+OaEqopGu0luQfbxO9Hc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1607457684533589.8701376590027; Tue, 8 Dec 2020 12:01:24 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.47774.84671 (Exim 4.92) (envelope-from ) id 1kmjAU-0005Y1-UH; Tue, 08 Dec 2020 20:01:02 +0000 Received: by outflank-mailman (output) from mailman id 47774.84671; Tue, 08 Dec 2020 20:01:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAT-0005Vm-31; Tue, 08 Dec 2020 20:01:01 +0000 Received: by outflank-mailman (input) for mailman id 47774; Tue, 08 Dec 2020 20:00:46 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAE-0004pt-4g for xen-devel@lists.xenproject.org; Tue, 08 Dec 2020 20:00:46 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAD-00086o-9D; Tue, 08 Dec 2020 20:00:45 +0000 Received: from host86-183-162-145.range86-183.btcentralplus.com ([86.183.162.145] helo=desktop.home) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kmihO-0001p0-56; Tue, 08 Dec 2020 19:30:58 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=5mcnUE0XX/ukJnV9lmREapDDysj6tEKU6ydDwPaupNM=; b=j3cfNJqIMtV77XKCh+VPTY8OVa DqhDMUt4wBwXSCzWc5YjCSZzk5uEfh2sZr8y1JiGvb6WAI5YCp4WXpPhGTQEHSbqZtGJI9X6oFzFW RjbP49/gOzPZKD+gQIBecAgZMMmhKhxjfAnNX6UzDcarTGGMVpO5ZscFOa0nmCMW7lXM=; From: Paul Durrant To: xen-devel@lists.xenproject.org Cc: Paul Durrant , Wei Liu , Ian Jackson , Anthony PERARD Subject: [PATCH v6 19/25] libxlu: introduce xlu_pci_parse_spec_string() Date: Tue, 8 Dec 2020 19:30:27 +0000 Message-Id: <20201208193033.11306-20-paul@xen.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201208193033.11306-1-paul@xen.org> References: <20201208193033.11306-1-paul@xen.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @xen.org) Content-Type: text/plain; charset="utf-8" From: Paul Durrant 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. As a side-effect this patch also fixes a bug where using '*' to speci= fy all functions would lead to an assertion failure at the end of xlu_pci_parse_bdf(). Fixes: d25cc3ec93eb ("libxl: workaround gcc 10.2 maybe-uninitialized warnin= g") Signed-off-by: Paul Durrant Acked-by: Wei Liu --- Cc: Ian Jackson Cc: Anthony PERARD --- tools/include/libxlutil.h | 8 +- tools/libs/util/libxlu_pci.c | 354 +++++++++++++++++++---------------- tools/xl/xl_cmdtable.c | 4 +- tools/xl/xl_parse.c | 4 +- tools/xl/xl_pci.c | 37 ++-- 5 files changed, 220 insertions(+), 187 deletions(-) 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. */ =20 +/* + * 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 cha= r *str); +int xlu_pci_parse_spec_string(XLU_Config *cfg, libxl_device_pci *pci, + const char *str); =20 /* * 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 =20 +#include + #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) =20 -static int hex_convert(const char *str, unsigned int *val, unsigned int ma= sk) +static int parse_bdf(libxl_pci_bdf *bdfp, uint32_t *vfunc_maskp, + const char *str, const char **endp) { - unsigned long ret; - char *end; - - ret =3D strtoul(str, &end, 16); - if ( end =3D=3D str || *end !=3D '\0' ) - return -1; - if ( ret & ~mask ) - return -1; - *val =3D (unsigned int)ret & mask; + const char *ptr =3D str; + unsigned int colons =3D 0; + unsigned int domain, bus, dev, func; + int n; + + /* Count occurrences of ':' to detrmine presence/absence of the 'domai= n' */ + while (isxdigit(*ptr) || *ptr =3D=3D ':') { + if (*ptr =3D=3D ':') + colons++; + ptr++; + } + + ptr =3D str; + switch (colons) { + case 1: + domain =3D 0; + if (sscanf(ptr, "%x:%x.%n", &bus, &dev, &n) !=3D 2) + return ERROR_INVAL; + break; + case 2: + if (sscanf(ptr, "%x:%x:%x.%n", &domain, &bus, &dev, &n) !=3D 3) + return ERROR_INVAL; + break; + default: + return ERROR_INVAL; + } + + if (domain > 0xffff || bus > 0xff || dev > 0x1f) + return ERROR_INVAL; + + ptr +=3D n; + if (*ptr =3D=3D '*') { + if (!vfunc_maskp) + return ERROR_INVAL; + *vfunc_maskp =3D LIBXL_PCI_FUNC_ALL; + func =3D 0; + ptr++; + } else { + if (sscanf(ptr, "%x%n", &func, &n) !=3D 1) + return ERROR_INVAL; + if (func > 7) + return ERROR_INVAL; + if (vfunc_maskp) + *vfunc_maskp =3D 1; + ptr +=3D n; + } + + bdfp->domain =3D domain; + bdfp->bus =3D bus; + bdfp->dev =3D dev; + bdfp->func =3D func; + + if (endp) + *endp =3D ptr; + return 0; } =20 -static int pci_struct_fill(libxl_device_pci *pci, unsigned int domain, - unsigned int bus, unsigned int dev, - unsigned int func, unsigned int vdevfn) +static int parse_vslot(uint32_t *vdevfnp, const char *str, const char **en= dp) { - pci->bdf.domain =3D domain; - pci->bdf.bus =3D bus; - pci->bdf.dev =3D dev; - pci->bdf.func =3D func; - pci->vdevfn =3D vdevfn; + const char *ptr =3D str; + unsigned int val; + int n; + + if (sscanf(ptr, "%x%n", &val, &n) !=3D 1) + return ERROR_INVAL; + + if (val > 0x1f) + return ERROR_INVAL; + + ptr +=3D n; + + *vdevfnp =3D val << 3; + + if (endp) + *endp =3D ptr; + return 0; } =20 -#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) +static int parse_key_val(char **keyp, char**valp, const char *str, + const char **endp) { - unsigned state =3D STATE_DOMAIN; - unsigned dom =3D INVALID, bus =3D INVALID, dev =3D INVALID, func =3D I= NVALID, vslot =3D 0; - char *buf2, *tok, *ptr, *end, *optkey =3D NULL; + const char *ptr =3D str; + char *key, *val; + + while (*ptr !=3D '=3D' && *ptr !=3D '\0') + ptr++; =20 - if ( NULL =3D=3D (buf2 =3D ptr =3D strdup(str)) ) + if (*ptr =3D=3D '\0') + return ERROR_INVAL; + + key =3D strndup(str, ptr - str); + if (!key) return ERROR_NOMEM; =20 - for(tok =3D ptr, end =3D ptr + strlen(ptr) + 1; ptr < end; ptr++) { - switch(state) { - case STATE_DOMAIN: - if ( *ptr =3D=3D ':' ) { - state =3D STATE_BUS; - *ptr =3D '\0'; - if ( hex_convert(tok, &dom, 0xffff) ) - goto parse_error; - tok =3D ptr + 1; - } - break; - case STATE_BUS: - if ( *ptr =3D=3D ':' ) { - state =3D STATE_DEV; - *ptr =3D '\0'; - if ( hex_convert(tok, &bus, 0xff) ) - goto parse_error; - tok =3D ptr + 1; - }else if ( *ptr =3D=3D '.' ) { - state =3D STATE_FUNC; - *ptr =3D '\0'; - if ( dom & ~0xff ) - goto parse_error; - bus =3D dom; - dom =3D 0; - if ( hex_convert(tok, &dev, 0xff) ) - goto parse_error; - tok =3D ptr + 1; - } - break; - case STATE_DEV: - if ( *ptr =3D=3D '.' ) { - state =3D STATE_FUNC; - *ptr =3D '\0'; - if ( hex_convert(tok, &dev, 0xff) ) - goto parse_error; - tok =3D ptr + 1; - } - break; - case STATE_FUNC: - if ( *ptr =3D=3D '\0' || *ptr =3D=3D '@' || *ptr =3D=3D ',' ) { - switch( *ptr ) { - case '\0': - state =3D STATE_TERMINAL; - break; - case '@': - state =3D STATE_VSLOT; - break; - case ',': - state =3D STATE_OPTIONS_K; - break; - } - *ptr =3D '\0'; - if ( !strcmp(tok, "*") ) { - pci->vfunc_mask =3D LIBXL_PCI_FUNC_ALL; - }else{ - if ( hex_convert(tok, &func, 0x7) ) - goto parse_error; - pci->vfunc_mask =3D (1 << 0); - } - tok =3D ptr + 1; - } - break; - case STATE_VSLOT: - if ( *ptr =3D=3D '\0' || *ptr =3D=3D ',' ) { - state =3D ( *ptr =3D=3D ',' ) ? STATE_OPTIONS_K : STATE_TE= RMINAL; - *ptr =3D '\0'; - if ( hex_convert(tok, &vslot, 0xff) ) - goto parse_error; - tok =3D ptr + 1; - } - break; - case STATE_OPTIONS_K: - if ( *ptr =3D=3D '=3D' ) { - state =3D STATE_OPTIONS_V; - *ptr =3D '\0'; - optkey =3D tok; - tok =3D ptr + 1; - } - break; - case STATE_OPTIONS_V: - if ( *ptr =3D=3D ',' || *ptr =3D=3D '\0' ) { - state =3D (*ptr =3D=3D ',') ? STATE_OPTIONS_K : STATE_TERM= INAL; - *ptr =3D '\0'; - if ( !strcmp(optkey, "msitranslate") ) { - pci->msitranslate =3D atoi(tok); - }else if ( !strcmp(optkey, "power_mgmt") ) { - pci->power_mgmt =3D atoi(tok); - }else if ( !strcmp(optkey, "permissive") ) { - pci->permissive =3D atoi(tok); - }else if ( !strcmp(optkey, "seize") ) { - pci->seize =3D atoi(tok); - } else if (!strcmp(optkey, "rdm_policy")) { - if (!strcmp(tok, "strict")) { - pci->rdm_policy =3D LIBXL_RDM_RESERVE_POLICY_STRIC= T; - } else if (!strcmp(tok, "relaxed")) { - pci->rdm_policy =3D LIBXL_RDM_RESERVE_POLICY_RELAX= ED; - } else { - XLU__PCI_ERR(cfg, "%s is not an valid PCI RDM prop= erty" - " policy: 'strict' or 'relaxed'.= ", - tok); - goto parse_error; - } - } else { - XLU__PCI_ERR(cfg, "Unknown PCI BDF option: %s", optkey= ); - } - tok =3D ptr + 1; - } - default: - break; + str =3D ++ptr; /* skip '=3D' */ + while (*ptr !=3D ',' && *ptr !=3D '\0') + ptr++; + + val =3D strndup(str, ptr - str); + if (!val) { + free(key); + return ERROR_NOMEM; + } + + if (*ptr =3D=3D ',') + ptr++; + + *keyp =3D key; + *valp =3D val; + *endp =3D ptr; + + return 0; +} + +static int parse_rdm_policy(XLU_Config *cfg, libxl_rdm_reserve_policy *pol= icy, + const char *str) +{ + int ret =3D 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 =3D str; + bool bdf_present =3D false; + int ret; + + /* Attempt to parse 'bdf' as positional parameter */ + ret =3D parse_bdf(&pcidev->bdf, &pcidev->vfunc_mask, ptr, &ptr); + if (!ret) { + bdf_present =3D true; + + /* Check whether 'vslot' if present */ + if (*ptr =3D=3D '@') { + ret =3D parse_vslot(&pcidev->vdevfn, ++ptr, &ptr); + if (ret) + return ret; } + if (*ptr =3D=3D ',') + ptr++; + else if (*ptr !=3D '\0') + return ERROR_INVAL; } =20 - if ( tok !=3D ptr || state !=3D STATE_TERMINAL ) - goto parse_error; + /* Parse the rest as 'key=3Dval' pairs */ + while (*ptr !=3D '\0') { + char *key, *val; =20 - assert(dom !=3D INVALID && bus !=3D INVALID && dev !=3D INVALID && fun= c !=3D INVALID); + ret =3D parse_key_val(&key, &val, ptr, &ptr); + if (ret) + return ret; =20 - /* Just a pretty way to fill in the values */ - pci_struct_fill(pci, dom, bus, dev, func, vslot << 3); + if (!strcmp(key, "bdf")) { + ret =3D parse_bdf(&pcidev->bdf, &pcidev->vfunc_mask, val, NULL= ); + bdf_present =3D !ret; + } else if (!strcmp(key, "vslot")) { + ret =3D parse_vslot(&pcidev->vdevfn, val, NULL); + } else if (!strcmp(key, "permissive")) { + pcidev->permissive =3D atoi(val); + } else if (!strcmp(key, "msitranslate")) { + pcidev->msitranslate =3D atoi(val); + } else if (!strcmp(key, "seize")) { + pcidev->seize=3D atoi(val); + } else if (!strcmp(key, "power_mgmt")) { + pcidev->power_mgmt =3D atoi(val); + } else if (!strcmp(key, "rdm_policy")) { + ret =3D parse_rdm_policy(cfg, &pcidev->rdm_policy, val); + } else { + XLU__PCI_ERR(cfg, "Unknown PCI_SPEC_STRING option: %s", key); + ret =3D ERROR_INVAL; + } =20 - free(buf2); + free(key); + free(val); =20 - return 0; + if (ret) + return ret; + } =20 -parse_error: - free(buf2); - return ERROR_INVAL; + if (!bdf_present) + return ERROR_INVAL; + + return 0; } =20 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 =3D STATE_TYPE; char *buf2, *tok, *ptr, *end; =20 @@ -227,15 +257,8 @@ int xlu_rdm_parse(XLU_Config *cfg, libxl_rdm_reserve *= rdm, const char *str) if (*ptr =3D=3D ',' || *ptr =3D=3D '\0') { state =3D *ptr =3D=3D ',' ? STATE_TYPE : STATE_TERMINAL; *ptr =3D '\0'; - if (!strcmp(tok, "strict")) { - rdm->policy =3D LIBXL_RDM_RESERVE_POLICY_STRICT; - } else if (!strcmp(tok, "relaxed")) { - rdm->policy =3D 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 =3D 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 } =20 /* diff --git a/tools/xl/xl_cmdtable.c b/tools/xl/xl_cmdtable.c index 6ab5e47da3f3..30e17a2848cd 100644 --- a/tools/xl/xl_cmdtable.c +++ b/tools/xl/xl_cmdtable.c @@ -90,12 +90,12 @@ struct cmd_spec cmd_table[] =3D { { "pci-attach", &main_pciattach, 0, 1, "Insert a new pass-through pci device", - " [Virtual Slot]", + " ", }, { "pci-detach", &main_pcidetach, 0, 1, "Remove a domain's pass-through pci device", - " ", + " ", }, { "pci-list", &main_pcilist, 0, 0, diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c index 4ebf39620ae7..867e4d068a59 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 =3D b_info->u.hvm.rdm.policy; - e =3D xlu_pci_parse_bdf(config, pci, buf); + e =3D 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 passthro= ugh\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; } =20 -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 =3D xlu_cfg_init(stderr, "command line"); if (!config) { perror("xlu_cfg_inig"); exit(-1); } =20 - 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 =3D 0; - const char *bdf =3D NULL; + const char *spec_string =3D NULL; =20 SWITCH_FOREACH_OPT(opt, "f", NULL, "pci-detach", 2) { case 'f': @@ -98,15 +99,15 @@ int main_pcidetach(int argc, char **argv) } =20 domid =3D find_domain(argv[optind]); - bdf =3D argv[optind + 1]; + spec_string =3D argv[optind + 1]; =20 - if (pcidetach(domid, bdf, force)) + if (pcidetach(domid, spec_string, force)) return EXIT_FAILURE; =20 return EXIT_SUCCESS; } =20 -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, c= onst char *vs) config =3D xlu_cfg_init(stderr, "command line"); if (!config) { perror("xlu_cfg_inig"); exit(-1); } =20 - 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); } =20 @@ -135,19 +137,16 @@ int main_pciattach(int argc, char **argv) { uint32_t domid; int opt; - const char *bdf =3D NULL, *vs =3D NULL; + const char *spec_string =3D NULL; =20 SWITCH_FOREACH_OPT(opt, "", NULL, "pci-attach", 2) { /* No options */ } =20 domid =3D find_domain(argv[optind]); - bdf =3D argv[optind + 1]; - - if (optind + 1 < argc) - vs =3D argv[optind + 2]; + spec_string =3D argv[optind + 1]; =20 - if (pciattach(domid, bdf, vs)) + if (pciattach(domid, spec_string)) return EXIT_FAILURE; =20 return EXIT_SUCCESS; @@ -193,8 +192,8 @@ static int pciassignable_add(const char *bdf, int rebin= d) config =3D xlu_cfg_init(stderr, "command line"); if (!config) { perror("xlu_cfg_init"); exit(-1); } =20 - 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); } =20 @@ -235,8 +234,8 @@ static int pciassignable_remove(const char *bdf, int re= bind) config =3D xlu_cfg_init(stderr, "command line"); if (!config) { perror("xlu_cfg_init"); exit(-1); } =20 - if (xlu_pci_parse_bdf(config, &pci, bdf)) { - fprintf(stderr, "pci-assignable-remove: malformed BDF specificatio= n \"%s\"\n", bdf); + if (xlu_pci_parse_bdf(config, &pci.bdf, bdf)) { + fprintf(stderr, "pci-assignable-remove: malformed BDF \"%s\"\n", b= df); exit(2); } =20 --=20 2.20.1 From nobody Thu May 2 00:14:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1607457892; cv=none; d=zohomail.com; s=zohoarc; b=TDj26rm/IDiU3s/faH8Xz3FyMB6D9G0+zx8zK2luIYHhQ1pldjaHFRg/jPQU18DcUGaWcxp6zqL4uw6Pv+2C5eetUqg0KFvM9zT6cf5HR51AvqGVM2nu+aij2PC2CI2Yi6zjrfQ0HJJKpdlv6EHzlgaTNyzqxE3YV55j+aClnNs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607457892; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=kHLySQ+itOx1hiauIp8pIwnhad1Xuv7b9R5clDzcs+U=; b=XUdkqs6Fk/GkDadCR0fdZv/BTyOx++KGbmqIYjtvS4saewPal+u+L6ubSBeGKUVfRYdBxwYni5VcX1/pFqV4oW8wOHx3HVuC8RLBdvUhuefKjK0Dj0tmyeYQvaIyU3FMIzO8G8xHqSlr4+NFSlBozyJecJrhdGlDvlTY6c+EX7U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTP id 1607457892029154.16715887486987; Tue, 8 Dec 2020 12:04:52 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.47772.84659 (Exim 4.92) (envelope-from ) id 1kmjAS-0005Pb-H6; Tue, 08 Dec 2020 20:01:00 +0000 Received: by outflank-mailman (output) from mailman id 47772.84659; Tue, 08 Dec 2020 20:01:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAQ-0005OB-LH; Tue, 08 Dec 2020 20:00:58 +0000 Received: by outflank-mailman (input) for mailman id 47772; Tue, 08 Dec 2020 20:00:46 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAE-0004pj-1u for xen-devel@lists.xenproject.org; Tue, 08 Dec 2020 20:00:46 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAD-00086s-B8; Tue, 08 Dec 2020 20:00:45 +0000 Received: from host86-183-162-145.range86-183.btcentralplus.com ([86.183.162.145] helo=desktop.home) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kmihO-0001p0-Uv; Tue, 08 Dec 2020 19:30:59 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=kHLySQ+itOx1hiauIp8pIwnhad1Xuv7b9R5clDzcs+U=; b=6LKp47s9wKFE4yMHdI3ddHL7em G7Q9FNCvKRA1VkFCJG0xOSdrFHvt9gCr4kMyaKyWXCVzt33c0fFeQ8+S49JocEA7I1eBUJTPKa5lA /aJ1wQ4jhEIgAZI8oVw9jCMm9Nd2IxknhewWE17k7mSIf7FfyUcDGoI+BuEFTPgGd1w8=; From: Paul Durrant To: xen-devel@lists.xenproject.org Cc: Paul Durrant , Wei Liu , Ian Jackson Subject: [PATCH v6 20/25] docs/man: modify xl(1) in preparation for naming of assignable devices Date: Tue, 8 Dec 2020 19:30:28 +0000 Message-Id: <20201208193033.11306-21-paul@xen.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201208193033.11306-1-paul@xen.org> References: <20201208193033.11306-1-paul@xen.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @xen.org) Content-Type: text/plain; charset="utf-8" From: Paul Durrant 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 Acked-by: Wei Liu --- Cc: Ian Jackson --- 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 af31d2b5727a..f4779d8fd654 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. =20 =3Dover 4 =20 -=3Ditem B +=3Ditem B [I<-n>] =20 List all the B of assignable PCI devices. See -L for more information. +L for more information. If the -n option is +specified then any name supplied when the device was made assignable +will also be displayed. =20 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. =20 -=3Ditem B I +=3Ditem B [I<-n NAME>] I =20 Make the device at B assignable to guests. See -L for more information. +L for more information. If the -n option is +supplied then the assignable device entry will the named with the +given B. =20 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 o= peration, such as storage controllers, network interfaces, or GPUs that are currently being used. =20 -=3Ditem B [I<-r>] I +=3Ditem B [I<-r>] I|I =20 -Make the device at B not assignable to guests. See -L for more information. +Make a device non-assignable to guests. The device may be identified +either by its B or the B supplied when the device was made +assignable. See L for more information. =20 This will at least unbind the device from pciback, and re-assign it from the "quarantine domain" back to domain 0. If the -r --=20 2.20.1 From nobody Thu May 2 00:14:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1607457673; cv=none; d=zohomail.com; s=zohoarc; b=gaB8fXRExqmD7VRwxFSTKluMl3UtooV7JAe3Fh0it3sgui1f1u3DlK8jXcKEc71hEdijt+Nt82i3cHKzpgPoyBUIBtt2/Jvzui3yUzKvfDNqeJd/NqijOPsU1NldHtt7MQed0uBBzXHcqyPDXAbfHT64DsrHSPD4QEE7TH6Abfs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607457673; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7O3jPwvmGZxkm+Vdmlru8cGpzRajsK5N4k2xBh61IQ4=; b=aZ28H0TP3d5Bz+ynwsm7RQjUqalTqmzvqI+K9ze8MgjYtOLYF6ieaJbQgys+GmNVOuzv/+P/Eagq2XxgbBv+InIoHULymr4WO2XIMvSDF8FXt54CgfuyXnHaSlHovX5oDCTZw9cP2siX3JR9A6+09zRfdFRu9Ku6Jo/b0/TqzGU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1607457673073956.6392518771968; Tue, 8 Dec 2020 12:01:13 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.47767.84587 (Exim 4.92) (envelope-from ) id 1kmjAJ-00051t-ES; Tue, 08 Dec 2020 20:00:51 +0000 Received: by outflank-mailman (output) from mailman id 47767.84587; Tue, 08 Dec 2020 20:00:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAI-00050u-W3; Tue, 08 Dec 2020 20:00:50 +0000 Received: by outflank-mailman (input) for mailman id 47767; Tue, 08 Dec 2020 20:00:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAD-0004pJ-Po for xen-devel@lists.xenproject.org; Tue, 08 Dec 2020 20:00:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAD-00086S-0s; Tue, 08 Dec 2020 20:00:45 +0000 Received: from host86-183-162-145.range86-183.btcentralplus.com ([86.183.162.145] helo=desktop.home) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kmihP-0001p0-Rf; Tue, 08 Dec 2020 19:31:00 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=7O3jPwvmGZxkm+Vdmlru8cGpzRajsK5N4k2xBh61IQ4=; b=UJuqKLFdKWw996L4WBuLN1AqaY vrZMak8/LpzlO6UphBo5zcFgFAtnzb9jYMYotQ6ep48EWMDBfZ3QPtu+IlYVUE47U0XpXGNy0X3T9 R1kYCMqar5N1zBwB9hZ0yQzn6m9MgcuwhKd0DiizMY8CNWG9Hw3n5BqlesDnGreDxkPY=; From: Paul Durrant To: xen-devel@lists.xenproject.org Cc: Paul Durrant , Ian Jackson , Wei Liu , Anthony PERARD Subject: [PATCH v6 21/25] libxl: convert internal functions in libxl_pci.c... Date: Tue, 8 Dec 2020 19:30:29 +0000 Message-Id: <20201208193033.11306-22-paul@xen.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201208193033.11306-1-paul@xen.org> References: <20201208193033.11306-1-paul@xen.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @xen.org) Content-Type: text/plain; charset="utf-8" From: Paul Durrant ... to use 'libx_pci_bdf' where appropriate. No API change. Signed-off-by: Paul Durrant Acked-by: Wei Liu --- Cc: Ian Jackson Cc: Wei Liu Cc: Anthony PERARD v6: - New in v6 (split out from "libxl: modify libxl_device_pci_assignable_add/ remove/list/list_free()..." --- tools/libs/light/libxl_pci.c | 192 +++++++++++++++++++---------------- 1 file changed, 103 insertions(+), 89 deletions(-) diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c index 6b14f0f29ef8..448fe969514b 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" =20 -static unsigned int pci_encode_bdf(libxl_device_pci *pci) +static unsigned int pci_encode_bdf(libxl_pci_bdf *pcibdf) { unsigned int value; =20 - value =3D pci->bdf.domain << 16; - value |=3D (pci->bdf.bus & 0xff) << 8; - value |=3D (pci->bdf.dev & 0x1f) << 3; - value |=3D (pci->bdf.func & 0x7); + value =3D pcibdf->domain << 16; + value |=3D (pcibdf->bus & 0xff) << 8; + value |=3D (pcibdf->dev & 0x1f) << 3; + value |=3D (pcibdf->func & 0x7); =20 return value; } =20 +static void pcibdf_struct_fill(libxl_pci_bdf *pcibdf, unsigned int domain, + unsigned int bus, unsigned int dev, + unsigned int func) +{ + pcibdf->domain =3D domain; + pcibdf->bus =3D bus; + pcibdf->dev =3D dev; + pcibdf->func =3D 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 =3D domain; - pci->bdf.bus =3D bus; - pci->bdf.dev =3D dev; - pci->bdf.func =3D func; + pcibdf_struct_fill(&pci->bdf, domain, bus, dev, func); pci->vdevfn =3D vdevfn; } =20 @@ -350,8 +357,8 @@ static bool is_pci_in_array(libxl_device_pci *pcis, int= num, } =20 /* 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; @@ -362,8 +369,8 @@ static int sysfs_write_bdf(libxl__gc *gc, const char * = sysfs_path, return ERROR_FAIL; } =20 - buf =3D GCSPRINTF(PCI_BDF, pci->bdf.domain, pci->bdf.bus, - pci->bdf.dev, pci->bdf.func); + buf =3D GCSPRINTF(PCI_BDF, pcibdf->domain, pcibdf->bus, + pcibdf->dev, pcibdf->func); rc =3D write(fd, buf, strlen(buf)); /* Annoying to have two if's, but we need the errno */ if (rc < 0) @@ -378,22 +385,22 @@ static int sysfs_write_bdf(libxl__gc *gc, const char = * sysfs_path, =20 #define PCI_INFO_PATH "/libxl/pci" =20 -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.fu= nc, + 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.fu= nc); + pcibdf->domain, pcibdf->bus, pcibdf->dev, pcibdf->func); } =20 =20 -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 =3D pci_info_xs_path(gc, pci, node); + char *path =3D pci_info_xs_path(gc, pcibdf, node); int rc =3D libxl__xs_printf(gc, XBT_NULL, path, "%s", val); =20 if (rc) LOGE(WARN, "Write of %s to node %s failed.", val, path); @@ -401,18 +408,18 @@ static int pci_info_xs_write(libxl__gc *gc, libxl_dev= ice_pci *pci, return rc; } =20 -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 =3D pci_info_xs_path(gc, pci, node); + char *path =3D pci_info_xs_path(gc, pcibdf, node); =20 return libxl__xs_read(gc, XBT_NULL, path); } =20 -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 =3D pci_info_xs_path(gc, pci, node); + char *path =3D pci_info_xs_path(gc, pcibdf, node); libxl_ctx *ctx =3D libxl__gc_owner(gc); =20 /* Remove the xenstore entry */ @@ -451,9 +458,9 @@ libxl_device_pci *libxl_device_pci_assignable_list(libx= l_ctx *ctx, int *num) new =3D pcis + *num; =20 libxl_device_pci_init(new); - pci_struct_fill(new, dom, bus, dev, func, 0); + pcibdf_struct_fill(&new->bdf, dom, bus, dev, func); =20 - if (pci_info_xs_read(gc, new, "domid")) /* already assigned */ + if (pci_info_xs_read(gc, &new->bdf, "domid")) /* already assigned = */ continue; =20 (*num)++; @@ -477,17 +484,17 @@ void libxl_device_pci_assignable_list_free(libxl_devi= ce_pci *list, int num) =20 /* Unbind device from its current driver, if any. If driver_path is non-N= ULL, * 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 =3D NULL; struct stat st; =20 spath =3D 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 =3D libxl__zalloc(gc, PATH_MAX); @@ -501,7 +508,7 @@ static int sysfs_dev_unbind(libxl__gc *gc, libxl_device= _pci *pci, =20 /* Unbind from the old driver */ spath =3D 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; } @@ -639,8 +646,8 @@ bool libxl__is_igd_vga_passthru(libxl__gc *gc, * already exist. */ =20 -/* 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 =3D 0; @@ -654,10 +661,10 @@ static int pciback_dev_has_slot(libxl__gc *gc, libxl_= device_pci *pci) } =20 while (fscanf(f, "%x:%x:%x.%d\n", &dom, &bus, &dev, &func) =3D=3D 4) { - if (dom =3D=3D pci->bdf.domain - && bus =3D=3D pci->bdf.bus - && dev =3D=3D pci->bdf.dev - && func =3D=3D pci->bdf.func) { + if (dom =3D=3D pcibdf->domain + && bus =3D=3D pcibdf->bus + && dev =3D=3D pcibdf->dev + && func =3D=3D pcibdf->func) { rc =3D 1; goto out; } @@ -667,7 +674,7 @@ out: return rc; } =20 -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; @@ -683,8 +690,8 @@ static int pciback_dev_is_assigned(libxl__gc *gc, libxl= _device_pci *pci) } =20 spath =3D 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 =3D lstat(spath, &st); =20 if( rc =3D=3D 0 ) @@ -695,40 +702,40 @@ static int pciback_dev_is_assigned(libxl__gc *gc, lib= xl_device_pci *pci) return -1; } =20 -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; =20 - if ( (rc =3D pciback_dev_has_slot(gc, pci)) < 0 ) { + if ( (rc =3D pciback_dev_has_slot(gc, pcibdf)) < 0 ) { LOGE(ERROR, "Error checking for pciback slot"); return ERROR_FAIL; } else if (rc =3D=3D 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; } } =20 - 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; } =20 -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; } =20 /* 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; } @@ -736,9 +743,9 @@ static int pciback_dev_unassign(libxl__gc *gc, libxl_de= vice_pci *pci) return 0; } =20 -static int libxl__device_pci_assignable_add(libxl__gc *gc, - libxl_device_pci *pci, - int rebind) +static int libxl__pci_bdf_assignable_add(libxl__gc *gc, + libxl_pci_bdf *pcibdf, + int rebind) { libxl_ctx *ctx =3D libxl__gc_owner(gc); unsigned dom, bus, dev, func; @@ -747,10 +754,10 @@ static int libxl__device_pci_assignable_add(libxl__gc= *gc, struct stat st; =20 /* Local copy for convenience */ - dom =3D pci->bdf.domain; - bus =3D pci->bdf.bus; - dev =3D pci->bdf.dev; - func =3D pci->bdf.func; + dom =3D pcibdf->domain; + bus =3D pcibdf->bus; + dev =3D pcibdf->dev; + func =3D pcibdf->func; =20 /* See if the device exists */ spath =3D GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF, dom, bus, dev, func); @@ -760,7 +767,7 @@ static int libxl__device_pci_assignable_add(libxl__gc *= gc, } =20 /* Check to see if it's already assigned to pciback */ - rc =3D pciback_dev_is_assigned(gc, pci); + rc =3D pciback_dev_is_assigned(gc, pcibdf); if ( rc < 0 ) { return ERROR_FAIL; } @@ -770,7 +777,7 @@ static int libxl__device_pci_assignable_add(libxl__gc *= gc, } =20 /* Check to see if there's already a driver that we need to unbind fro= m */ - 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; @@ -779,9 +786,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 =3D - pci_info_xs_read(gc, pci, "driver_path")) !=3D NULL )= { + pci_info_xs_read(gc, pcibdf, "driver_path")) !=3D NUL= L ) { LOG(INFO, PCI_BDF" not bound to a driver, will be rebound to %= s", dom, bus, dev, func, driver_path); } else { @@ -789,10 +796,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"); } =20 - if ( pciback_dev_assign(gc, pci) ) { + if ( pciback_dev_assign(gc, pcibdf) ) { LOG(ERROR, "Couldn't bind device to pciback!"); return ERROR_FAIL; } @@ -803,7 +810,7 @@ quarantine: * so always pass XEN_DOMCTL_DEV_RDM_RELAXED to avoid assignment being * unnecessarily denied. */ - rc =3D xc_assign_device(ctx->xch, DOMID_IO, pci_encode_bdf(pci), + rc =3D 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); @@ -813,33 +820,33 @@ quarantine: return 0; } =20 -static int libxl__device_pci_assignable_remove(libxl__gc *gc, - libxl_device_pci *pci, - int rebind) +static int libxl__pci_bdf_assignable_remove(libxl__gc *gc, + libxl_pci_bdf *pcibdf, + int rebind) { libxl_ctx *ctx =3D libxl__gc_owner(gc); int rc; char *driver_path; =20 /* De-quarantine */ - rc =3D xc_deassign_device(ctx->xch, DOMID_IO, pci_encode_bdf(pci)); + rc =3D 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; } =20 /* Unbind from pciback */ - if ( (rc =3D pciback_dev_is_assigned(gc, pci)) < 0 ) { + if ( (rc =3D 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"); } =20 /* Rebind if necessary */ - driver_path =3D pci_info_xs_read(gc, pci, "driver_path"); + driver_path =3D pci_info_xs_read(gc, pcibdf, "driver_path"); =20 if ( driver_path ) { if ( rebind ) { @@ -847,12 +854,12 @@ static int libxl__device_pci_assignable_remove(libxl_= _gc *gc, =20 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; } =20 - pci_info_xs_remove(gc, pci, "driver_path"); + pci_info_xs_remove(gc, pcibdf, "driver_path"); } } else { if ( rebind ) { @@ -870,7 +877,7 @@ int libxl_device_pci_assignable_add(libxl_ctx *ctx, lib= xl_device_pci *pci, GC_INIT(ctx); int rc; =20 - rc =3D libxl__device_pci_assignable_add(gc, pci, rebind); + rc =3D libxl__pci_bdf_assignable_add(gc, &pci->bdf, rebind); =20 GC_FREE; return rc; @@ -883,7 +890,7 @@ int libxl_device_pci_assignable_remove(libxl_ctx *ctx, = libxl_device_pci *pci, GC_INIT(ctx); int rc; =20 - rc =3D libxl__device_pci_assignable_remove(gc, pci, rebind); + rc =3D libxl__pci_bdf_assignable_remove(gc, &pci->bdf, rebind); =20 GC_FREE; return rc; @@ -1385,7 +1392,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 =3D ERROR_FAIL; goto out; @@ -1401,7 +1408,8 @@ out_no_irq: rc =3D ERROR_FAIL; goto out; } - r =3D xc_assign_device(ctx->xch, domid, pci_encode_bdf(pci), flag); + r =3D xc_assign_device(ctx->xch, domid, pci_encode_bdf(&pci->bdf), + flag); if (r < 0 && (hvm || errno !=3D ENOSYS)) { LOGED(ERROR, domainid, "xc_assign_device failed"); rc =3D ERROR_FAIL; @@ -1480,17 +1488,21 @@ int libxl_device_pci_add(libxl_ctx *ctx, uint32_t d= omid, return AO_INPROGRESS; } =20 -static bool libxl_pci_assignable(libxl_ctx *ctx, libxl_device_pci *pci) +static bool is_bdf_assignable(libxl_ctx *ctx, libxl_pci_bdf *pcibdf) { libxl_device_pci *pcis; - int num; - bool assignable; + int num, i; =20 pcis =3D libxl_device_pci_assignable_list(ctx, &num); - assignable =3D is_pci_in_array(pcis, num, pci); + + for (i =3D 0; i < num; i++) { + if (COMPARE_BDF(pcibdf, &pcis[i].bdf)) + break; + } + libxl_device_pci_assignable_list_free(pcis, num); =20 - return assignable; + return i < num; } =20 static void device_pci_add_stubdom_wait(libxl__egc *egc, @@ -1523,7 +1535,8 @@ void libxl__device_pci_add(libxl__egc *egc, uint32_t = domid, pas->callback =3D device_pci_add_stubdom_done; =20 if (libxl__domain_type(gc, domid) =3D=3D LIBXL_DOMAIN_TYPE_HVM) { - rc =3D xc_test_assign_device(ctx->xch, domid, pci_encode_bdf(pci)); + rc =3D xc_test_assign_device(ctx->xch, domid, + pci_encode_bdf(&pci->bdf)); if (rc) { LOGD(ERROR, domid, "PCI device %04x:%02x:%02x.%u %s?", @@ -1537,20 +1550,20 @@ void libxl__device_pci_add(libxl__egc *egc, uint32_= t domid, rc =3D libxl__device_pci_setdefault(gc, domid, pci, !starting); if (rc) goto out; =20 - if (pci->seize && !pciback_dev_is_assigned(gc, pci)) { - rc =3D libxl__device_pci_assignable_add(gc, pci, 1); + if (pci->seize && !pciback_dev_is_assigned(gc, &pci->bdf)) { + rc =3D libxl__pci_bdf_assignable_add(gc, &pci->bdf, 1); if ( rc ) goto out; } =20 - 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 =3D ERROR_FAIL; goto out; } =20 - rc =3D pci_info_xs_write(gc, pci, "domid", GCSPRINTF("%u", domid)); + rc =3D pci_info_xs_write(gc, &pci->bdf, "domid", GCSPRINTF("%u", domid= )); if (rc) goto out; =20 libxl__device_pci_reset(gc, pci->bdf.domain, pci->bdf.bus, pci->bdf.de= v, pci->bdf.func); @@ -1674,7 +1687,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 =3D rc; @@ -2114,7 +2127,8 @@ static void pci_remove_detached(libxl__egc *egc, } =20 if (!isstubdom) { - rc =3D xc_deassign_device(CTX->xch, domid, pci_encode_bdf(pci)); + rc =3D xc_deassign_device(CTX->xch, domid, + pci_encode_bdf(&pci->bdf)); if (rc < 0 && (prs->hvm || errno !=3D ENOSYS)) LOGED(ERROR, domainid, "xc_deassign_device failed"); } @@ -2243,7 +2257,7 @@ out: libxl__ev_time_deregister(gc, &prs->timeout); libxl__ev_time_deregister(gc, &prs->retry_timer); =20 - if (!rc) pci_info_xs_remove(gc, pci, "domid"); + if (!rc) pci_info_xs_remove(gc, &pci->bdf, "domid"); =20 libxl_device_pci_dispose(pci); aodev->rc =3D rc; --=20 2.20.1 From nobody Thu May 2 00:14:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1607457672; cv=none; d=zohomail.com; s=zohoarc; b=Be6599Y4cZ2qAAESO2WkoDYgDKqlJwQzHGhotxJ3My2phBkAQY0fYEuNuJmSvyUlkFcZuvQsd8SKe0wjvwofgFkOWMSYTPBYo+rTe1E+AsX8n574t2/149ZZmw4Bej4/FGqnTTjAKPkZ16OzSTM/054sPIEhQlLzcRAVdb8SLrQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607457672; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Ys3y67RaqaXIN5X7X+CEx/lpFH/KIEaBqkv7RhCev3w=; b=gnHP39BZe7GPjsqwGkm5XJNETgj0vyBtIZAj776xuXB6nyokH5hYl3EtK5V4dMRZsLBKuAvjL2ZITK4LUFdM2jgRschCURH6W4KQTigykDP7+hAi7d/9AMnAWzjn817ImtV2wSkABBP8wDBi6ekcmFcvyvYZuUKgeqrf6HrAIxw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1607457672808253.84682887852557; Tue, 8 Dec 2020 12:01:12 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.47766.84577 (Exim 4.92) (envelope-from ) id 1kmjAI-0004zB-Mr; Tue, 08 Dec 2020 20:00:50 +0000 Received: by outflank-mailman (output) from mailman id 47766.84577; Tue, 08 Dec 2020 20:00:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAI-0004yQ-3r; Tue, 08 Dec 2020 20:00:50 +0000 Received: by outflank-mailman (input) for mailman id 47766; Tue, 08 Dec 2020 20:00:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAD-0004pG-NT for xen-devel@lists.xenproject.org; Tue, 08 Dec 2020 20:00:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAC-00086M-TG; Tue, 08 Dec 2020 20:00:44 +0000 Received: from host86-183-162-145.range86-183.btcentralplus.com ([86.183.162.145] helo=desktop.home) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kmihQ-0001p0-OP; Tue, 08 Dec 2020 19:31:00 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=Ys3y67RaqaXIN5X7X+CEx/lpFH/KIEaBqkv7RhCev3w=; b=gjhvluOV6aC2KdnKGAZACFnyMU nyxcR2eTaiUWLCy9OTGdiB1TD6pksTH2nvHdnHbDczzMEku+k5HEmAbt4N0ZUwiyYKMsMu3hRz3+b FT4FgdnK6QVnIORwlRvTvWUQVEmaSya8jMrKJmIGvZYNXwq/rWXoHYPrlnETEFn1AyrA=; From: Paul Durrant To: xen-devel@lists.xenproject.org Cc: Paul Durrant , Ian Jackson , Wei Liu , Anthony PERARD Subject: [PATCH v6 22/25] libxl: introduce libxl_pci_bdf_assignable_add/remove/list/list_free(), ... Date: Tue, 8 Dec 2020 19:30:30 +0000 Message-Id: <20201208193033.11306-23-paul@xen.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201208193033.11306-1-paul@xen.org> References: <20201208193033.11306-1-paul@xen.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @xen.org) Content-Type: text/plain; charset="utf-8" From: Paul Durrant which support naming and use 'libxl_pci_bdf' rather than 'libxl_device_pci', as replacements for libxl_device_pci_assignable_add/remove/list/list_free(). libxl_pci_bdf_assignable_add() takes a 'name' parameter which is stored in xenstore and facilitates two addtional functions added by this patch: libxl_pci_bdf_assignable_name2bdf() and libxl_pci_bdf_assignable_bdf2name(). Currently there are no callers of these two functions. They will be added in a subsequent patch. libxl_device_pci_assignable_add/remove/list/list_free() are left in place for compatibility but are re-implemented in terms of the newly introduced functions. Signed-off-by: Paul Durrant Acked-by: Wei Liu --- Cc: Ian Jackson Cc: Wei Liu Cc: Anthony PERARD v6: - New in v6 (replacing remaining code from "libxl: modify libxl_device_pci_assignable_add/remove/list/list_free()...") --- tools/include/libxl.h | 36 ++++++-- tools/libs/light/libxl_pci.c | 166 ++++++++++++++++++++++++++++++----- 2 files changed, 171 insertions(+), 31 deletions(-) diff --git a/tools/include/libxl.h b/tools/include/libxl.h index 1fa4c5806df9..fda611f88960 100644 --- a/tools/include/libxl.h +++ b/tools/include/libxl.h @@ -469,6 +469,13 @@ */ #define LIBXL_HAVE_PCI_BDF 1 =20 +/* + * LIBXL_HAVE_PCI_ASSIGNABLE_BDF indicates that the + * libxl_pci_bdf_assignable_add/remove/list/list_free() functions all + * exist. + */ +#define LIBXL_HAVE_PCI_ASSIGNABLE_BDF 1 + /* * libxl ABI compatibility * @@ -2357,9 +2364,9 @@ int libxl_device_events_handler(libxl_ctx *ctx, LIBXL_EXTERNAL_CALLERS_ONLY; =20 /* - * Functions related to making devices assignable -- that is, bound to - * the pciback driver, ready to be given to a guest via - * libxl_pci_device_add. + * Functions related to making PCI devices with the specified BDF + * assignable -- that is, bound to the pciback driver, ready to be given to + * a guest via libxl_pci_device_add. * * - ..._add() will unbind the device from its current driver (if * already bound) and re-bind it to pciback; at that point it will be @@ -2371,16 +2378,31 @@ int libxl_device_events_handler(libxl_ctx *ctx, * rebind is non-zero, attempt to assign it back to the driver * from whence it came. * - * - ..._list() will return a list of the PCI devices available to be + * - ..._list() will return a list of the PCI BDFs available to be * assigned. * * add and remove are idempotent: if the device in question is already * 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 *p= ci, int rebind); -libxl_device_pci *libxl_device_pci_assignable_list(libxl_ctx *ctx, int *nu= m); +int libxl_pci_bdf_assignable_add(libxl_ctx *ctx, libxl_pci_bdf *pcibdf, + const char *name, int rebind); +int libxl_pci_bdf_assignable_remove(libxl_ctx *ctx, libxl_pci_bdf *pcibdf, + int rebind); +libxl_pci_bdf *libxl_pci_bdf_assignable_list(libxl_ctx *ctx, int *num); +void libxl_pci_bdf_assignable_list_free(libxl_pci_bdf *list, int num); +libxl_pci_bdf *libxl_pci_bdf_assignable_name2bdf(libxl_ctx *ctx, + const char *name); +char *libxl_pci_bdf_assignable_bdf2name(libxl_ctx *ctx, + libxl_pci_bdf *pcibdf); + +/* Compatibility functions - Use libxl_pci_bdf_assignable_* instead */ +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 *p= ci, + 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= ); =20 /* CPUID handling */ diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c index 448fe969514b..e11574e73f59 100644 --- a/tools/libs/light/libxl_pci.c +++ b/tools/libs/light/libxl_pci.c @@ -426,10 +426,10 @@ static void pci_info_xs_remove(libxl__gc *gc, libxl_p= ci_bdf *pcibdf, xs_rm(ctx->xsh, XBT_NULL, path); } =20 -libxl_device_pci *libxl_device_pci_assignable_list(libxl_ctx *ctx, int *nu= m) +libxl_pci_bdf *libxl_pci_bdf_assignable_list(libxl_ctx *ctx, int *num) { GC_INIT(ctx); - libxl_device_pci *pcis =3D NULL, *new; + libxl_pci_bdf *pcibdfs =3D NULL, *new; struct dirent *de; DIR *dir; =20 @@ -450,17 +450,17 @@ libxl_device_pci *libxl_device_pci_assignable_list(li= bxl_ctx *ctx, int *num) if (sscanf(de->d_name, PCI_BDF, &dom, &bus, &dev, &func) !=3D 4) continue; =20 - new =3D realloc(pcis, ((*num) + 1) * sizeof(*new)); + new =3D realloc(pcibdfs, ((*num) + 1) * sizeof(*new)); if (NULL =3D=3D new) continue; =20 - pcis =3D new; - new =3D pcis + *num; + pcibdfs =3D new; + new =3D pcibdfs + *num; =20 - libxl_device_pci_init(new); - pcibdf_struct_fill(&new->bdf, dom, bus, dev, func); + libxl_pci_bdf_init(new); + pcibdf_struct_fill(new, dom, bus, dev, func); =20 - if (pci_info_xs_read(gc, &new->bdf, "domid")) /* already assigned = */ + if (pci_info_xs_read(gc, new, "domid")) /* already assigned */ continue; =20 (*num)++; @@ -469,15 +469,15 @@ libxl_device_pci *libxl_device_pci_assignable_list(li= bxl_ctx *ctx, int *num) closedir(dir); out: GC_FREE; - return pcis; + return pcibdfs; } =20 -void libxl_device_pci_assignable_list_free(libxl_device_pci *list, int num) +void libxl_pci_bdf_assignable_list_free(libxl_pci_bdf *list, int num) { int i; =20 for (i =3D 0; i < num; i++) - libxl_device_pci_dispose(&list[i]); + libxl_pci_bdf_dispose(&list[i]); =20 free(list); } @@ -745,6 +745,7 @@ static int pciback_dev_unassign(libxl__gc *gc, libxl_pc= i_bdf *pcibdf) =20 static int libxl__pci_bdf_assignable_add(libxl__gc *gc, libxl_pci_bdf *pcibdf, + const char *name, int rebind) { libxl_ctx *ctx =3D libxl__gc_owner(gc); @@ -753,6 +754,23 @@ static int libxl__pci_bdf_assignable_add(libxl__gc *gc, int rc; struct stat st; =20 + /* Sanitise any name that was passed */ + if (name) { + unsigned int i, n =3D strlen(name); + + if (n > 64) { /* Reasonable upper bound on name length */ + LOG(ERROR, "Name too long"); + return ERROR_FAIL; + } + + for (i =3D 0; i < n; i++) { + if (!isgraph(name[i])) { + LOG(ERROR, "Names may only include printable characters"); + return ERROR_FAIL; + } + } + } + /* Local copy for convenience */ dom =3D pcibdf->domain; bus =3D pcibdf->bus; @@ -773,7 +791,7 @@ static int libxl__pci_bdf_assignable_add(libxl__gc *gc, } if ( rc ) { LOG(WARN, PCI_BDF" already assigned to pciback", dom, bus, dev, fu= nc); - goto quarantine; + goto name; } =20 /* Check to see if there's already a driver that we need to unbind fro= m */ @@ -804,7 +822,12 @@ static int libxl__pci_bdf_assignable_add(libxl__gc *gc, return ERROR_FAIL; } =20 -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 @@ -868,34 +891,87 @@ static int libxl__pci_bdf_assignable_remove(libxl__gc= *gc, } } =20 + pci_info_xs_remove(gc, pcibdf, "name"); + return 0; } =20 -int libxl_device_pci_assignable_add(libxl_ctx *ctx, libxl_device_pci *pci, - int rebind) +int libxl_pci_bdf_assignable_add(libxl_ctx *ctx, libxl_pci_bdf *pcibdf, + const char *name, int rebind) { GC_INIT(ctx); int rc; =20 - rc =3D libxl__pci_bdf_assignable_add(gc, &pci->bdf, rebind); + rc =3D libxl__pci_bdf_assignable_add(gc, pcibdf, name, rebind); =20 GC_FREE; return rc; } =20 =20 -int libxl_device_pci_assignable_remove(libxl_ctx *ctx, libxl_device_pci *p= ci, - int rebind) +int libxl_pci_bdf_assignable_remove(libxl_ctx *ctx, libxl_pci_bdf *pcibdf, + int rebind) { GC_INIT(ctx); int rc; =20 - rc =3D libxl__pci_bdf_assignable_remove(gc, &pci->bdf, rebind); + rc =3D libxl__pci_bdf_assignable_remove(gc, pcibdf, rebind); =20 GC_FREE; return rc; } =20 +libxl_pci_bdf *libxl_pci_bdf_assignable_name2bdf(libxl_ctx *ctx, + const char *name) +{ + GC_INIT(ctx); + char **bdfs; + libxl_pci_bdf *pcibdf =3D NULL; + unsigned int i, n; + + bdfs =3D libxl__xs_directory(gc, XBT_NULL, PCI_INFO_PATH, &n); + if (!n) + goto out; + + pcibdf =3D calloc(1, sizeof(*pcibdf)); + if (!pcibdf) + goto out; + + for (i =3D 0; i < n; i++) { + unsigned dom, bus, dev, func; + const char *tmp; + + if (sscanf(bdfs[i], PCI_BDF_XSPATH, &dom, &bus, &dev, &func) !=3D = 4) + continue; + + pcibdf_struct_fill(pcibdf, dom, bus, dev, func); + + tmp =3D pci_info_xs_read(gc, pcibdf, "name"); + if (tmp && !strcmp(tmp, name)) + goto out; + } + + free(pcibdf); + pcibdf =3D NULL; + +out: + GC_FREE; + return pcibdf; +} + +char *libxl_pci_bdf_assignable_bdf2name(libxl_ctx *ctx, + libxl_pci_bdf *pcibdf) +{ + GC_INIT(ctx); + char *name =3D NULL, *tmp =3D pci_info_xs_read(gc, pcibdf, "name"); + + if (tmp) + name =3D 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 pr= esent @@ -1490,17 +1566,17 @@ int libxl_device_pci_add(libxl_ctx *ctx, uint32_t d= omid, =20 static bool is_bdf_assignable(libxl_ctx *ctx, libxl_pci_bdf *pcibdf) { - libxl_device_pci *pcis; + libxl_pci_bdf *pcibdfs; int num, i; =20 - pcis =3D libxl_device_pci_assignable_list(ctx, &num); + pcibdfs =3D libxl_pci_bdf_assignable_list(ctx, &num); =20 for (i =3D 0; i < num; i++) { - if (COMPARE_BDF(pcibdf, &pcis[i].bdf)) + if (COMPARE_BDF(pcibdf, &pcibdfs[i])) break; } =20 - libxl_device_pci_assignable_list_free(pcis, num); + libxl_pci_bdf_assignable_list_free(pcibdfs, num); =20 return i < num; } @@ -1551,7 +1627,7 @@ void libxl__device_pci_add(libxl__egc *egc, uint32_t = domid, if (rc) goto out; =20 if (pci->seize && !pciback_dev_is_assigned(gc, &pci->bdf)) { - rc =3D libxl__pci_bdf_assignable_add(gc, &pci->bdf, 1); + rc =3D libxl__pci_bdf_assignable_add(gc, &pci->bdf, NULL, 1); if ( rc ) goto out; } @@ -2449,6 +2525,48 @@ DEFINE_DEVICE_TYPE_STRUCT(pci, PCI, pcidevs, .from_xenstore =3D libxl__device_pci_from_xs_be, ); =20 +int libxl_device_pci_assignable_add(libxl_ctx *ctx, libxl_device_pci *pci, + int rebind) +{ + return libxl_pci_bdf_assignable_add(ctx, &pci->bdf, NULL, rebind); +} + +int libxl_device_pci_assignable_remove(libxl_ctx *ctx, libxl_device_pci *p= ci, + int rebind) +{ + return libxl_pci_bdf_assignable_remove(ctx, &pci->bdf, rebind); +} + +libxl_device_pci *libxl_device_pci_assignable_list(libxl_ctx *ctx, + int *num) +{ + libxl_pci_bdf *pcibdfs =3D libxl_pci_bdf_assignable_list(ctx, num); + libxl_device_pci *pcis; + unsigned int i; + + if (!pcibdfs) + return NULL; + + pcis =3D calloc(*num, sizeof(*pcis)); + if (!pcis) { + libxl_pci_bdf_assignable_list_free(pcibdfs, *num); + return NULL; + } + + for (i =3D 0; i < *num; i++) { + libxl_device_pci_init(&pcis[i]); + libxl_pci_bdf_copy(ctx, &pcis[i].bdf, &pcibdfs[i]); + } + + libxl_pci_bdf_assignable_list_free(pcibdfs, *num); + return pcis; +} + +void libxl_device_pci_assignable_list_free(libxl_device_pci *list, int num) +{ + libxl_device_pci_list_free(list, num); +} + /* * Local variables: * mode: C --=20 2.20.1 From nobody Thu May 2 00:14:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1607457977; cv=none; d=zohomail.com; s=zohoarc; b=CTMUoERsk1NVFghHn7I8aKkLB/vQtpD+sMJikl6vqRDi7wIB4MIR+OIbHqPbqRaOy0e0U4YwlpZcA0jfpY2V9QZPWj+fqrNHHxL6iv/4XcCjbdlKG7dVHqVE/CfC42WPrz54UlxuRwb18cKmEJIfCUuGQrGUdkCg67f1iXun2Ao= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607457977; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+f7YY+lF0YoyI1swofoqUpjdUy+mpVesNl7dk7J2kFI=; b=BIU5GhnZ8NFZQp86mB0FxV98fQKHN4T4dlNQIusOU3AG99Nfa0JXeK/eAcXL11cFZvOVKOzzd14Dq7J+RzCX7xf4wLLG35Z4ASg5WftK2LwqCd4FvN/BRQ2oPZBjTjADasZlj189e+OJ1ePg1wRHqj8zjsedcmUnr8Xhgw6osxU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTP id 1607457977421184.81988720005097; Tue, 8 Dec 2020 12:06:17 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.47761.84540 (Exim 4.92) (envelope-from ) id 1kmjAG-0004su-Op; Tue, 08 Dec 2020 20:00:48 +0000 Received: by outflank-mailman (output) from mailman id 47761.84540; Tue, 08 Dec 2020 20:00:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAG-0004s6-Bb; Tue, 08 Dec 2020 20:00:48 +0000 Received: by outflank-mailman (input) for mailman id 47761; Tue, 08 Dec 2020 20:00:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAD-0004oo-Il for xen-devel@lists.xenproject.org; Tue, 08 Dec 2020 20:00:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAC-00086C-Gp; Tue, 08 Dec 2020 20:00:44 +0000 Received: from host86-183-162-145.range86-183.btcentralplus.com ([86.183.162.145] helo=desktop.home) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kmihR-0001p0-LB; Tue, 08 Dec 2020 19:31:01 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=+f7YY+lF0YoyI1swofoqUpjdUy+mpVesNl7dk7J2kFI=; b=rr04WefTtRhowSm90K+hZUAZQu 2w9CfjUdYuOPRetPipUjVXc+yzmn5NctlWwxICoNQZ8F7v8gb83hPvR76PeMlgL4GVzwAVCHrWAem r/yYGqdgmzbEHIRWSuhTFO/3bm70s1QC6hSdUITLTr33oA+Mgmz9O+f7SSjDE9O31uuA=; From: Paul Durrant To: xen-devel@lists.xenproject.org Cc: Paul Durrant , Ian Jackson , Wei Liu , Anthony PERARD Subject: [PATCH v6 23/25] xl: support naming of assignable devices Date: Tue, 8 Dec 2020 19:30:31 +0000 Message-Id: <20201208193033.11306-24-paul@xen.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201208193033.11306-1-paul@xen.org> References: <20201208193033.11306-1-paul@xen.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @xen.org) Content-Type: text/plain; charset="utf-8" From: Paul Durrant This patch converts libxl to use libxl_pci_bdf_assignable_add/remove/list/ list_free() rather than libxl_device_pci_assignable_add/remove/list/ list_free(), which then allows naming of assignable devices to be supported. With this patch applied 'xl pci-assignable-add' will take an optional '--na= me' parameter, 'xl pci-assignable-remove' can be passed either a BDF or a name = and 'xl pci-assignable-list' will take a optional '--show-names' flag which determines whether names are displayed in its output. Signed-off-by: Paul Durrant Acked-by: Wei Liu --- Cc: Ian Jackson Cc: Wei Liu Cc: Anthony PERARD v6: - New in v6 (split out from "xl / libxl: support naming of assignable devices") --- tools/xl/xl_cmdtable.c | 12 +++-- tools/xl/xl_pci.c | 100 +++++++++++++++++++++++++++-------------- 2 files changed, 74 insertions(+), 38 deletions(-) diff --git a/tools/xl/xl_cmdtable.c b/tools/xl/xl_cmdtable.c index 30e17a2848cd..bd8af12ff36e 100644 --- a/tools/xl/xl_cmdtable.c +++ b/tools/xl/xl_cmdtable.c @@ -105,21 +105,25 @@ struct cmd_spec cmd_table[] =3D { { "pci-assignable-add", &main_pciassignable_add, 0, 1, "Make a device assignable for pci-passthru", - "", + "[options] ", + "-n NAME, --name=3DNAME 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] ", + "[options] |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 9c24496cb2dd..eb29b4e08d8b 100644 --- a/tools/xl/xl_pci.c +++ b/tools/xl/xl_pci.c @@ -152,55 +152,68 @@ int main_pciattach(int argc, char **argv) return EXIT_SUCCESS; } =20 -static void pciassignable_list(void) +static void pciassignable_list(bool show_names) { - libxl_device_pci *pcis; + libxl_pci_bdf *pcibdfs; int num, i; =20 - pcis =3D libxl_device_pci_assignable_list(ctx, &num); + pcibdfs =3D libxl_pci_bdf_assignable_list(ctx, &num); =20 - if ( pcis =3D=3D NULL ) + if ( pcibdfs =3D=3D NULL ) return; for (i =3D 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); + libxl_pci_bdf *pcibdf =3D &pcibdfs[i]; + char *name =3D show_names ? + libxl_pci_bdf_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(pcis, num); + libxl_pci_bdf_assignable_list_free(pcibdfs, num); } =20 int main_pciassignable_list(int argc, char **argv) { int opt; - - SWITCH_FOREACH_OPT(opt, "", NULL, "pci-assignable-list", 0) { - /* No options */ + static struct option opts[] =3D { + {"show-names", 0, 0, 'n'}, + COMMON_LONG_OPTS + }; + bool show_names =3D false; + + SWITCH_FOREACH_OPT(opt, "n", opts, "pci-assignable-list", 0) { + case 'n': + show_names =3D true; + break; } =20 - pciassignable_list(); + pciassignable_list(show_names); return 0; } =20 -static int pciassignable_add(const char *bdf, int rebind) +static int pciassignable_add(const char *bdf, const char *name, int rebind) { - libxl_device_pci pci; + libxl_pci_bdf pcibdf; XLU_Config *config; int r =3D 0; =20 - libxl_device_pci_init(&pci); + libxl_pci_bdf_init(&pcibdf); =20 config =3D xlu_cfg_init(stderr, "command line"); if (!config) { perror("xlu_cfg_init"); exit(-1); } =20 - 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); } =20 - if (libxl_device_pci_assignable_add(ctx, &pci, rebind)) + if (libxl_pci_bdf_assignable_add(ctx, &pcibdf, name, rebind)) r =3D 1; =20 - libxl_device_pci_dispose(&pci); + libxl_pci_bdf_dispose(&pcibdf); xlu_cfg_destroy(config); =20 return r; @@ -210,39 +223,58 @@ int main_pciassignable_add(int argc, char **argv) { int opt; const char *bdf =3D NULL; - - SWITCH_FOREACH_OPT(opt, "", NULL, "pci-assignable-add", 1) { - /* No options */ + static struct option opts[] =3D { + {"name", 1, 0, 'n'}, + COMMON_LONG_OPTS + }; + const char *name =3D NULL; + + SWITCH_FOREACH_OPT(opt, "n:", opts, "pci-assignable-add", 0) { + case 'n': + name =3D optarg; + break; } =20 bdf =3D argv[optind]; =20 - if (pciassignable_add(bdf, 1)) + if (pciassignable_add(bdf, name, 1)) return EXIT_FAILURE; =20 return EXIT_SUCCESS; } =20 -static int pciassignable_remove(const char *bdf, int rebind) +static int pciassignable_remove(const char *ident, int rebind) { - libxl_device_pci pci; + libxl_pci_bdf *pcibdf; XLU_Config *config; int r =3D 0; =20 - libxl_device_pci_init(&pci); - config =3D xlu_cfg_init(stderr, "command line"); if (!config) { perror("xlu_cfg_init"); exit(-1); } =20 - if (xlu_pci_parse_bdf(config, &pci.bdf, bdf)) { - fprintf(stderr, "pci-assignable-remove: malformed BDF \"%s\"\n", b= df); - exit(2); + pcibdf =3D libxl_pci_bdf_assignable_name2bdf(ctx, ident); + if (!pcibdf) { + pcibdf =3D 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); + } } =20 - if (libxl_device_pci_assignable_remove(ctx, &pci, rebind)) + if (libxl_pci_bdf_assignable_remove(ctx, pcibdf, rebind)) r =3D 1; =20 - libxl_device_pci_dispose(&pci); + libxl_pci_bdf_dispose(pcibdf); + free(pcibdf); xlu_cfg_destroy(config); =20 return r; @@ -251,7 +283,7 @@ static int pciassignable_remove(const char *bdf, int re= bind) int main_pciassignable_remove(int argc, char **argv) { int opt; - const char *bdf =3D NULL; + const char *ident =3D NULL; int rebind =3D 0; =20 SWITCH_FOREACH_OPT(opt, "r", NULL, "pci-assignable-remove", 1) { @@ -260,9 +292,9 @@ int main_pciassignable_remove(int argc, char **argv) break; } =20 - bdf =3D argv[optind]; + ident =3D argv[optind]; =20 - if (pciassignable_remove(bdf, rebind)) + if (pciassignable_remove(ident, rebind)) return EXIT_FAILURE; =20 return EXIT_SUCCESS; --=20 2.20.1 From nobody Thu May 2 00:14:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1607457670; cv=none; d=zohomail.com; s=zohoarc; b=jfv9WCqrT+MHlt2v68wVZUoQuiilgpnY+fZMgV1N9B4qT/hPSWmkEVNBgzuuvIVpJecBoARxyiSicB4asv6fyBlJACITR0rt2wz7TGHrnaXHVgrp+6N8Kaxzdno1TKghrH16arG2IusSzQGFICT3j168jUFXaSHiEzRNEit0cPY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607457670; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0oRd0qn55VhmZOaU+m4KZB043Eh08xShf8/CczC16Yk=; b=iBk+EzdwF66hSHsfoEAd4G+Mbxc3G7gbGNSTmgp9Tetmr+n14mkcE9+nit78EmIIoybSQ0Zczj0iLeG0Ag+fhmgwuXDrKb1MXdAEF8eCl83+K3VlRrfs9c6KIb1t58KL0dPs8idfph0v8aSF3eA74PvslKclv0fMsF1qWtcdKI0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 16074576699531006.8313596372409; Tue, 8 Dec 2020 12:01:09 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.47762.84523 (Exim 4.92) (envelope-from ) id 1kmjAF-0004r6-Rh; Tue, 08 Dec 2020 20:00:47 +0000 Received: by outflank-mailman (output) from mailman id 47762.84523; Tue, 08 Dec 2020 20:00:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAF-0004qz-Ng; Tue, 08 Dec 2020 20:00:47 +0000 Received: by outflank-mailman (input) for mailman id 47762; Tue, 08 Dec 2020 20:00:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAD-0004op-Ik for xen-devel@lists.xenproject.org; Tue, 08 Dec 2020 20:00:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAC-00086O-V8; Tue, 08 Dec 2020 20:00:44 +0000 Received: from host86-183-162-145.range86-183.btcentralplus.com ([86.183.162.145] helo=desktop.home) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kmihS-0001p0-El; Tue, 08 Dec 2020 19:31:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=0oRd0qn55VhmZOaU+m4KZB043Eh08xShf8/CczC16Yk=; b=CTRnNxB9yMYOWioY0XVnNe+VCd Oe4BOCUxWqx/i8gR9S/ml9csKS2QhM8L5PpBSKvn1iSgq8tP2f2s1S3+e8IcMqD1R2ngy+jr2NVqF FyAvVfpxKc7a9y712PXdJZcEQGzEHH1ktQt/VUTPTOZ2QWSSo04iZbmdOZUYC5SYa9oI=; From: Paul Durrant To: xen-devel@lists.xenproject.org Cc: Paul Durrant , Wei Liu , Ian Jackson Subject: [PATCH v6 24/25] docs/man: modify xl-pci-configuration(5) to add 'name' field to PCI_SPEC_STRING Date: Tue, 8 Dec 2020 19:30:32 +0000 Message-Id: <20201208193033.11306-25-paul@xen.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201208193033.11306-1-paul@xen.org> References: <20201208193033.11306-1-paul@xen.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @xen.org) Content-Type: text/plain; charset="utf-8" From: Paul Durrant 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 assigna= ble (or assigned) devices. Signed-off-by: Paul Durrant Acked-by: Wei Liu --- Cc: Ian Jackson --- 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-configur= ation.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 val= ue (whether positionally or explicitly). =20 B: In context of B (see L), parameters other t= han -B will be ignored. +B or B will be ignored. =20 =3Dhead1 Positional Parameters =20 @@ -70,7 +70,11 @@ B<*> to indicate all functions of a multi-function devic= e. =20 =3Ditem Default Value =20 -None. This parameter is mandatory as it identifies the device. +None. This parameter is mandatory in its positional form. As a non-positio= nal +parameter it is also mandatory unless a B parameter is present, in +which case B must not be present since the B will be used to fi= nd +the B in the list of assignable devices. See L for more inform= ation +on naming assignable devices. =20 =3Dback =20 @@ -194,4 +198,21 @@ B: This overrides the global B option. =20 =3Dback =20 +=3Ditem B=3DI + +=3Dover 4 + +=3Ditem Description + +This is the name given when the B was made assignable. See L f= or +more information on naming assignable devices. + +=3Ditem Default Value + +None. This parameter must not be present if a B parameter is present. +If a B parameter is not present then B is mandatory as it is +required to look up the B in the list of assignable devices. + +=3Dback + =3Dback --=20 2.20.1 From nobody Thu May 2 00:14:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1607457671; cv=none; d=zohomail.com; s=zohoarc; b=Iq5mApH2DhUTWg8fmjmqIPiXmabmfaGOPLGsBdiTEzA2wI4RmZKJ4JmJswRObtdfIp2/VuzH0OEb1CQS26GEQ1n70guDIbUzrczaeeuH9D5DBs95ZFRXBnFwNLHJWP9ZqMiGMM3MDfLZUE6o7JDGrkUfld5Owv6ri11pJ/yepSg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607457671; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=oIgRO1UliD0pqS423IkrFQbxvGE4mpUSzQoY5cMSB2U=; b=UBB4CbSKRgtGBIUyCGjf6vnmnsbeOVIEFD68l/oISgaUX2HIO4cgG3GE82kICM5Q+f6A6+Ptxs0W7T6GvIc6evXxIF3qOoCdy/MkJsCDEnHwLDkLNUuqgImwoAqOfuIAOBW+buEwEeX0J5Z70jpCEYZH2h1QJ5LGy59khDoYYfM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1607457671541509.6588264119649; Tue, 8 Dec 2020 12:01:11 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.47769.84610 (Exim 4.92) (envelope-from ) id 1kmjAL-00056q-Af; Tue, 08 Dec 2020 20:00:53 +0000 Received: by outflank-mailman (output) from mailman id 47769.84610; Tue, 08 Dec 2020 20:00:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAK-00055J-IK; Tue, 08 Dec 2020 20:00:52 +0000 Received: by outflank-mailman (input) for mailman id 47769; Tue, 08 Dec 2020 20:00:46 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAE-0004pX-00 for xen-devel@lists.xenproject.org; Tue, 08 Dec 2020 20:00:46 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kmjAD-00086w-E8; Tue, 08 Dec 2020 20:00:45 +0000 Received: from host86-183-162-145.range86-183.btcentralplus.com ([86.183.162.145] helo=desktop.home) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kmihT-0001p0-Bg; Tue, 08 Dec 2020 19:31:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=oIgRO1UliD0pqS423IkrFQbxvGE4mpUSzQoY5cMSB2U=; b=Y/Zi/AcMSIem7j9OgSSum2zfRA 8FYyNk7eHSnHs6cu13ELU96e+uBAMiaq4CJcvouCAA/RPEpOTpi2UH7Abbog0HVO2aCEx580INw6Z mLSpdApGuzDVFwX0h6w6WJzi44i5OXAexf82ZCd4j6jCSiGr0rMtWEIp7HJf9Qm0up3M=; From: Paul Durrant To: xen-devel@lists.xenproject.org Cc: Paul Durrant , Wei Liu , Ian Jackson , Anthony PERARD Subject: [PATCH v6 25/25] libxl / libxlu: support 'xl pci-attach/detach' by name Date: Tue, 8 Dec 2020 19:30:33 +0000 Message-Id: <20201208193033.11306-26-paul@xen.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201208193033.11306-1-paul@xen.org> References: <20201208193033.11306-1-paul@xen.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @xen.org) Content-Type: text/plain; charset="utf-8" From: Paul Durrant 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 Acked-by: Wei Liu --- Cc: Ian Jackson Cc: Anthony PERARD v6: - Re-base - Slight modification to the patch name - Kept Wei's A-b since modifications are small --- 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 fda611f88960..90a7aa9b731a 100644 --- a/tools/include/libxl.h +++ b/tools/include/libxl.h @@ -476,6 +476,12 @@ */ #define LIBXL_HAVE_PCI_ASSIGNABLE_BDF 1 =20 +/* + * 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 e11574e73f59..5d83db2a5981 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 *g= c, 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.bu= s, pci->bdf.dev, pci->bdf.func)); flexarray_append(back, GCSPRINTF("dev-%d", num)); @@ -284,6 +288,7 @@ retry_transaction: =20 retry_transaction2: t =3D 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)); @@ -322,6 +327,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 =3D GCSPRINTF("%s/name-%d", be_path, j); + tmp =3D 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 =3D=3D EAGAIN) @@ -1610,6 +1621,23 @@ void libxl__device_pci_add(libxl__egc *egc, uint32_t= domid, pas->starting =3D starting; pas->callback =3D device_pci_add_stubdom_done; =20 + if (pci->name) { + libxl_pci_bdf *pcibdf =3D + libxl_pci_bdf_assignable_name2bdf(CTX, pci->name); + + if (!pcibdf) { + rc =3D 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) =3D=3D LIBXL_DOMAIN_TYPE_HVM) { rc =3D xc_test_assign_device(ctx->xch, domid, pci_encode_bdf(&pci->bdf)); @@ -1758,11 +1786,19 @@ static void device_pci_add_done(libxl__egc *egc, libxl_device_pci *pci =3D &pas->pci; =20 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.fun= c, + rc); + } pci_info_xs_remove(gc, &pci->bdf, "domid"); } libxl_device_pci_dispose(pci); @@ -2279,6 +2315,23 @@ static void libxl__device_pci_remove_common(libxl__e= gc *egc, libxl__ev_time_init(&prs->timeout); libxl__ev_time_init(&prs->retry_timer); =20 + if (pci->name) { + libxl_pci_bdf *pcibdf =3D + libxl_pci_bdf_assignable_name2bdf(CTX, pci->name); + + if (!pcibdf) { + rc =3D 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 =3D pci->vdevfn & ~7U; =20 if ( pci->vfunc_mask =3D=3D LIBXL_PCI_FUNC_ALL ) { @@ -2413,6 +2466,10 @@ static int libxl__device_pci_from_xs_be(libxl__gc *g= c, } while ((p =3D strtok_r(NULL, ",=3D", &saveptr)) !=3D NULL); } =20 + s =3D libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/name-%d", be_path, nr= )); + if (s) + pci->name =3D strdup(s); + return 0; } =20 diff --git a/tools/libs/light/libxl_types.idl b/tools/libs/light/libxl_type= s.idl index 21a2cf5c1c9b..32cc99beff6d 100644 --- a/tools/libs/light/libxl_types.idl +++ b/tools/libs/light/libxl_types.idl @@ -779,6 +779,7 @@ libxl_pci_bdf =3D Struct("pci_bdf", [ =20 libxl_device_pci =3D 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_de= vice_pci *pcidev, { const char *ptr =3D str; bool bdf_present =3D false; + bool name_present =3D false; int ret; =20 /* Attempt to parse 'bdf' as positional parameter */ @@ -193,6 +194,10 @@ int xlu_pci_parse_spec_string(XLU_Config *cfg, libxl_d= evice_pci *pcidev, pcidev->power_mgmt =3D atoi(val); } else if (!strcmp(key, "rdm_policy")) { ret =3D parse_rdm_policy(cfg, &pcidev->rdm_policy, val); + } else if (!strcmp(key, "name")) { + name_present =3D true; + pcidev->name =3D strdup(val); + if (!pcidev->name) ret =3D ERROR_NOMEM; } else { XLU__PCI_ERR(cfg, "Unknown PCI_SPEC_STRING option: %s", key); ret =3D ERROR_INVAL; @@ -205,7 +210,7 @@ int xlu_pci_parse_spec_string(XLU_Config *cfg, libxl_de= vice_pci *pcidev, return ret; } =20 - if (!bdf_present) + if (!(bdf_present ^ name_present)) return ERROR_INVAL; =20 return 0; --=20 2.20.1