From patchwork Mon Aug 28 08:56:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhupinder Thakur X-Patchwork-Id: 111117 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp4548127qge; Mon, 28 Aug 2017 01:58:54 -0700 (PDT) X-Received: by 10.36.104.210 with SMTP id v201mr5930021itb.95.1503910734917; Mon, 28 Aug 2017 01:58:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503910734; cv=none; d=google.com; s=arc-20160816; b=xM2RgcOFvbu67CZCjapAK0sYEXZ68YM7q9pKZEUdVMqIvIsTp4PiTnYN/hUBwvLRVM Wdv3TjqQ+x4WTuVjRJkWlxoL1yDhzih6G7ISqQ/LOXIv7DzusvB2mnJJqfIxjFXqqA6W EEI9djSlSculnOp9qikN3xaoISx+uiC04I1lz0280n6SyyZ11Bh3iJDK5HrTn/aUB8tq knvq+eHjZfGFtjkSPYPbqbHfo4o4utCvMuHqcAf94HL55yAX78p8fsyUycdeJfpfqhJS GSFhqZGJgNV7y0XOBqLB/kuCWvts/yXPaGh5R83dJcnOb9c6TV8PW5uSy7Sz6wwKJ5Tc 4zug== 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=3aa+qutL86sgRqK48J9Q/2ZHC/CfX7KsDNhnQ0C9hCg=; b=BKLjpkPuu3mkirqLc8yJFLOa0L1mb6qeEh5ihAyBJSGgWL70flLo3Ec1FjSaQ6C/tL H5BeW+lAcrN5Ea72Lfd1hGhEi7eClMf/g+aAS9d6CCzVG+/7CQzBkMSTTy9/8ODFpYXz pVgt4uQ69cBHGbE1HmKK1AtLKVfpoy74fQAbvn+p1RvXARURIZdcDUSZJpxGpxGSF0F5 R4ocuOdoy1LJiZW2u32bKpard2Zbr8AnAKd27lRKBUsYpTiTIt9sPdfxJdOhw4hh4KRG 8CxPZLX3855E84+QZWmLW3Rjn910ihgzST3qPhLl+CIK+cM9vPWU8r03vew89gd5YhIz SeFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=eFlk0+k9; 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 v19si4377187iov.262.2017.08.28.01.58.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Aug 2017 01:58:54 -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=eFlk0+k9; 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 1dmFrO-0005ed-AT; Mon, 28 Aug 2017 08:57: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 1dmFrN-0005cB-7h for xen-devel@lists.xenproject.org; Mon, 28 Aug 2017 08:57:29 +0000 Received: from [193.109.254.147] by server-11.bemta-6.messagelabs.com id 55/CC-03612-8FAD3A95; Mon, 28 Aug 2017 08:57:28 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprLIsWRWlGSWpSXmKPExsXiVRtsqPv91uJ Ig73P9C2+b5nM5MDocfjDFZYAxijWzLyk/IoE1owvpy8wFuzwrLi5uYmlgXGnTRcjJ4eQwHRG iaMnc7sYuThYBOYxS+z9cJsNxJEQ6GeVePToDStIlYRAmsSKhjXMEHaZxOdlq5ghurUkjp6az Qph72eSWNrH38XIwcEmYCIxq0MCJCwioCRxb9VkJpCZzALzGSWaJvWygSSEBaIkJqzYCzaHRU BVYu3qAywgvbwCPhL3NhZCrJKTuHmuE6yEEyi8Y+1ddohV3hJdrz+wTmAUWMDIsIpRvTi1qCy 1SNdCL6koMz2jJDcxM0fX0MBMLze1uDgxPTUnMalYLzk/dxMjMKgYgGAH4+zL/ocYJTmYlER5 d1YsjhTiS8pPqcxILM6ILyrNSS0+xCjDwaEkwXvmJlBOsCg1PbUiLTMHGN4waQkOHiUR3g8ga d7igsTc4sx0iNQpRl2OSQe2f2ESYsnLz0uVEud9CFIkAFKUUZoHNwIWa5cYZaWEeRmBjhLiKU gtys0sQZV/xSjOwagkzPsXZApPZl4J3KZXQEcwAR2hKLgQ5IiSRISUVAPjdqXdUetKFhT+Xtv K5e32aoJ8sNfOq5Hf2rjzSpt11yitW3A2YoZB6C3eV2I2XBamdi5r1OcknI5h+VVqmv7/KO9v /wlTGPak+P1Msr5T0OZVoHfFQVxMRp0j4RrfcTdRBYnZqpp1c/w4vvxq290cabs8VHaDSv+6Y pM9renx1fe9NeZeV1NiKc5INNRiLipOBABn5eHdsAIAAA== X-Env-Sender: bhupinder.thakur@linaro.org X-Msg-Ref: server-13.tower-27.messagelabs.com!1503910646!104229659!1 X-Originating-IP: [74.125.83.49] 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 26254 invoked from network); 28 Aug 2017 08:57:27 -0000 Received: from mail-pg0-f49.google.com (HELO mail-pg0-f49.google.com) (74.125.83.49) by server-13.tower-27.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 28 Aug 2017 08:57:27 -0000 Received: by mail-pg0-f49.google.com with SMTP id 83so22179991pgb.4 for ; Mon, 28 Aug 2017 01:57: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=yN/dRo67pbmLqMoNSi7CzmRU3B/Bnu+PsAldLb+rZdk=; b=eFlk0+k9F5M98RYIJJtLbOBsHD1S2rOnhX2rCGzIXK5Fp19WxumM8JLrtHXGqMzqij oyeODIwSrRmSyVb3BEvlOYSzRwIDsfYVxyHRSK8PIrgB0NyWXNS6nRjTEATjGuHL+eaY hnS03wcr+qgJpdzWZcZwYlhLhmK0mComWCxSs= 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=yN/dRo67pbmLqMoNSi7CzmRU3B/Bnu+PsAldLb+rZdk=; b=bfVrkmYTioVjgf/KTO+fpBjTQHtsRpN9CH+ERsDK3IXb1uFpGazs4fku0vtMjE/z72 W2IpuGR6WYGkQ+vq0e62gsxaJjku/oRUMs0kZ93OJh3ryi+xZULcGiJXtyvg6TAZW/I0 hNkFLD5rCuF2msqj2mkUVNDo6iky84D2PsALsm60zyGQDKuyPR8t90bZowPphD8wQwT3 Ooayr/elgs5+9IVzJ8GS1mRnAirTat7fbKH4NDKSsa1GbX54/7kEDeDiyzEBCsfXuz36 IfvD73QNLZxJvu46HyadzJX9OTGwxMjkMJOtBY/sMRi2WUTobU49z4cj/QxGPmdegO86 Bycg== X-Gm-Message-State: AHYfb5i/n8OHq0XU2pdEcOu5+VVyKQjqdnmuhSop/48pRpRuE9s6Elil hhHgtzeeeJuVOzIdk7yjNQ== X-Received: by 10.99.48.7 with SMTP id w7mr6591589pgw.244.1503910646002; Mon, 28 Aug 2017 01:57:26 -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.57.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 28 Aug 2017 01:57:25 -0700 (PDT) From: Bhupinder Thakur To: xen-devel@lists.xenproject.org Date: Mon, 28 Aug 2017 14:26:04 +0530 Message-Id: <1503910570-24427-22-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 21/27 v8] 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);