>From 797a228abdd5d560dddf217572d984b1dce97154 Mon Sep 17 00:00:00 2001 From: Jason Wessel Date: Sun, 26 Feb 2012 07:49:16 -0600 Subject: [PATCH 1/1] From: Andrei Warkentin Subject: [PATCH] KDB: Fix usability issues relating to the 'enter' key. Date: Sun Feb 26 07:51:01 CST 2012 This fixes the following problems: 1) Typematic-repeat of 'enter' gives warning message. 2) Use of 'keypad enter' gives warning message. 3) Lag on the order of seconds between "break" and "make" when expecting the enter "break" code. Seen under virtualized environments such as VMware ESX. Explanations: 1) Holding down 'enter' will not set a repeating sequence of 0x1c(make)-0x9c(make), but a repeating sequence of make codes, followed by one break code when the key is released. Thus, it's wrong to expect the break code after seeing the 'enter' make code. 2) Keypad enter generates different make/break, namely 0xe0 0x1c and 0xe0 0x9c. The 'generic' logic handles the 0xe0 escape already, but the special 'enter' logic always expects '0x9c' and not '0xe0 0x9c', so you get a warning message, again. 3) When expecting the 'enter' break code, the code polls the status register in a tight loop, like so - > while ((inb(KBD_STATUS_REG) & KBD_STAT_OBF) == 0); However, it really should do something like - > while ((inb(KBD_STATUS_REG) & KBD_STAT_OBF) == 0) > cpu_relax(); /* pause */ Basically, it's a common optimization to have a fast path for accessing often accessed and slow changing I/O in a virtualized environment. The tight spinning in KDB seems to run against the logic by ESX keyboard virtualization code to detect when the fast path or the slow path should be used to satisfy the keyboard status read, leading to multi-second timeouts before the 'real' status comes through. Without knowing ESX internals, it's hard to say if this is an ESX bug or not, but letting the VM be explicitely descheduled seems to resolve the problem. I've seen something similar with shared MMIO buffers with VMs on Hyper-V. Signed-off-by: Andrei Warkentin [jason.wessel@windriver.com: use cpu_relax() and remove expected msg] Signed-off-by: Jason Wessel --- kernel/debug/kdb/kdb_keyboard.c | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-) diff --git a/kernel/debug/kdb/kdb_keyboard.c b/kernel/debug/kdb/kdb_keyboard.c index 4bca634..0351d0c 100644 --- a/kernel/debug/kdb/kdb_keyboard.c +++ b/kernel/debug/kdb/kdb_keyboard.c @@ -183,7 +183,7 @@ int kdb_get_kbd_char(void) * enter key. All done. Absorb the release scancode. */ while ((inb(KBD_STATUS_REG) & KBD_STAT_OBF) == 0) - ; + cpu_relax(); /* * Fetch the scancode @@ -192,18 +192,11 @@ int kdb_get_kbd_char(void) scanstatus = inb(KBD_STATUS_REG); while (scanstatus & KBD_STAT_MOUSE_OBF) { + cpu_relax(); scancode = inb(KBD_DATA_REG); scanstatus = inb(KBD_STATUS_REG); } - if (scancode != 0x9c) { - /* - * Wasn't an enter-release, why not? - */ - kdb_printf("kdb: expected enter got 0x%x status 0x%x\n", - scancode, scanstatus); - } - return 13; } -- 1.7.5.4