From patchwork Fri Aug 31 20:51:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Thompson X-Patchwork-Id: 145700 Delivered-To: patches@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp1217074ljw; Fri, 31 Aug 2018 13:52:32 -0700 (PDT) X-Received: by 2002:a1c:85cb:: with SMTP id h194-v6mr6049914wmd.54.1535748752322; Fri, 31 Aug 2018 13:52:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535748752; cv=none; d=google.com; s=arc-20160816; b=VrtJNv4QGNYpsrqRccqrTcVzTjaORZ3+UyWywyQ3zArMdIlHeY9aTwdnoZJGH0YLXu 13U6YPbPs9oak1E/aTrq/+SveBCiYQnumwQWJAgkhvN27W5vAoqAP9HQ3zw6CEw+eiqW mPlX8i/sTN0c86TD2h/sJ3wWlWXbUDf+vTVeBjJRis/n7LGR9fc8hMo0abn0B/fA8wSE ZE+5Ebjy8VFY7Z/VPBGRy/eUQIOI9IAeuyKjAWJFLJENiI8+NS3+FBWCvfzwjOe88KT1 ClaNA9dgYZoiz1tdlA7JVS3OJYnp9yvoMFAzd2Na/tM2EcSDzWdac8TL4K2G8EUPEqla /vAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=HK5LT08ykmG5YwLnjISm/Y2crdQ/7wW+cXZ1BfyQFI8=; b=Y1ReSY9gFmRkPRbRDO3+Y3MRK9QcOdvNAS8Cd3UeyhQoEW8cqaa7ZPBAQJBssHr0ZX uiAB5WLIZPzS0hJipTXx8G94h5lfSmXMh6WjoHpK+ioMWTpHz0GUrahUfI/h5IBW8XGk kdcx+2AaTcZvw4cLeomiqcqk7snEZ4/z7Bgw7rmLNA4ZVa32lwNJvpVYwL+MyLIbz7wq UVvqp4echEhVUuxSLmpShS5OByvY9ZjqDGtGZs1BvFDStujgJtga/mB8ATWY81dWmrqI 0QJCZAHTINYMvcJdh3KWp1cuzvnrEUZwUSCcHbp3LnX8U1/hifOu/b9BDTL6XqtIVIhR wcgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=R0hdD9u6; spf=pass (google.com: domain of daniel.thompson@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=daniel.thompson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id k13-v6sor3192725wmd.18.2018.08.31.13.52.32 for (Google Transport Security); Fri, 31 Aug 2018 13:52:32 -0700 (PDT) Received-SPF: pass (google.com: domain of daniel.thompson@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=R0hdD9u6; spf=pass (google.com: domain of daniel.thompson@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=daniel.thompson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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=HK5LT08ykmG5YwLnjISm/Y2crdQ/7wW+cXZ1BfyQFI8=; b=R0hdD9u6TBA26WHr0G785Fv+iiZjdlo4tQoCdlURoSmI8I5e5471pL1xQ4uATFT7SJ 5MSUZgnlEmfDD8JaxBe81kzMO6iOYcQ2lxZ9Tw8Zezy02EbG7yEoIzRvNHyfdJwc6sfY 73B8keRHLKkH4BSiCoIyvSyXImGjjjnfMXHnM= 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=HK5LT08ykmG5YwLnjISm/Y2crdQ/7wW+cXZ1BfyQFI8=; b=pOWcrYlArFvys4LB3sQnBBWgMMJK0vt4xF8e8Rq3SQYQXtyYrHIvmG0PND7SYr0Qc9 8SR6NuGEupnsifIfzY2THU2Uf007ZDC3OqCh39GO41Djk0ls/2hSbF1Gxc1w/RFurmBN feSQZqYRsFMu0c3bJ/fWp6J1eSIf5USVOfBOXJfb0euSMpNP0A9X+7ybwW+fees44MwI RUMZ252UoBXQVmZX2wcIgV+cTkZO7MF7frw4wWKcleGrG4dvnuAyEorSM7iIySogi/mP c/UJkXQbAU+s4LWlgu1flX5lj+z/1S0zQIZ7GtTV0q+gi+Rikml1wmFR9/5Ce6KJRD3p 3U8Q== X-Gm-Message-State: APzg51Bfqhm/wNd0xvjbZNCauqym0rPu6TFELDofWRwEJd0EccgG9Rzv wYB0HS2RW6GjlsYoM95ogIZ0mP97 X-Google-Smtp-Source: ANB0VdYoDCiDiofGxGikt2RZNgRDt3yxTWAlFjQjqwBKyMgvT5n0EusWgFqJole97bMaRUzoe5mw+g== X-Received: by 2002:a1c:f001:: with SMTP id a1-v6mr6040620wmb.160.1535748751991; Fri, 31 Aug 2018 13:52:31 -0700 (PDT) Return-Path: Received: from wychelm.lan (cpc141214-aztw34-2-0-cust773.18-1.cable.virginm.net. [86.9.19.6]) by smtp.gmail.com with ESMTPSA id u4-v6sm7659356wro.47.2018.08.31.13.52.30 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 31 Aug 2018 13:52:31 -0700 (PDT) From: Daniel Thompson To: Jason Wessel Cc: Daniel Thompson , kgdb-bugreport@lists.sourceforge.net, linux-kernel@vger.kernel.org, patches@linaro.org Subject: [PATCH 2/5] kdb: Simplify code to fetch characters from console Date: Fri, 31 Aug 2018 21:51:39 +0100 Message-Id: <20180831205142.23609-3-daniel.thompson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180831205142.23609-1-daniel.thompson@linaro.org> References: <20180831205142.23609-1-daniel.thompson@linaro.org> Currently kdb_read_get_key() contains complex control flow that, on close inspection, turns out to be unnecessary. In particular: 1. It is impossible to enter the branch conditioned on (escape_delay == 1) except when the loop enters with (escape_delay == 2) allowing us to combine the branches. 2. Most of the code conditioned on (escape_delay == 2) simply modifies local data and then breaks out of the loop causing the function to return escape_data[0]. 3. Based on #2 there is not actually any need to ever explicitly set escape_delay to 2 because we it is much simpler to directly return escape_data[0] instead. 4. escape_data[0] is, for all but one exit path, known to be '\e'. Simplify the code based on these observations. There is a subtle (and harmless) change of behaviour resulting from this simplification: instead of letting the escape timeout after ~1998 milliseconds we now timeout after ~2000 milliseconds Signed-off-by: Daniel Thompson --- kernel/debug/kdb/kdb_io.c | 38 ++++++++++++++------------------------ 1 file changed, 14 insertions(+), 24 deletions(-) -- 2.17.1 diff --git a/kernel/debug/kdb/kdb_io.c b/kernel/debug/kdb/kdb_io.c index e54e1e185c47..0ba490728459 100644 --- a/kernel/debug/kdb/kdb_io.c +++ b/kernel/debug/kdb/kdb_io.c @@ -122,25 +122,18 @@ static int kdb_read_get_key(char *buffer, size_t bufsize) touch_nmi_watchdog(); f = &kdb_poll_funcs[0]; } - if (escape_delay == 2) { - *ped = '\0'; - ped = escape_data; - --escape_delay; - } - if (escape_delay == 1) { - key = *ped++; - if (!*ped) - --escape_delay; - break; - } + key = (*f)(); + if (key == -1) { if (escape_delay) { udelay(ESCAPE_UDELAY); - --escape_delay; + if (--escape_delay == 0) + return '\e'; } continue; } + if (bufsize <= 2) { if (key == '\r') key = '\n'; @@ -148,28 +141,25 @@ static int kdb_read_get_key(char *buffer, size_t bufsize) *buffer = '\0'; return -1; } + if (escape_delay == 0 && key == '\e') { escape_delay = ESCAPE_DELAY; ped = escape_data; f_escape = f; } if (escape_delay) { - *ped++ = key; - if (f_escape != f) { - escape_delay = 2; - continue; - } + if (f_escape != f) + return '\e'; + *ped++ = key; key = kdb_read_handle_escape(escape_data, ped - escape_data); - if (key > 0) { - escape_data[0] = key; - escape_data[1] = '\0'; - } - if (key) - escape_delay = 2; - continue; + if (key < 0) + return '\e'; + if (key == 0) + continue; } + break; /* A key to process */ } return key;