Merge remote-tracking branch 'upstream/master' into open-src/need-kco…

…nfig-format-spec-2
intel · Apr 15, 2024 · 566036d · 566036d
2 parents f93c6f8 + d075562
commit 566036d
Show file tree

Hide file tree

Showing 377 changed files with 4,791 additions and 2,826 deletions.
diff --git a/.github/workflows/code.yml b/.github/workflows/code.yml
@@ -34,3 +34,10 @@ jobs:
     - run: rubocop -v
     - run: bundle exec rake code
 
+  test-packages:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Test packages
+        run: tools/test-packages.sh
diff --git a/.rubocop.2.0.yml b/.rubocop.2.0.yml
@@ -21,7 +21,10 @@ Metrics/PerceivedComplexity:
   Enabled: false
 
 Metrics/BlockNesting:
-  Enabled: false
+  Exclude:
+    - programs/test-bpf/parse
+    - lib/hash.rb
+    - programs/suspend/parse
 
 Metrics/ClassLength:
   Enabled: false
@@ -101,9 +104,6 @@ Lint/UnneededDisable:
 Lint/BlockAlignment:
   Enabled: false
 
-Layout/CommentIndentation:
-  Enabled: false
-
 Layout/IndentHeredoc:
   Enabled: false
 

diff --git a/.rubocop.yml b/.rubocop.yml
@@ -25,7 +25,10 @@ Metrics/PerceivedComplexity:
   Enabled: false
 
 Metrics/BlockNesting:
-  Enabled: false
+  Exclude:
+    - programs/test-bpf/parse
+    - lib/hash.rb
+    - programs/suspend/parse
 
 Metrics/ClassLength:
   Enabled: false
@@ -120,9 +123,6 @@ Layout/LineLength:
 Layout/FirstArrayElementIndentation:
   Enabled: false
 
-Layout/CommentIndentation:
-  Enabled: false
-
 # Layout/IndentHeredoc:
 #   Enabled: false
 

diff --git a/bin/post-run b/bin/post-run
@@ -35,7 +35,7 @@ wait_for_bg_procs()
 
 	echo wait for background processes: $(cat $pidfile $TMP/.name-wait-bg-procs)
 
-	for i in 1 2 3 4 5
+	for i in $(seq 15)
 	do
 		sleep $i
 		any_pid_alive $pidfile && continue
@@ -105,7 +105,10 @@ grep -q perf-profile $TMP/program_list && {
 }
 
 for post_run in $TMP_RESULT_ROOT/post-run.* $LKP_SRC/post-run/*; do
-	[ -f "$post_run" ] && sh "$post_run"
+	[ -f "$post_run" ] && {
+		echo "$(date +'%F %T') executing post-run script: $post_run"
+		sh "$post_run"
+	}
 done
 
 has_advance_pgrep()

diff --git a/distro/adaptation/amazon_linux b/distro/adaptation/amazon_linux
@@ -152,7 +152,6 @@ libtool-bin: libtool
 libubsan0:
 libudev1: systemd-libs
 libudev-dev: systemd-devel
-libunwind8: libunwind
 libunwind-dev: libunwind-devel
 libuuid1: libuuid 
 libuv1-dev: libuv-devel

diff --git a/distro/adaptation/centos b/distro/adaptation/centos
@@ -184,7 +184,6 @@ libubsan0:
 libudev-dev: systemd-devel
 libudev1: systemd-libs
 libunwind-dev: libunwind-devel
-libunwind8: libunwind
 libuuid1: libuuid
 libuv1-dev: libuv-devel
 libvirt-clients: libvirt-client

diff --git a/distro/adaptation/centos-8 b/distro/adaptation/centos-8
@@ -13,7 +13,7 @@ libpng12-dev:
 libtraceevent-dev: libtraceevent-devel 
 libtraceevent1: 
 libunwind-dev:
-libunwind8:
+libunwind:
 llvm-dev: llvm-devel
 pkg-config:
 python-dev:

diff --git a/distro/adaptation/centos-9 b/distro/adaptation/centos-9
@@ -31,7 +31,7 @@ libpython3: python3-libs
 libtraceevent-dev: libtraceevent-devel
 libtraceevent1: libtraceevent
 libunwind-dev:
-libunwind8:  
+libunwind:
 llvm-dev: llvm-devel
 openbsd-inetd:
 pkg-config:

diff --git a/distro/adaptation/debian b/distro/adaptation/debian
@@ -7,3 +7,4 @@ libgcc-dev: libgcc-6-dev
 openjdk: openjdk-11-jdk
 mysql-server: default-mysql-server
 gtk3: gir1.2-gtk-3.0
+libunwind: libunwind8
diff --git a/distro/adaptation/debian-10 b/distro/adaptation/debian-10
@@ -28,3 +28,4 @@ libevent-2: libevent-2.1-6
 gcc: gcc-9
 libgsl: libgsl23
 libprocps: libprocps7
+liburing:
diff --git a/distro/adaptation/debian-11 b/distro/adaptation/debian-11
@@ -30,3 +30,4 @@ libpython3: libpython3.9
 gcc: gcc-10
 libgsl: libgsl25
 libprocps: libprocps8
+liburing: liburing1
diff --git a/distro/adaptation/debian-12 b/distro/adaptation/debian-12
@@ -4,7 +4,6 @@
 winpdb:
 python3-gobject:
 xfsdump:
-python-setuptools:
 crda:
 libpython2.7:
 freeglut3:
@@ -24,7 +23,6 @@ libtirpc: libtirpc-common
 libicu: libicu72
 libjson: libjson-c5
 python3-crypto: python3-pycryptodome
-python-docutils: python3-docutils
 libevent-2: libevent-2.1-7
 libasan: libasan6
 libperl5: libperl5.36
@@ -54,5 +52,7 @@ cython:
 dh-systemd: debhelper
 libevent-2.1-6: libevent-2.1-7
 libhwloc5: libhwloc15
-libssl1.1: libssl3
-python-tox: tox
+python3-tox: tox
+liburing: liburing2
+libpolly-dev: libpolly-14-dev
+python-setuptools: python3-setuptools
diff --git a/distro/adaptation/fedora b/distro/adaptation/fedora
@@ -165,7 +165,6 @@ libtraceevent1: libtraceevent
 libudev-dev: systemd-devel
 libudev1: systemd-libs
 libunwind-dev: libunwind-devel
-libunwind8: libunwind
 libuuid1: libuuid
 libuv1-dev: libuv-devel
 libvirt-clients: libvirt-client

diff --git a/distro/adaptation/ubuntu b/distro/adaptation/ubuntu
@@ -5,18 +5,16 @@ libcpupower-dev:
 libevent-2: libevent-dev
 libgcrypt-dev: libgcrypt20-dev
 libgflags2v5: libgflags-dev
-libhugetlbfs-bin: hugepages
 libhugetlbfs: libhugetlbfs0
 libicu: libicu-dev
 libntfs: libntfs-3g88
 libperl5: libperl5.26
 libsnappy1v5: libsnappy-dev
-libssl: libssl1.0.0
+libssl: libssl1.1
 libtirpc: libtirpc1
 libtool-bin:
 libzmq: libzmq5
 linux-perf: linux-tools-common
-linux-perf: linux-tools-generic
 linux-tools: linux-tools-generic
 perl-modules-5: perl-modules-5.26
 pmdk: pmdk-tools
@@ -25,3 +23,5 @@ nasm: nasm
 btrfs-tools: btrfs-progs
 gtk3: gir1.2-gtk-3.0
 libjpeg62-turbo: libjpeg-turbo8
+libglut3: freeglut3
+libglut-dev: freeglut3-dev  
diff --git a/distro/adaptation/ubuntu-22.04 b/distro/adaptation/ubuntu-22.04
@@ -1,8 +1,14 @@
 # jammy
 
+crda:
+cython:
+dh-systemd: debhelper
+exfat-utils: exfatprogs
 python: python-is-python3
-libunwind8: libunwind-14
-libunwind-dev: libunwind-14-dev
+python3-gobject:
+python3-tox: tox
+python3-crypto: python3-pycryptodome
+libunwind: libunwind-15
 libperl5: libperl5.34
 perl-modules-5: perl-modules-5.34
 libx32gcc1: libx32gcc-s1
@@ -11,3 +17,19 @@ libx32gcc-dev: libx32gcc-12-dev
 libipsec-mb: libipsec-mb1
 libpython3: libpython3.10
 libtirpc: libtirpc-common
+libssl: libssl3
+winpdb:
+qt5-default: qtbase5-dev
+openjdk: openjdk-17-jdk
+mcelog: rasdaemon
+libreadline5: readline-common
+libprocps: libprocps8
+libpolly-dev:
+libntfs: libntfs-3g89
+libldap-2.4-2: libldap-2.5-0
+libjson: libjson-c5
+libhwloc5: libhwloc15
+libgsl: libgsl27
+libevent-2.1-6: libevent-2.1-7
+mariadb-server:mariadb-server-10.6
+fuse: fuse3
diff --git a/distro/depends/lkp-dev b/distro/depends/lkp-dev
@@ -2,9 +2,7 @@
 # package. We can change this requiremet if we modify
 # distro/adaptation/* files to use something uniq that is not
 # part of real packages, like: |
-make
 automake
-gcc
 build-essential
 libtool
 patch
@@ -16,9 +14,7 @@ rsync
 cpio
 wget
 libklibc-dev
-linux-libc-dev
 linux-libc-dev:i386 (x86_64)
-libc6-dev
 libc6-dev:i386 (x86_64)
 ruby
 ruby-dev

diff --git a/etc/index-perf-all.yaml b/etc/index-perf-all.yaml
@@ -211,7 +211,7 @@ swapin\.throughput: 1
 sysbench\-.+\.throughput_events\/s: 1
 sysbench\-.+\.throughput_MB\/s: 1
 sysbench\-.+\.throughput_ops\/s: 1
-tbench\.throughput-MB\/sec: 1
+tbench\.throughput_MB\/s: 1
 tcrypt\.async\..+\.decryption: 1
 tcrypt\.async\..+\.encryption: 1
 thrulay\.jitter: -1

diff --git a/etc/kconfigs.yaml b/etc/kconfigs.yaml
@@ -267,6 +267,10 @@ STM_SOURCE_CONSOLE: v4.4-rc1
 STMMAC_SELFTESTS: v5.3-rc1 
 STM_SOURCE_FTRACE: v4.6-rc1
 STM_SOURCE_HEARTBEAT: v4.6-rc1
+STRING_SELFTEST: <= v6.8
+TEST_STRING_HELPERS: <= v6.8
+STRING_KUNIT_TEST: v6.9-rc1
+STRING_HELPERS_KUNIT_TEST: v6.9-rc1
 STRSCPY_KUNIT_TEST: v6.2-rc1
 SYNTH_EVENT_GEN_TEST: v5.6-rc1
 SYNC: <= v4.7

diff --git a/etc/oops-pattern-ignore b/etc/oops-pattern-ignore
@@ -4,3 +4,4 @@ Killed process [0-9]+ \(
 Out of memory: .*trinity
 trinity.*: page allocation failure
 trinity.*: page allocation stalls for
+Spectre V2 : WARNING: Unprivileged eBPF is enabled with eIBRS on, data leaks possible via Spectre v2 BHB attacks