Merge branch 'master' into deploy

Author: mpe

build/scripts/container-build.sh

@@ -153,6 +153,10 @@ elif [[ "$1" == "docs" ]]; then
 elif [[ "$1" == "perf" ]]; then
     cmd="make $quiet -C tools/perf O=/output"
 
+    if [[ $(uname -m) != "ppc64le" ]]; then
+        cmd+=" NO_LIBELF=1 NO_LIBTRACEEVENT=1"
+    fi
+
     if [[ -n "$PRE_CLEAN" ]]; then
         (set -x; $cmd clean)
     fi

lib/pexpect_utils.py

@@ -38,22 +38,10 @@ def terminate(self):
         self.child.terminate()
         self.wait_for_exit()
 
-    def drain_and_terminate(self, child, msg):
-        logging.error(msg)
-
-        # Wait for the end of the oops, if it is one
-        try:
-            idx = self.child.expect(['--\[ end trace', pexpect.TIMEOUT], timeout=10)
-        except pexpect.exceptions.EOF:
-            idx = -1
-            pass
-
-        if idx == 1:
-            # That didn't match, let it run for a bit
-            time.sleep(5)
-
+    def drain_and_terminate(self):
+        # Wait for 10s out of output, which should give oopses time to be logged
+        self.child.expect([pexpect.TIMEOUT, pexpect.EOF], timeout=10)
         self.terminate()
-        raise Exception(msg)
 
     def get_match(self, i=0):
         return self.child.match.group(i)
@@ -71,10 +59,16 @@ def expect(self, patterns, timeout=-1, bug_patterns=None):
         patterns.extend(bug_patterns)
 
         idx = self.child.expect(patterns, timeout=timeout)
-        logging.debug("Matched: '%s' %s", self.get_match(), self.matches())
+        if self.child.match == pexpect.TIMEOUT:
+            logging.debug("Timed out looking for a match")
+        else:
+            logging.debug("Matched: '%s' %s", self.get_match(), self.matches())
 
         if idx >= len(patterns) - len(bug_patterns):
-            self.drain_and_terminate(self.child, "Error: saw oops/warning etc. while expecting")
+            msg = "Error: saw oops/warning etc. while expecting"
+            logging.error(msg)
+            self.drain_and_terminate()
+            raise Exception(msg)
 
         return idx
 

lib/qemu.py

@@ -84,17 +84,19 @@ def apply_defaults(self):
 
         if self.cpuinfo is None:
             if self.machine_is('pseries'):
-                self.cpuinfo = 'IBM pSeries \(emulated by qemu\)'
+                self.cpuinfo = ['IBM pSeries \(emulated by qemu\)']
             elif self.machine_is('powernv'):
-                self.cpuinfo = 'IBM PowerNV \(emulated by qemu\)'
+                self.cpuinfo = ['IBM PowerNV \(emulated by qemu\)']
             elif self.machine == 'mac99':
-                self.cpuinfo = 'PowerMac3,1 MacRISC MacRISC2 Power Macintosh'
+                self.cpuinfo = ['PowerMac3,1 MacRISC MacRISC2 Power Macintosh']
             elif self.machine == 'g3beige':
-                self.cpuinfo = 'AAPL,PowerMac G3 MacRISC'
+                self.cpuinfo = ['AAPL,PowerMac G3 MacRISC']
             elif self.machine == 'bamboo':
-                self.cpuinfo = 'PowerPC 44x Platform'
+                self.cpuinfo = ['PowerPC 44x Platform']
             elif self.machine == 'ppce500':
-                self.cpuinfo = 'QEMU ppce500'
+                self.cpuinfo = ['QEMU ppce500']
+                if self.cpu:
+                    self.cpuinfo.insert(0, f'cpu\s+: {self.cpu}')
 
         if self.qemu_path is None:
             if self.machine_is('pseries') or self.machine_is('powernv'):
@@ -235,6 +237,7 @@ def qemu_monitor_shutdown(p):
 
 
 def get_qemu(name='qemu-system-ppc64'):
+    # This looks for QEMU_SYSTEM_PPC64 or QEMU_SYSTEM_PPC in the environment
     qemu = get_env_var(name.upper().replace('-', '_'))
     if qemu is None:
         # Defer to $PATH search
@@ -381,7 +384,8 @@ def qemu_main(qconf):
 
     p.send('cat /proc/cpuinfo')
     if qconf.cpuinfo:
-        p.expect(qconf.cpuinfo)
+        for s in qconf.cpuinfo:
+            p.expect(s)
     p.expect_prompt()
 
     if qconf.net_tests:

scripts/boot/qemu-e500mc

@@ -0,0 +1,48 @@
+#!/usr/bin/python3
+#
+# Kernel needs:
+#   corenet32_smp_defconfig +
+#   CONFIG_PPC_QEMU_E500=y
+#   CONFIG_POWER_RESET_GPIO=y
+#
+# $ cd ~/src/linux
+# $ make
+# $ ~/src/ci-scripts/scripts/boot/qemu-e500mc
+#
+# Or:
+#
+# export VMLINUX_PATH=~/src/linux/vmlinux
+# export KERNEL_RELEASE_PATH=~/src/linux/include/config/kernel.release
+#
+# Optional:
+# export QEMU_SYSTEM_PPC=~/src/qemu/ppc-softmmu/qemu-system-ppc
+# export ROOT_DISK_PATH=~/some/directory
+#
+# Expects ROOT_DISK_PATH to contain:
+#   ppc-rootfs.cpio.gz
+
+import logging
+import os, sys
+sys.path.append(f'{os.path.dirname(sys.argv[0])}/../../lib')
+
+from qemu import QemuConfig, qemu_main
+from utils import setup_logging
+
+
+def main():
+    setup_logging()
+
+    qconf = QemuConfig('ppce500')
+    qconf.configure_from_env()
+    qconf.configure_from_args(sys.argv[1:])
+    qconf.qemu_path = 'qemu-system-ppc'
+    qconf.net_tests = False
+    qconf.mem = '2G'
+    qconf.smp = 1
+    qconf.cpu = 'e500mc'
+
+    qconf.apply_defaults()
+
+    return qemu_main(qconf)
+
+sys.exit(0 if main() else 1)

scripts/boot/qemu-e5500

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+exec "$(dirname "$0")"/qemu-ppc64e $@

scripts/boot/qemu-e6500

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+export CPU=e6500
+export QEMU_INITRD=ppc64-rootfs.cpio.gz
+
+exec "$(dirname "$0")"/qemu-ppc64e $@

scripts/boot/qemu-ppc64e

@@ -36,13 +36,13 @@ def main():
     setup_logging()
 
     qconf = QemuConfig('ppce500')
+    qconf.cpu = 'e5500'
     qconf.configure_from_env()
     qconf.configure_from_args(sys.argv[1:])
     qconf.qemu_path = 'qemu-system-ppc64'
     qconf.net_tests = False
     qconf.mem = '4G'
     qconf.smp = 1
-    qconf.cpu = 'e5500'
 
     qconf.apply_defaults()