From patchwork Mon Aug 7 08:53:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhupinder Thakur X-Patchwork-Id: 109524 Delivered-To: patch@linaro.org Received: by 10.182.109.195 with SMTP id hu3csp2481876obb; Mon, 7 Aug 2017 01:55:45 -0700 (PDT) X-Received: by 10.36.74.212 with SMTP id k203mr173682itb.14.1502096145139; Mon, 07 Aug 2017 01:55:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502096145; cv=none; d=google.com; s=arc-20160816; b=f4da/eoOVU1V9Wc1xgNihT8BqVVP4szYAHhxbanr2BKSZ/8Hse5d7h3vhT7ISUjCLc wB5WDdn5MnFGQFpVj3f8sPJxYO+A3wpM6EldSIVODEV8plSteIB4HM6kuKz78CSUK8NH ThCBBkqhhUjX9G16TU0S60Qd65DiVCkRg1jpYJielT5ilFX0sTYShiusvLEW6c4ibAtq EuQwSDEkMJZpRtnX+rWAF6YOP5tx6fejzqWNSIOAZRnBawzi25waGvNPEN05Unj6ur4Y 92Ao8LH3nxMevREhElj4M6eTwPWgYKdMclx87ioLnrdSPLxQSQ/U0ZXi3mjZFzCHMapN enjw== 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=B+cPD5qQMh06VI+WfJwSqbQcFlWwQTyCV+SgzWjo05o=; b=dLnaBVkngEst77cCX1BzC2Hr0LmQeY9GcbV+4Ub0DI/ZUXPCyq2GaXVOmJLc1YL/e5 NVeQ/XacuiSoNxN6TAf+1YoOTvQrTQB2inqKrAuQvtuU0mCe/N5WQC2b1WR6JDF4mDhI p1s9I3Se4QT1Yaqlpt8x86oq4nmAYRwIJ7O40dqA5Ryy0hUcIjSOppnZisRwMpsLOCSn ClERYdt1CqbH7eyRXMeLxjyIhou0HbD63qMI1zfZgPJfTf0prWQHjERtw9qI7PaJaVER 15vooc9OJJimy4xIu4gWK29FzlSWhIzRGOPFDAHGuXxdoDlfDKwYwohmezfnGDaDf/CL dsAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.b=XEd/qOts; 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 o6si7960151ith.171.2017.08.07.01.55.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Aug 2017 01:55:45 -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.b=XEd/qOts; 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 1dedno-0004uZ-6L; Mon, 07 Aug 2017 08:54:20 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dednm-0004rg-QO for xen-devel@lists.xenproject.org; Mon, 07 Aug 2017 08:54:18 +0000 Received: from [193.109.254.147] by server-5.bemta-6.messagelabs.com id 1C/BC-03368-ABA28895; Mon, 07 Aug 2017 08:54:18 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrGIsWRWlGSWpSXmKPExsXiVRtspLtTqyP SoOejpMX3LZOZHBg9Dn+4whLAGMWamZeUX5HAmnH832q2gtdiFb967zI1MF4V6mLk5BASmMEo sXarURcjFweLwDxmiZVHzzKBOBIC/awSy18sZQepkhBIk5h+YgILhF0p0fFoKzNEt5bE0VOzW UEahATamCSOvj7O1sXIwcEmYCIxq0MCpEZEQEni3qrJYEOZBeYzSjRN6mUDSQgLxEvcmPsVzG YRUJXY1viaEcTmFfCR2LRnOxPEMjmJm+c6wZZxAsXPX3rDArHYW+L2sT7GCYwCCxgZVjFqFKc WlaUW6RqZ6yUVZaZnlOQmZuboGhqY6eWmFhcnpqfmJCYV6yXn525iBIYWAxDsYFy8NvAQoyQH k5Iob/yKtkghvqT8lMqMxOKM+KLSnNTiQ4wyHBxKEryfNTsihQSLUtNTK9Iyc4BBDpOW4OBRE uF9oQ6U5i0uSMwtzkyHSJ1iNOaYdGD7FyaOVxP+f2MSYsnLz0uVEuc9BzJJAKQ0ozQPbhAs+i 4xykoJ8zICnSbEU5BalJtZgir/ilGcg1FJmDcMZApPZl4J3L5XQKcwAZ3yJrEV5JSSRISUVAO j0db1Woejkxr+x9yJarXtlzbZuDqf+1TA0vfT4j03aAq/TZ32p+uC2EvthIqcnkJDwT0rqrVv BaQVGHh/OmzU47N9gvjXxQ6h8w8bz1+W1i+6zGVz8JPzRdv+LWviz9eazBix7c4Z06oMFcs9x 3N2bstx1L5lcEs47eNE7+1FMtc2Zkcd996uxFKckWioxVxUnAgA5i0shrkCAAA= X-Env-Sender: bhupinder.thakur@linaro.org X-Msg-Ref: server-3.tower-27.messagelabs.com!1502096056!110339820!1 X-Originating-IP: [74.125.83.50] 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 33473 invoked from network); 7 Aug 2017 08:54:17 -0000 Received: from mail-pg0-f50.google.com (HELO mail-pg0-f50.google.com) (74.125.83.50) by server-3.tower-27.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 7 Aug 2017 08:54:17 -0000 Received: by mail-pg0-f50.google.com with SMTP id l64so31603584pge.5 for ; Mon, 07 Aug 2017 01:54:17 -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=PIjElh5iZCANBxQx6NqiqNqyIkPe3CusSbv427/MqCw=; b=XEd/qOts50kBhgUIQWw/kX+wQrhzS6W/5WcOPzXPIcxS6a7LzW/n63L4Z8CSZfei5b J2RpropvRyMAB/Yi/xpyzGoAaycWzYStamrZ7sAyQ1Yd6421LLPUiX7LffycQf2E5aPk dKnyQNKideg6UDTPknCJ8DRAJg31oC+TrAXWY= 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=PIjElh5iZCANBxQx6NqiqNqyIkPe3CusSbv427/MqCw=; b=gYPDLnybbsY4sI3s6s2ekNYvo4eFlhG7fbKUHUFWZGpG/3eoKFzB0r+ZLmoqrKG9kk lZvO5iP894qOzus2i3vAjjw0xGIU865etmtMcQGBe4vHzozHUFX9WmHnQ5ycvuGjUN5u P+WJShgb0IfQgvEbpz1867J1iv31BpnRG5bhUtzHEjHD+XQq5BgpOCRHse1ZO1Mbdsbr 2ivRvSS73NiTJHxLvOR0BpvqLmktCG61atpmZOxP78um6ffa7kVsN+eu1yoOzbf4+iic I6QnHOno4JrrEr2AHhmM6Ol6/Cs089TRmQ1P+IiXAqBpcbxEXq3Xv60mdDi5Qo7v8QnI hEKw== X-Gm-Message-State: AIVw113AlhXmkl/OC0FdE7tIOXvScxxMHy4qcvlvTEcPoQNrs16VwQw1 80DIOYr8gXU/eYlUi/GeGw== X-Received: by 10.98.27.65 with SMTP id b62mr11172589pfb.258.1502096055465; Mon, 07 Aug 2017 01:54:15 -0700 (PDT) Received: from blr-ubuntu-linaro.wlan.qualcomm.com ([103.5.19.18]) by smtp.gmail.com with ESMTPSA id p77sm12604047pfi.153.2017.08.07.01.54.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 07 Aug 2017 01:54:15 -0700 (PDT) From: Bhupinder Thakur To: xen-devel@lists.xenproject.org Date: Mon, 7 Aug 2017 14:23:08 +0530 Message-Id: <1502095997-31219-17-git-send-email-bhupinder.thakur@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1502095997-31219-1-git-send-email-bhupinder.thakur@linaro.org> References: <1502095997-31219-1-git-send-email-bhupinder.thakur@linaro.org> Cc: Wei Liu , Julien Grall , Stefano Stabellini , Ian Jackson Subject: [Xen-devel] [PATCH 16/25 v7] xen/arm: vpl011: Add a new handle_console_ring function 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 introduces a new handle_console_ring function. This function reads the data from the ring buffer on receiving an event. The initialization of event channel poll fd to -1 is moved inside the handle_console_ring function as they are related. There should be no change in the behavior as there is no functional change. 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 v5: - Split this change in a separate patch. tools/console/daemon/io.c | 40 +++++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/tools/console/daemon/io.c b/tools/console/daemon/io.c index 2dcaee6..c361b42 100644 --- a/tools/console/daemon/io.c +++ b/tools/console/daemon/io.c @@ -934,17 +934,23 @@ static void console_evtchn_unmask(struct console *con, void *data) } } -static void handle_ring_read(struct domain *dom) +static void handle_ring_read(struct console *con) { xenevtchn_port_or_error_t port; - struct console *con = &dom->console; - if (dom->is_dead) + if (con->d->is_dead) return; if ((port = xenevtchn_pending(con->xce_handle)) == -1) return; + if (port != con->local_port) { + dolog(LOG_ERR, + "Event received for invalid port %d, Expected port is %d\n", + port, con->local_port); + return; + } + con->event_count++; buffer_append(con); @@ -953,6 +959,21 @@ static void handle_ring_read(struct domain *dom) (void)xenevtchn_unmask(con->xce_handle, port); } +static void handle_console_ring(struct console *con) +{ + if (con->event_count < RATE_LIMIT_ALLOWANCE) { + if (con->xce_handle != NULL && + con->xce_pollfd_idx != -1 && + !(fds[con->xce_pollfd_idx].revents & + ~(POLLIN|POLLOUT|POLLPRI)) && + (fds[con->xce_pollfd_idx].revents & + POLLIN)) + handle_ring_read(con); + } + + con->xce_pollfd_idx = -1; +} + static void handle_xs(void) { char **vec; @@ -1236,15 +1257,8 @@ void handle_io(void) struct console *con = &d->console; n = d->next; - if (con->event_count < RATE_LIMIT_ALLOWANCE) { - if (con->xce_handle != NULL && - con->xce_pollfd_idx != -1 && - !(fds[con->xce_pollfd_idx].revents & - ~(POLLIN|POLLOUT|POLLPRI)) && - (fds[con->xce_pollfd_idx].revents & - POLLIN)) - handle_ring_read(d); - } + + handle_console_ring(con); if (con->master_fd != -1 && con->master_pollfd_idx != -1) { if (fds[con->master_pollfd_idx].revents & @@ -1261,7 +1275,7 @@ void handle_io(void) } } - con->xce_pollfd_idx = con->master_pollfd_idx = -1; + con->master_pollfd_idx = -1; if (d->last_seen != enum_pass) shutdown_domain(d);