From patchwork Thu Jun 22 07:38:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhupinder Thakur X-Patchwork-Id: 106162 Delivered-To: patch@linaro.org Received: by 10.140.91.2 with SMTP id y2csp2327102qgd; Thu, 22 Jun 2017 00:41:13 -0700 (PDT) X-Received: by 10.36.120.72 with SMTP id p69mr723435itc.19.1498117273490; Thu, 22 Jun 2017 00:41:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498117273; cv=none; d=google.com; s=arc-20160816; b=vH5njtC216vcjWPdE51/0P4wlcAcBQaeqDhvDrKvp7CIAOppQn5sNqqOEY/t2/J9m5 9DPQovTGeT3604i7/IRB5R50vYTu39yKaYXJtUq/MCpvKbHU74rbUuRz+t4ynHwJ4IWm 3GK4PCsLdO6HVjgvhLWgPL3SDqVniO9PdIzM0SB2Naq2z3ZOYqB3l9A8Q14/kMRITyXM k2DwJ66zzjB8VNTcMJIBdS+vMwb3My2NAJlFE9OVdUQM4ux3LMhMWLLzCYPMeN9D9nv2 0NKL86H6EykTDRGg+YJ/U887gT4YjmuNGD+LniC8oisVDW0HP6TyZLUZx8cfKCWA+cUP Tt2w== 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=kU4vXamHYE4CFySHyywyKE5/PfjSCyj3dywqMUu7ZyA=; b=qOWT49NeOAxlZBOIJsMw5qMjFOhf+tTC+889aNcYPoU3l3YQs9RmmVLkXJ/nCFIaf2 2gz9Gr9QUUOGdDAIDLV82ZK2/so1HSaKZ9+mbxL4PxIKt1CWAEwn5snQ/v4BOELa3OT9 mEzTGUyT4M8wlomiaMm3Gkgu2FkO8k18jn965b98OB3rbu1GYYa7ZpRQzuCV0QkK4Q3d pTh8kn0kmyR8WQ2rkoC8azFdcl7rIOnRDj+emRpp0lGikFaoubDRnPBYC4eigO896AbE qZQwiippD6O4XjHuMyxSFUeP0gRPswSMKeEFtHgeja59e0e/3ou0ZlJIwJD1ufObU3Pg LQcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.b=egjua/fe; 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 n138si363846itn.73.2017.06.22.00.41.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Jun 2017 00:41:13 -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.b=egjua/fe; 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 1dNwiA-0005bg-Cf; Thu, 22 Jun 2017 07:39:30 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dNwi8-0005aH-Rx for xen-devel@lists.xenproject.org; Thu, 22 Jun 2017 07:39:28 +0000 Received: from [193.109.254.147] by server-9.bemta-6.messagelabs.com id 61/F8-03557-0347B495; Thu, 22 Jun 2017 07:39:28 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrAIsWRWlGSWpSXmKPExsXiVRtsoKtf4h1 pcP6tksX3LZOZHBg9Dn+4whLAGMWamZeUX5HAmrHt1UPmgklWFcde72RqYNyp08XIySEkMJ1R 4tM1pi5GLg4WgXnMEhM/7WIGcSQE+lkl2npnMoJUSQikSaz52skOYZdJXNj1kA2iW0vi6KnZr CANQgL7mCR2zJ4ElODgYBMwkZjVIQFSIyKgJHFv1WSwDcwC8xklmib1gjULC/hL9D6exwJisw ioSvTNmA1m8wr4SLxffIEJYpmcxM1zncwgNidQfMWOhewQi70ldp2ZzDKBUWABI8MqRo3i1KK y1CJdY0O9pKLM9IyS3MTMHF1DAzO93NTi4sT01JzEpGK95PzcTYzA0GIAgh2MTYsCDzFKcjAp ifJuLvaOFOJLyk+pzEgszogvKs1JLT7EKMPBoSTBOwMkJ1iUmp5akZaZAwxymLQEB4+SCG9LH lCat7ggMbc4Mx0idYpRl2PSge1fmIRY8vLzUqXEedtBZgiAFGWU5sGNgEXcJUZZKWFeRqCjhH gKUotyM0tQ5V8xinMwKgnz6hcBTeHJzCuB2/QK6AgmoCNeHPEAOaIkESEl1cDIedBLe1brXxO TuVWOYSITuo0CJJPDGws4ewIeJcq9nn4lJbXihH3LlpItlVGWPGWbIvu27tbovbomoY5l76fq Ld+6Qg9LfvBqzD7aHPB936JG5rxLuz3Xhcmrv9p0JtG5TSN+YdTSrSffloisXiUm87aBbVGWl M5SX62JyRd3l/97yll1t1yJpTgj0VCLuag4EQAaMlaoswIAAA== X-Env-Sender: bhupinder.thakur@linaro.org X-Msg-Ref: server-12.tower-27.messagelabs.com!1498117166!107418873!1 X-Originating-IP: [74.125.83.48] 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 13103 invoked from network); 22 Jun 2017 07:39:27 -0000 Received: from mail-pg0-f48.google.com (HELO mail-pg0-f48.google.com) (74.125.83.48) by server-12.tower-27.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 22 Jun 2017 07:39:27 -0000 Received: by mail-pg0-f48.google.com with SMTP id u62so4583085pgb.3 for ; Thu, 22 Jun 2017 00:39:27 -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=sXKovx9+9I1xBpizrIdSwnnHB+yomwhuD/tQ8AJHAlg=; b=egjua/feyyox2GMu7Y0ztwuAmWwISmz56GZRWJLQ3BsnURZ6/PgyV1WYd0OY33pNua z0ayl2F0iLAAjix0hyLNKloi/v9hv58N1EkYvs9CrH1DFwbnhxg5P7A6DuVugZuxnMbn n25JRrmdXDTYKsmBBXoJTJ5Ub9WVsuAUh2Uj8= 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=sXKovx9+9I1xBpizrIdSwnnHB+yomwhuD/tQ8AJHAlg=; b=qdCAXGNreSRIfh6FGVmDAlLztUPADcsb6sEheywuwi9lEjHtMgXHR4FDFPgJHGaVVb M717bR7t6sKNw49VdTna+jMBnVmLcSg3zInvc6/5ez+EFKIacLwegOjo4s8JtoPr64KQ NPcUHuSOZVCOqsRXi5XbY38s5ZUoRCDT9PFlQTXa0OmtbgWKQr5C7lwHanGgOSv0NAfI KhrjqD9gfyKt0SDISaEPnaXubtu7+7B8OuEgZpWhmXdAypWgujCGY5+z9BuvIhcwcODs vJvwciv18TQUzDDph9n3MwG97q6Qbxc+cXREm6jGdtjpOIIRWPQ5ToQ5wHpA5YEkDxSO NoJw== X-Gm-Message-State: AKS2vOz75Wo9IQBzuqz0slZisrvfxB4M1bCD+KuxXK6V1j6zCRQQEdVu 8TC5cdWxiCHYQBd8b24igA== X-Received: by 10.84.138.1 with SMTP id 1mr1437314plo.188.1498117165818; Thu, 22 Jun 2017 00:39:25 -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 w69sm1883591pfk.107.2017.06.22.00.39.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 22 Jun 2017 00:39:25 -0700 (PDT) From: Bhupinder Thakur To: xen-devel@lists.xenproject.org Date: Thu, 22 Jun 2017 13:08:44 +0530 Message-Id: <1498117132-27139-10-git-send-email-bhupinder.thakur@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1498117132-27139-1-git-send-email-bhupinder.thakur@linaro.org> References: <1498117132-27139-1-git-send-email-bhupinder.thakur@linaro.org> Cc: Wei Liu , Julien Grall , Stefano Stabellini , Ian Jackson Subject: [Xen-devel] [PATCH 09/17 v5] 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 | 10 +++++++- tools/libxl/libxl_device.c | 9 ++++++-- tools/libxl/libxl_internal.h | 3 +++ tools/libxl/libxl_types_internal.idl | 1 + 5 files changed, 64 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 bffbc45..cfd85ec 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,14 @@ 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) + { + 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 d0d50c3..2b3f4e1 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", [