Merge branch 'master' into deploy

Author: mpe

README.md

@@ -51,6 +51,8 @@ Different toolchains
 
 There are images for various toolchains, they are encoded in the distro name/version.
 
+ - `korg@13.1.0`: kernel.org gcc 13.1.0, binutils 2.40
+ - `korg@12.3.0`: kernel.org gcc 12.3.0, binutils 2.40
  - `korg@12.2.0`: kernel.org gcc 12.2.0, binutils 2.39
  - `korg@12.1.0`: kernel.org gcc 12.1.0, binutils 2.38
  - `korg@11.3.0`: kernel.org gcc 11.3.0, binutils 2.38
@@ -67,6 +69,7 @@ There are images for various toolchains, they are encoded in the distro name/ver
  - `ubuntu@20.04`: Ubuntu 20.04, gcc 9.4.0, binutils 2.34
  - `ubuntu@18.04`: Ubuntu 18.04, gcc 7.5.0, binutils 2.30
  - `ubuntu@16.04`: Ubuntu 16.04, gcc 5.4.0, binutils 2.26.1
+ - `fedora@38`: Fedora 38, gcc 12.2.1, binutils 2.39-3, clang 16.0.2
  - `fedora@37`: Fedora 37, gcc 12.2.1, binutils 2.38-5, clang 15.0.7
  - `fedora@36`: Fedora 36, gcc 12.1.1, binutils 2.37-7, clang 14.0.5
  - `fedora@35`: Fedora 35, gcc 11.2.1, binutils 2.37-3, clang 13.0.1

build/Makefile

@@ -1,23 +1,26 @@
 all: help
 
-export FEDORA_LATEST := 37
-export UBUNTU_LATEST := 22.04
-
-# If we're on ppc64le
-ifeq ($(shell uname -m),ppc64le)
-    # And we don't see ISA v3.0
-    ifeq ($(shell LD_SHOW_AUXV=1 /bin/true | grep "AT_HWCAP2:.*\barch_3_00\b"),)
-        # Then we can't use 22.04
-        UBUNTU_LATEST := 21.10
-    endif
+export FEDORA_LATEST := 38
+
+x86 = $(filter x86_64,$(shell uname -m))
+isa_3 = $(filter arch_3_00,$(shell LD_SHOW_AUXV=1 /bin/true))
+
+ifeq ($(or ${x86},${isa_3}),)
+# Can't use 22.04 or newer on P8
+export UBUNTU_LATEST := 21.10
+UBUNTU_DISTROS := ubuntu@${UBUNTU_LATEST}
+else
+export UBUNTU_LATEST := 22.10
+UBUNTU_DISTROS := ubuntu@${UBUNTU_LATEST} ubuntu@22.04
 endif
 
-FEDORA_DISTROS := fedora@${FEDORA_LATEST} fedora@36 fedora@35 fedora@34 fedora@33 fedora@31 fedora
-UBUNTU_DISTROS := ubuntu@${UBUNTU_LATEST} ubuntu@20.04 ubuntu@18.04 ubuntu@16.04 ubuntu
-KORG_DISTROS := korg@12.2.0 korg@12.1.0 korg@11.3.0 korg@11.1.0 korg@10.3.0 korg@9.4.0 korg@9.3.0 korg@8.5.0 korg@8.1.0 korg@5.5.0
+UBUNTU_DISTROS += ubuntu@20.04 ubuntu@18.04 ubuntu@16.04 ubuntu
+
+FEDORA_DISTROS := fedora@${FEDORA_LATEST} fedora@37 fedora@36 fedora@35 fedora@34 fedora@33 fedora@31 fedora
+KORG_DISTROS := korg@13.1.0 korg@12.3.0 korg@12.2.0 korg@12.1.0 korg@11.3.0 korg@11.1.0 korg@10.3.0 korg@9.4.0 korg@9.3.0 korg@8.5.0 korg@8.1.0 korg@5.5.0
 ALL_DISTROS := ${UBUNTU_DISTROS} ${KORG_DISTROS} ${FEDORA_DISTROS}
 DOCS_DISTRO := docs@${UBUNTU_LATEST}
-X86_DISTRO := ubuntu@${UBUNTU_LATEST}
+X86_DISTROS := ubuntu@${UBUNTU_LATEST} ubuntu
 ALIAS_DISTROS := ubuntu ubuntu-allcross fedora
 ALLCROSS_DISTROS := ubuntu-allcross@${UBUNTU_LATEST} ubuntu-allcross
 ALL_ARCHES := alpha arm arm64 i686 m68k mips mips64 riscv s390 sh sparc x86_64
@@ -83,11 +86,15 @@ endef
 $(eval $(call MAIN_TEMPLATE,ppc64le,${DOCS_DISTRO}))
 $(eval $(call DOCS_TEMPLATE,ppc64le,${DOCS_DISTRO}))
 
-$(eval $(call MAIN_TEMPLATE,x86_64,${X86_DISTRO}))
-$(eval $(call KERNEL_TEMPLATE,x86_64,${X86_DISTRO}))
+$(foreach distro,${X86_DISTROS}, \
+	$(eval $(call MAIN_TEMPLATE,x86_64,${distro})) \
+	$(eval $(call KERNEL_TEMPLATE,x86_64,${distro})) \
+)
 
 ifeq ($(shell uname -m),x86_64)
-$(eval $(call SELFTESTS_TEMPLATE,x86_64,${X86_DISTRO}))
+$(foreach distro,${X86_DISTROS}, \
+	$(eval $(call SELFTESTS_TEMPLATE,x86_64,${distro})) \
+)
 endif
 
 $(foreach distro,${ALL_DISTROS}, \

build/fedora/Dockerfile

@@ -34,6 +34,7 @@ RUN dnf -y install --setopt=install_weak_deps=False \
         rsync \
         sparse \
         uboot-tools \
+        which \
         xz && \
     dnf clean all
 

build/korg/Dockerfile

@@ -27,6 +27,7 @@ RUN apt-get -q -y update && \
       libssl-dev \
       lzop \
       make \
+      python3 \
       openssl \
       u-boot-tools \
       rename \
@@ -53,6 +54,7 @@ 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
 USER linuxppc

build/scripts/build.sh

@@ -164,7 +164,8 @@ if [[ -n $TARGETS ]]; then
     cmd+="-e TARGETS=$TARGETS "
 fi
 
-output_dir=$(get_output_dir "$script_base" "$subarch" "$distro" "$version" "$task" "$DEFCONFIG" "$TARGETS" "$CLANG")
+output_dir=$(get_output_dir "$script_base" "$subarch" "$distro" "$version" "$task" "$DEFCONFIG" "$TARGETS" "$CLANG" "")
+output_symlink=$(get_output_dir "$script_base" "$subarch" "$distro" "$version" "$task" "$DEFCONFIG" "$TARGETS" "$CLANG" "symlink")
 mkdir -p "$output_dir" || exit 1
 
 cmd+="-v $output_dir:/output:rw "
@@ -200,6 +201,14 @@ image="linuxppc/build:$distro-$version"
 cmd+="$image "
 cmd+="/bin/container-build.sh $task"
 
+echo "## output        = $output_dir"
+
 (set -x; $cmd)
 
-exit $?
+ret=$?
+if [[ $ret -eq 0  && -n "$output_symlink" ]]; then
+    rm -f $output_symlink
+    ln -s $output_dir $output_symlink
+fi
+
+exit $ret

build/scripts/clean.sh

@@ -11,6 +11,6 @@ script_base="$(realpath "$dir")"
 
 IFS=@ read -r task subarch distro version <<< "$1"
 
-output_dir=$(get_output_dir "$script_base" "$subarch" "$distro" "$version" "$task" "$DEFCONFIG" "$TARGETS" "$CLANG")
+output_dir=$(get_output_dir "$script_base" "$subarch" "$distro" "$version" "$task" "$DEFCONFIG" "$TARGETS" "$CLANG" "")
 
 (set -x ; rm -rf "$output_dir")

build/scripts/container-build.sh

@@ -128,6 +128,8 @@ if [[ "$1" == "kernel" ]]; then
 
     echo "## Kernel build completed rc = $rc"
 
+    /linux/scripts/clang-tools/gen_compile_commands.py -o /output/compile_commands.json /output > /dev/null 2>&1 || true
+
     if [[ -f /output/vmlinux ]]; then
         size /output/vmlinux
     fi
@@ -198,6 +200,7 @@ else
         (set -x; $cmd clean)
     fi
 
+    (set -x; make $quiet -j $JFACTOR headers)
     (set -x; $cmd)
     rc=$?
     echo "## Selftest build completed rc = $rc"

build/scripts/image.sh

@@ -123,6 +123,8 @@ elif [[ "$distro" == "korg" ]]; then
     # Use an older distro for the 5.x toolchains.
     if [[ "$version" == 5.* ]]; then
 	from="docker.io/ubuntu:16.04"
+    elif [[ "$version" == 13.* ]]; then
+	from="docker.io/ubuntu:23.04"
     else
 	from="docker.io/ubuntu:20.04"
     fi

build/scripts/lib.sh

@@ -25,6 +25,7 @@ function get_output_dir()
     local defconfig="$6"
     local targets="$7"
     local clang="$8"
+    local symlink="$9"
     local d
 
     if [[ -z "$script_base" || -z "$subarch" || -z "$distro" ]]; then
@@ -41,6 +42,10 @@ function get_output_dir()
     case "$task" in
         kernel) ;&
         clean-kernel)
+	    if [[ -n "$symlink" ]]; then
+		echo "$d/latest-kernel"
+		return 0
+	    fi
             if [[ -n "$defconfig" ]]; then
                 defconfig="${defconfig//\//_}"
                 d="$d/$defconfig"
@@ -49,6 +54,10 @@ function get_output_dir()
         ppctests) ;&
         selftests) ;&
         clean-selftests)
+	    if [[ -n "$symlink" ]]; then
+		echo "$d/latest-selftests"
+		return 0
+	    fi
             if [[ -n "$targets" ]]; then
                 targets=${targets// /_}
                 targets=${targets//\//_}
@@ -59,6 +68,10 @@ function get_output_dir()
             ;;
         perf) ;&
         clean-perf)
+	    if [[ -n "$symlink" ]]; then
+		echo "$d/latest-perf"
+		return 0
+	    fi
             d="$d/perf"
             ;;
     esac
@@ -76,6 +89,7 @@ function get_output_dir()
         d="$d@$version"
     fi
 
+    d=$(realpath $d)
     echo "$d"
 
     return 0

etc/configs/prove-locking.config etc/configs/lockdep-y.configetc/configs/prove-locking.config renamed to etc/configs/lockdep-y.config

@@ -1,3 +1,2 @@
 CONFIG_PROVE_LOCKING=y
 CONFIG_RCU_EXPERT=y
-CONFIG_PROVE_RCU_LIST=y