From patchwork Fri Sep 22 08:23:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhupinder Thakur X-Patchwork-Id: 113972 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp3010992qgf; Fri, 22 Sep 2017 01:25:55 -0700 (PDT) X-Received: by 10.36.20.5 with SMTP id 5mr5222834itg.131.1506068755865; Fri, 22 Sep 2017 01:25:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506068755; cv=none; d=google.com; s=arc-20160816; b=AjRMjVG1BLNnVsUoB2p/+n5b3vrwJLE/8wJysYXI1Xy5NZIaAlAif0DLPFUIlQIjys oB48r3HOgZPKyF+8owRf+9xIkwMR1LEccE9jp5tQNGHETJaR67V9Peku3SmSrEO6lLxD v26V+gUJ1B5He9BMqyx75gD0cL9Xo6qBC1/CMINPUosdCq46ADotdJG84bHwByTd1/3O dreg1494q5v50ADenTspMCSLLcLmnptigxnndAAeZ0PetYgLtVrfISG9hUPxtcZ1ewWP z0rZj5vkSc/ZHIB9DvpgA1mrN9TcjG3RPlx+r4CFNVeiqsRcntWDwKsU7LXwBK6C8ByL 672g== 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=NQu2U2Y0mmfBaEBqfsKZpaOj5vrCPTemt8YZW0wsXZs=; b=n6WxCJFKYcabBJp/mF/+89I1X28VThvQkpyxdqDW8FDXRgd93elFcxTYbEbUoDKhIk dy4PPBKqv6ZJOYNGHPmtZoaGIka2VsDGwD4h1AZlXT/y0tMujM7sUL3wRgMg8CE8vqgu xffmFggU1hWZkrCmKj4WrktMSuWDxm0D50OeifficJ/FR5+XIEYdi1c3SoOIibiRa6j7 mDEmaXtAAwZMEddNvrmWhhnUQZ+wYUS34W4OG24BtsUSvgvIKqwfrJfNXhvt8XIjuOZe 7vIzMdWaDZCb454PT0OTc8i4xoUnaew4Bt2TgwVKaDFg0uHxy4Wdb2BzfVHmoyROcQNa tpFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=KblNslOW; 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 u82si3440520itf.123.2017.09.22.01.25.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Sep 2017 01:25:55 -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=KblNslOW; 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 1dvJFf-0003nY-P8; Fri, 22 Sep 2017 08:23:59 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dvJFe-0003mN-Hw for xen-devel@lists.xenproject.org; Fri, 22 Sep 2017 08:23:58 +0000 Received: from [85.158.143.35] by server-11.bemta-6.messagelabs.com id 1E/31-03616-D98C4C95; Fri, 22 Sep 2017 08:23:57 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrOIsWRWlGSWpSXmKPExsVyMfTAWt25J45 EGtx8IWzxfctkJgdGj8MfrrAEMEaxZuYl5VcksGacaOIu+GNVMbH9OHMD4wTdLkYuDiGB6YwS M+a/YgNxWATmMUvc+/WJvYuRk0NCoJ9V4uEHQwg7T2LV7X8sEHaaxIQLC9gg7HKJ1k2bmEFsI QEtiaOnZrNCTN3BJNE25R1jFyMHB5uAicSsDgmQGhEBJYl7qyYzgdQwC8xnlGia1As2SFggQO LzzIlgg1gEVCVWPtsJZvMKeEu863rDCLFMTuLmuU6wOKeAj8Ta/xtYIBZ7S2y9cZVlAqPgAka GVYwaxalFZalFuobGeklFmekZJbmJmTm6hgZmermpxcWJ6ak5iUnFesn5uZsYgQHHAAQ7GL8s CzjEKMnBpCTK+/jIkUghvqT8lMqMxOKM+KLSnNTiQ4wyHBxKEry1x4FygkWp6akVaZk5wNCHS Utw8CiJ8IaDpHmLCxJzizPTIVKnGC05Lty59IeJ48CeW0Cy4+bdP0xCLHn5ealS4rwBIA0CIA 0ZpXlw42DxeYlRVkqYlxHoQCGegtSi3MwSVPlXjOIcjErCvDEgU3gy80rgtr4COogJ6KDy1WA HlSQipKQaGNs/aJ6conRE82auxekn6fy9rHL7b64SjLaaH7f7KOtuE+ajs5T6bk0SE7wy/+SK d2r1PHMnXph105L3Me8mFcal63qYIufd3Bv2PkyV5Wi2+GrVKYsepXPstXqwLe2fu0BmDJ8/5 /xk07jkjFn2XnoFz73Nz22d/+iYjvaj9LuRbWftlpVtk1FiKc5INNRiLipOBABSpvDQygIAAA == X-Env-Sender: bhupinder.thakur@linaro.org X-Msg-Ref: server-6.tower-21.messagelabs.com!1506068636!61035805!1 X-Originating-IP: [209.85.192.173] 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 7119 invoked from network); 22 Sep 2017 08:23:57 -0000 Received: from mail-pf0-f173.google.com (HELO mail-pf0-f173.google.com) (209.85.192.173) by server-6.tower-21.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 22 Sep 2017 08:23:57 -0000 Received: by mail-pf0-f173.google.com with SMTP id r68so240531pfj.3 for ; Fri, 22 Sep 2017 01:23:56 -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=4sd+jityzyLKl9T+2Zny6hdYes/xeKdW5J2msJXqt9U=; b=KblNslOWkxWy6W89cBWEbwbozPxp85DrTeeiYLAFTsb2+pMpc387RtqZFRJR6sQ1iu zlvAyHxI/KJhKr0EWOvFnB2jDgZPAUN/qxRuJw/zCT5g5U1nT8b9hs5ZS2Ew7a0mpPmb HgzPHt8+TbG1/U6Y2oYHBwaLv3HMo5n/MXUFU= 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=4sd+jityzyLKl9T+2Zny6hdYes/xeKdW5J2msJXqt9U=; b=X/hPiEj4U/P2VNtefOBG60QWZQf2VJXq87yW8sBSEqGYAcV2mtJPTYkZD2S4V0ZYSa KCO5yEOrbo0FZVB53VEJ3dqCIV1zildG+phLXc7lxAXX7+EVUSeR5ac/CRCjAdzozEp1 JBp2R8Piu+4JKBiZGoIjtDogxXdTNZQ077fRN3L3fQo1K210lWhKXCPPvsqAgZuProna eVc6fyj2bfG3xSpdaOjqWjdoQr4sfcboQjWV0qSZ3Wur5J9/mWE2hy9qipwAC4YgFmu0 DCpqOXWFpR5GkNz+q8LxgScLgECGR8BHvWO3TFqUb0Gz1xVhGtEdp1MVeUCRM5ex/lt0 sm8A== X-Gm-Message-State: AHPjjUh6ITBqj/QpWSiEWqZlrJ34OgcsyL8njuFmp55OwQWGq6UMXAjD fOIkUJpV7u77siloC6YDhdf9DHj0PNw= X-Google-Smtp-Source: AOwi7QBIt05k91mzJiyAg3pG8cqEy3TU/djFu6dTRGwNNU/LpI4y44zhTTHcmyhonSfBHA3AINDtOA== X-Received: by 10.99.108.2 with SMTP id h2mr8368644pgc.371.1506068635550; Fri, 22 Sep 2017 01:23:55 -0700 (PDT) Received: from blr-ubuntu-linaro.qualcomm.com (blr-bdr-fw-01_globalnat_allzones-outside.qualcomm.com. [103.229.18.19]) by smtp.gmail.com with ESMTPSA id f74sm5569284pfa.36.2017.09.22.01.23.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 22 Sep 2017 01:23:55 -0700 (PDT) From: Bhupinder Thakur To: xen-devel@lists.xenproject.org Date: Fri, 22 Sep 2017 13:53:06 +0530 Message-Id: <1506068606-17066-8-git-send-email-bhupinder.thakur@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1506068606-17066-1-git-send-email-bhupinder.thakur@linaro.org> References: <1506068606-17066-1-git-send-email-bhupinder.thakur@linaro.org> Cc: Wei Liu , Julien Grall , Stefano Stabellini , Ian Jackson Subject: [Xen-devel] [PATCH 07/27 v10] 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 f4f64ad..0db9cd0 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 0ef54d2..9dcbe48 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1370,7 +1370,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++) { @@ -1380,6 +1380,13 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, &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 67b7afb..3473687 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 30a5cb2..1f878de 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 673a6d5..d144dd6 100644 --- a/tools/libxl/libxl_types_internal.idl +++ b/tools/libxl/libxl_types_internal.idl @@ -27,6 +27,7 @@ libxl__device_kind = Enumeration("device_kind", [ (10, "QUSB"), (11, "9PFS"), (12, "VDISPL"), + (13, "VUART"), ]) libxl__console_backend = Enumeration("console_backend", [