From patchwork Tue Oct 8 13:20:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Thompson X-Patchwork-Id: 175496 Delivered-To: patches@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp5695299ill; Tue, 8 Oct 2019 06:21:03 -0700 (PDT) X-Received: by 2002:a7b:c387:: with SMTP id s7mr3571053wmj.22.1570540863468; Tue, 08 Oct 2019 06:21:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570540863; cv=none; d=google.com; s=arc-20160816; b=ic7EZbQamu7qzVjfiX/Cnz9HJjeQMH8+PCZtPLYCuE93/TUAk6CxhY34lAm3oR0Bu0 myw1Yd8ChLjNX3lJk1vrxn7X+y6uPg6jeycxwykGYrC4xroPpoorOZb1Ck2EyK0ZkxBE pqiFEYHSRS833NQHrRzdPc7+Hn3vTzeWDZ8654/ONONiOJXsx3Go+3jdFrG9y3a0sb9p Z3VaMa8k/BOVh36k8tAWHHKx0vyAg6FnL+O6Zbxl9X5ZnHPkOqcD2oBJsdIaQaW2OG5s hYb82tR23F790Kn5BN2/N+OF73+5ZHae/mER7izJ5eeoiAcj//ak+6CO2mHHvrghQlQf yX1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=NMLYLlRd8vaGiF3jciw9wbZQHk5ZOlFvcl94Sy7qkg4=; b=IT3ON9bjCoBmWopw45RFF/TaIl6S6rZzWoNFXQFVcMrqHWjG7yS3jr5lfb5WODKPHJ C66YKI5BXm/VGsBibFphDLdtkEJx7158kjI7GID7cSz1t7NUya+qGLLW3qSqcg2DUe8K z7FfbCjL3lQ8WDxqWRrONj34e5waVdyaVquTx0+9DRk7MJOArW7omjL4AkeggKqz/gG6 NC+XWYSiQP3OmWGCJF1vzD7YoIWGG0u2qGjvlTfESFTkJ/hbAATFgBA4/ZmjmT4JHaE7 /mjsefy67aEZs5NGXfnlwuQaUCyAk11pt8NfYDYuicCMDGo8tIXCYb8V2XSBdV28lyQA YSow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Xri8FTar; 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 u2sor11908362wri.44.2019.10.08.06.21.03 for (Google Transport Security); Tue, 08 Oct 2019 06:21:03 -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=Xri8FTar; 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 :mime-version:content-transfer-encoding; bh=NMLYLlRd8vaGiF3jciw9wbZQHk5ZOlFvcl94Sy7qkg4=; b=Xri8FTarDkqF/+gVzxi8Z1C8t3l+cY/LBwvDd8AM/lD01TIBPh2Ax8Ye7jrUK5VjUD gJC5tdWhaPPdZCcLfRW4CZjYLAnT17YFEKMw87Q7uUF1i+q1YxE4v/dYeiTh+QgIoNYx FtHyVPPWVXtJH1xRusubfoHJoCZyPBJtES89DoUpdmyV4NlUqRPmurRCMPfoivfs3UhZ GmzFrQZbbXuODOak2XTTxp4GSNJl+ua5nuNUN8sIKKpQvj1XCnArikM/DyMzeVeLej6R J37LpQfeb276fZwkABKDadNJslLGV9TQA3JlBV4xAPaiIRfLytvGobHmf9dMgWBbiIyj WW4Q== 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:mime-version:content-transfer-encoding; bh=NMLYLlRd8vaGiF3jciw9wbZQHk5ZOlFvcl94Sy7qkg4=; b=D7hfqamMYX7XWIxf4HY6i9B2P8DcUTRQEl/UnaiENWjPLndW2XBDYl/bgcRsFS6FJ/ vhpin0oa8pEVYdecaq+HCs7B99JrB8SD7Gr3DP/OrGAjgngXQw4eoXX/p522Spf66nJB M5pL/4tO2aDM9jGCEqbSDjYAg1qhHf0rrU/mHXy+dqXM/tw/m2JJdj9E/cbcht1XzWLJ 6/eyTB6Sod6uSG7xqhtw6UtwCVsA1CDRB2otbKHjxqUdvDTL/TqsbOfIY21Gl/HXeOuF Qhzvc7OfEr+H6QYrCrSnFNFMSwH7mAxtdoVVLFH6jHuyhxvbIf/W4bjG2pZbvf/jtiEs cqiw== X-Gm-Message-State: APjAAAXw3CUDNrWuoxD9EehRmHGvEm4ArE3gBovIfjwR/bsx7GIsjYM8 +hem8NwNiC/C4y0vrQ+fo3/qDtRn X-Google-Smtp-Source: APXvYqwg7jDYE8hDC+1bJHrrQK5xqAb2IY7xmf6UM3OWEdgwCAq2KjDkHpqihKJYblsyf4uaAwuHvw== X-Received: by 2002:adf:bb0a:: with SMTP id r10mr28074897wrg.13.1570540862771; Tue, 08 Oct 2019 06:21:02 -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 t8sm18237214wrx.76.2019.10.08.06.21.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Oct 2019 06:21:01 -0700 (PDT) From: Daniel Thompson To: Jason Wessel , Douglas Anderson Cc: Daniel Thompson , kgdb-bugreport@lists.sourceforge.net, linux-kernel@vger.kernel.org, patches@linaro.org Subject: [PATCH v2 3/5] kdb: Remove special case logic from kdb_read() Date: Tue, 8 Oct 2019 14:20:41 +0100 Message-Id: <20191008132043.7966-4-daniel.thompson@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191008132043.7966-1-daniel.thompson@linaro.org> References: <20191008132043.7966-1-daniel.thompson@linaro.org> MIME-Version: 1.0 kdb_read() contains special case logic to force it exit after reading a single character. We can remove all the special case logic by directly calling the function to read a single character instead. This also allows us to tidy up the function prototype which, because it now matches getchar(), we can also rename in order to make its role clearer. Signed-off-by: Daniel Thompson --- kernel/debug/kdb/kdb_io.c | 56 ++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 33 deletions(-) -- 2.21.0 diff --git a/kernel/debug/kdb/kdb_io.c b/kernel/debug/kdb/kdb_io.c index 78cb6e339408..a9e73bc9d1c3 100644 --- a/kernel/debug/kdb/kdb_io.c +++ b/kernel/debug/kdb/kdb_io.c @@ -106,7 +106,19 @@ static int kdb_read_handle_escape(char *buf, size_t sz) return -1; } -static int kdb_read_get_key(char *buffer, size_t bufsize) +/* + * kdb_getchar + * + * Read a single character from kdb console (or consoles). + * + * An escape key could be the start of a vt100 control sequence such as \e[D + * (left arrow) or it could be a character in its own right. The standard + * method for detecting the difference is to wait for 2 seconds to see if there + * are any other characters. kdb is complicated by the lack of a timer service + * (interrupts are off), by multiple input sources. Escape sequence processing + * has to be done as states in the polling loop. + */ +static int kdb_getchar(void) { #define ESCAPE_UDELAY 1000 #define ESCAPE_DELAY (2*1000000/ESCAPE_UDELAY) /* 2 seconds worth of udelays */ @@ -124,7 +136,6 @@ static int kdb_read_get_key(char *buffer, size_t bufsize) } key = (*f)(); - if (key == -1) { if (escape_delay) { udelay(ESCAPE_UDELAY); @@ -134,14 +145,6 @@ static int kdb_read_get_key(char *buffer, size_t bufsize) continue; } - if (bufsize <= 2) { - if (key == '\r') - key = '\n'; - *buffer++ = key; - *buffer = '\0'; - return -1; - } - if (escape_delay == 0 && key == '\e') { escape_delay = ESCAPE_DELAY; ped = escape_data; @@ -183,17 +186,7 @@ static int kdb_read_get_key(char *buffer, size_t bufsize) * function. It is not reentrant - it relies on the fact * that while kdb is running on only one "master debug" cpu. * Remarks: - * - * The buffer size must be >= 2. A buffer size of 2 means that the caller only - * wants a single key. - * - * An escape key could be the start of a vt100 control sequence such as \e[D - * (left arrow) or it could be a character in its own right. The standard - * method for detecting the difference is to wait for 2 seconds to see if there - * are any other characters. kdb is complicated by the lack of a timer service - * (interrupts are off), by multiple input sources and by the need to sometimes - * return after just one key. Escape sequence processing has to be done as - * states in the polling loop. + * The buffer size must be >= 2. */ static char *kdb_read(char *buffer, size_t bufsize) @@ -228,9 +221,7 @@ static char *kdb_read(char *buffer, size_t bufsize) *cp = '\0'; kdb_printf("%s", buffer); poll_again: - key = kdb_read_get_key(buffer, bufsize); - if (key == -1) - return buffer; + key = kdb_getchar(); if (key != 9) tab = 0; switch (key) { @@ -741,7 +732,7 @@ int vkdb_printf(enum kdb_msgsrc src, const char *fmt, va_list ap) /* check for having reached the LINES number of printed lines */ if (kdb_nextline >= linecount) { - char buf1[16] = ""; + char ch; /* Watch out for recursion here. Any routine that calls * kdb_printf will come back through here. And kdb_read @@ -776,39 +767,38 @@ int vkdb_printf(enum kdb_msgsrc src, const char *fmt, va_list ap) if (logging) printk("%s", moreprompt); - kdb_read(buf1, 2); /* '2' indicates to return - * immediately after getting one key. */ + ch = kdb_getchar(); kdb_nextline = 1; /* Really set output line 1 */ /* empty and reset the buffer: */ kdb_buffer[0] = '\0'; next_avail = kdb_buffer; size_avail = sizeof(kdb_buffer); - if ((buf1[0] == 'q') || (buf1[0] == 'Q')) { + if ((ch == 'q') || (ch == 'Q')) { /* user hit q or Q */ KDB_FLAG_SET(CMD_INTERRUPT); /* command interrupted */ KDB_STATE_CLEAR(PAGER); /* end of command output; back to normal mode */ kdb_grepping_flag = 0; kdb_printf("\n"); - } else if (buf1[0] == ' ') { + } else if (ch == ' ') { kdb_printf("\r"); suspend_grep = 1; /* for this recursion */ - } else if (buf1[0] == '\n') { + } else if (ch == '\n' || ch == '\r') { kdb_nextline = linecount - 1; kdb_printf("\r"); suspend_grep = 1; /* for this recursion */ - } else if (buf1[0] == '/' && !kdb_grepping_flag) { + } else if (ch == '/' && !kdb_grepping_flag) { kdb_printf("\r"); kdb_getstr(kdb_grep_string, KDB_GREP_STRLEN, kdbgetenv("SEARCHPROMPT") ?: "search> "); *strchrnul(kdb_grep_string, '\n') = '\0'; kdb_grepping_flag += KDB_GREPPING_FLAG_SEARCH; suspend_grep = 1; /* for this recursion */ - } else if (buf1[0] && buf1[0] != '\n') { + } else if (ch && ch != '\n') { /* user hit something other than enter */ suspend_grep = 1; /* for this recursion */ - if (buf1[0] != '/') + if (ch != '/') kdb_printf( "\nOnly 'q', 'Q' or '/' are processed at " "more prompt, input ignored\n");