From patchwork Fri Sep 22 08:23:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhupinder Thakur X-Patchwork-Id: 113980 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp3011112qgf; Fri, 22 Sep 2017 01:26:03 -0700 (PDT) X-Received: by 10.107.10.77 with SMTP id u74mr6993511ioi.243.1506068763868; Fri, 22 Sep 2017 01:26:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506068763; cv=none; d=google.com; s=arc-20160816; b=V+2gpqL3OIoLe1C+ahH9eT9bRWak9YaQ1AgYw25hvpNVT3jhS2eutBwGu0zBPkqGgk sxsIRwn8UDyKmjyPpG9KszCYShUZH9M7DsZODmQkdVqmYK0WBNi5w4uLiE+fHtySA6h9 vkPT+5ETWygoe2HWHhMnY5GoJ4itTuvsEgluoCQokeoDH4slJY0ZQ10AkNx/IUDfHT6l 0R9kQlU+LLqX6SBuPOKGrvBPY+2l47O5TXR4h4H9x58OTlAO9Fa0X9hjt3Lt+NNJFbeG F7F8+RbQV1Zl+rSrgmevyj1G95KT6KABUvdqLhEGNtAQbcfKb1d20gfejuDS7q3bJhzC BVpg== 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=d28LQcbW5AD8LMs7FTS7EYwy8nxOvKDMb/oprClQods=; b=p1wiLWLI63cKxCs7nlzRy2FyFaYbVhVQnt6b1cv/T4dSo9aMmLBeuRoCuQ+QrdK9YW Q9RwQ7CIYhDEbrs9vkdeQz/yXR42wFVvomggSbqR2y5oyCfhZpLwAXFGr+S/zyI5gEvf N/87jNZ7ubjkc8QY9xJR/Q/3dYST7Pxws4KgkxYZXUtg3qK7isDD3aDLEnZeP1yUjXx3 JufUg8JApyQD7fAJC+ccd41IG+FDSnecWEIF4udrL4QD7ELJyAwjKqqnebUavMjElfH2 V9stdUjThAZtr2I74wgQczZ3fYp4D3gKVG9lTL3CK+Jjf1bffnuUyPOwpdnjq/dXKr/c 574w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=RDZ8zUC6; 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 k34si3038819iod.151.2017.09.22.01.26.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Sep 2017 01:26:03 -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=RDZ8zUC6; 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 1dvJGL-0004Zf-Cb; Fri, 22 Sep 2017 08:24:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dvJGJ-0004W8-Hn for xen-devel@lists.xenproject.org; Fri, 22 Sep 2017 08:24:39 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id A2/F7-02023-6C8C4C95; Fri, 22 Sep 2017 08:24:38 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrBIsWRWlGSWpSXmKPExsVyMfTARt2jJ45 EGszbbWHxfctkJgdGj8MfrrAEMEaxZuYl5VcksGacv7+DveCBZ8W9bydZGhjv2nQxcnEICUxn lDhw6B1zFyMnB4vAPGaJG1O1QRISAv2sEitfHGMFSUgI5Em8/7+QHcJOkzhzvIENwq6QuNf6D MwWEtCSOHpqNivE1B1MErufdgFN5eBgEzCRmNUhAVIjIqAkcW/VZCaQGmaB+YwSTZN6wZqFBa Ilzq05yQZxharE6ba/YDavgI/E2u4XzBDL5CRunusEszlB4v83sEAs9pbYeuMqywRGwQWMDKs YNYpTi8pSi3QNzfWSijLTM0pyEzNzdA0NTPVyU4uLE9NTcxKTivWS83M3MQJDjgEIdjBePO15 iFGSg0lJlPfxkSORQnxJ+SmVGYnFGfFFpTmpxYcYZTg4lCR4dx4HygkWpaanVqRl5gCDHyYtw cGjJMIbDpLmLS5IzC3OTIdInWK05Lhw59IfJo4De24ByY6bd/8wCbHk5eelSonzzgdpEABpyC jNgxsHi9BLjLJSwryMQAcK8RSkFuVmlqDKv2IU52BUEuadBTKFJzOvBG7rK6CDmIAOKl8NdlB JIkJKqoExxlvdiF8jz/3Pmot9z1rDDqu99jm71+ZkXJD1RKmENIelR5NPin1M63qR5Rpdl99d ea9gqVepKO8Pjk9K9Yve2q5wLkx5ldb1p+ZGq/8fwd3X7h1QvR/A92CDR11doJJiqVA2Y6pFh +PO+6e95lXuWTqVsTip4+faifkLVA6eUphxrLl1QY8SS3FGoqEWc1FxIgCAVZG3ywIAAA== X-Env-Sender: bhupinder.thakur@linaro.org X-Msg-Ref: server-15.tower-206.messagelabs.com!1506068676!98732261!1 X-Originating-IP: [209.85.192.177] 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 13833 invoked from network); 22 Sep 2017 08:24:37 -0000 Received: from mail-pf0-f177.google.com (HELO mail-pf0-f177.google.com) (209.85.192.177) by server-15.tower-206.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 22 Sep 2017 08:24:37 -0000 Received: by mail-pf0-f177.google.com with SMTP id y29so244434pff.0 for ; Fri, 22 Sep 2017 01:24:37 -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=ynPuUYoJvCxIS6CFaobuA5PgWjQou9R3STzppfCSqEs=; b=RDZ8zUC6jQBuB41uuSuadaJFjmtDw5GU8OKfbZz2zvhWb5qK1A+Stup+LYEGse57LU rmUdfiHTNqpvA1SnOBPRO4Cq23+aALFWt0tt54vJUTaNEqINUSrTKNZNuRJYrvr7SUnX A0sbWdpVW75MUTzwttVk+rIdNlCf/VQagzXUU= 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=ynPuUYoJvCxIS6CFaobuA5PgWjQou9R3STzppfCSqEs=; b=Nv0UnEfQOYv5AMbf3YdIwcTuIc/OopUALjyM0p9YA4X+XHxzKadBniln41BEeHmimb ElWcrVl1tVYjweodUaSMA5kYBUTeTPpX9FlCJ8Pg3ALoBN7rqIfIvN84j29SYHh+Ip+s HcXz8YZx/VLixgcRK9Ro+h3u5qU8MCXO2MQ1FVstzGINtswWQp2Pg14Vzq3D7I7v65dt 9VujoCqatJSK+iGkztsNQWRiz+ZYxcWLKCQl8tIESx04zE8UrWOaWJxpB1/bbRdLtZRf w35y8dqCAYqOXagSYwHYYjBaWf50aiTZJkp42SexNVPWPe1TC9+ezOQTJ2jfEKzmpx0s Fsmg== X-Gm-Message-State: AHPjjUiqDZOtKGFuj6sCZJy9zkcHB5DAYkTomOhOzpdtYuqOtWmp/Spn fNsvbqhPklC7QPSwDC5lo7Vdsl0HrDE= X-Google-Smtp-Source: AOwi7QC3wEq9MCSAZLOuzQkJphheta9yvLH1ag1linKa3nuWaLoVitV+kB+RmoxMLQ7Rxm9dneiaHA== X-Received: by 10.98.210.67 with SMTP id c64mr8367173pfg.60.1506068676078; Fri, 22 Sep 2017 01:24:36 -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.24.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 22 Sep 2017 01:24:35 -0700 (PDT) From: Bhupinder Thakur To: xen-devel@lists.xenproject.org Date: Fri, 22 Sep 2017 13:53:20 +0530 Message-Id: <1506068606-17066-22-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 21/27 v10] xen/arm: vpl011: Add support for multiple consoles in xenconsole 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" This patch adds the support for multiple consoles and introduces the iterator functions to operate on multiple consoles. The functions called by the iterators check that they are operating on valid I/O parameters. This ensures that if a particular console is not initialized then the functions will not do anything for that console type. This patch is in preparation to support a new vuart console. Signed-off-by: Bhupinder Thakur Acked-by: Wei Liu --- CC: Ian Jackson CC: Wei Liu CC: Stefano Stabellini CC: Julien Grall Changes since v5: - Split this patch in multiple smaller patches. Changes since v4: - Changes to make event channel handling per console rather than per domain. Changes since v3: - The changes in xenconsole have been split into four patches. This is the third patch. tools/console/daemon/io.c | 160 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 126 insertions(+), 34 deletions(-) diff --git a/tools/console/daemon/io.c b/tools/console/daemon/io.c index 71465a0..a198dbb 100644 --- a/tools/console/daemon/io.c +++ b/tools/console/daemon/io.c @@ -90,12 +90,14 @@ struct buffer { }; struct console { + char *ttyname; int master_fd; int master_pollfd_idx; int slave_fd; int log_fd; struct buffer buffer; char *xspath; + char *log_suffix; int ring_ref; xenevtchn_handle *xce_handle; int xce_pollfd_idx; @@ -107,21 +109,109 @@ struct console { struct domain *d; }; +struct console_type { + char *xsname; + char *ttyname; + char *log_suffix; +}; + +static struct console_type console_type[] = { + { + .xsname = "/console", + .ttyname = "tty", + .log_suffix = "", + }, +}; + +#define NUM_CONSOLE_TYPE (sizeof(console_type)/sizeof(struct console_type)) + struct domain { int domid; bool is_dead; unsigned last_seen; struct domain *next; - struct console console; + struct console console[NUM_CONSOLE_TYPE]; }; static struct domain *dom_head; +typedef void (*VOID_ITER_FUNC_ARG1)(struct console *); +typedef int (*INT_ITER_FUNC_ARG1)(struct console *); +typedef void (*VOID_ITER_FUNC_ARG2)(struct console *, void *); +typedef int (*INT_ITER_FUNC_ARG3)(struct console *, + struct domain *dom, void **); + static inline bool console_enabled(struct console *con) { return con->local_port != -1; } +static inline void console_iter_void_arg1(struct domain *d, + VOID_ITER_FUNC_ARG1 iter_func) +{ + unsigned int i; + struct console *con = &d->console[0]; + + for (i = 0; i < NUM_CONSOLE_TYPE; i++, con++) { + iter_func(con); + } +} + +static inline void console_iter_void_arg2(struct domain *d, + VOID_ITER_FUNC_ARG2 iter_func, + void *iter_data) +{ + unsigned int i; + struct console *con = &d->console[0]; + + for (i = 0; i < NUM_CONSOLE_TYPE; i++, con++) { + iter_func(con, iter_data); + } +} + +static inline int console_iter_int_arg1(struct domain *d, + INT_ITER_FUNC_ARG1 iter_func) +{ + unsigned int i; + int ret; + struct console *con = &d->console[0]; + + for (i = 0; i < NUM_CONSOLE_TYPE; i++, con++) { + /* + * Zero return values means success. + * + * Non-zero return value indicates an error in which + * case terminate the loop. + */ + ret = iter_func(con); + if (ret) + break; + } + return ret; +} + +static inline int console_iter_int_arg3(struct domain *d, + INT_ITER_FUNC_ARG3 iter_func, + void **iter_data) +{ + unsigned int i; + int ret; + struct console *con = &d->console[0]; + + for (i = 0; i < NUM_CONSOLE_TYPE; i++, con++) { + /* + * Zero return values means success. + * + * Non-zero return value indicates an error in which + * case terminate the loop. + */ + ret = iter_func(con, d, iter_data); + if (ret) + break; + } + return ret; +} + static int write_all(int fd, const char* buf, size_t len) { while (len) { @@ -336,7 +426,9 @@ static int create_console_log(struct console *con) return -1; } - snprintf(logfile, PATH_MAX-1, "%s/guest-%s.log", log_dir, data); + snprintf(logfile, PATH_MAX-1, "%s/guest-%s%s.log", + log_dir, data, con->log_suffix); + free(data); logfile[PATH_MAX-1] = '\0'; @@ -488,7 +580,7 @@ static int console_create_tty(struct console *con) } free(path); - success = (asprintf(&path, "%s/tty", con->xspath) != -1); + success = (asprintf(&path, "%s/%s", con->xspath, con->ttyname) != -1); if (!success) goto out; success = xs_write(xs, XBT_NULL, path, slave, strlen(slave)); @@ -654,13 +746,13 @@ static bool watch_domain(struct domain *dom, bool watch) { char domid_str[3 + MAX_STRLEN(dom->domid)]; bool success; - struct console *con = &dom->console; + struct console *con = &dom->console[0]; snprintf(domid_str, sizeof(domid_str), "dom%u", dom->domid); if (watch) { success = xs_watch(xs, con->xspath, domid_str); if (success) - console_create_ring(con); + console_iter_int_arg1(dom, console_create_ring); else xs_unwatch(xs, con->xspath, domid_str); } else { @@ -670,11 +762,13 @@ static bool watch_domain(struct domain *dom, bool watch) return success; } -static int console_init(struct console *con, struct domain *dom) +static int console_init(struct console *con, struct domain *dom, void **data) { char *s; int err = -1; struct timespec ts; + struct console_type **con_type = (struct console_type **)data; + char *xsname, *xspath; if (clock_gettime(CLOCK_MONOTONIC, &ts) < 0) { dolog(LOG_ERR, "Cannot get time of day %s:%s:L%d", @@ -692,15 +786,21 @@ static int console_init(struct console *con, struct domain *dom) con->xce_pollfd_idx = -1; con->next_period = ((long long)ts.tv_sec * 1000) + (ts.tv_nsec / 1000000) + RATE_LIMIT_PERIOD; con->d = dom; - con->xspath = xs_get_domain_path(xs, dom->domid); - s = realloc(con->xspath, strlen(con->xspath) + - strlen("/console") + 1); + con->ttyname = (*con_type)->ttyname; + con->log_suffix = (*con_type)->log_suffix; + xsname = (char *)(*con_type)->xsname; + xspath = xs_get_domain_path(xs, dom->domid); + s = realloc(xspath, strlen(xspath) + + strlen(xsname) + 1); if (s) { - con->xspath = s; - strcat(con->xspath, "/console"); + xspath = s; + strcat(xspath, xsname); + con->xspath = xspath; err = 0; } + (*con_type)++; + return err; } @@ -713,7 +813,7 @@ static void console_free(struct console *con) static struct domain *create_domain(int domid) { struct domain *dom; - struct console *con; + struct console_type *con_type = &console_type[0]; dom = calloc(1, sizeof *dom); if (dom == NULL) { @@ -723,9 +823,8 @@ static struct domain *create_domain(int domid) } dom->domid = domid; - con = &dom->console; - if (console_init(con, dom)) + if (console_iter_int_arg3(dom, console_init, (void **)&con_type)) goto out; if (!watch_domain(dom, true)) @@ -738,7 +837,7 @@ static struct domain *create_domain(int domid) return dom; out: - console_free(con); + console_iter_void_arg1(dom, console_free); free(dom); return NULL; } @@ -784,11 +883,9 @@ static void console_cleanup(struct console *con) static void cleanup_domain(struct domain *d) { - struct console *con = &d->console; + console_iter_void_arg1(d, console_close_tty); - console_close_tty(con); - - console_cleanup(con); + console_iter_void_arg1(d, console_cleanup); remove_domain(d); } @@ -803,12 +900,10 @@ static void console_close_evtchn(struct console *con) static void shutdown_domain(struct domain *d) { - struct console *con = &d->console; - d->is_dead = true; watch_domain(d, false); - console_unmap_interface(con); - console_close_evtchn(con); + console_iter_void_arg1(d, console_unmap_interface); + console_iter_void_arg1(d, console_close_evtchn); } static unsigned enum_pass = 0; @@ -1003,7 +1098,7 @@ static void handle_xs(void) /* We may get watches firing for domains that have recently been removed, so dom may be NULL here. */ if (dom && dom->is_dead == false) - console_create_ring(&dom->console); + console_iter_int_arg1(dom, console_create_ring); } free(vec); @@ -1058,9 +1153,7 @@ static void handle_log_reload(void) if (log_guest) { struct domain *d; for (d = dom_head; d; d = d->next) { - struct console *con = &d->console; - - console_open_log(con); + console_iter_void_arg1(d, console_open_log); } } @@ -1223,13 +1316,13 @@ void handle_io(void) /* Re-calculate any event counter allowances & unblock domains with new allowance */ for (d = dom_head; d; d = d->next) { - struct console *con = &d->console; - console_evtchn_unmask(con, (void *)now); + console_iter_void_arg2(d, console_evtchn_unmask, (void *)now); - maybe_add_console_evtchn_fd(con, (void *)&next_timeout); + console_iter_void_arg2(d, maybe_add_console_evtchn_fd, + (void *)&next_timeout); - maybe_add_console_tty_fd(con); + console_iter_void_arg1(d, maybe_add_console_tty_fd); } /* If any domain has been rate limited, we need to work @@ -1290,13 +1383,12 @@ void handle_io(void) } for (d = dom_head; d; d = n) { - struct console *con = &d->console; n = d->next; - handle_console_ring(con); + console_iter_void_arg1(d, handle_console_ring); - handle_console_tty(con); + console_iter_void_arg1(d, handle_console_tty); if (d->last_seen != enum_pass) shutdown_domain(d);