From patchwork Mon Sep 18 10:31:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhupinder Thakur X-Patchwork-Id: 112895 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp3501293qgf; Mon, 18 Sep 2017 03:35:02 -0700 (PDT) X-Received: by 10.107.57.70 with SMTP id g67mr21669353ioa.224.1505730902021; Mon, 18 Sep 2017 03:35:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505730902; cv=none; d=google.com; s=arc-20160816; b=hOKjNp++Y1KE4NxS7K15uEqoDssY4CwCQ/gITvkozheHX+J4PUGPwn2NctWi9nKScx Rue/haJyNgglFpWQlxQa6ukty9QpU8DaCC4Srv5x35u5sWCLDq5P26z0ZSEG9tl7gv3Y uwMoHEq5Te584EYroOLSoitgqusMiHOQF9+HXQ9NT8rzxd+minrma1YWoEQ+AuHtW6+X dtN7Ympr8iqEdrGKA41rX4VcPy7cOGEpPpORK6zrMwa5PuFC4ivvbzRbeDh+s3QXmx79 f+KlqrkHtUetlYrzzIpZiyOReJuraQanxcy2mXWJlFOkXjiGt9DEAn0v/Y4Xrx/6ndhp j01A== 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=WXsVKFtSEvooh/gQViJFmbABTRKBe0u52bhIWXyD934=; b=lAP3lMvECfrUEJa+3PzgS+tjiEQJQYUc99/U5YKYcTQKc9dhC+0/yeATYdZpzlOD6m MuEEkHPkJAmT5spQEmGREV5/gjzviWt/JTqOxUIdg1XE1jxCdA95Bklx7es9m60wJ3QZ 7nBddIlX7vrOPLon2VK9IS3gB8txpPUuJPrPdtaqkkKSDY9k7yFQaK8HKF4crbC4atIb vcuQrFlEp+nxlXI1MyT/IVTLq2Q0cF2SUBqJ3KCfKE2Vkfv7FbNowVSvmwWoVOEcoz4v g0pD9RpvGZGyEFuNRXUVyieQz9fLJUIpVD3KFK/tOQTEahC3gVI/6EL13Cb8/D5b+0Cg Y8iQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=XrSlDlQO; 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 s128si4294885itd.186.2017.09.18.03.35.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Sep 2017 03:35:02 -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=XrSlDlQO; 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 1dttMI-00021w-Vr; Mon, 18 Sep 2017 10:32:58 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dttMH-0001zW-Qy for xen-devel@lists.xenproject.org; Mon, 18 Sep 2017 10:32:57 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 93/57-02226-8D0AFB95; Mon, 18 Sep 2017 10:32:56 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrBIsWRWlGSWpSXmKPExsVyMfTAet3LC/Z HGrRNF7P4vmUykwOjx+EPV1gCGKNYM/OS8isSWDMaTpxlLnjrWdF1aAdjA+Nfmy5GLg4hgWmM Eqt7jrOCOCwC85glZi+7wQbiSAj0s0p0P3sNlOEEctIktjzoZIKxb/xqZIawqySOnZnFDmILC WhJHD01mxVi7A4midXtS4EmcXCwCZhIzOqQAKkREVCSuLdqMhNIDbPAfEaJpkm9YDXCApkSTw 5JgtSwCKhKvD7yCWwmr4CPxPm3TVC75CRunusEszlB4usfsELs9ZaY9+sK4wRGwQWMDKsYNYp Ti8pSi3SNzPWSijLTM0pyEzNzdA0NjPVyU4uLE9NTcxKTivWS83M3MQJDrp6BgXEHY8tev0OM khxMSqK8opH7I4X4kvJTKjMSizPii0pzUosPMcpwcChJ8JbNB8oJFqWmp1akZeYAgx8mLcHBo yTCWwiS5i0uSMwtzkyHSJ1itOS4cOfSHyaOA3tuAcmOm3f/MAmx5OXnpUqJ89aBNAiANGSU5s GNg0XoJUZZKWFeRgYGBiGegtSi3MwSVPlXjOIcjErCvMtApvBk5pXAbX0FdBAT0EEtO/aAHFS SiJCSamCUt6l5IF99wn9O5Dq737POcS353RTdLPiYh2Xp4zk/7itXe6Ub2LNdL+RSejsv4GV7 kchbTS31Va48x/+3MlmffSuyl/mnqsIp072lL1d1XPM6fSbgLJe0+Z3+O/sY73o4X329bbues cU+rrXahz1PpsXkrP8lrOOWOnupW1zRNLtkrd3HXM2VWIozEg21mIuKEwFlIfS4ywIAAA== X-Env-Sender: bhupinder.thakur@linaro.org X-Msg-Ref: server-16.tower-31.messagelabs.com!1505730770!107672538!1 X-Originating-IP: [209.85.192.175] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12985 invoked from network); 18 Sep 2017 10:32:51 -0000 Received: from mail-pf0-f175.google.com (HELO mail-pf0-f175.google.com) (209.85.192.175) by server-16.tower-31.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 18 Sep 2017 10:32:51 -0000 Received: by mail-pf0-f175.google.com with SMTP id m63so29459pfk.7 for ; Mon, 18 Sep 2017 03:32:50 -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=/c87JD9XyWkvHP2iWascyeQ5IUSzbfWQc11J8Ir9N+k=; b=XrSlDlQOWep1SZeVyvhec9s8RWjox1qQKrGzLPDUhtWRE3oIgw7rH6B3hRujOmykAN BFqOr+Nh+Se3xuV3iblL2Hm30aWYJ/TZd1nensmoOmkVLIdEnktbLOo31lMLhYQhFGgR j+lz3Pm+aowXH/O2oDTPjOMtSlyzwOuo62CVU= 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=/c87JD9XyWkvHP2iWascyeQ5IUSzbfWQc11J8Ir9N+k=; b=Hl0mi7+nq6EUg/2Q8hKCFoQcmKYcVLzTmh/zGHOS0YqcJJmqiprh84F5c4jX4+a5No VUlY/gPXRs2gqHXqf5K71d5yY1BHIXgjHeRdnIgt99eWlOJkMJbyADJCVElUSmoVttVB Q2FfyhUwKYWeomy8M7dsHfTlVKJpTrREgyjKGeUjlxZyTXqL4POQsAkz4bdz/G74Jd1r +D3dkGkTBnAdaM/Ugbg3h4Q/Nv0/yeilppGR64PvTCnGJaRDTr8a3bfkuFLs4wlWFkc4 Q0dMbXxxHr1tX1zDDdiTt7mD4kMI+Bd6zt7xjpQPw2H+o6faouxzqAu+Bdb9Un9DeOI9 JOwQ== X-Gm-Message-State: AHPjjUgo8LcoF5Wm+2XYNQqEvyUSExBanE2yq8NV+nCCY9vrkxGNBPvB nVKQsht55eCUbZKnKqD3fw== X-Google-Smtp-Source: ADKCNb57MFoU0dbNdT7WFJM3BXtvFP1cxg9DsUUsrYYdXNNBtUmW1bBEh8SZpPugcOlDed2a1wS8Ng== X-Received: by 10.99.126.84 with SMTP id o20mr32575867pgn.131.1505730769472; Mon, 18 Sep 2017 03:32:49 -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 b7sm12937845pge.79.2017.09.18.03.32.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 18 Sep 2017 03:32:48 -0700 (PDT) From: Bhupinder Thakur To: xen-devel@lists.xenproject.org Date: Mon, 18 Sep 2017 16:01:54 +0530 Message-Id: <1505730731-10947-11-git-send-email-bhupinder.thakur@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1505730731-10947-1-git-send-email-bhupinder.thakur@linaro.org> References: <1505730731-10947-1-git-send-email-bhupinder.thakur@linaro.org> Cc: Wei Liu , Julien Grall , Stefano Stabellini , Ian Jackson Subject: [Xen-devel] [PATCH 10/27 v9] xen/arm: vpl011: Modify xenconsole functions to take console structure as input 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" Xenconsole functions take domain structure as input. These functions shall be modified to take console structure as input since these functions typically perform console specific operations. Also the console specific functions starting with prefix "domain_" shall be modified to "console_" to indicate that these are console specific functions. This patch is in preparation to support multiple consoles to support vuart console. Signed-off-by: Bhupinder Thakur Acked-by: Stefano Stabellini Acked-by: Wei Liu --- CC: Ian Jackson CC: Wei Liu CC: Stefano Stabellini CC: Julien Grall Changes since v3: - The changes in xenconsole have been split into multiple patches. This is the second patch. tools/console/daemon/io.c | 79 +++++++++++++++++++++++------------------------ 1 file changed, 38 insertions(+), 41 deletions(-) diff --git a/tools/console/daemon/io.c b/tools/console/daemon/io.c index 6f5c69c..a2a3496 100644 --- a/tools/console/daemon/io.c +++ b/tools/console/daemon/io.c @@ -163,10 +163,10 @@ static int write_with_timestamp(int fd, const char *data, size_t sz, return 0; } -static void buffer_append(struct domain *dom) +static void buffer_append(struct console *con) { - struct console *con = &dom->console; struct buffer *buffer = &con->buffer; + struct domain *dom = con->d; XENCONS_RING_IDX cons, prod, size; struct xencons_interface *intf = con->interface; @@ -296,12 +296,13 @@ static int create_hv_log(void) return fd; } -static int create_domain_log(struct domain *dom) +static int create_console_log(struct console *con) { char logfile[PATH_MAX]; char *namepath, *data, *s; int fd; unsigned int len; + struct domain *dom = con->d; namepath = xs_get_domain_path(xs, dom->domid); s = realloc(namepath, strlen(namepath) + 6); @@ -342,10 +343,8 @@ static int create_domain_log(struct domain *dom) return fd; } -static void domain_close_tty(struct domain *dom) +static void console_close_tty(struct console *con) { - struct console *con = &dom->console; - if (con->master_fd != -1) { close(con->master_fd); con->master_fd = -1; @@ -417,7 +416,7 @@ void cfmakeraw(struct termios *termios_p) } #endif /* __sun__ */ -static int domain_create_tty(struct domain *dom) +static int console_create_tty(struct console *con) { const char *slave; char *path; @@ -426,7 +425,7 @@ static int domain_create_tty(struct domain *dom) char *data; unsigned int len; struct termios term; - struct console *con = &dom->console; + struct domain *dom = con->d; assert(con->slave_fd == -1); assert(con->master_fd == -1); @@ -487,7 +486,7 @@ static int domain_create_tty(struct domain *dom) return 1; out: - domain_close_tty(dom); + console_close_tty(con); return 0; } @@ -526,10 +525,8 @@ static int xs_gather(struct xs_handle *xs, const char *dir, ...) return ret; } -static void domain_unmap_interface(struct domain *dom) +static void console_unmap_interface(struct console *con) { - struct console *con = &dom->console; - if (con->interface == NULL) return; if (xgt_handle && con->ring_ref == -1) @@ -540,11 +537,11 @@ static void domain_unmap_interface(struct domain *dom) con->ring_ref = -1; } -static int domain_create_ring(struct domain *dom) +static int console_create_ring(struct console *con) { int err, remote_port, ring_ref, rc; char *type, path[PATH_MAX]; - struct console *con = &dom->console; + struct domain *dom = con->d; err = xs_gather(xs, con->xspath, "ring-ref", "%u", &ring_ref, @@ -563,7 +560,7 @@ static int domain_create_ring(struct domain *dom) /* If using ring_ref and it has changed, remap */ if (ring_ref != con->ring_ref && con->ring_ref != -1) - domain_unmap_interface(dom); + console_unmap_interface(con); if (!con->interface && xgt_handle) { /* Prefer using grant table */ @@ -621,7 +618,7 @@ static int domain_create_ring(struct domain *dom) con->remote_port = remote_port; if (con->master_fd == -1) { - if (!domain_create_tty(dom)) { + if (!console_create_tty(con)) { err = errno; xenevtchn_close(con->xce_handle); con->xce_handle = NULL; @@ -632,7 +629,7 @@ static int domain_create_ring(struct domain *dom) } if (log_guest && (con->log_fd == -1)) - con->log_fd = create_domain_log(dom); + con->log_fd = create_console_log(con); out: return err; @@ -648,7 +645,7 @@ static bool watch_domain(struct domain *dom, bool watch) if (watch) { success = xs_watch(xs, con->xspath, domid_str); if (success) - domain_create_ring(dom); + console_create_ring(con); else xs_unwatch(xs, con->xspath, domid_str); } else { @@ -695,6 +692,7 @@ static struct domain *create_domain(int domid) con->slave_fd = -1; con->log_fd = -1; con->xce_pollfd_idx = -1; + con->d = dom; con->next_period = ((long long)ts.tv_sec * 1000) + (ts.tv_nsec / 1000000) + RATE_LIMIT_PERIOD; @@ -746,7 +744,7 @@ static void cleanup_domain(struct domain *d) { struct console *con = &d->console; - domain_close_tty(d); + console_close_tty(con); if (con->log_fd != -1) { close(con->log_fd); @@ -768,7 +766,7 @@ static void shutdown_domain(struct domain *d) d->is_dead = true; watch_domain(d, false); - domain_unmap_interface(d); + console_unmap_interface(con); if (con->xce_handle != NULL) xenevtchn_close(con->xce_handle); con->xce_handle = NULL; @@ -799,9 +797,8 @@ static void enum_domains(void) } } -static int ring_free_bytes(struct domain *dom) +static int ring_free_bytes(struct console *con) { - struct console *con = &dom->console; struct xencons_interface *intf = con->interface; XENCONS_RING_IDX cons, prod, space; @@ -816,30 +813,30 @@ static int ring_free_bytes(struct domain *dom) return (sizeof(intf->in) - space); } -static void domain_handle_broken_tty(struct domain *dom, int recreate) +static void console_handle_broken_tty(struct console *con, int recreate) { - domain_close_tty(dom); + console_close_tty(con); if (recreate) { - domain_create_tty(dom); + console_create_tty(con); } else { - shutdown_domain(dom); + shutdown_domain(con->d); } } -static void handle_tty_read(struct domain *dom) +static void handle_tty_read(struct console *con) { ssize_t len = 0; char msg[80]; int i; - struct console *con = &dom->console; struct xencons_interface *intf = con->interface; + struct domain *dom = con->d; XENCONS_RING_IDX prod; if (dom->is_dead) return; - len = ring_free_bytes(dom); + len = ring_free_bytes(con); if (len == 0) return; @@ -853,7 +850,7 @@ static void handle_tty_read(struct domain *dom) * keep the slave open for the duration. */ if (len < 0) { - domain_handle_broken_tty(dom, domain_is_valid(dom->domid)); + console_handle_broken_tty(con, domain_is_valid(dom->domid)); } else if (domain_is_valid(dom->domid)) { prod = intf->in_prod; for (i = 0; i < len; i++) { @@ -864,15 +861,15 @@ static void handle_tty_read(struct domain *dom) intf->in_prod = prod; xenevtchn_notify(con->xce_handle, con->local_port); } else { - domain_close_tty(dom); + console_close_tty(con); shutdown_domain(dom); } } -static void handle_tty_write(struct domain *dom) +static void handle_tty_write(struct console *con) { ssize_t len; - struct console *con = &dom->console; + struct domain *dom = con->d; if (dom->is_dead) return; @@ -882,7 +879,7 @@ static void handle_tty_write(struct domain *dom) if (len < 1) { dolog(LOG_DEBUG, "Write failed on domain %d: %zd, %d\n", dom->domid, len, errno); - domain_handle_broken_tty(dom, domain_is_valid(dom->domid)); + console_handle_broken_tty(con, domain_is_valid(dom->domid)); } else { buffer_advance(&con->buffer, len); } @@ -901,7 +898,7 @@ static void handle_ring_read(struct domain *dom) con->event_count++; - buffer_append(dom); + buffer_append(con); if (con->event_count < RATE_LIMIT_ALLOWANCE) (void)xenevtchn_unmask(con->xce_handle, port); @@ -925,7 +922,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) - domain_create_ring(dom); + console_create_ring(&dom->console); } free(vec); @@ -975,7 +972,7 @@ static void handle_log_reload(void) if (con->log_fd != -1) close(con->log_fd); - con->log_fd = create_domain_log(d); + con->log_fd = create_console_log(con); } } @@ -1121,7 +1118,7 @@ void handle_io(void) if (con->master_fd != -1) { short events = 0; - if (!d->is_dead && ring_free_bytes(d)) + if (!d->is_dead && ring_free_bytes(con)) events |= POLLIN; if (!buffer_empty(&con->buffer)) @@ -1208,15 +1205,15 @@ void handle_io(void) if (con->master_fd != -1 && con->master_pollfd_idx != -1) { if (fds[con->master_pollfd_idx].revents & ~(POLLIN|POLLOUT|POLLPRI)) - domain_handle_broken_tty(d, + console_handle_broken_tty(con, domain_is_valid(d->domid)); else { if (fds[con->master_pollfd_idx].revents & POLLIN) - handle_tty_read(d); + handle_tty_read(con); if (fds[con->master_pollfd_idx].revents & POLLOUT) - handle_tty_write(d); + handle_tty_write(con); } }