From patchwork Wed Sep 27 06:13:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhupinder Thakur X-Patchwork-Id: 114325 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp4665221qgf; Tue, 26 Sep 2017 23:16:48 -0700 (PDT) X-Received: by 10.36.87.83 with SMTP id u80mr834054ita.41.1506493008741; Tue, 26 Sep 2017 23:16:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506493008; cv=none; d=google.com; s=arc-20160816; b=VBru1cFptuWSGz4EJrac670PUkYAjen2mOL8JXXQhFG6eo9Uprv2iw9QGcYjZ4uwnD bysppzq9zfS+iod6wEr6LuJhNnufAqYxcJuPDL7gHGwUZY1sbN/ZHe6bPjWzamQj/+ph pTU45O8dxk2iq0OCWpSnhY1RBqet888c8EK9LY6nR1xpruv5xTLmc9ohCgYBB6gg6ag1 deRqvTOCV1O2N1fAClhI6ZoChhLC/xz9GUS5a1SmswA5jFk8c1hMABz83TicbL6PeBdT XVmt2mXah7smuejYtEoiHEjhDzgQDm7rf1YAlHf6NOH5vnvl785i0wUtfJhQHx4cPgxC Uegw== 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=pOLw/Af2qiyicHSvmPitXp7oGCfqh8CVlpbp7qWrjGAB4gGrSx3rVSKofBo53umZZ3 drp56UxxWLZb/PYSg84Af4tw8s0+BRk/q2Er8/+1VXCNkaiEl23I3Kfv191jhXBFNgqp MzbiLEGmFiLnKIAF8gNX/eJNqwjs+mTuMNjiaTVoHGUKeqSLbNvCFApsntZmmsgZJ3LZ Ic1fE1TuFPpUjQa0n7JP6+ocjmSSyyPbfYCpNjtvy17VVb4lFZMDZMH8fu9OHS3wnZg3 DRRGZ8d+/ln2BRQsUhVGr48db1fbMJXiLhmxwZCKohfd8CAlfbdUuI2zeGMHQTqSqFoG pziw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=FQyg0Pzg; 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 n75si8754410ioi.350.2017.09.26.23.16.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Sep 2017 23:16:48 -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=FQyg0Pzg; 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 1dx5bv-00039B-40; Wed, 27 Sep 2017 06:14:19 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dx5bt-00036A-9B for xen-devel@lists.xenproject.org; Wed, 27 Sep 2017 06:14:17 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 05/77-25201-8B14BC95; Wed, 27 Sep 2017 06:14:16 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrJIsWRWlGSWpSXmKPExsXiVRuso7vd8XS kwb6VKhbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8b5+zvYCx54Vtz7dpKlgfGuTRcjF4eQwDRG icZLT5hBHBaBecwS+z4tYQVxJAT6WSWm/fgH5HACOXkSS/d1QNlpEhff32SBsCsktqy5AmYLC WhJHD01mxVi7AomiZuvzgM5HBxsAiYSszokQGpEBJQk7q2azARSwywwn1GiaVIvG0hCWCBaYs Oba2A2i4CqxPyp7WDLeAV8JFrefWaEWCYncfNcJzOIzQkUP91/mw1isbfEpZX9rBMYBRcwMqx i1ChOLSpLLdI1NNZLKspMzyjJTczM0TU0MNXLTS0uTkxPzUlMKtZLzs/dxAgMOgYg2MH4b5vn IUZJDiYlUd6a/6cihfiS8lMqMxKLM+KLSnNSiw8xynBwKEnw3nA4HSkkWJSanlqRlpkDDH+Yt AQHj5IIryAwBoR4iwsSc4sz0yFSpxgtOb703vjDxLFvzy0g2XHz7h8mIZa8/LxUKXHeiyDzBE AaMkrz4MbBYvQSo6yUMC8j0IFCPAWpRbmZJajyrxjFORiVhHllQdbyZOaVwG19BXQQE9BBvVN PgBxUkoiQkmpgtP5q0b1+obbyPK/HHCKzeMM12JXmLHQJ0rkRuPif91cZgbkLd/UmTp+2Tvyk 4gYb5xT31vuLs/9vbJgzpVipfUJn0/eWSl/B7u2PIvxiltobmk1Q3fNyq8udnX5FL3RnrDK9/ nynUHC9kXAjF6fgpoM8rMYSyzZfjVSqvRg9Y3+wz1zlg7vDlFiKMxINtZiLihMBIIMymMwCAA A= X-Env-Sender: bhupinder.thakur@linaro.org X-Msg-Ref: server-7.tower-206.messagelabs.com!1506492854!110540352!1 X-Originating-IP: [74.125.83.44] 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 11859 invoked from network); 27 Sep 2017 06:14:15 -0000 Received: from mail-pg0-f44.google.com (HELO mail-pg0-f44.google.com) (74.125.83.44) by server-7.tower-206.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 27 Sep 2017 06:14:15 -0000 Received: by mail-pg0-f44.google.com with SMTP id p5so7220953pgn.7 for ; Tue, 26 Sep 2017 23:14:15 -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=FQyg0PzgjjHlWMdEGmoNzV92h2J8Ow5scIvVKzXtwbpdLfwXqi9Kgiun8RfE0p8W3f xLcAxwPStBd18aW3aoDpXdqTw1pXz2bOU4Yqd1LJGNpr2KztgwCk1ZoGdDrIR0Arsejs c2u0f0r6qSodmLLzfFuEEmu60UHtgsR/SPl9Y= 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=VsHzkqMGAePBuurV3Rhb/nF//c98jDkCIvCO56xpsL7a9DRkqqk4VtKn0ccI8QxIhl 6lwFjTRy3pUlh6zJGn8loWzcWvq3CgUSm6XciuzgFdlo8WgVqP3zzbXilT7MoR9ifdFN FTxqPH54ivTcALhsF2T9w0OjYw/R5JlFypATfKqmGHj7wix6UgxqZdF5WpYwqUdnBKCb tsoQaLkkeyhgW5RgM9RPg0ubhpeMhZrp9Opct/DwrbAf0OPvY0TPt28Tt9yBTs5s/Hp/ CJu64hnb6V88gF4ncSpFpv/Qfm7vHANgzJ8TQyyKjMe7vbpEfPVD60GHWwL40U4dDR4i bOTg== X-Gm-Message-State: AHPjjUhyD0zxFsgLe48H0VyrW8kBK66Ac/VL3HbKwn5wYqbTRmIexGUR ZPsZyNB0wBE4nGb+KRFc7Yey2ZZ99NQ= X-Google-Smtp-Source: AOwi7QAnAkmt1ctTz+Ybco6qqkJazKKfyWLPfa7rmHvyWzI8iaoRzK/3wPzO0EVRIJugDxafSEosTg== X-Received: by 10.84.128.107 with SMTP id 98mr333174pla.282.1506492853456; Tue, 26 Sep 2017 23:14:13 -0700 (PDT) Received: from blr-ubuntu-linaro.wlan.qualcomm.com (h3.248.139.40.ip.windstream.net. [40.139.248.3]) by smtp.gmail.com with ESMTPSA id s187sm18013485pgb.82.2017.09.26.23.14.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 26 Sep 2017 23:14:13 -0700 (PDT) From: Bhupinder Thakur To: xen-devel@lists.xenproject.org Date: Wed, 27 Sep 2017 11:43:30 +0530 Message-Id: <1506492816-25954-22-git-send-email-bhupinder.thakur@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1506492816-25954-1-git-send-email-bhupinder.thakur@linaro.org> References: <1506492816-25954-1-git-send-email-bhupinder.thakur@linaro.org> Cc: Wei Liu , Julien Grall , Stefano Stabellini , Ian Jackson Subject: [Xen-devel] [PATCH 21/27 v11] 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);