OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

tests/avocado: reverse_debugging drain console to prevent hang

Browse Source 
Like replay_linux.py, reverse_debugging.py starts the vm with console
set but does not interact with it (e.g., with wait_for_console_pattern).
In this situation, the console should have a drainer attached so the
socket does not fill. replay_linux.py has a drainer, but it is missing
from reverse_debugging.py.

Per analysis in Link: this can cause the console socket/pipe to fill and
QEMU get stuck in qemu_chr_write_buffer, leading to strange test case
failures (ppc64 fails because it prints a lot to console in early bios).
Attaching a drainer prevents this.

Note, this commit does not fix bugs introduced by the commits referenced
in the first two Fixes: tags, but together those commits conspire to
irritate the problem and cause test case failure, which this commit
fixes.

Link: https://lore.kernel.org/qemu-devel/ZVT-bY9YOr69QTPX@redhat.com/
Fixes: 1d4796cd00 ("python/machine: use socketpair() for console connections")
Fixes: 761a13b239 ("tests/avocado: ppc64 reverse debugging tests for pseries and powernv")
Fixes: be52eca309 ("tests/acceptance: add reverse debugging test")
Tested-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Message-ID: <20231116115354.228678-1-npiggin@gmail.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Nicholas Piggin 2023-11-16 21:53:52 +10:00 committed by Thomas Huth
parent 572960cb23
commit cd43f00524
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/avocado/reverse_debugging.py
View File

@ -12,6 +12,7 @@ import logging
from avocado import skipIf from avocado import skipIf
from avocado_qemu import BUILD_DIR from avocado_qemu import BUILD_DIR
from avocado.utils import datadrainer
from avocado.utils import gdb from avocado.utils import gdb
from avocado.utils import process from avocado.utils import process
from avocado.utils.network.ports import find_free_port from avocado.utils.network.ports import find_free_port
@ -52,6 +53,10 @@ class ReverseDebugging(LinuxKernelTest):
if args: if args:
vm.add_args(*args) vm.add_args(*args)
vm.launch() vm.launch()
console_drainer = datadrainer.LineLogger(vm.console_socket.fileno(),
logger=self.log.getChild('console'),
stop_check=(lambda : not vm.is_running()))
console_drainer.start()
return vm return vm
@staticmethod @staticmethod