From patchwork Mon Aug 28 08:55:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhupinder Thakur X-Patchwork-Id: 111114 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp4548072qge; Mon, 28 Aug 2017 01:58:51 -0700 (PDT) X-Received: by 10.107.59.80 with SMTP id i77mr5000709ioa.288.1503910731645; Mon, 28 Aug 2017 01:58:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503910731; cv=none; d=google.com; s=arc-20160816; b=zOlptJrVTSjV16O++r+knFBAEI+dpp/WGZ9J1LTlJB3+WmUFYCFoqXqwk2D8uBumBB t1Tq/ATI5okprROxeuCHQXSPk4pc1VU1lSrY/PQmriDAE6FknpDj0kOvIPwj24y4aE4I y9UkT9nGlyLGerJ/nfDhUH1Un0sa+nqnPTfK/mUEGYmHlDTEa9H5E8lF0BhuW8RR6nr2 xmAufdwnHdCWNiSt6sZNQtu4jnIfxiFDV1TE1GJ6Pp6rU+4ar7KH3gTO3xgVXYB1bqJO LPHo9Y1PyL8vMKN8Km/t3jKBPGiAV8ABeSE6Avx+8T7/ZxMmYA6KDxjxxcQVRIBNB3wR MBDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-unsubscribe:list-id :precedence:subject:cc:references:in-reply-to:message-id:date:to :from:dkim-signature:arc-authentication-results; bh=T1W83F6O6Kc21Vb9shMnui2lDzQnYqH2DbtyX6bjXBg=; b=Ex9exFSWIu7XHXK1eZ0yMhfWR+WTbiUf5xtLOBI/EGSK3PDA0ngw2Vvti/q3iBenML 7stX/p20ZxJppEFjTiNpDo9bOFhwPE2fSKp5nUf6XmqXIwn9dOc02T+JGwsziipOQ3Zx zpoZB2LngPNk4nQHzcdfRA0RE4HBnxTwh7/9UN5pmc2K8KxND+UX+EFyNaYI3vonqV+u UK/K/WrW1c5m8QD8GUNPl55R1+hoMzH6NPQa8GuZoh1cfSrT9W1mhg57DOpwSjjseuwG Lfk4KZ0uaK4WgK8AUqzE+r+ONhUMo5lSTDUKC2ppUhrUu/bUzYvusixaT7pjherrvFIt z7UQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=ABPQEKON; spf=neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) smtp.mailfrom=xen-devel-bounces@lists.xen.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id h17si12180088iod.181.2017.08.28.01.58.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Aug 2017 01:58:51 -0700 (PDT) Received-SPF: neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) client-ip=192.237.175.120; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=ABPQEKON; spf=neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) smtp.mailfrom=xen-devel-bounces@lists.xen.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dmFqg-0004pD-NU; Mon, 28 Aug 2017 08:56:46 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dmFqf-0004o2-8k for xen-devel@lists.xenproject.org; Mon, 28 Aug 2017 08:56:45 +0000 Received: from [85.158.143.35] by server-5.bemta-6.messagelabs.com id 6F/82-03368-CCAD3A95; Mon, 28 Aug 2017 08:56:44 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrIIsWRWlGSWpSXmKPExsXiVRusqXv61uJ Ig9fXzS2+b5nM5MDocfjDFZYAxijWzLyk/IoE1oxl028yF3RYV9y5N4e9gXGNbhcjF4eQwHRG idV/Z7OBOCwC85glju15BuZICPSzSuyd1wnkcAI5aRKr3q9ggbArJDZ/+soIYgsJaEkcPTWbF WLUfiaJG99ambsYOTjYBEwkZnVIgNSICChJ3Fs1mQmkhllgPqNE06ResKHCAv4STa1bWUFsFg FViZ0HD7OD2LwC3hJrl/9khlgmJ3HzXCeYzSngI7Fj7V12iMXeEl2vP7BOYBRYwMiwilGjOLW oLLVI19BYL6koMz2jJDcxM0fX0MBMLze1uDgxPTUnMalYLzk/dxMjMLgYgGAH45dlAYcYJTmY lER5d1YsjhTiS8pPqcxILM6ILyrNSS0+xCjDwaEkwXvmJlBOsCg1PbUiLTMHGOYwaQkOHiUR3 g8gad7igsTc4sx0iNQpRl2OSQe2f2ESYsnLz0uVEuf1ASkSACnKKM2DGwGLuUuMslLCvIxARw nxFKQW5WaWoMq/YhTnYFQS5j0IMoUnM68EbtMroCOYgI5QFFwIckRJIkJKqoEx7NnPzQeuxDh 8kLkqaPEk8um3gsVTbr5uqkni9JE5nJ5+L/ro7n7xD/ePWWgdXHpOKHCqz0eR4yWOShN4rgb9 TFn/7B37hOXPhF9PEH/i8qKLx6ytZp9+4csH/gubRfvO5D2Y37DC72Tnk2ennwZteyf0eefFs JPV+w3Z896caQ51EHl5Xi04XomlOCPRUIu5qDgRALI+YKq0AgAA X-Env-Sender: bhupinder.thakur@linaro.org X-Msg-Ref: server-10.tower-21.messagelabs.com!1503910602!73233126!1 X-Originating-IP: [74.125.83.41] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 38182 invoked from network); 28 Aug 2017 08:56:43 -0000 Received: from mail-pg0-f41.google.com (HELO mail-pg0-f41.google.com) (74.125.83.41) by server-10.tower-21.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 28 Aug 2017 08:56:43 -0000 Received: by mail-pg0-f41.google.com with SMTP id 63so22239321pgc.2 for ; Mon, 28 Aug 2017 01:56:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=u7iNqMhDSt45oYpw7rX/c6FW4ApFInM/Yj9vI6RxQMI=; b=ABPQEKONDAtCJDhTrmIlSGjziiKEfV4arwTHqlgQezKoNgVW95wIk8ZoUWxyJ/GhID FI8a9mYaYrxMjgv6/5fACBJiwYyDHATTEdTcCxcTRRuUayJViM7Uwy5DyXEUYht4MX+4 bq33PAnNZXEh5DgO+bC45EjPKsn8ZN+afEYd8= 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=u7iNqMhDSt45oYpw7rX/c6FW4ApFInM/Yj9vI6RxQMI=; b=fcVbubSP+oNe5LJQuumOWj+g+PTAarq939+Bsi7JLMRxx6sWqgDmHggl8Y8npQ2mVb lm5b5fCNSiqaYV/buEYR6uWX1dneErmutfSl5RZD104jXNd8cuzgsdUvtl53fS3kOq9O SClytpfHJNOxPWqOkGsNwylUaDOa4yh1ikJaxuayI0/hqJdncHRgD1TpRT6dXbCcLvEY ZvREYNcEM/uF+2QFbZkODTlfqU81PP+ia+hgj3m+CTbMxyKtNGiMxE7aa/khmunGSJNP rShr8slxXcRtbgRn04+VeGAO4eswnf11y1cb8BBROg/2CCjdbBqtypKgKykjfT64GvSh Ppxw== X-Gm-Message-State: AHYfb5iITPU70JDCYZzrae5V19Vp9tmnypHK/R73FASkK9X+5Ev/DLQO 6xVyU2uAbCPgsqgigAEhmA== X-Received: by 10.99.44.10 with SMTP id s10mr6653603pgs.116.1503910602015; Mon, 28 Aug 2017 01:56:42 -0700 (PDT) Received: from blr-ubuntu-linaro.wlan.qualcomm.com (blr-bdr-fw-01_globalnat_allzones-outside.qualcomm.com. [103.229.18.19]) by smtp.gmail.com with ESMTPSA id d88sm21713569pfl.158.2017.08.28.01.56.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 28 Aug 2017 01:56:41 -0700 (PDT) From: Bhupinder Thakur To: xen-devel@lists.xenproject.org Date: Mon, 28 Aug 2017 14:25:50 +0530 Message-Id: <1503910570-24427-8-git-send-email-bhupinder.thakur@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1503910570-24427-1-git-send-email-bhupinder.thakur@linaro.org> References: <1503910570-24427-1-git-send-email-bhupinder.thakur@linaro.org> Cc: Wei Liu , Julien Grall , Stefano Stabellini , Ian Jackson Subject: [Xen-devel] [PATCH 07/27 v8] xen/arm: vpl011: Add a new vuart node in the xenstore 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" Add a new vuart console node to xenstore. This node is added at /local/domain/$DOMID/vuart/0. The node contains information such as the ring-ref, event channel, buffer limit and type of console. Xenconsole reads the node information to setup the ring buffer and event channel for sending/receiving vuart data. Signed-off-by: Bhupinder Thakur Reviewed-by: Stefano Stabellini Acked-by: Wei Liu --- CC: Ian Jackson CC: Wei Liu CC: Stefano Stabellini CC: Julien Grall Changes since v4: - vuart_device moved inside libxl__device_vuart_add() as a local variable. Changes since v3: - Added a backend node for vpl011. - Removed libxl__device_vuart_add() for HVM guest. It is called only for PV guest. tools/libxl/libxl_console.c | 44 ++++++++++++++++++++++++++++++++++++ tools/libxl/libxl_create.c | 9 +++++++- tools/libxl/libxl_device.c | 9 ++++++-- tools/libxl/libxl_internal.h | 3 +++ tools/libxl/libxl_types_internal.idl | 1 + 5 files changed, 63 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_console.c b/tools/libxl/libxl_console.c index 853be15..cdaf7fd 100644 --- a/tools/libxl/libxl_console.c +++ b/tools/libxl/libxl_console.c @@ -344,6 +344,50 @@ out: return rc; } +int libxl__device_vuart_add(libxl__gc *gc, uint32_t domid, + libxl__device_console *console, + libxl__domain_build_state *state) +{ + libxl__device device; + flexarray_t *ro_front; + flexarray_t *back; + int rc; + + ro_front = flexarray_make(gc, 16, 1); + back = flexarray_make(gc, 16, 1); + + device.backend_devid = console->devid; + device.backend_domid = console->backend_domid; + device.backend_kind = LIBXL__DEVICE_KIND_VUART; + device.devid = console->devid; + device.domid = domid; + device.kind = LIBXL__DEVICE_KIND_VUART; + + flexarray_append(back, "frontend-id"); + flexarray_append(back, GCSPRINTF("%d", domid)); + flexarray_append(back, "online"); + flexarray_append(back, "1"); + flexarray_append(back, "state"); + flexarray_append(back, GCSPRINTF("%d", XenbusStateInitialising)); + flexarray_append(back, "protocol"); + flexarray_append(back, LIBXL_XENCONSOLE_PROTOCOL); + + flexarray_append(ro_front, "port"); + flexarray_append(ro_front, GCSPRINTF("%"PRIu32, state->vuart_port)); + flexarray_append(ro_front, "ring-ref"); + flexarray_append(ro_front, GCSPRINTF("%lu", state->vuart_gfn)); + flexarray_append(ro_front, "limit"); + flexarray_append(ro_front, GCSPRINTF("%d", LIBXL_XENCONSOLE_LIMIT)); + flexarray_append(ro_front, "type"); + flexarray_append(ro_front, "xenconsoled"); + + rc = libxl__device_generic_add(gc, XBT_NULL, &device, + libxl__xs_kvs_of_flexarray(gc, back), + NULL, + libxl__xs_kvs_of_flexarray(gc, ro_front)); + return rc; +} + int libxl__init_console_from_channel(libxl__gc *gc, libxl__device_console *console, int dev_num, diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 1158303..6c3acb3 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1367,7 +1367,7 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, } case LIBXL_DOMAIN_TYPE_PV: { - libxl__device_console console; + libxl__device_console console, vuart; libxl__device device; for (i = 0; i < d_config->num_vfbs; i++) { @@ -1375,6 +1375,13 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, libxl__device_vkb_add(gc, domid, &d_config->vkbs[i]); } + if (d_config->b_info.arch_arm.vuart == LIBXL_VUART_TYPE_SBSA_UART) { + init_console_info(gc, &vuart, 0); + vuart.backend_domid = state->console_domid; + libxl__device_vuart_add(gc, domid, &vuart, state); + libxl__device_console_dispose(&vuart); + } + init_console_info(gc, &console, 0); console.backend_domid = state->console_domid; libxl__device_console_add(gc, domid, &console, state, &device); diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index 00356af..3b10c58 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -26,6 +26,9 @@ static char *libxl__device_frontend_path(libxl__gc *gc, libxl__device *device) if (device->kind == LIBXL__DEVICE_KIND_CONSOLE && device->devid == 0) return GCSPRINTF("%s/console", dom_path); + if (device->kind == LIBXL__DEVICE_KIND_VUART) + return GCSPRINTF("%s/vuart/%d", dom_path, device->devid); + return GCSPRINTF("%s/device/%s/%d", dom_path, libxl__device_kind_to_string(device->kind), device->devid); @@ -170,7 +173,8 @@ retry_transaction: * historically contained other information, such as the * vnc-port, which we don't want the guest fiddling with. */ - if (device->kind == LIBXL__DEVICE_KIND_CONSOLE && device->devid == 0) + if ((device->kind == LIBXL__DEVICE_KIND_CONSOLE && device->devid == 0) || + (device->kind == LIBXL__DEVICE_KIND_VUART)) xs_set_permissions(ctx->xsh, t, frontend_path, ro_frontend_perms, ARRAY_SIZE(ro_frontend_perms)); else @@ -800,7 +804,8 @@ void libxl__devices_destroy(libxl__egc *egc, libxl__devices_remove_state *drs) dev->domid = domid; dev->kind = kind; dev->devid = atoi(devs[j]); - if (dev->backend_kind == LIBXL__DEVICE_KIND_CONSOLE) { + if (dev->backend_kind == LIBXL__DEVICE_KIND_CONSOLE || + dev->backend_kind == LIBXL__DEVICE_KIND_VUART) { /* Currently console devices can be destroyed * synchronously by just removing xenstore entries, * this is what libxl__device_destroy does. diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 6b38453..3f7cff9 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1206,6 +1206,9 @@ _hidden int libxl__device_console_add(libxl__gc *gc, uint32_t domid, libxl__device_console *console, libxl__domain_build_state *state, libxl__device *device); +_hidden int libxl__device_vuart_add(libxl__gc *gc, uint32_t domid, + libxl__device_console *console, + libxl__domain_build_state *state); /* Returns 1 if device exists, 0 if not, ERROR_* (<0) on error. */ _hidden int libxl__device_exists(libxl__gc *gc, xs_transaction_t t, diff --git a/tools/libxl/libxl_types_internal.idl b/tools/libxl/libxl_types_internal.idl index 7dc4d0f..c463c33 100644 --- a/tools/libxl/libxl_types_internal.idl +++ b/tools/libxl/libxl_types_internal.idl @@ -26,6 +26,7 @@ libxl__device_kind = Enumeration("device_kind", [ (9, "VUSB"), (10, "QUSB"), (11, "9PFS"), + (12, "VUART"), ]) libxl__console_backend = Enumeration("console_backend", [