From: Paul Durrant <paul@xen.org>
To: xen-devel@lists.xenproject.org
Cc: Paul Durrant <pdurrant@amazon.com>,
Ian Jackson <iwj@xenproject.org>, Wei Liu <wl@xen.org>
Subject: [PATCH 08/25] libxl: generalise 'driver_path' xenstore access functions in libxl_pci.c
Date: Fri, 23 Oct 2020 16:22:57 +0000 [thread overview]
Message-ID: <20201023162314.2235-9-paul@xen.org> (raw)
In-Reply-To: <20201023162314.2235-1-paul@xen.org>
From: Paul Durrant <pdurrant@amazon.com>
For the purposes of re-binding a device to its previous driver
libxl__device_pci_assignable_add() writes the driver path into xenstore.
This path is then read back in libxl__device_pci_assignable_remove().
The functions that support this writing to and reading from xenstore are
currently dedicated for this purpose and hence the node name 'driver_path'
is hard-coded. This patch generalizes these utility functions and passes
'driver_path' as an argument. Subsequent patches will invoke them to
access other nodes.
NOTE: Because functions will have a broader use (other than storing a
driver path in lieu of pciback) the base xenstore path is also
changed from '/libxl/pciback' to '/libxl/pci'.
Signed-off-by: Paul Durrant <pdurrant@amazon.com>
---
Cc: Ian Jackson <iwj@xenproject.org>
Cc: Wei Liu <wl@xen.org>
---
tools/libs/light/libxl_pci.c | 66 +++++++++++++++++++++-----------------------
1 file changed, 32 insertions(+), 34 deletions(-)
diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c
index b8d8cc6a69..f74203100d 100644
--- a/tools/libs/light/libxl_pci.c
+++ b/tools/libs/light/libxl_pci.c
@@ -718,48 +718,46 @@ static int pciback_dev_unassign(libxl__gc *gc, libxl_device_pci *pci)
return 0;
}
-#define PCIBACK_INFO_PATH "/libxl/pciback"
+#define PCI_INFO_PATH "/libxl/pci"
-static void pci_assignable_driver_path_write(libxl__gc *gc,
- libxl_device_pci *pci,
- char *driver_path)
+static char *pci_info_xs_path(libxl__gc *gc, libxl_device_pci *pci,
+ const char *node)
{
- char *path;
+ return node ?
+ GCSPRINTF(PCI_INFO_PATH"/"PCI_BDF_XSPATH"/%s",
+ pci->domain, pci->bus, pci->dev, pci->func,
+ node) :
+ GCSPRINTF(PCI_INFO_PATH"/"PCI_BDF_XSPATH,
+ pci->domain, pci->bus, pci->dev, pci->func);
+}
+
+
+static void pci_info_xs_write(libxl__gc *gc, libxl_device_pci *pci,
+ const char *node, const char *val)
+{
+ char *path = pci_info_xs_path(gc, pci, node);
- path = GCSPRINTF(PCIBACK_INFO_PATH"/"PCI_BDF_XSPATH"/driver_path",
- pci->domain,
- pci->bus,
- pci->dev,
- pci->func);
- if ( libxl__xs_printf(gc, XBT_NULL, path, "%s", driver_path) < 0 ) {
- LOGE(WARN, "Write of %s to node %s failed.", driver_path, path);
+ if ( libxl__xs_printf(gc, XBT_NULL, path, "%s", val) < 0 ) {
+ LOGE(WARN, "Write of %s to node %s failed.", val, path);
}
}
-static char * pci_assignable_driver_path_read(libxl__gc *gc,
- libxl_device_pci *pci)
+static char *pci_info_xs_read(libxl__gc *gc, libxl_device_pci *pci,
+ const char *node)
{
- return libxl__xs_read(gc, XBT_NULL,
- GCSPRINTF(
- PCIBACK_INFO_PATH "/" PCI_BDF_XSPATH "/driver_path",
- pci->domain,
- pci->bus,
- pci->dev,
- pci->func));
+ char *path = pci_info_xs_path(gc, pci, node);
+
+ return libxl__xs_read(gc, XBT_NULL, path);
}
-static void pci_assignable_driver_path_remove(libxl__gc *gc,
- libxl_device_pci *pci)
+static void pci_info_xs_remove(libxl__gc *gc, libxl_device_pci *pci,
+ const char *node)
{
+ char *path = pci_info_xs_path(gc, pci, node);
libxl_ctx *ctx = libxl__gc_owner(gc);
/* Remove the xenstore entry */
- xs_rm(ctx->xsh, XBT_NULL,
- GCSPRINTF(PCIBACK_INFO_PATH "/" PCI_BDF_XSPATH,
- pci->domain,
- pci->bus,
- pci->dev,
- pci->func) );
+ xs_rm(ctx->xsh, XBT_NULL, path);
}
static int libxl__device_pci_assignable_add(libxl__gc *gc,
@@ -805,9 +803,9 @@ static int libxl__device_pci_assignable_add(libxl__gc *gc,
/* Store driver_path for rebinding to dom0 */
if ( rebind ) {
if ( driver_path ) {
- pci_assignable_driver_path_write(gc, pci, driver_path);
+ pci_info_xs_write(gc, pci, "driver_path", driver_path);
} else if ( (driver_path =
- pci_assignable_driver_path_read(gc, pci)) != NULL ) {
+ pci_info_xs_read(gc, pci, "driver_path")) != NULL ) {
LOG(INFO, PCI_BDF" not bound to a driver, will be rebound to %s",
dom, bus, dev, func, driver_path);
} else {
@@ -815,7 +813,7 @@ static int libxl__device_pci_assignable_add(libxl__gc *gc,
dom, bus, dev, func);
}
} else {
- pci_assignable_driver_path_remove(gc, pci);
+ pci_info_xs_remove(gc, pci, "driver_path");
}
if ( pciback_dev_assign(gc, pci) ) {
@@ -865,7 +863,7 @@ static int libxl__device_pci_assignable_remove(libxl__gc *gc,
}
/* Rebind if necessary */
- driver_path = pci_assignable_driver_path_read(gc, pci);
+ driver_path = pci_info_xs_read(gc, pci, "driver_path");
if ( driver_path ) {
if ( rebind ) {
@@ -878,7 +876,7 @@ static int libxl__device_pci_assignable_remove(libxl__gc *gc,
return -1;
}
- pci_assignable_driver_path_remove(gc, pci);
+ pci_info_xs_remove(gc, pci, "driver_path");
}
} else {
if ( rebind ) {
--
2.11.0
next prev parent reply other threads:[~2020-10-23 16:23 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-23 16:22 [PATCH 00/25] xl / libxl: named PCI pass-through devices Paul Durrant
2020-10-23 16:22 ` [PATCH 01/25] xl / libxl: s/pcidev/pci and remove DEFINE_DEVICE_TYPE_STRUCT_X Paul Durrant
2020-10-23 16:22 ` [PATCH 02/25] libxl: use LIBXL_DEFINE_DEVICE_LIST for pci devices Paul Durrant
2020-10-23 16:22 ` [PATCH 03/25] libxl: use LIBXL_DEFINE_DEVICE_LIST for nic devices Paul Durrant
2020-10-23 16:22 ` [PATCH 04/25] libxl: s/domainid/domid/g in libxl_pci.c Paul Durrant
2020-10-23 16:22 ` [PATCH 05/25] libxl: s/detatched/detached " Paul Durrant
2020-10-23 16:22 ` [PATCH 06/25] libxl: remove extraneous arguments to do_pci_remove() " Paul Durrant
2020-10-23 16:22 ` [PATCH 07/25] libxl: stop using aodev->device_config in libxl__device_pci_add() Paul Durrant
2020-10-23 16:22 ` Paul Durrant [this message]
2020-10-23 16:22 ` [PATCH 09/25] libxl: remove unnecessary check from libxl__device_pci_add() Paul Durrant
2020-10-23 16:22 ` [PATCH 10/25] libxl: remove get_all_assigned_devices() from libxl_pci.c Paul Durrant
2020-10-23 16:23 ` [PATCH 11/25] libxl: make sure callers of libxl_device_pci_list() free the list after use Paul Durrant
2020-10-23 16:23 ` [PATCH 12/25] libxl: add libxl_device_pci_assignable_list_free() Paul Durrant
2020-10-23 16:23 ` [PATCH 13/25] libxl: use COMPARE_PCI() macro is_pci_in_array() Paul Durrant
2020-10-23 16:23 ` [PATCH 14/25] libxl: add/recover 'rdm_policy' to/from PCI backend in xenstore Paul Durrant
2020-10-23 16:23 ` [PATCH 15/25] libxl: Make sure devices added by pci-attach are reflected in the config Paul Durrant
2020-10-23 16:23 ` [PATCH 16/25] docs/man: extract documentation of PCI_SPEC_STRING from the xl.cfg manpage Paul Durrant
2020-10-23 16:23 ` [PATCH 17/25] docs/man: improve documentation of PCI_SPEC_STRING Paul Durrant
2020-10-23 16:23 ` [PATCH 18/25] docs/man: fix xl(1) documentation for 'pci' operations Paul Durrant
2020-10-23 16:23 ` [PATCH 19/25] libxl: introduce 'libxl_pci_bdf' in the idl Paul Durrant
2020-10-23 16:23 ` [PATCH 20/25] libxlu: introduce xlu_pci_parse_spec_string() Paul Durrant
2020-10-23 16:23 ` [PATCH 21/25] libxl: modify libxl_device_pci_assignable_add/remove/list/list_free() Paul Durrant
2020-10-23 16:23 ` [PATCH 22/25] docs/man: modify xl(1) in preparation for naming of assignable devices Paul Durrant
2020-10-23 16:23 ` [PATCH 23/25] xl / libxl: support " Paul Durrant
2020-10-23 16:23 ` [PATCH 24/25] docs/man: modify xl-pci-configuration(5) to add 'name' field to PCI_SPEC_STRING Paul Durrant
2020-10-23 16:23 ` [PATCH 25/25] xl / libxl: support 'xl pci-attach/detach' by name Paul Durrant
2020-10-26 9:10 ` [PATCH 00/25] xl / libxl: named PCI pass-through devices Christian Lindig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201023162314.2235-9-paul@xen.org \
--to=paul@xen.org \
--cc=iwj@xenproject.org \
--cc=pdurrant@amazon.com \
--cc=wl@xen.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.