From patchwork Tue Jul 18 14:25:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksandr Grytsov X-Patchwork-Id: 9848515 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DF06860393 for ; Tue, 18 Jul 2017 14:27:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CD55B26E74 for ; Tue, 18 Jul 2017 14:27:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C1E9A2856B; Tue, 18 Jul 2017 14:27:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 02E972852B for ; Tue, 18 Jul 2017 14:27:49 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dXTRX-0002Uo-E1; Tue, 18 Jul 2017 14:25:43 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dXTRW-0002UX-7l for xen-devel@lists.xenproject.org; Tue, 18 Jul 2017 14:25:42 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 67/D5-02185-56A1E695; Tue, 18 Jul 2017 14:25:41 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrDIsWRWlGSWpSXmKPExsVyMfS6k26KVF6 kwcFV+hbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8b3pftZC14VVMy5sZ2xgXFDQBcjJ4eQwHRG iV1TEkBsFoGXLBL/3wZ2MXJxSAj0s0o8fHWDBSQhIZAk0TH/IxuEXSKx9eRlJohmeYmDLZfZQ RqEBKYxSfx6cQ0swSagJXH/9gqwBhEBJYl7qyaDxZkFUiT2rmtjBLGFBZwlVm7ZxA6xWVXi39 sbYHFeAQeJbRvXQC2Tk7h5rpO5i5GDg1PAUWLrjHKIvQ4SN1pfsU9gFFjAyLCKUaM4tagstUj XyEwvqSgzPaMkNzEzR9fQwFgvN7W4ODE9NScxqVgvOT93EyMwrOoZGBh3MDbs9TvEKMnBpCTK u/pAbqQQX1J+SmVGYnFGfFFpTmrxIUYNDg6Bn0//tjBKseTl56UqSfDySOZFCgkWpaanVqRl5 gADH6ZUgoNHSYQ3XwIozVtckJhbnJkOkTrFaM9x5cq6L0wcUw5sB5KvJvz/xsTR9P3jdyYhsK lS4rwdIFMFQNoySvPghsIi9RKjrJQwLyMDA4MQT0FqUW5mCar8K0ZxDkYlYd4CkCk8mXklcLt fAZ3FBHSWsG8OyFkliQgpqQbG+vMbkhYdWmhfemRdne7anexvn3w9sEPn+b3YKZNeL7KRyrjk G/pFsXLtssOvuB/PEL/21ix8jZ/PO70ML4OyA9w5ZktuzD05oXvPcefnAjrxfA1OGX6hRX0ln rLXpDdyON5yMm4rks3/HyJbcsjg4wGf3AWnpjHv+rjoVfQJ7+l779u/WTlzohJLcUaioRZzUX EiALu87iXPAgAA X-Env-Sender: al1img@gmail.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1500387940!106002892!1 X-Originating-IP: [209.85.215.66] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 9.4.25; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29146 invoked from network); 18 Jul 2017 14:25:40 -0000 Received: from mail-lf0-f66.google.com (HELO mail-lf0-f66.google.com) (209.85.215.66) by server-3.tower-31.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 18 Jul 2017 14:25:40 -0000 Received: by mail-lf0-f66.google.com with SMTP id p11so1997097lfd.1 for ; Tue, 18 Jul 2017 07:25:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=GdKZuJCwOMZ58mIFttZkhRpz1EGM2WNQa1SpPkaa7ZY=; b=n9hvEPhIkMNrevcNpDgmOvj6LX59mO5e54rIyYl6wiL6T+myhCsbjQtl9biN+0EXFK wikZY2RxTw654QYG154BF13g30XlvW2GQI5pEIZv1HX2pwUzlG4jJAlNYj/H6jYuyoSl ULA5cnf6s4ujuMqcgZcpOzyB9x7HV6Km+rcUH+uIAQgjcSeEdIQ6DOAdU0DgGOdxWkOH pfVCcOkyRnZrn9GYtgzg3Mow1WPTpVnOXJ3YubVQ7MsjQPUE0M++9Qt4l/iwaD8+A9tt nY2V6GDlxf/+2gXSju3iUJch//8F0eYFgAy8wquLjtfy85AvZho5bM5OwfhfrfMQRdQh DHRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=GdKZuJCwOMZ58mIFttZkhRpz1EGM2WNQa1SpPkaa7ZY=; b=Yo5Rk2WlRveDaUsohPDhwLV8wKME5mJZ8Ho9AdHJwRE3pQQjF8N2JEk06HtpDDI0gQ kNbNmHLDjd8mddvQCcejjg9IH17U54wTj48rleuEMd6XK5wbR7Ctl8w6KstNTswC+0PO I13G3rPsICoIEztHNPeYTX92Szea7v1leDTo2srzjWJTb5QVtM7HGeN33x1yAeczYeEn eN3RdHjDE+d75t2njwq8OU2SHl0Mtx6B2od/C6cHYNv3geFnyG9Zr50Vas7YsRN8yhij tSqltr8sMEF+Fss28fPwTK9XHWtciXFRJ7k8Ok/2c8MVuk1KgKvM3OydepK9tt/K5Rgt GCTQ== X-Gm-Message-State: AIVw111WYOfgJWPbkw2V7VLg6aDPp3gRTG2qkKjj8If7wXwpp5wZF4BH gIktfeRms2LaAkOkn28= X-Received: by 10.25.92.4 with SMTP id q4mr800642lfb.69.1500387939749; Tue, 18 Jul 2017 07:25:39 -0700 (PDT) Received: from al1-pc.kyiv.epam.com (ll-58.209.223.85.sovam.net.ua. [85.223.209.58]) by smtp.gmail.com with ESMTPSA id s134sm620442lfe.27.2017.07.18.07.25.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 18 Jul 2017 07:25:38 -0700 (PDT) From: Oleksandr Grytsov To: xen-devel@lists.xenproject.org Date: Tue, 18 Jul 2017 17:25:18 +0300 Message-Id: <1500387930-16317-2-git-send-email-al1img@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1500387930-16317-1-git-send-email-al1img@gmail.com> References: <1500387930-16317-1-git-send-email-al1img@gmail.com> Cc: ian.jackson@eu.citrix.com, wei.liu2@citrix.com, Oleksandr Grytsov Subject: [Xen-devel] [PATCH v4 01/13] libxl: add generic function to add device X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Oleksandr Grytsov Add libxl__device_add to simple write XenStore device conifg and libxl__device_add_async to update domain configuration and write XenStore device config asynchroniously. Almost all devices have similar libxl__device_xxxx_add function. This generic functions implement same functionality but using the device handling framework. Th device specific part such as setting xen store configurationis moved to set_xenstore_config callback of the device framework. Signed-off-by: Oleksandr Grytsov --- tools/libxl/libxl_create.c | 3 + tools/libxl/libxl_device.c | 198 +++++++++++++++++++++++++++++++++++++++++++ tools/libxl/libxl_disk.c | 2 + tools/libxl/libxl_internal.h | 36 ++++++++ tools/libxl/libxl_nic.c | 2 + tools/libxl/libxl_pci.c | 2 + tools/libxl/libxl_usb.c | 6 ++ tools/libxl/libxl_vtpm.c | 2 + 8 files changed, 251 insertions(+) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index bffbc45..b2163cd 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1430,6 +1430,9 @@ out: #define libxl_device_dtdev_list NULL #define libxl_device_dtdev_compare NULL +#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); const struct libxl_device_type *device_type_tbl[] = { diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index 00356af..07165f0 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -1793,6 +1793,204 @@ out: return AO_CREATE_FAIL(rc); } +static void device_add_domain_config(libxl__gc *gc, + libxl_domain_config *d_config, + const struct libxl_device_type *dt, + void *type) +{ + int *num_dev; + int i; + void *item = NULL; + + num_dev = libxl__device_type_get_num(dt, d_config); + + /* Check for existing device */ + for (i = 0; i < *num_dev; i++) { + if (dt->compare(libxl__device_type_get_elem(dt, d_config, i), type)) { + item = libxl__device_type_get_elem(dt, d_config, i); + } + } + + if (!item) { + void **devs= libxl__device_type_get_ptr(dt, d_config); + *devs = libxl__realloc(NOGC, *devs, + dt->dev_elem_size * (*num_dev + 1)); + item = libxl__device_type_get_elem(dt, d_config, *num_dev); + (*num_dev)++; + } else { + dt->dispose(item); + } + + dt->init(item); + dt->copy(CTX, item, type); +} + +void libxl__device_add_async(libxl__egc *egc, uint32_t domid, + const struct libxl_device_type *dt, void *type, + libxl__ao_device *aodev) +{ + STATE_AO_GC(aodev->ao); + flexarray_t *back; + flexarray_t *front, *ro_front; + libxl__device *device; + xs_transaction_t t = XBT_NULL; + libxl_domain_config d_config; + void *type_saved; + libxl__domain_userdata_lock *lock = NULL; + int rc; + + libxl_domain_config_init(&d_config); + + type_saved = libxl__malloc(gc, dt->dev_elem_size); + + dt->init(type_saved); + dt->copy(CTX, type_saved, type); + + if (dt->set_default) { + rc = dt->set_default(gc, domid, type, aodev->update_json); + if (rc) goto out; + } + + if (dt->update_devid) { + rc = dt->update_devid(gc, domid, type); + if (rc) goto out; + } + + if (dt->update_config) + dt->update_config(gc, type_saved, type); + + GCNEW(device); + rc = dt->to_device(gc, domid, type, device); + if (rc) goto out; + + if (aodev->update_json) { + + lock = libxl__lock_domain_userdata(gc, domid); + if (!lock) { + rc = ERROR_LOCK_FAIL; + goto out; + } + + rc = libxl__get_domain_configuration(gc, domid, &d_config); + if (rc) goto out; + + device_add_domain_config(gc, &d_config, dt, type_saved); + + rc = libxl__dm_check_start(gc, &d_config, domid); + if (rc) goto out; + } + + back = flexarray_make(gc, 16, 1); + front = flexarray_make(gc, 16, 1); + ro_front = flexarray_make(gc, 16, 1); + + flexarray_append_pair(back, "frontend-id", GCSPRINTF("%d", domid)); + flexarray_append_pair(back, "online", "1"); + flexarray_append_pair(back, "state", + GCSPRINTF("%d", XenbusStateInitialising)); + + flexarray_append_pair(front, "backend-id", + GCSPRINTF("%d", device->backend_domid)); + flexarray_append_pair(front, "state", + GCSPRINTF("%d", XenbusStateInitialising)); + + if (dt->set_xenstore_config) + dt->set_xenstore_config(gc, domid, type, back, front, ro_front); + + for (;;) { + rc = libxl__xs_transaction_start(gc, &t); + if (rc) goto out; + + rc = libxl__device_exists(gc, t, device); + if (rc < 0) goto out; + if (rc == 1) { /* already exists in xenstore */ + LOGD(ERROR, domid, "device already exists in xenstore"); + aodev->action = LIBXL__DEVICE_ACTION_ADD; /* for error message */ + rc = ERROR_DEVICE_EXISTS; + goto out; + } + + if (aodev->update_json) { + rc = libxl__set_domain_configuration(gc, domid, &d_config); + if (rc) goto out; + } + + libxl__device_generic_add(gc, t, device, + libxl__xs_kvs_of_flexarray(gc, back), + libxl__xs_kvs_of_flexarray(gc, front), + libxl__xs_kvs_of_flexarray(gc, ro_front)); + + rc = libxl__xs_transaction_commit(gc, &t); + if (!rc) break; + if (rc < 0) goto out; + } + + aodev->dev = device; + aodev->action = LIBXL__DEVICE_ACTION_ADD; + libxl__wait_device_connection(egc, aodev); + + rc = 0; + +out: + libxl__xs_transaction_abort(gc, &t); + if (lock) libxl__unlock_domain_userdata(lock); + dt->dispose(type_saved); + libxl_domain_config_dispose(&d_config); + aodev->rc = rc; + if (rc) aodev->callback(egc, aodev); + return; +} + +int libxl__device_add(libxl__gc *gc, uint32_t domid, + const struct libxl_device_type *dt, void *type) +{ + flexarray_t *back; + flexarray_t *front, *ro_front; + libxl__device *device; + int rc; + + if (dt->set_default) { + rc = dt->set_default(gc, domid, type, false); + if (rc) goto out; + } + + if (dt->update_devid) { + rc = dt->update_devid(gc, domid, type); + if (rc) goto out; + } + + GCNEW(device); + rc = dt->to_device(gc, domid, type, device); + if (rc) goto out; + + back = flexarray_make(gc, 16, 1); + front = flexarray_make(gc, 16, 1); + ro_front = flexarray_make(gc, 16, 1); + + flexarray_append_pair(back, "frontend-id", GCSPRINTF("%d", domid)); + flexarray_append_pair(back, "online", "1"); + flexarray_append_pair(back, "state", + GCSPRINTF("%d", XenbusStateInitialising)); + flexarray_append_pair(front, "backend-id", + libxl__sprintf(gc, "%d", device->backend_domid)); + flexarray_append_pair(front, "state", + GCSPRINTF("%d", XenbusStateInitialising)); + + if (dt->set_xenstore_config) + dt->set_xenstore_config(gc, domid, type, back, front, ro_front); + + rc = libxl__device_generic_add(gc, XBT_NULL, device, + libxl__xs_kvs_of_flexarray(gc, back), + libxl__xs_kvs_of_flexarray(gc, front), + libxl__xs_kvs_of_flexarray(gc, ro_front)); + if (rc) goto out; + + rc = 0; + +out: + return rc; +} + /* * Local variables: * mode: C diff --git a/tools/libxl/libxl_disk.c b/tools/libxl/libxl_disk.c index 63de75c..f2f3635 100644 --- a/tools/libxl/libxl_disk.c +++ b/tools/libxl/libxl_disk.c @@ -1244,6 +1244,8 @@ static int libxl_device_disk_dm_needed(void *e, unsigned domid) elem->backend_domid == domid; } +#define libxl__device_disk_update_devid NULL + DEFINE_DEVICE_TYPE_STRUCT(disk, .merge = libxl_device_disk_merge, .dm_needed = libxl_device_disk_dm_needed, diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index afe6652..075dfe3 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -3467,6 +3467,18 @@ _hidden void libxl__bootloader_run(libxl__egc*, libxl__bootloader_state *st); return AO_INPROGRESS; \ } +#define LIBXL_DEFINE_UPDATE_DEVID(type, name) \ + int libxl__device_##type##_update_devid(libxl__gc *gc, \ + uint32_t domid, \ + libxl_device_##type *type) \ + { \ + if (type->devid == -1) \ + type->devid = libxl__device_nextid(gc, domid, name); \ + if (type->devid < 0) \ + return ERROR_FAIL; \ + return 0; \ + } + #define LIBXL_DEFINE_DEVICE_REMOVE(type) \ LIBXL_DEFINE_DEVICE_REMOVE_EXT(type, generic, remove, 0) \ LIBXL_DEFINE_DEVICE_REMOVE_EXT(type, generic, destroy, 1) @@ -3484,11 +3496,18 @@ struct libxl_device_type { void (*add)(libxl__egc *, libxl__ao *, uint32_t, libxl_domain_config *, libxl__multidev *); void *(*list)(libxl_ctx *, uint32_t, int *); + int (*set_default)(libxl__gc *, uint32_t, void *, bool); + int (*to_device)(libxl__gc *, uint32_t, void *, libxl__device *); + void (*init)(void *); + void (*copy)(libxl_ctx *, void *, void *); void (*dispose)(void *); int (*compare)(void *, void *); void (*merge)(libxl_ctx *, void *, void *); int (*dm_needed)(void *, unsigned); void (*update_config)(libxl__gc *, void *, void *); + int (*update_devid)(libxl__gc *, uint32_t, void *); + int (*set_xenstore_config)(libxl__gc *, uint32_t, void *, flexarray_t *, + flexarray_t *, flexarray_t *); }; #define DEFINE_DEVICE_TYPE_STRUCT_X(name, sname, ...) \ @@ -3500,9 +3519,19 @@ struct libxl_device_type { .add = libxl__add_ ## name ## s, \ .list = (void *(*)(libxl_ctx *, uint32_t, int *)) \ libxl_device_ ## sname ## _list, \ + .set_default = (int (*)(libxl__gc *, uint32_t, void *, bool hotplug))\ + libxl__device_ ## sname ## _setdefault, \ + .to_device = (int (*)(libxl__gc *, uint32_t, \ + void *, libxl__device *)) \ + libxl__device_from_ ## name, \ + .init = (void (*)(void *))libxl_device_ ## sname ## _init, \ + .copy = (void (*)(libxl_ctx *, void *, void *)) \ + libxl_device_ ## sname ## _copy, \ .dispose = (void (*)(void *))libxl_device_ ## sname ## _dispose, \ .compare = (int (*)(void *, void *)) \ libxl_device_ ## sname ## _compare, \ + .update_devid = (int (*)(libxl__gc *, uint32_t, void *)) \ + libxl__device_ ## sname ## _update_devid, \ __VA_ARGS__ \ } @@ -4350,6 +4379,13 @@ static inline bool libxl__acpi_defbool_val(const libxl_domain_build_info *b_info return libxl_defbool_val(b_info->acpi) && libxl_defbool_val(b_info->u.hvm.acpi); } + +void libxl__device_add_async(libxl__egc *egc, uint32_t domid, + const struct libxl_device_type *dt, void *type, + libxl__ao_device *aodev); +int libxl__device_add(libxl__gc *gc, uint32_t domid, + const struct libxl_device_type *dt, void *type); + #endif /* diff --git a/tools/libxl/libxl_nic.c b/tools/libxl/libxl_nic.c index 4b6e8c0..dd07a6c 100644 --- a/tools/libxl/libxl_nic.c +++ b/tools/libxl/libxl_nic.c @@ -669,6 +669,8 @@ LIBXL_DEFINE_DEVICE_ADD(nic) LIBXL_DEFINE_DEVICES_ADD(nic) LIBXL_DEFINE_DEVICE_REMOVE(nic) +#define libxl__device_nic_update_devid NULL + DEFINE_DEVICE_TYPE_STRUCT(nic, .update_config = libxl_device_nic_update_config ); diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index b14df16..c3f1e5c 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -1708,6 +1708,8 @@ static int libxl_device_pci_compare(libxl_device_pci *d1, return COMPARE_PCI(d1, d2); } +#define libxl__device_pci_update_devid NULL + DEFINE_DEVICE_TYPE_STRUCT_X(pcidev, pci); /* diff --git a/tools/libxl/libxl_usb.c b/tools/libxl/libxl_usb.c index d8948d5..07fb202 100644 --- a/tools/libxl/libxl_usb.c +++ b/tools/libxl/libxl_usb.c @@ -1965,9 +1965,15 @@ void libxl_device_usbdev_list_free(libxl_device_usbdev *list, int nr) free(list); } +#define libxl__device_usbctrl_update_devid NULL + DEFINE_DEVICE_TYPE_STRUCT(usbctrl, .dm_needed = libxl_device_usbctrl_dm_needed ); + +#define libxl__device_from_usbdev NULL +#define libxl__device_usbdev_update_devid NULL + DEFINE_DEVICE_TYPE_STRUCT(usbdev); /* diff --git a/tools/libxl/libxl_vtpm.c b/tools/libxl/libxl_vtpm.c index 9ee8cce..cbd5461 100644 --- a/tools/libxl/libxl_vtpm.c +++ b/tools/libxl/libxl_vtpm.c @@ -364,6 +364,8 @@ LIBXL_DEFINE_DEVICE_ADD(vtpm) static LIBXL_DEFINE_DEVICES_ADD(vtpm) LIBXL_DEFINE_DEVICE_REMOVE(vtpm) +#define libxl__device_vtpm_update_devid NULL + DEFINE_DEVICE_TYPE_STRUCT(vtpm, .update_config = libxl_device_vtpm_update_config );