From patchwork Tue Jun 6 10:03:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhupinder Thakur X-Patchwork-Id: 103148 Delivered-To: patch@linaro.org Received: by 10.182.29.35 with SMTP id g3csp1185975obh; Tue, 6 Jun 2017 03:05:40 -0700 (PDT) X-Received: by 10.36.33.142 with SMTP id e136mr15567937ita.72.1496743540854; Tue, 06 Jun 2017 03:05:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496743540; cv=none; d=google.com; s=arc-20160816; b=qgGyT5DQbmtp079m63/sCDsZAJ8PclRLAVrKZm30Kd2ZsJG37MGox6TNcOcqUXLVj0 l42IvZVGrQXcJ1rz7bRO01pb7eFBVyHWcz5q8DxPg9zf170ZX+kg5FfAw0AT6PXtY7or 02ijIfNwFS96p38TSYH6phHBGydSoCfCqAeBaoUmqsR9VnY/yDPst3+zcgUAKCLr5hVB jY+k2TjVY85jRjOrmjKZgjGTRlmTywnMVTtCs2KIT+BjraezA6Jt8NyHvSzmDSaIlKp8 73HLosbAPnJGoj5Ga1S3sV+bY3idaOR37wOuJiz29vqxuN45K2wJ22RhyCtgYVbgI+Ux 50JQ== 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:message-id:date:to:from:dkim-signature :arc-authentication-results; bh=xoqIHc2vm8cTnf48V5LoEvEUac33y6JX/KKmiJ4pgoY=; b=Ji2nj82l4+ObV7R+EZa8L57nOZu4Xkpu4DlKyJFhTbfXEFhKfbGrfZyk/lCG9KqkV2 oEyAbztbIgyX0me3+Mb9kGKT7OtHCtZ26T2t9Xtz4Mey0TvmKLiWtF/GPRBYB+k7I1Xc O2neIPtwEPCAt5jNmbYq+rBb0hAuD8Jw/UXfbgr9T0B1d18EEAdrOxhAAYdcK1IKdIuQ 0KeRMuMT6X1CxfpryyM7mCav/dNAW8OL8Pq2WY/n3PVU4kQKKhqD202S67NvEML5VsSv sD2hItdWl2WY6zylxs/CL4xHGBoj0spxNiKrJU3y4ulOPN28eMU6deFX7ARNeskzgIhE Yh7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; 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 d184si1507101ita.46.2017.06.06.03.05.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Jun 2017 03:05:40 -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; 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 1dIBLB-0003rg-Rx; Tue, 06 Jun 2017 10:03:57 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dIBLA-0003r0-Qk for xen-devel@lists.xenproject.org; Tue, 06 Jun 2017 10:03:56 +0000 Received: from [85.158.143.35] by server-5.bemta-6.messagelabs.com id 87/81-03371-C0E76395; Tue, 06 Jun 2017 10:03:56 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupjkeJIrShJLcpLzFFi42K5GHpgky53nVm kweU1ihbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8bHt/sZCzotK+ZPus7awPhfq4uRi0NIYCaj xPxlc9hAHBaBdmaJ1bf+MoI4EgLvWCSOvO8BynACOWkSL/99YISwqyT2PjsNZgsJaEkcPTWbF cLexyQx94pNFyMHB5uAicSsDgmQsIiAksS9VZOZQGYyC8xnlGia1As2U1jAX6LrzF9mEJtFQF Xi5PUzLCA2r4C3RM/eDqhdchI3z3UyT2DkW8DIsIpRozi1qCy1SNfQQC+pKDM9oyQ3MTMHyDP Ty00tLk5MT81JTCrWS87P3cQIDBUGINjBeG9ZwCFGSQ4mJVHe2gSzSCG+pPyUyozE4oz4otKc 1OJDjDIcHEoSvJNqgHKCRanpqRVpmTnAoIVJS3DwKInwKlcCpXmLCxJzizPTIVKnGI05rlxZ9 4WJY8qB7V+YhFjy8vNSpcR5J4BMEgApzSjNgxsEi6ZLjLJSwryMQKcJ8RSkFuVmlqDKv2IU52 BUEub9BjKFJzOvBG7fK6BTmIBO4btkAnJKSSJCSqqB8VBvZo1yo0fjsooblqcVXgtb/kvbpt4 TsqzyxJP+O9yzBTW/vl236nHXV/WK7BLVSV/3G2tcDpt7dfXq8imM8fW1nj+kf1xmkbY54pFT /136rohP4MJQBbM07iUujrMcXFNnJS/PnGzx+5vB34rPew59TEkI1OXdnHOuXOYov/bZwsPGb l+eKrEUZyQaajEXFScCAK1luuehAgAA X-Env-Sender: bhupinder.thakur@linaro.org X-Msg-Ref: server-13.tower-21.messagelabs.com!1496743434!66617830!1 X-Originating-IP: [209.85.192.178] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.19; banners=-,-,- X-VirusChecked: Checked Received: (qmail 52747 invoked from network); 6 Jun 2017 10:03:55 -0000 Received: from mail-pf0-f178.google.com (HELO mail-pf0-f178.google.com) (209.85.192.178) by server-13.tower-21.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 6 Jun 2017 10:03:55 -0000 Received: by mail-pf0-f178.google.com with SMTP id m17so96208799pfg.3 for ; Tue, 06 Jun 2017 03:03:55 -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; bh=KicDYSIi+tO2vx7LSo3m7+4K2Zdw9BfOGCDzDRrCQkg=; b=DkVKN/H03k68eKJptT7/HQmlcWJyaO07GVywrY8u9c5a5G0l04WUP0kNX3sAZbY01r tuDtm/0lwSSiWMP6d0ft3oXjjkP9hxKPxULuMxEmxe7a7NOV4IEIQ4ndm34GJNAB+pvL mI/4TWeL+8nZY0P8jw3rj33W/MpoT2+Lh1+6o= 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; bh=KicDYSIi+tO2vx7LSo3m7+4K2Zdw9BfOGCDzDRrCQkg=; b=K1gLevzJVNPXqD9dryqGXex1e7yiht94Kr8eWxzrnL8ynKXWMpVWgKo/Tx8Gl3Cg9O u33sbl730pBmRjTJs+tDHqUS50WrgNPf+pwl1/bVT+EwYhPoruwZ4yek3mhe7rO+EnqV cqR+21LHoblz+fc0or1oLs/BRgy4shbUc003AFoevnzbIMPyC/j06D8kM5JjRYhvFRBh 1MoK2nb7OQZCp5zjm8hJw3/A0Y/slTImnsZisR/LlTi9T9Q6LUbTlXrvOwFT5URH4qaz ARcvXe6t7O0xO198rMwrBk+SnMsslI8ReR3k0M7jbrUOc/QKKHqaOlZ61VnK8IeGC14m h+sw== X-Gm-Message-State: AODbwcDS134JZrabmXf+K0td/+Ml7P7NMWPs8DgSxWHIqYZXc1CcOtz9 kgfRNzdcJJvt+yD6eJWG+w== X-Received: by 10.99.169.26 with SMTP id u26mr26030285pge.177.1496743433581; Tue, 06 Jun 2017 03:03:53 -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 z128sm16187940pgb.1.2017.06.06.03.03.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 06 Jun 2017 03:03:53 -0700 (PDT) From: Bhupinder Thakur To: xen-devel@lists.xenproject.org Date: Tue, 6 Jun 2017 15:33:48 +0530 Message-Id: <1496743428-15784-1-git-send-email-bhupinder.thakur@linaro.org> X-Mailer: git-send-email 2.7.4 Cc: Wei Liu , Julien Grall , Stefano Stabellini , Ian Jackson Subject: [Xen-devel] [PATCH 07/14 v4] 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 --- 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 | 12 ++++++++-- tools/libxl/libxl_device.c | 9 ++++++-- tools/libxl/libxl_internal.h | 4 ++++ tools/libxl/libxl_types_internal.idl | 1 + 5 files changed, 66 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl_console.c b/tools/libxl/libxl_console.c index 853be15..259f865 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 bffbc45..091a661 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1367,14 +1367,22 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, } case LIBXL_DOMAIN_TYPE_PV: { - libxl__device_console console; - libxl__device device; + libxl__device_console console, vuart; + libxl__device device, vuart_device; for (i = 0; i < d_config->num_vfbs; i++) { libxl__device_vfb_add(gc, domid, &d_config->vfbs[i]); libxl__device_vkb_add(gc, domid, &d_config->vkbs[i]); } + if (d_config->b_info.arch_arm.vuart) + { + init_console_info(gc, &vuart, 0); + vuart.backend_domid = state->console_domid; + libxl__device_vuart_add(gc, domid, &vuart, state, &vuart_device); + 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 5e96676..b110041 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 4e2c247..7a22db0 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1202,6 +1202,10 @@ _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, + libxl__device *device); /* 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", [