|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [RFC PATCH v3 08/10] tools/libs/light: pcid: implement reset_device command
From: Dmytro Semenets <dmytro_semenets@xxxxxxxx>
Signed-off-by: Dmytro Semenets <dmytro_semenets@xxxxxxxx>
---
tools/include/pcid.h | 15 ++++++++
tools/libs/light/libxl_pci.c | 52 +++++++++++----------------
tools/libs/light/libxl_pcid.c | 66 +++++++++++++++++++++++++++++++++++
3 files changed, 102 insertions(+), 31 deletions(-)
diff --git a/tools/include/pcid.h b/tools/include/pcid.h
index 983e067dfc..63ac0bcac9 100644
--- a/tools/include/pcid.h
+++ b/tools/include/pcid.h
@@ -155,6 +155,21 @@
#define PCID_CMD_IS_ASSIGNED "is_device_assigned"
#define PCID_MSG_FIELD_RESULT "result"
+/*
+
*******************************************************************************
+ * Reset PCI device
+ *
+ * This command resets PCI device
+ *
+ * Request (see other mandatory fields above):
+ * - "cmd" field of the request must be set to "reset_device".
+ * - "sbdf" SBDF of the device in format defined by PCID_SBDF_FMT.
+ *
+ * Response (see other mandatory fields above):
+ * - "resp" field of the response must be set to "reset_device".
+ */
+#define PCID_CMD_RESET_DEVICE "reset_device"
+
int libxl_pcid_process(libxl_ctx *ctx);
#endif /* PCID_H */
diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c
index d68cb1986f..e9f0bad442 100644
--- a/tools/libs/light/libxl_pci.c
+++ b/tools/libs/light/libxl_pci.c
@@ -89,6 +89,8 @@ static int pci_handle_response(libxl__gc *gc,
else if (strcmp(command_name, PCID_CMD_IS_ASSIGNED) == 0)
*result = (libxl__json_object
*)libxl__json_map_get(PCID_MSG_FIELD_RESULT,
response, JSON_BOOL);
+ else if (strcmp(command_name, PCID_CMD_RESET_DEVICE) == 0)
+ *result = libxl__json_object_alloc(gc, JSON_NULL);
return ret;
}
@@ -1518,38 +1520,26 @@ out:
static int libxl__device_pci_reset(libxl__gc *gc, unsigned int domain,
unsigned int bus,
unsigned int dev, unsigned int func)
{
- char *reset;
- int fd, rc;
-
- reset = GCSPRINTF("%s/do_flr", SYSFS_PCIBACK_DRIVER);
- fd = open(reset, O_WRONLY);
- if (fd >= 0) {
- char *buf = GCSPRINTF(PCI_BDF, domain, bus, dev, func);
- rc = write(fd, buf, strlen(buf));
- if (rc < 0)
- LOGD(ERROR, domain, "write to %s returned %d", reset, rc);
- close(fd);
- return rc < 0 ? rc : 0;
- }
- if (errno != ENOENT)
- LOGED(ERROR, domain, "Failed to access pciback path %s", reset);
- reset = GCSPRINTF("%s/"PCI_BDF"/reset", SYSFS_PCI_DEV, domain, bus, dev,
func);
- fd = open(reset, O_WRONLY);
- if (fd >= 0) {
- rc = write(fd, "1", 1);
- if (rc < 0)
- LOGED(ERROR, domain, "write to %s returned %d", reset, rc);
- close(fd);
- return rc < 0 ? rc : 0;
- }
- if (errno == ENOENT) {
- LOGD(ERROR, domain,
- "The kernel doesn't support reset from sysfs for PCI device
"PCI_BDF,
- domain, bus, dev, func);
- } else {
- LOGED(ERROR, domain, "Failed to access reset path %s", reset);
+ struct vchan_info *vchan;
+ int rc = 0;
+ libxl__json_object *args, *result;
+
+ vchan = pci_vchan_get_client(gc);
+ if (!vchan) {
+ rc = ERROR_NOT_READY;
+ goto out;
}
- return -1;
+ args = libxl__vchan_start_args(gc);
+
+ libxl__vchan_arg_add_string(gc, args, PCID_MSG_FIELD_SBDF,
+ GCSPRINTF(PCID_SBDF_FMT, domain, bus, dev, func));
+ result = vchan_send_command(gc, vchan, PCID_CMD_RESET_DEVICE, args);
+ if (!result)
+ rc = ERROR_FAIL;
+ pci_vchan_free(gc, vchan);
+
+ out:
+ return rc;
}
int libxl__device_pci_setdefault(libxl__gc *gc, uint32_t domid,
diff --git a/tools/libs/light/libxl_pcid.c b/tools/libs/light/libxl_pcid.c
index d72beed405..80bcd3c63e 100644
--- a/tools/libs/light/libxl_pcid.c
+++ b/tools/libs/light/libxl_pcid.c
@@ -364,6 +364,69 @@ static int process_pciback_dev_is_assigned(libxl__gc *gc,
yajl_gen gen,
return 0;
}
+static int device_pci_reset(libxl__gc *gc, unsigned int domain, unsigned int
bus,
+ unsigned int dev, unsigned int func)
+{
+ char *reset;
+ int fd, rc;
+
+ reset = GCSPRINTF("%s/do_flr", SYSFS_PCIBACK_DRIVER);
+ fd = open(reset, O_WRONLY);
+ if (fd >= 0) {
+ char *buf = GCSPRINTF(PCI_BDF, domain, bus, dev, func);
+ rc = write(fd, buf, strlen(buf));
+ if (rc < 0)
+ LOGD(ERROR, domain, "write to %s returned %d", reset, rc);
+ close(fd);
+ return rc < 0 ? rc : 0;
+ }
+ if (errno != ENOENT)
+ LOGED(ERROR, domain, "Failed to access pciback path %s", reset);
+ reset = GCSPRINTF("%s/"PCI_BDF"/reset", SYSFS_PCI_DEV, domain, bus, dev,
func);
+ fd = open(reset, O_WRONLY);
+ if (fd >= 0) {
+ rc = write(fd, "1", 1);
+ if (rc < 0)
+ LOGED(ERROR, domain, "write to %s returned %d", reset, rc);
+ close(fd);
+ return rc < 0 ? rc : 0;
+ }
+ if (errno == ENOENT) {
+ LOGD(ERROR, domain,
+ "The kernel doesn't support reset from sysfs for PCI device
"PCI_BDF,
+ domain, bus, dev, func);
+ } else {
+ LOGED(ERROR, domain, "Failed to access reset path %s", reset);
+ }
+ return -1;
+}
+
+static int process_device_pci_reset(libxl__gc *gc, yajl_gen gen,
+ char *command_name,
+ const struct libxl__json_object *request,
+ struct libxl__json_object **response)
+{
+ const struct libxl__json_object *json_o;
+ unsigned int dom, bus, dev, func;
+ int rc;
+
+ json_o = libxl__json_map_get(PCID_MSG_FIELD_SBDF, request, JSON_STRING);
+ if (!json_o) {
+ make_error_reply(gc, gen, "No mandatory parameter 'sbdf'",
command_name);
+ return ERROR_FAIL;
+ }
+
+ if (sscanf(libxl__json_object_get_string(json_o), PCID_SBDF_FMT,
+ &dom, &bus, &dev, &func) != 4) {
+ make_error_reply(gc, gen, "Can't parse SBDF", command_name);
+ return ERROR_FAIL;
+ }
+ rc = device_pci_reset(gc, dom, bus, dev, func);
+ if (rc < 0)
+ return ERROR_FAIL;
+ return rc;
+}
+
static int process_make_assignable(libxl__gc *gc, yajl_gen gen,
char *command_name,
const struct libxl__json_object *request,
@@ -570,6 +633,9 @@ static int pcid_handle_request(libxl__gc *gc, yajl_gen gen,
else if (strcmp(command_name, PCID_CMD_IS_ASSIGNED) == 0)
ret = process_pciback_dev_is_assigned(gc, gen, command_name,
request, &command_response);
+ else if (strcmp(command_name, PCID_CMD_RESET_DEVICE) == 0)
+ ret = process_device_pci_reset(gc, gen, command_name,
+ request, &command_response);
else {
/*
* This is an unsupported command: make a reply and proceed over
--
2.34.1
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |