All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 0/2] Enable QMP Dumping for testimage
@ 2021-01-26 17:31 Saul Wold
  2021-01-26 17:31 ` [PATCH 1/2] qemu-system-native: install qmp python module Saul Wold
                   ` (2 more replies)
  0 siblings, 3 replies; 8+ messages in thread
From: Saul Wold @ 2021-01-26 17:31 UTC (permalink / raw)
  To: openembedded-core

I hope that this is the final pass!

This patch set enables getting debug information from QEMU via the
Qemu Machine Protocol interface. The Qemu source provides a qmp.py
module which is instaled in the recipe-sysroot-native and loaded 
via python's importlib during runtime.

The initial commands that I issue to qmp with a failure is detected
is: query-status and query-block. The output goes into formated json
files as follows:

tmp/log/runtime-hostdump/202101061054_qmp
├── qmp_00_query-block
├── qmp_00_query-status
├── qmp_01_query-block
└── qmp_01_query-status

Comments welcome, I tested this by calling the monitor_dump code 
directly in the target/ssh.py code instead of waiting for a given
failure.

This has been tested with both testimage and oe-selftest as they 
take different code paths to the qemurunner code with different
parameters.  I also tested oe-selftest with and without the -j option.
I saw 1 failure which I think is due to my setup and not the code in
question, runtime_test.TestImage.test_testimage_virgl_gtk_sdl failed

Sau!

Saul Wold (2):
  qemu-system-native: install qmp python module
  qemurunner: Add support for qmp commands

 meta/classes/testimage.bbclass                |  6 ++++
 meta/lib/oeqa/core/target/qemu.py             |  6 ++++
 meta/lib/oeqa/core/target/ssh.py              | 17 +++++++++-
 meta/lib/oeqa/targetcontrol.py                |  3 ++
 meta/lib/oeqa/utils/dump.py                   | 31 +++++++++++++++++--
 meta/lib/oeqa/utils/qemurunner.py             | 29 ++++++++++++++++-
 .../qemu/qemu-system-native_5.1.0.bb          |  4 +++
 7 files changed, 91 insertions(+), 5 deletions(-)

-- 
2.25.1

Saul Wold (2):
  qemu-system-native: install qmp python module
  qemurunner: Add support for qmp commands

 meta/classes/testimage.bbclass                |  6 +++
 meta/lib/oeqa/core/target/qemu.py             |  6 +++
 meta/lib/oeqa/core/target/ssh.py              | 17 +++++++-
 meta/lib/oeqa/targetcontrol.py                |  3 ++
 meta/lib/oeqa/utils/dump.py                   | 31 ++++++++++++--
 meta/lib/oeqa/utils/qemurunner.py             | 41 ++++++++++++++++++-
 .../qemu/qemu-system-native_5.2.0.bb          |  4 ++
 7 files changed, 102 insertions(+), 6 deletions(-)

-- 
2.25.1


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH 1/2] qemu-system-native: install qmp python module
  2021-01-26 17:31 [PATCH 0/2] Enable QMP Dumping for testimage Saul Wold
@ 2021-01-26 17:31 ` Saul Wold
  2021-01-27  8:27   ` [OE-core] " Richard Purdie
  2021-01-26 17:31 ` [PATCH 2/2] qemurunner: Add support for qmp commands Saul Wold
  2021-01-27  8:25 ` [OE-core] [PATCH 0/2] Enable QMP Dumping for testimage Richard Purdie
  2 siblings, 1 reply; 8+ messages in thread
From: Saul Wold @ 2021-01-26 17:31 UTC (permalink / raw)
  To: openembedded-core

The qmp python module supports the Qemu Machine Protocol [0].
This module needs to be installed in a known location so the
qemurunner python script can find the qmp module.

This change causes it to be installed in the recipe-sysroot-native
of the target image and that directory can be added to the python
sys.path that needs to use the qmp.py module.

[0] https://github.com/qemu/qemu/blob/master/docs/interop/qmp-spec.txt

Signed-off-by: Saul Wold <saul.wold@windriver.com>
---
 meta/recipes-devtools/qemu/qemu-system-native_5.2.0.bb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta/recipes-devtools/qemu/qemu-system-native_5.2.0.bb b/meta/recipes-devtools/qemu/qemu-system-native_5.2.0.bb
index 222b55cbc6e..4a58bf9055b 100644
--- a/meta/recipes-devtools/qemu/qemu-system-native_5.2.0.bb
+++ b/meta/recipes-devtools/qemu/qemu-system-native_5.2.0.bb
@@ -2,6 +2,7 @@ BPN = "qemu"
 
 require qemu-native.inc
 
+inherit python3-dir
 # As some of the files installed by qemu-native and qemu-system-native
 # are the same, we depend on qemu-native to get the full installation set
 # and avoid file clashes
@@ -23,4 +24,7 @@ do_install_append() {
     rm -f ${D}${datadir}/qemu/trace-events-all
     rm -rf ${D}${datadir}/qemu/keymaps
     rm -rf ${D}${datadir}/icons/
+
+    # Install qmp.py to be used with testimage
+    install -D ${S}/python/qemu/qmp.py ${D}${PYTHON_SITEPACKAGES_DIR}/qmp.py
 }
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH 2/2] qemurunner: Add support for qmp commands
  2021-01-26 17:31 [PATCH 0/2] Enable QMP Dumping for testimage Saul Wold
  2021-01-26 17:31 ` [PATCH 1/2] qemu-system-native: install qmp python module Saul Wold
@ 2021-01-26 17:31 ` Saul Wold
  2021-01-27  8:25 ` [OE-core] [PATCH 0/2] Enable QMP Dumping for testimage Richard Purdie
  2 siblings, 0 replies; 8+ messages in thread
From: Saul Wold @ 2021-01-26 17:31 UTC (permalink / raw)
  To: openembedded-core

This adds support for the Qemu Machine Protocol [0] extending
the current dump process for Host and Target. The commands are
added in the testimage.bbclass.

Currently, we setup qemu to stall until qmp gets connected and
sends the initialization and continue commands, this works
correctly.

With this version, the monitor_dumper is created in OEQemuTarget
but then set in OESSHTarget as that's where we get the SSH failure
happens. Python's @property is used to create a setter/getter type
of setup in OESSHTarget to get overridden by OEQemuTarget.

By default the data is currently dumped to files for each command in
TMPDIR/log/runtime-hostdump/<date>_qmp/unknown_<seq>_qemu_monitor as
this is the naming convenstion in the dump.py code.

We use the qmp.py from qemu, which needs to get installed in the
recipe-sysroot-native of the target image.

[0] https://github.com/qemu/qemu/blob/master/docs/interop/qmp-spec.txt

Signed-off-by: Saul Wold <saul.wold@windriver.com>
---
 meta/classes/testimage.bbclass    |  6 +++++
 meta/lib/oeqa/core/target/qemu.py |  6 +++++
 meta/lib/oeqa/core/target/ssh.py  | 17 ++++++++++++-
 meta/lib/oeqa/targetcontrol.py    |  3 +++
 meta/lib/oeqa/utils/dump.py       | 31 ++++++++++++++++++++---
 meta/lib/oeqa/utils/qemurunner.py | 41 +++++++++++++++++++++++++++++--
 6 files changed, 98 insertions(+), 6 deletions(-)

diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index 78da4b09bdf..5db384d342f 100644
--- a/meta/classes/testimage.bbclass
+++ b/meta/classes/testimage.bbclass
@@ -127,6 +127,11 @@ testimage_dump_host () {
     netstat -an
 }
 
+testimage_dump_monitor () {
+    query-status
+    query-block
+}
+
 python do_testimage() {
     testimage_main(d)
 }
@@ -319,6 +324,7 @@ def testimage_main(d):
     target_kwargs['powercontrol_extra_args'] = d.getVar("TEST_POWERCONTROL_EXTRA_ARGS") or ""
     target_kwargs['serialcontrol_cmd'] = d.getVar("TEST_SERIALCONTROL_CMD") or None
     target_kwargs['serialcontrol_extra_args'] = d.getVar("TEST_SERIALCONTROL_EXTRA_ARGS") or ""
+    target_kwargs['testimage_dump_monitor'] = d.getVar("testimage_dump_monitor") or ""
     target_kwargs['testimage_dump_target'] = d.getVar("testimage_dump_target") or ""
 
     def export_ssh_agent(d):
diff --git a/meta/lib/oeqa/core/target/qemu.py b/meta/lib/oeqa/core/target/qemu.py
index 0f29414df54..a73d82d9aff 100644
--- a/meta/lib/oeqa/core/target/qemu.py
+++ b/meta/lib/oeqa/core/target/qemu.py
@@ -12,6 +12,7 @@ from collections import defaultdict
 
 from .ssh import OESSHTarget
 from oeqa.utils.qemurunner import QemuRunner
+from oeqa.utils.dump import MonitorDumper
 from oeqa.utils.dump import TargetDumper
 
 supported_fstypes = ['ext3', 'ext4', 'cpio.gz', 'wic']
@@ -43,6 +44,11 @@ class OEQemuTarget(OESSHTarget):
                                  dump_host_cmds=dump_host_cmds, logger=logger,
                                  serial_ports=serial_ports, boot_patterns = boot_patterns, 
                                  use_ovmf=ovmf)
+        dump_monitor_cmds = kwargs.get("testimage_dump_monitor")
+        self.monitor_dumper = MonitorDumper(dump_monitor_cmds, dump_dir, self.runner)
+        if self.monitor_dumper:
+            self.monitor_dumper.create_dir("qmp")
+
         dump_target_cmds = kwargs.get("testimage_dump_target")
         self.target_dumper = TargetDumper(dump_target_cmds, dump_dir, self.runner)
         self.target_dumper.create_dir("qemu")
diff --git a/meta/lib/oeqa/core/target/ssh.py b/meta/lib/oeqa/core/target/ssh.py
index 461448dbc56..923a223b25b 100644
--- a/meta/lib/oeqa/core/target/ssh.py
+++ b/meta/lib/oeqa/core/target/ssh.py
@@ -43,6 +43,7 @@ class OESSHTarget(OETarget):
         if port:
             self.ssh = self.ssh + [ '-p', port ]
             self.scp = self.scp + [ '-P', port ]
+        self._monitor_dumper = None
 
     def start(self, **kwargs):
         pass
@@ -50,6 +51,15 @@ class OESSHTarget(OETarget):
     def stop(self, **kwargs):
         pass
 
+    @property
+    def monitor_dumper(self):
+        return self._monitor_dumper
+
+    @monitor_dumper.setter
+    def monitor_dumper(self, dumper):
+        self._monitor_dumper = dumper
+        self.monitor_dumper.dump_monitor()
+
     def _run(self, command, timeout=None, ignore_status=True):
         """
             Runs command in target using SSHProcess.
@@ -87,9 +97,14 @@ class OESSHTarget(OETarget):
             processTimeout = self.timeout
 
         status, output = self._run(sshCmd, processTimeout, True)
-        self.logger.debug('Command: %s\nOutput:  %s\n' % (command, output))
+        self.logger.debug('Command: %s\nStatus: %d Output:  %s\n' % (command, status, output))
         if (status == 255) and (('No route to host') in output):
+            if self.monitor_dumper:
+                self.monitor_dumper.dump_monitor()
+        if status == 255:
             self.target_dumper.dump_target()
+            if self.monitor_dumper:
+                self.monitor_dumper.dump_monitor()
         return (status, output)
 
     def copyTo(self, localSrc, remoteDst):
diff --git a/meta/lib/oeqa/targetcontrol.py b/meta/lib/oeqa/targetcontrol.py
index 19f5a4ea7e9..15709ad5d16 100644
--- a/meta/lib/oeqa/targetcontrol.py
+++ b/meta/lib/oeqa/targetcontrol.py
@@ -17,6 +17,7 @@ from oeqa.utils.sshcontrol import SSHControl
 from oeqa.utils.qemurunner import QemuRunner
 from oeqa.utils.qemutinyrunner import QemuTinyRunner
 from oeqa.utils.dump import TargetDumper
+from oeqa.utils.dump import MonitorDumper
 from oeqa.controllers.testtargetloader import TestTargetLoader
 from abc import ABCMeta, abstractmethod
 
@@ -108,6 +109,7 @@ class QemuTarget(BaseTarget):
         self.qemulog = os.path.join(self.testdir, "qemu_boot_log.%s" % self.datetime)
         dump_target_cmds = d.getVar("testimage_dump_target")
         dump_host_cmds = d.getVar("testimage_dump_host")
+        dump_monitor_cmds = d.getVar("testimage_dump_monitor")
         dump_dir = d.getVar("TESTIMAGE_DUMP_DIR")
         if not dump_dir:
             dump_dir = os.path.join(d.getVar('LOG_DIR'), 'runtime-hostdump')
@@ -147,6 +149,7 @@ class QemuTarget(BaseTarget):
                             serial_ports = len(d.getVar("SERIAL_CONSOLES").split()))
 
         self.target_dumper = TargetDumper(dump_target_cmds, dump_dir, self.runner)
+        self.monitor_dumper = MonitorDumper(dump_monitor_cmds, dump_dir, self.runner)
 
     def deploy(self):
         bb.utils.mkdirhier(self.testdir)
diff --git a/meta/lib/oeqa/utils/dump.py b/meta/lib/oeqa/utils/dump.py
index 09a44329e01..7391126c8bb 100644
--- a/meta/lib/oeqa/utils/dump.py
+++ b/meta/lib/oeqa/utils/dump.py
@@ -4,6 +4,7 @@
 
 import os
 import sys
+import json
 import errno
 import datetime
 import itertools
@@ -51,6 +52,8 @@ class BaseDumper(object):
             prefix = "host"
         elif isinstance(self, TargetDumper):
             prefix = "target"
+        elif isinstance(self, MonitorDumper):
+            prefix = "qmp"
         else:
             prefix = "unknown"
         for i in itertools.count():
@@ -58,9 +61,12 @@ class BaseDumper(object):
             fullname = os.path.join(self.dump_dir, filename)
             if not os.path.exists(fullname):
                 break
-        with open(fullname, 'w') as dump_file:
-            dump_file.write(output)
-
+        if isinstance(self, MonitorDumper):
+            with open(fullname, 'w') as json_file:
+                json.dump(output, json_file, indent=4)
+        else:
+            with open(fullname, 'w') as dump_file:
+                dump_file.write(output)
 
 class HostDumper(BaseDumper):
     """ Class to get dumps from the host running the tests """
@@ -96,3 +102,22 @@ class TargetDumper(BaseDumper):
             except:
                 print("Tried to dump info from target but "
                         "serial console failed")
+                print("Failed CMD: %s" % (cmd))
+
+class MonitorDumper(BaseDumper):
+    """ Class to get dumps via the Qemu Monitor, it only works with QemuRunner """
+
+    def __init__(self, cmds, parent_dir, runner):
+        super(MonitorDumper, self).__init__(cmds, parent_dir)
+        self.runner = runner
+
+    def dump_monitor(self, dump_dir=""):
+        if dump_dir:
+            self.dump_dir = dump_dir
+        for cmd in self.cmds:
+            try:
+                output = self.runner.run_monitor(cmd)
+                self._write_dump(cmd, output)
+            except:
+                print("Failed to dump montor data")
+                print("Failed CMD: %s" % (cmd))
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py
index 77ec939ad72..0e52053ffee 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -20,8 +20,10 @@ import string
 import threading
 import codecs
 import logging
+import tempfile
 from oeqa.utils.dump import HostDumper
 from collections import defaultdict
+import importlib
 
 # Get Unicode non printable control chars
 control_range = list(range(0,32))+list(range(127,160))
@@ -168,6 +170,21 @@ class QemuRunner:
         return self.launch(launch_cmd, qemuparams=qemuparams, get_ip=get_ip, extra_bootparams=extra_bootparams, env=env)
 
     def launch(self, launch_cmd, get_ip = True, qemuparams = None, extra_bootparams = None, env = None):
+        # use logfile to determine the recipe-sysroot-native path and
+        # then add in the site-packages path components and add that
+        # to the python sys.path so qmp.py can be found.
+        python_path = os.path.dirname(os.path.dirname(self.logfile))
+        python_path += "/recipe-sysroot-native/usr/lib/python3.9/site-packages"
+        sys.path.append(python_path)
+        importlib.invalidate_caches()
+        try:
+            qmp = importlib.import_module("qmp")
+        except:
+            self.logger.error("qemurunner: qmp.py missing, please ensure it's installed")
+            return False
+        qmp_port = self.tmpdir + "/." + next(tempfile._get_candidate_names())
+        qmp_param = ' -S -qmp unix:%s,server,wait' % (qmp_port)
+
         try:
             if self.serial_ports >= 2:
                 self.threadsock, threadport = self.create_socket()
@@ -184,7 +201,8 @@ class QemuRunner:
         # and analyze descendents in order to determine it.
         if os.path.exists(self.qemu_pidfile):
             os.remove(self.qemu_pidfile)
-        self.qemuparams = 'bootparams="{0}" qemuparams="-pidfile {1}"'.format(bootparams, self.qemu_pidfile)
+        self.qemuparams = 'bootparams="{0}" qemuparams="-pidfile {1} {2}"'.format(bootparams, self.qemu_pidfile, qmp_param)
+
         if qemuparams:
             self.qemuparams = self.qemuparams[:-1] + " " + qemuparams + " " + '\"'
 
@@ -251,6 +269,19 @@ class QemuRunner:
         if self.runqemu_exited:
             return False
 
+        # Create the client socket for the QEMU Monitor Control Socket
+        # This will allow us to read status from Qemu if the the process
+        # is still alive
+        try:
+            self.qmp = qmp.QEMUMonitorProtocol(qmp_port)
+            self.qmp.connect()
+        except socket.error as msg:
+            self.logger.error("Failed to connect qemu monitor socket: %s" % msg[1])
+            return False
+
+        # Release the qemu porcess to continue running
+        self.run_monitor('cont')
+
         if not self.is_alive():
             self.logger.error("Qemu pid didn't appear in %s seconds (%s)" %
                               (self.runqemutime, time.strftime("%D %H:%M:%S")))
@@ -376,7 +407,6 @@ class QemuRunner:
                         sock.close()
                         stopread = True
 
-
         if not reachedlogin:
             if time.time() >= endtime:
                 self.logger.warning("Target didn't reach login banner in %d seconds (%s)" %
@@ -391,6 +421,7 @@ class QemuRunner:
             self.stop()
             return False
 
+        self._dump_host()
         # If we are not able to login the tests can continue
         try:
             (status, output) = self.run_serial(self.boot_patterns['send_login_user'], raw=True, timeout=120)
@@ -437,6 +468,9 @@ class QemuRunner:
             self.runqemu.stdout.close()
             self.runqemu_exited = True
 
+        if hasattr(self, 'qmp') and self.qmp:
+            self.qmp.close()
+            self.qmp = None
         if hasattr(self, 'server_socket') and self.server_socket:
             self.server_socket.close()
             self.server_socket = None
@@ -495,6 +529,9 @@ class QemuRunner:
                         return True
         return False
 
+    def run_monitor(self, command, timeout=60):
+        return self.qmp.cmd(command)
+
     def run_serial(self, command, raw=False, timeout=60):
         # We assume target system have echo to get command status
         if not raw:
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [OE-core] [PATCH 0/2] Enable QMP Dumping for testimage
  2021-01-26 17:31 [PATCH 0/2] Enable QMP Dumping for testimage Saul Wold
  2021-01-26 17:31 ` [PATCH 1/2] qemu-system-native: install qmp python module Saul Wold
  2021-01-26 17:31 ` [PATCH 2/2] qemurunner: Add support for qmp commands Saul Wold
@ 2021-01-27  8:25 ` Richard Purdie
  2021-01-27 16:30   ` Saul Wold
  2 siblings, 1 reply; 8+ messages in thread
From: Richard Purdie @ 2021-01-27  8:25 UTC (permalink / raw)
  To: Saul Wold, openembedded-core

On Tue, 2021-01-26 at 09:31 -0800, Saul Wold wrote:
> I hope that this is the final pass!
> 
> This patch set enables getting debug information from QEMU via the
> Qemu Machine Protocol interface. The Qemu source provides a qmp.py
> module which is instaled in the recipe-sysroot-native and loaded 
> via python's importlib during runtime.
> 
> The initial commands that I issue to qmp with a failure is detected
> is: query-status and query-block. The output goes into formated json
> files as follows:
> 
> tmp/log/runtime-hostdump/202101061054_qmp
> ├── qmp_00_query-block
> ├── qmp_00_query-status
> ├── qmp_01_query-block
> └── qmp_01_query-status
> 
> Comments welcome, I tested this by calling the monitor_dump code 
> directly in the target/ssh.py code instead of waiting for a given
> failure.
> 
> This has been tested with both testimage and oe-selftest as they 
> take different code paths to the qemurunner code with different
> parameters.  I also tested oe-selftest with and without the -j option.
> I saw 1 failure which I think is due to my setup and not the code in
> question, runtime_test.TestImage.test_testimage_virgl_gtk_sdl failed

I ran this through the autobuilder and it looks better but we're not
quite there. We did reproduce the
runtime_test.TestImage.test_testimage_virgl_gtk_sdl failure:

https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/1758/steps/14/logs/stdio

and given its giving a traceback here:

     0275:        try:
     0276:            self.qmp = qmp.QEMUMonitorProtocol(qmp_port)
     0277:            self.qmp.connect()
     0278:        except socket.error as msg:
 *** 0279:            self.logger.error("Failed to connect qemu monitor socket: %s" % msg[1])
     0280:            return False
     0281:
     0282:        # Release the qemu porcess to continue running
     0283:        self.run_monitor('cont')
Exception: TypeError: 'FileNotFoundError' object is not subscriptable

I'd say that is an issue with this patch, it needs to more gracefully
handle that. It could be its attempting the test and expecting a
failure elsewhere in the stack as I think you're right that not every
vrtigl test runs on every system. You could check older logs to see if
this is expected to pass or skip.

Besides that we are seeing a lot of warnings:

stdio: WARNING: core-image-minimal-1.0-r0 do_testimage: Qemu ended unexpectedly, dump data from host is in /home/pokybuild/yocto-worker/pkgman-non-rpm/build/build/tmp/log/runtime-hostdump/202101270227_qemu
stdio: WARNING: core-image-sato-1.0-r0 do_testimage: Qemu ended unexpectedly, dump data from host is in /home/pokybuild/yocto-worker/pkgman-non-rpm/build/build/tmp/log/runtime-hostdump/202101270227_qemu
stdio: WARNING: core-image-sato-sdk-1.0-r0 do_testimage: Qemu ended unexpectedly, dump data from host is in /home/pokybuild/yocto-worker/pkgman-non-rpm/build/build/tmp/log/runtime-hostdump/202101270227_qemu

The build is a lovely toaster orange:

https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/1787

so I suspect there is some other side effect we also need to fix.

Sounds like we're getting there though!

Cheers,

Richard




^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [OE-core] [PATCH 1/2] qemu-system-native: install qmp python module
  2021-01-26 17:31 ` [PATCH 1/2] qemu-system-native: install qmp python module Saul Wold
@ 2021-01-27  8:27   ` Richard Purdie
  0 siblings, 0 replies; 8+ messages in thread
From: Richard Purdie @ 2021-01-27  8:27 UTC (permalink / raw)
  To: Saul Wold, openembedded-core

On Tue, 2021-01-26 at 09:31 -0800, Saul Wold wrote:
> The qmp python module supports the Qemu Machine Protocol [0].
> This module needs to be installed in a known location so the
> qemurunner python script can find the qmp module.
> 
> This change causes it to be installed in the recipe-sysroot-native
> of the target image and that directory can be added to the python
> sys.path that needs to use the qmp.py module.
> 
> [0] https://github.com/qemu/qemu/blob/master/docs/interop/qmp-spec.txt
> 
> Signed-off-by: Saul Wold <saul.wold@windriver.com>
> ---
>  meta/recipes-devtools/qemu/qemu-system-native_5.2.0.bb | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/meta/recipes-devtools/qemu/qemu-system-native_5.2.0.bb b/meta/recipes-devtools/qemu/qemu-system-native_5.2.0.bb
> index 222b55cbc6e..4a58bf9055b 100644
> --- a/meta/recipes-devtools/qemu/qemu-system-native_5.2.0.bb
> +++ b/meta/recipes-devtools/qemu/qemu-system-native_5.2.0.bb
> @@ -2,6 +2,7 @@ BPN = "qemu"
>  
> 
>  require qemu-native.inc
>
>  +inherit python3-dir
> 

In this patch the inherit needs to go before the qemu-native.inc, as
in:

http://git.yoctoproject.org/cgit.cgi/poky/commit/?h=master-next&id=5267509ea39770655dc707e9879158ca2ff3959d

due to:

http://git.yoctoproject.org/cgit.cgi/poky/commit/?h=master-next&id=62367fb4c240a054e6a73d0316cc6da6b5f18f79

Cheers,

Richard



^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [OE-core] [PATCH 0/2] Enable QMP Dumping for testimage
  2021-01-27  8:25 ` [OE-core] [PATCH 0/2] Enable QMP Dumping for testimage Richard Purdie
@ 2021-01-27 16:30   ` Saul Wold
  0 siblings, 0 replies; 8+ messages in thread
From: Saul Wold @ 2021-01-27 16:30 UTC (permalink / raw)
  To: openembedded-core, Richard Purdie



On 1/27/21 12:25 AM, Richard Purdie wrote:
> On Tue, 2021-01-26 at 09:31 -0800, Saul Wold wrote:
>> I hope that this is the final pass!
>>
>> This patch set enables getting debug information from QEMU via the
>> Qemu Machine Protocol interface. The Qemu source provides a qmp.py
>> module which is instaled in the recipe-sysroot-native and loaded
>> via python's importlib during runtime.
>>
>> The initial commands that I issue to qmp with a failure is detected
>> is: query-status and query-block. The output goes into formated json
>> files as follows:
>>
>> tmp/log/runtime-hostdump/202101061054_qmp
>> ├── qmp_00_query-block
>> ├── qmp_00_query-status
>> ├── qmp_01_query-block
>> └── qmp_01_query-status
>>
>> Comments welcome, I tested this by calling the monitor_dump code
>> directly in the target/ssh.py code instead of waiting for a given
>> failure.
>>
>> This has been tested with both testimage and oe-selftest as they
>> take different code paths to the qemurunner code with different
>> parameters.  I also tested oe-selftest with and without the -j option.
>> I saw 1 failure which I think is due to my setup and not the code in
>> question, runtime_test.TestImage.test_testimage_virgl_gtk_sdl failed
> 
> I ran this through the autobuilder and it looks better but we're not
> quite there. We did reproduce the
> runtime_test.TestImage.test_testimage_virgl_gtk_sdl failure:
> 
> https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/1758/steps/14/logs/stdio
> 
> and given its giving a traceback here:
> 
>       0275:        try:
>       0276:            self.qmp = qmp.QEMUMonitorProtocol(qmp_port)
>       0277:            self.qmp.connect()
>       0278:        except socket.error as msg:
>   *** 0279:            self.logger.error("Failed to connect qemu monitor socket: %s" % msg[1])
>       0280:            return False
>       0281:
>       0282:        # Release the qemu porcess to continue running
>       0283:        self.run_monitor('cont')
> Exception: TypeError: 'FileNotFoundError' object is not subscriptable
> 
> I'd say that is an issue with this patch, it needs to more gracefully
> handle that. It could be its attempting the test and expecting a
> failure elsewhere in the stack as I think you're right that not every
> vrtigl test runs on every system. You could check older logs to see if
> this is expected to pass or skip.
> 
I tested with my same machine and master and got a Runtime error, so 
this is an issue on my machine.

> Besides that we are seeing a lot of warnings:
> 
I will dig into this.

> stdio: WARNING: core-image-minimal-1.0-r0 do_testimage: Qemu ended unexpectedly, dump data from host is in /home/pokybuild/yocto-worker/pkgman-non-rpm/build/build/tmp/log/runtime-hostdump/202101270227_qemu
> stdio: WARNING: core-image-sato-1.0-r0 do_testimage: Qemu ended unexpectedly, dump data from host is in /home/pokybuild/yocto-worker/pkgman-non-rpm/build/build/tmp/log/runtime-hostdump/202101270227_qemu
> stdio: WARNING: core-image-sato-sdk-1.0-r0 do_testimage: Qemu ended unexpectedly, dump data from host is in /home/pokybuild/yocto-worker/pkgman-non-rpm/build/build/tmp/log/runtime-hostdump/202101270227_qemu
> 
> The build is a lovely toaster orange:
> 
> https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/1787
> 
> so I suspect there is some other side effect we also need to fix.
> 
I will throw it against the autobuilder next time.

> Sounds like we're getting there though!
> 
Slowly unfortunately.

Sau!

> Cheers,
> 
> Richard
> 
> 
> 
> 
> 
> 
> 

-- 
Sau!

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH 0/2] Enable QMP Dumping for testimage
@ 2021-04-26 14:45 Saul Wold
  0 siblings, 0 replies; 8+ messages in thread
From: Saul Wold @ 2021-04-26 14:45 UTC (permalink / raw)
  To: openembedded-core

This is the forth (and maybe final) pass at enabling getting debug
information from QEMU via the Qemu Machine Protocol interface. The
Qemu source provides a qmp.py module which is installed in the 
recipe-sysroot-native site-packages.

The initial commands that are issued to qmp when a failure is detected
are: query-status and query-block. The output goes into formated json
files as follows:

tmp/log/runtime-hostdump/202101061054_qmp
├── qmp_00_query-block
├── qmp_00_query-status
├── qmp_01_query-block
└── qmp_01_query-status

This has been tested by calling the monitor_dump code directly in the
target/ssh.py code instead of waiting for a given failure.

This version adds a time-out loop to check for the Unix Socket file
that was being problematic on the CentOS-8 builders.

Sau!

Saul Wold (2):
  qemu-system-native: install qmp python module
  qemurunner: Add support for qmp commands

 meta/classes/testimage.bbclass                |  6 ++++
 meta/lib/oeqa/core/target/qemu.py             |  6 ++++
 meta/lib/oeqa/core/target/ssh.py              | 17 +++++++++-
 meta/lib/oeqa/targetcontrol.py                |  3 ++
 meta/lib/oeqa/utils/dump.py                   | 31 +++++++++++++++++--
 meta/lib/oeqa/utils/qemurunner.py             | 29 ++++++++++++++++-
 .../qemu/qemu-system-native_5.1.0.bb          |  4 +++
 7 files changed, 91 insertions(+), 5 deletions(-)

-- 
2.25.1


Saul Wold (2):
  qemu-system-native: install qmp python module
  qemurunner: Add support for qmp commands

 meta/classes/testimage.bbclass                |  6 ++
 meta/lib/oeqa/core/target/qemu.py             |  6 ++
 meta/lib/oeqa/core/target/ssh.py              | 17 +++++-
 meta/lib/oeqa/targetcontrol.py                |  3 +
 meta/lib/oeqa/utils/dump.py                   | 31 +++++++++-
 meta/lib/oeqa/utils/qemurunner.py             | 56 ++++++++++++++++++-
 .../qemu/qemu-system-native_5.2.0.bb          |  5 ++
 7 files changed, 118 insertions(+), 6 deletions(-)

-- 
2.25.1

*** BLURB HERE ***

Saul Wold (2):
  qemu-system-native: install qmp python module
  qemurunner: Add support for qmp commands

 meta/classes/testimage.bbclass                |  6 ++
 meta/lib/oeqa/core/target/qemu.py             |  6 ++
 meta/lib/oeqa/core/target/ssh.py              | 17 ++++-
 meta/lib/oeqa/targetcontrol.py                |  3 +
 meta/lib/oeqa/utils/dump.py                   | 32 ++++++++-
 meta/lib/oeqa/utils/qemurunner.py             | 70 ++++++++++++++++++-
 .../qemu/qemu-system-native_5.2.0.bb          |  5 ++
 meta/recipes-devtools/qemu/qemu.inc           |  2 +-
 8 files changed, 134 insertions(+), 7 deletions(-)

-- 
2.25.1


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH 0/2] Enable QMP Dumping for testimage
@ 2021-01-12 23:11 Saul Wold
  0 siblings, 0 replies; 8+ messages in thread
From: Saul Wold @ 2021-01-12 23:11 UTC (permalink / raw)
  To: openembedded-core

This is the second pass at enabling getting debug information from
QEMU via the Qemu Machine Protocol interface. The Qemu source provides
a qmp.py module which I install in the recipe-sysroot-native location.

The initial commands that I issue to qmp with a failure is detected
is: query-status and query-block. The output goes into formated json
files as follows:

tmp/log/runtime-hostdump/202101061054_qmp
├── qmp_00_query-block
├── qmp_00_query-status
├── qmp_01_query-block
└── qmp_01_query-status

Comments welcome, I tested this by calling the monitor_dump code 
directly in the target/ssh.py code instead of waiting for a given
failure.

Sau!


Saul Wold (2):
  qemu-system-native: install qmp python module
  qemurunner: Add support for qmp commands

 meta/classes/testimage.bbclass                |  6 ++++
 meta/lib/oeqa/core/target/qemu.py             |  6 ++++
 meta/lib/oeqa/core/target/ssh.py              | 17 +++++++++-
 meta/lib/oeqa/targetcontrol.py                |  3 ++
 meta/lib/oeqa/utils/dump.py                   | 31 +++++++++++++++--
 meta/lib/oeqa/utils/qemurunner.py             | 34 ++++++++++++++++++-
 .../qemu/qemu-system-native_5.2.0.bb          |  4 +++
 7 files changed, 96 insertions(+), 5 deletions(-)

-- 
2.25.1


^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2021-04-26 14:45 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-26 17:31 [PATCH 0/2] Enable QMP Dumping for testimage Saul Wold
2021-01-26 17:31 ` [PATCH 1/2] qemu-system-native: install qmp python module Saul Wold
2021-01-27  8:27   ` [OE-core] " Richard Purdie
2021-01-26 17:31 ` [PATCH 2/2] qemurunner: Add support for qmp commands Saul Wold
2021-01-27  8:25 ` [OE-core] [PATCH 0/2] Enable QMP Dumping for testimage Richard Purdie
2021-01-27 16:30   ` Saul Wold
  -- strict thread matches above, loose matches on Subject: below --
2021-04-26 14:45 Saul Wold
2021-01-12 23:11 Saul Wold

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.