Merge branch 'master' into deploy

Author: mpe

README.md

@@ -149,3 +149,72 @@ $ make rebuild-image@ppc64le@ubuntu
 
 Note that the build mounts the source tree read-only, so nothing it does can
 affect your source tree.
+
+Bisecting the kernel vs a selftest
+----------------------------------
+
+Build the selftests using a version of the test that's known good. Usually
+there's no reason to rebuild the tests on every kernel revision.
+
+These examples are run from the kernel directory, not the ci-scripts directory.
+It can be done either way, but it's more natural to run from the kernel
+directory when bisectting the kernel. This assumes Linux is in `~/linux` and
+these scripts are in `~/ci-scripts`, adapt as appropriate.
+
+```
+$ cd ~/linux
+```
+
+```
+$ make SRC=$PWD -C ~/ci-scripts/build QUIET=1 JFACTOR=$(nproc) ppctests@ppc64le@ubuntu@16.04 INSTALL=1
+```
+
+:rotating_light: Using an old Ubuntu image uses an older libc, which is more
+likely to be present on the guest root filesystem. Another option is to build
+the selftests statically.
+
+Tar up the selftests into the current directory, the qemu scripts will detect them:
+
+```
+$ tar -czf selftests.tar.gz -C $HOME/ci-scripts/build/output/selftests_powerpc@ppc64le@ubuntu@16.04/ install
+```
+
+```
+$ ~/ci-scripts/scripts/boot/qemu-pseries+kvm --callback "run_selftests(powerpc/mm:wild_bctr)"
+...
+INFO: Running 'qemu-system-ppc64 -nographic -vga none -M pseries -smp 8 -m 4G -accel kvm ...
+...
+/ # INFO: Running individual selftests powerpc/mm:wild_bctr
+/var/tmp/selftests/run_kselftest.sh -t powerpc/mm:wild_bctr
+[    2.783761][  T201] kselftest: Running tests in powerpc
+TAP version 13
+1..1
+# timeout set to 300
+# selftests: powerpc/mm: wild_bctr
+# test: wild_bctr
+# tags: git_version:v6.8-rc6-2555-gfe559db
+# Everything is OK in here.
+...
+# success: wild_bctr
+ok 1 selftests: powerpc/mm: wild_bctr
+/ # poweroff
+/ # Stopping network: [    3.104385][  T274] ip (274) used greatest stack depth: 10912 bytes left
+OK
+Saving random seed: OK
+Stopping klogd: OK
+Stopping syslogd: OK
+umount: devtmpfs busy - remounted read-only
+umount: can't unmount /: Invalid argument
+The system is going down NOW!
+Sent SIGTERM to all processes
+Sent SIGKILL to all processes
+Requesting system poweroff
+[    5.152672][  T293] reboot: Power down
+INFO: Test completed OK
+```
+
+More than one selftest can be run by passing multiple arguments to
+`run_selftests` or by passing multiple `--callback` options.
+
+From there the bisection can either be run by hand, or fully automated by
+creating a script to build the kernel and run the qemu test.

build/allcross/Dockerfile

@@ -38,7 +38,7 @@ RUN apt-get -q -y update && \
       libc-dev \
       libelf-dev \
       libfuse-dev \
-      liblz4-tool \
+      lz4 \
       libssl-dev \
       lzop \
       make \
@@ -52,11 +52,7 @@ RUN apt-get -q -y update && \
       xz-utils && \
     rm -rf /var/lib/apt/lists/* /tmp/packages.sh /var/cache/* /var/log/dpkg.log
 
-ARG uid
-ARG gid
-
-RUN groupadd --gid $gid linuxppc
-RUN useradd --uid $uid --gid $gid linuxppc
+RUN useradd linuxppc
 USER linuxppc
 
 COPY scripts/container-build.sh /bin/container-build.sh

build/docs/Dockerfile

@@ -29,11 +29,7 @@ RUN apt-get -q -y update && \
       && \
     rm -rf /var/lib/apt/lists/* /var/cache/* /var/log/dpkg.log
 
-ARG uid
-ARG gid
-
-RUN groupadd --gid $gid linuxppc
-RUN useradd --uid $uid --gid $gid linuxppc
+RUN useradd linuxppc
 USER linuxppc
 
 COPY scripts/container-build.sh /bin/container-build.sh

build/fedora/Dockerfile

@@ -41,11 +41,7 @@ RUN dnf -y install --setopt=install_weak_deps=False \
 COPY fedora/make-links.sh /tmp/make-links.sh
 RUN /tmp/make-links.sh ${compiler_version} && rm /tmp/make-links.sh
 
-ARG uid
-ARG gid
-
-RUN groupadd --gid $gid linuxppc
-RUN useradd --uid $uid --gid $gid linuxppc
+RUN useradd linuxppc
 USER linuxppc
 
 COPY scripts/container-build.sh /bin/container-build.sh

build/korg/Dockerfile

@@ -51,12 +51,7 @@ RUN curl -sSL $base_url/$tar_file > $tar_file && \
 COPY korg/make-links.sh /tmp/make-links.sh
 RUN /tmp/make-links.sh ${compiler_version} && rm /tmp/make-links.sh
 
-ARG uid
-ARG gid
-
-RUN userdel -r ubuntu || true
-RUN groupadd --gid $gid linuxppc
-RUN useradd --uid $uid --gid $gid linuxppc
+RUN useradd linuxppc
 USER linuxppc
 
 COPY scripts/container-build.sh /bin/container-build.sh

build/scripts/container-build.sh

@@ -124,6 +124,7 @@ if [[ "$1" == "kernel" ]]; then
             rc=$?
             if [[ $rc -eq 0 ]]; then
                 tar -cjf /output/modules.tar.bz2 -C $mod_path lib
+                tar -czf /output/modules.tar.gz -C $mod_path lib
             fi
         else
             echo "## Modules not configured"

build/scripts/image.sh

@@ -117,23 +117,13 @@ if [[ -n "$https_proxy" ]]; then
     cmd+="--build-arg https_proxy=$https_proxy "
 fi
 
-if [[ -z "$UID" ]]; then
-    UID=$(id -u)
-fi
-
-if [[ -z "$GID" ]]; then
-    GID=$(id -g)
-fi
-
 if [[ "$distro" == "korg" ]]; then
     cmd+="--build-arg compiler_version=$version "
     arch=$(uname -m)
     cmd+="--build-arg base_url=https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/${arch}/${version}/ "
     cmd+="--build-arg tar_file=${arch}-gcc-${version}-nolibc-powerpc64-linux.tar.xz "
 fi
 
-cmd+="--build-arg uid=$UID "
-cmd+="--build-arg gid=$GID "
 cmd+="--build-arg from=$from "
 cmd+="--build-arg apt_mirror=$APT_MIRROR "
 cmd+="-t $image ."

build/scripts/prune.sh

@@ -27,7 +27,7 @@ case "$task" in
         mkdir -p "artifacts"
         for path in .config vmlinux System.map arch/powerpc/boot/zImage include/config/kernel.release \
                     arch/powerpc/kernel/asm-offsets.s arch/powerpc/boot/uImage modules.tar.bz2 \
-                    sparse.log log.txt
+                    modules.tar.gz sparse.log log.txt
         do
             if [[ -e "$path" ]]; then
                 mv "$path" artifacts/

build/ubuntu/Dockerfile

@@ -8,8 +8,8 @@ ARG apt_mirror
 ENV apt_mirror=${apt_mirror}
 RUN [ -n "$apt_mirror" ] && sed -i -e "s|ports.ubuntu.com|$apt_mirror|" /etc/apt/sources.list || true
 
-# Deal with Ubuntu 21.10 repos moving to old-releases (ppc64le only)
-RUN if echo "$from" | grep -q ".*ubuntu:21.10"; then sed -i -e "s|ports.ubuntu.com/ubuntu-ports|old-releases.ubuntu.com/ubuntu|" /etc/apt/sources.list; fi
+# Deal with Ubuntu 21/22.10 repos moving to old-releases (ppc64le only)
+RUN if echo "$from" | grep -q ".*ubuntu:2[12]\.10"; then sed -i -e "s|ports.ubuntu.com/ubuntu-ports|old-releases.ubuntu.com/ubuntu|" /etc/apt/sources.list; fi
 
 RUN apt-get -q -y update && \
     DEBIAN_FRONTEND=noninteractive \
@@ -52,11 +52,7 @@ RUN apt-get -q -y update && \
 COPY ubuntu/make-links.sh /tmp/make-links.sh
 RUN /tmp/make-links.sh ${compiler_version} && rm /tmp/make-links.sh
 
-ARG uid
-ARG gid
-
-RUN groupadd --gid $gid linuxppc
-RUN useradd --uid $uid --gid $gid linuxppc
+RUN useradd linuxppc
 USER linuxppc
 
 COPY scripts/container-build.sh /bin/container-build.sh

build/ubuntu/packages.sh

@@ -20,7 +20,9 @@ if [[ "$machine" == "ppc64le" ]]; then
     PACKAGES+=" libhugetlbfs-dev"
     PACKAGES+=" libmnl-dev"
     PACKAGES+=" libmount-dev"
-    PACKAGES+=" liburing-dev"
+    if [[ "$major" -gt 20 ]]; then
+        PACKAGES+=" liburing-dev"
+    fi
 
     # For the x86_64 container
     if [[ "$major" -ge 21 ]]; then