From 63775658d15f25fbb42f5cc093bc07f9c7322897 Mon Sep 17 00:00:00 2001 From: Lei Lu Date: Wed, 5 Jul 2017 09:57:01 +0800 Subject: [PATCH 001/108] hosts: upgrade lkp-wsx01 memory size to 320G Signed-off-by: Lei Lu Signed-off-by: Philip Li --- hosts/lkp-wsx01 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/lkp-wsx01 b/hosts/lkp-wsx01 index 7a52c8ed3..27d7285b9 100644 --- a/hosts/lkp-wsx01 +++ b/hosts/lkp-wsx01 @@ -1,5 +1,5 @@ model: Westmere-EX -memory: 256G +memory: 320G nr_cpu: 80 nr_hdd_partitions: 0 hdd_partitions: From 99cc4616348bdffe0150be563060f8d650daab4e Mon Sep 17 00:00:00 2001 From: Xiaolong Ye Date: Wed, 5 Jul 2017 15:14:09 +0800 Subject: [PATCH 002/108] failure: add patterns to recognize build errors changed-stats-queue relies on this file to identify/save changed stats to trigger bisection, add patterns to recognize build errors as failure. This should solve no valid bisections for build-dpdk within more than 6 months. Signed-off-by: Xiaolong Ye Signed-off-by: Philip Li --- etc/failure | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/failure b/etc/failure index c6e168ff0..fe4fc2a5a 100644 --- a/etc/failure +++ b/etc/failure @@ -4,3 +4,4 @@ stderr.* .+\..+(fail|crash|timeout|warn|dmesg-warn|dmesg-fail|inconsistent_fs)$ last_state.* lkp-bug.* +.+\.(error|warn).* From 464169a644ddef2e420f0f96a36214ee78265f24 Mon Sep 17 00:00:00 2001 From: Li Zhijian Date: Wed, 5 Jul 2017 15:42:58 +0800 Subject: [PATCH 003/108] kernel_selftests: mark skipped case as ignored_by_lkp Signed-off-by: Li Zhijian Signed-off-by: Philip Li --- lib/tests/kernel_selftests.sh | 18 ++++++++++++------ tests/kernel_selftests | 14 ++++++-------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/lib/tests/kernel_selftests.sh b/lib/tests/kernel_selftests.sh index 89de85ae5..5743cf737 100644 --- a/lib/tests/kernel_selftests.sh +++ b/lib/tests/kernel_selftests.sh @@ -24,7 +24,7 @@ check_makefile() { subtest=$1 grep -E -q -m 1 "^TARGETS \+?= ?$subtest" Makefile || { - echo "skip ${subtest} test: not be default compiling/testing target" + echo "ignored_by_lkp ${subtest} test: not be default compiling/testing target" return 1 } } @@ -32,19 +32,19 @@ check_makefile() prepare_for_efivarfs() { [[ -d "/sys/firmware/efi" ]] || { - echo "skip efivarfs test: /sys/firmware/efi dir does not exist" + echo "ignored_by_lkp efivarfs test: /sys/firmware/efi dir does not exist" return 1 } grep -q -F -w efivarfs /proc/filesystems || modprobe efivarfs || { - echo "skip efivarfs test: no efivarfs support, try enable CONFIG_EFIVAR_FS" + echo "ignored_by_lkp efivarfs test: no efivarfs support, try enable CONFIG_EFIVAR_FS" return 1 } # if efivarfs is built-in, "modprobe efivarfs" always returns 0, but it does not means # efivarfs is supported since this requires some specified hardwares, such as booting from # uefi, so check again log_cmd mount -t efivarfs efivarfs /sys/firmware/efi/efivars || { - echo "skip efivarfs test: unable to mount efivarfs to /sys/firmware/efi/efivars" + echo "ignored_by_lkp efivarfs test: unable to mount efivarfs to /sys/firmware/efi/efivars" return 1 } } @@ -55,7 +55,7 @@ prepare_for_pstore() # in order to create a /dev/pmsg0, we insert a dummy ramoops device modprobe ramoops mem_address=0x8000000 ecc=1 mem_size=1000000 2>&1 [[ ! -e /dev/pmsg0 ]] && { - echo "skip pstore test: /dev/pmsg0 does not exist" + echo "ignored_by_lkp pstore test: /dev/pmsg0 does not exist" return 1 } } @@ -89,9 +89,15 @@ prepare_for_capabilities() { # workaround: skip capabilities if lkp user is not exist. grep -q ^lkp: /etc/passwd || { - echo "skip capabilities test: lkp user is not exist" + echo "ignored_by_lkp capabilities test: lkp user is not exist" return 1 } # workaround: run capabilities under user lkp log_cmd chown lkp $subtest -R 2>&1 } + +subtest_in_skip_filter() +{ + local filter=$@ + echo "$filter" | grep -w -q "$subtest" && echo "ignored_by_lkp $subtest test" +} diff --git a/tests/kernel_selftests b/tests/kernel_selftests index e161dbc63..d3bb7e68c 100755 --- a/tests/kernel_selftests +++ b/tests/kernel_selftests @@ -17,19 +17,17 @@ cd $linux_selftests_dir/tools/testing/selftests || die prepare_for_test +# breakpoints: skip breakpoints when running host hanging dead +# timers: counting 5 update interrupts from reading /dev/rtc0 +# hanging for a long time and cannot be finished +skip_filter="breakpoints timers powerpc" + for mf in */Makefile; do subtest=${mf%/Makefile} check_makefile $subtest || continue - # skip breakpoints when running host hanging dead - [[ $subtest = "breakpoints" ]] && continue - - # counting 5 update interrupts from reading /dev/rtc0 - # hanging for a long time and cannot be finished - [[ $subtest = "timers" ]] && continue - - [[ $subtest = "powerpc" ]] && continue + subtest_in_skip_filter "$skip_filter" && continue if [[ $subtest = "efivarfs" ]]; then prepare_for_efivarfs || continue From 9b479b39cd5c8ec7e1bbce5a3c0bde93be02044f Mon Sep 17 00:00:00 2001 From: Li Zhijian Date: Wed, 5 Jul 2017 15:42:59 +0800 Subject: [PATCH 004/108] stats/kernel_selftests: change test_skip to ignored_by_lkp Signed-off-by: Li Zhijian Signed-off-by: Philip Li --- stats/kernel_selftests | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stats/kernel_selftests b/stats/kernel_selftests index a9474bc01..df54d5de9 100755 --- a/stats/kernel_selftests +++ b/stats/kernel_selftests @@ -96,8 +96,8 @@ while (line = STDIN.gets) next unless testname # do not count make fail in nr_test, which is for sub test number stats << "#{testname}.make_fail: 1" - when /^skip (.*) test:/ - stats << "#{$1}.test_skip: 1" + when /^ignored_by_lkp (.*) test/ + stats << "#{$1}.ignored_by_lkp: 1" else if testname == 'futex' futex_stat(line, tests_stats['futex'], stats) @@ -116,5 +116,5 @@ unless mqueue_speed.empty? end stats.uniq.each { |stat| puts stat } -nr_test = stats.count { |k, _v| k !~ /\.make_fail|\.test_skip/ } +nr_test = stats.count { |k, _v| k !~ /\.make_fail|\.ignored_by_lkp/ } puts "total_test: #{nr_test}" if nr_test.nonzero? From bae48fce18eb28d83a0558914c17c55762b6e847 Mon Sep 17 00:00:00 2001 From: Xiaolong Ye Date: Thu, 6 Jul 2017 08:49:55 +0800 Subject: [PATCH 005/108] repo: update Josh's repo Hi, Can you please change my old github repo link to my new kernel.org repo: https://git.kernel.org/pub/scm/linux/kernel/git/jpoimboe/linux.git Thanks! Cc: Josh Poimboeuf Signed-off-by: Xiaolong Ye Signed-off-by: Philip Li --- repo/linux/jpoimboe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repo/linux/jpoimboe b/repo/linux/jpoimboe index 0f0261715..1f05c3025 100644 --- a/repo/linux/jpoimboe +++ b/repo/linux/jpoimboe @@ -1,4 +1,4 @@ -url: https://github.com/jpoimboe/linux +url: https://git.kernel.org/pub/scm/linux/kernel/git/jpoimboe/linux.git owner: Josh Poimboeuf notify_build_success_branch: .* test_old_branches: .* From 33714735f7500e30e0d323a0a8445bb86a21b9f1 Mon Sep 17 00:00:00 2001 From: Lei Lu Date: Thu, 6 Jul 2017 12:29:48 +0800 Subject: [PATCH 006/108] hosts: setup swap partition for lkp-wsx01 Signed-off-by: Lei Lu Signed-off-by: Philip Li --- hosts/lkp-wsx01 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/lkp-wsx01 b/hosts/lkp-wsx01 index 27d7285b9..3aef326c9 100644 --- a/hosts/lkp-wsx01 +++ b/hosts/lkp-wsx01 @@ -3,5 +3,5 @@ memory: 320G nr_cpu: 80 nr_hdd_partitions: 0 hdd_partitions: -swap_partitions: +swap_partitions: LABEL=SWAP rootfs_partition: From 36ff268c4fa4a1843a3bd951b5ab47fdcab5f02d Mon Sep 17 00:00:00 2001 From: Li Zhijian Date: Thu, 6 Jul 2017 13:36:54 +0800 Subject: [PATCH 007/108] mce-log: mark skipped cases as ignored_by_lkp Signed-off-by: Li Zhijian Signed-off-by: Philip Li --- stats/mce-log | 2 ++ tests/mce-log | 14 +++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/stats/mce-log b/stats/mce-log index f8b5b05af..2a7eca702 100755 --- a/stats/mce-log +++ b/stats/mce-log @@ -10,6 +10,8 @@ while (line = STDIN.gets) stats[item + '.' + $1] = 'pass' when /^(\S+)\.conf: triggers did not trigger as expected:/ stats[item + '.' + $1] = 'fail' + when /^(ignored_by_lkp): (.*)/ + stats[$2] = $1 end end diff --git a/tests/mce-log b/tests/mce-log index 9f3ea8e24..bc54e33d2 100755 --- a/tests/mce-log +++ b/tests/mce-log @@ -15,7 +15,19 @@ touch .depend # skip test/socket case, because it requires hardware register CMCI support # match start with "\t./test socket*" -sed -i '/.*\.\/test socket*/d' tests/Makefile +grep -q -w './test socket' tests/Makefile 2>/dev/null && { + sed -i '/.*\.\/test socket*/d' tests/Makefile + cd tests/socket + # root@lkp-u410 /lkp/benchmarks/mce-log/tests/socket# ls *.conf + # socket-1.conf socket-2.conf socket-memdb.conf + for skip in *.conf + do + skip=${skip%%\.conf} + echo "ignored_by_lkp: socket.$skip" + done + cd $BENCHMARK_ROOT/mce-log +} + make test exit_value=$? From 02d741ae16dccee4cea06738c61aa58bd0d4cd28 Mon Sep 17 00:00:00 2001 From: Xiang Dai Date: Thu, 6 Jul 2017 17:48:06 +0800 Subject: [PATCH 008/108] pack/xfstests: remove cases which need maintain by hand Signed-off-by: Xiang Dai Signed-off-by: Philip Li --- pack/xfstests | 2 -- 1 file changed, 2 deletions(-) diff --git a/pack/xfstests b/pack/xfstests index beba9911d..1ecd54478 100755 --- a/pack/xfstests +++ b/pack/xfstests @@ -24,8 +24,6 @@ build_ignore_file() cd ../xfstests-dev || return git grep "_require_xfs_mkfs_without_validation" | grep -v "common/" | awk -F '[:/]' '{print $3}' > ignore git grep _require_xfs_io_command | grep -E "fzero|fcollapse|finsert|fcollapse" | grep generic | awk -F '[:/]' '{print $3}' > generic-btrfs-ignore - echo 015 >> generic-btrfs-ignore - echo -e "066\n091\n263\n240\n102\n103\n204" >> generic-f2fs-ignore } build() From 1a8bb251d88a3d5b89db34402891c77f2fbb6b14 Mon Sep 17 00:00:00 2001 From: Xiang Dai Date: Thu, 6 Jul 2017 17:48:07 +0800 Subject: [PATCH 009/108] move ignored tests which need maintain by hand under pack/xfstests-addon/tests Signed-off-by: Xiang Dai Signed-off-by: Philip Li --- pack/xfstests-addon/tests/generic-btrfs-ignore | 1 + pack/xfstests-addon/tests/generic-f2fs-ignore | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 pack/xfstests-addon/tests/generic-btrfs-ignore create mode 100644 pack/xfstests-addon/tests/generic-f2fs-ignore diff --git a/pack/xfstests-addon/tests/generic-btrfs-ignore b/pack/xfstests-addon/tests/generic-btrfs-ignore new file mode 100644 index 000000000..c42e3b003 --- /dev/null +++ b/pack/xfstests-addon/tests/generic-btrfs-ignore @@ -0,0 +1 @@ +015 diff --git a/pack/xfstests-addon/tests/generic-f2fs-ignore b/pack/xfstests-addon/tests/generic-f2fs-ignore new file mode 100644 index 000000000..0c5412a96 --- /dev/null +++ b/pack/xfstests-addon/tests/generic-f2fs-ignore @@ -0,0 +1,7 @@ +066 +091 +263 +240 +102 +103 +204 From eda8d28bfc24cb53f0d30ecbb0aa3663857ef09a Mon Sep 17 00:00:00 2001 From: Xiaolong Ye Date: Fri, 7 Jul 2017 11:01:42 +0800 Subject: [PATCH 010/108] backlist: backlist more meaningless stderr stats Signed-off-by: Xiaolong Ye Signed-off-by: Philip Li --- etc/blacklist | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/etc/blacklist b/etc/blacklist index 806260ed1..f33d2f978 100644 --- a/etc/blacklist +++ b/etc/blacklist @@ -60,10 +60,27 @@ ^stderr.has_stderr ^stderr.Killed ^stderr.modprobe:ERROR:../libkmod/libkmod.c:#kmod_search_moddep()could_not_open_moddep_file -^stderr.*oom-killer:*Invalid_argument +^stderr.*Invalid_argument ^stderr.pmeter_server_does_not_start_correctly ^stderr.*scripts/aim_..sh:not_found ^stderr.some_monitors_do_not_quit_in_time +^stderr./lkp/benchmarks.* +^stderr./lkp/lkp/src/.* +^stderr.sh:echo:I/O_error +^stderr.disk_number.* +^stderr.Can_not_find_perf_command +^stderr.make_perf_failed +^stderr.make.*Error +^stderr.*:Connection_reset_by_peer +^stderr.Invalid_number_of_requests +^stderr.socket:Too_many_open_files +^stderr.ls:cannot_access.* +^stderr.*Failed_to_fetch_http +^stderr.fail_to_setup_test_environment +^stderr.See.*for_details +^stderr.*write_error +^stderr.Illegal_instruction +^stderr.curl.*Empty_reply_from_server ^tcrypt.* .*\.total_test ^vmstat.cpu From 6987c56041043749207c66aeedee16bdc3a18082 Mon Sep 17 00:00:00 2001 From: Li Zhijian Date: Fri, 7 Jul 2017 11:05:33 +0800 Subject: [PATCH 011/108] spec/stats/kernel_selftests: update sigaltstack.sas output this case was enabled at recent kernel Signed-off-by: Li Zhijian Signed-off-by: Philip Li --- spec/stats/kernel_selftests.13 | 24 +++++++++++++----------- spec/stats/kernel_selftests.14 | 2 +- spec/stats/kernel_selftests.15 | 5 ----- spec/stats/kernel_selftests.15.yaml | 2 -- 4 files changed, 14 insertions(+), 19 deletions(-) delete mode 100644 spec/stats/kernel_selftests.15 delete mode 100644 spec/stats/kernel_selftests.15.yaml diff --git a/spec/stats/kernel_selftests.13 b/spec/stats/kernel_selftests.13 index 4288ca417..1e922556f 100644 --- a/spec/stats/kernel_selftests.13 +++ b/spec/stats/kernel_selftests.13 @@ -1,13 +1,15 @@ # sigaltstack pass -make: Entering directory '/usr/src/linux-selftests-x86_64-rhel-7.2-d5adbfcd5f7bcc6fa58a41c5c5ada0e5c826ce2c/tools/testing/selftests/sigaltstack' -gcc -Wall sas.c -o sas -[OK] Initial sigaltstack state was SS_DISABLE -[RUN] signal USR1 -[OK] sigaltstack is disabled in sighandler -[RUN] switched to user ctx -[RUN] signal USR2 -[OK] Stack preserved -[OK] sigaltstack is still SS_AUTODISARM after signal -[OK] Test passed -make: Leaving directory '/usr/src/linux-selftests-x86_64-rhel-7.2-d5adbfcd5f7bcc6fa58a41c5c5ada0e5c826ce2c/tools/testing/selftests/sigaltstack' +make: Entering directory '/usr/src/linux-selftests-x86_64-rhel-7.2-6f7da290413ba713f0cdd9ff1a2a9bb129ef4f6c/tools/testing/selftests/sigaltstack' +gcc -Wall sas.c -o /usr/src/linux-selftests-x86_64-rhel-7.2-6f7da290413ba713f0cdd9ff1a2a9bb129ef4f6c/tools/testing/selftests/sigaltstack/sas +[OK] Initial sigaltstack state was SS_DISABLE +[RUN] signal USR1 +[OK] sigaltstack is disabled in sighandler +[RUN] switched to user ctx +[RUN] signal USR2 +[OK] Stack preserved +[OK] sigaltstack is still SS_AUTODISARM after signal +[OK] Test passed +selftests: sas [PASS] +/usr/src/linux-selftests-x86_64-rhel-7.2-6f7da290413ba713f0cdd9ff1a2a9bb129ef4f6c/tools/testing/selftests/sigaltstack +make: Leaving directory '/usr/src/linux-selftests-x86_64-rhel-7.2-6f7da290413ba713f0cdd9ff1a2a9bb129ef4f6c/tools/testing/selftests/sigaltstack' diff --git a/spec/stats/kernel_selftests.14 b/spec/stats/kernel_selftests.14 index 6ed126db5..c8985ea8f 100644 --- a/spec/stats/kernel_selftests.14 +++ b/spec/stats/kernel_selftests.14 @@ -2,5 +2,5 @@ make: Entering directory '/usr/src/linux-selftests-x86_64-rhel-7.2-d5adbfcd5f7bcc6fa58a41c5c5ada0e5c826ce2c/tools/testing/selftests/sigaltstack' gcc -Wall sas.c -o sas -mmap() +selftests: sas [FAIL] make: Leaving directory '/usr/src/linux-selftests-x86_64-rhel-7.2-d5adbfcd5f7bcc6fa58a41c5c5ada0e5c826ce2c/tools/testing/selftests/sigaltstack' diff --git a/spec/stats/kernel_selftests.15 b/spec/stats/kernel_selftests.15 deleted file mode 100644 index 1e7d5b523..000000000 --- a/spec/stats/kernel_selftests.15 +++ /dev/null @@ -1,5 +0,0 @@ -# sigaltstack skip - -make: Entering directory '/usr/src/linux-selftests-x86_64-rhel-7.2-d5adbfcd5f7bcc6fa58a41c5c5ada0e5c826ce2c/tools/testing/selftests/sigaltstack' -gcc -Wall sas.c -o sas -make: Leaving directory '/usr/src/linux-selftests-x86_64-rhel-7.2-d5adbfcd5f7bcc6fa58a41c5c5ada0e5c826ce2c/tools/testing/selftests/sigaltstack' diff --git a/spec/stats/kernel_selftests.15.yaml b/spec/stats/kernel_selftests.15.yaml deleted file mode 100644 index 5728d2630..000000000 --- a/spec/stats/kernel_selftests.15.yaml +++ /dev/null @@ -1,2 +0,0 @@ -sigaltstack.sas.skip: 1 -total_test: 1 From 67b34f3a2111037c6caa5f8cd78485aa458c7d12 Mon Sep 17 00:00:00 2001 From: Chen Rong Date: Mon, 10 Jul 2017 14:59:49 +0800 Subject: [PATCH 012/108] pack/hwsim: support WPA-EAP-SUITE-B-192 add "CONFIG_SUITEB192=y" build option for wpa_supplicant and hostapd fix the following issue: ----------------- Skip test case: WPA-EAP-SUITE-B-192 not supported hwsim.suite_b_192 skip -> pass hwsim.suite_b_192_mic_failure skip -> fail hwsim.suite_b_192_pmkid_failure skip -> fail hwsim.suite_b_192_radius skip -> pass ----------------- Signed-off-by: Chen Rong Signed-off-by: Philip Li --- pack/hwsim | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pack/hwsim b/pack/hwsim index ee3b9491d..4d38c6085 100755 --- a/pack/hwsim +++ b/pack/hwsim @@ -14,6 +14,27 @@ build() make install || return cd - patch_source || return + + # support WPA-EAP-SUITE-B-192, example-wpa_supplicant.config and example-hostapd.config contains support options for build. + # hostapd_config_parse_key_mgmt() in hostapd/config_file.c will check "CONFIG_SUITEB192". + # if not set "CONFIG_SUITEB192=y", suite_b_192 can not be added into key_mnt. + + # if example-wpa_supplicant.config and example-hostapd.config not exist, it means hostap(git://w1.fi/srv/git/hostap.git) + # remove the files, we need to check the option in the new configuration files + local wpa_supplicant_config="./tests/hwsim/example-wpa_supplicant.config" + local hostapd_config="./tests/hwsim/example-hostapd.config" + + if [[ -f $wpa_supplicant_config ]]; then + grep -q -w "CONFIG_SUITEB192=y" $wpa_supplicant_config || echo "CONFIG_SUITEB192=y" >> $wpa_supplicant_config + else + echo "Warning: $wpa_supplicant_config not exist, failed to set CONFIG_SUITEB192=y" + fi + if [[ -f $hostapd_config ]]; then + grep -q -w "CONFIG_SUITEB192=y" $hostapd_config || echo "CONFIG_SUITEB192=y" >> $hostapd_config + else + echo "Warning: $hostapd_config not exist, failed to set CONFIG_SUITEB192=y" + fi + $RUN_QUIET ./tests/hwsim/build.sh } From c95d8b6cf8373a6740cd077d7665a2b7689e1491 Mon Sep 17 00:00:00 2001 From: Wen Jin Date: Mon, 10 Jul 2017 17:26:20 +0800 Subject: [PATCH 013/108] add codes to make it convenient for run different mce-test cases add codes to make it convenient for run different mce-test cases via adding YMAL hash to job and fix some bugs in shell script under tests directory Signed-off-by: Wen Jin Signed-off-by: Philip Li --- include/mce-test | 14 ++++++++- jobs/mce-test.yaml | 4 +-- pack/mce-test | 18 +++++------ tests/mce-test | 75 ++++++++++++++++++++++++++++++++-------------- 4 files changed, 76 insertions(+), 35 deletions(-) diff --git a/include/mce-test b/include/mce-test index dad3d7fd0..de32f6818 100644 --- a/include/mce-test +++ b/include/mce-test @@ -1,11 +1,23 @@ need_kconfig: - CONFIG_X86_MCE=y - CONFIG_X86_MCE_INTEL=y +- CONFIG_X86_MCE_THRESHOLD=y - CONFIG_X86_MCE_INJECT - CONFIG_MEMORY_FAILURE=y +- CONFIG_HWPOISON_INJECT +- CONFIG_HAVE_ACPI_APEI=y +- CONFIG_HAVE_ACPI_APEI_NMI=y +- CONFIG_ACPI_APEI=y +- CONFIG_ACPI_APEI_GHES=y +- CONFIG_ACPI_APEI_PCIEAER=y +- CONFIG_ACPI_APEI_MEMORY_FAILURE=y +- CONFIG_ACPI_APEI_EINJ +- CONFIG_ACPI_APEI_ERST_DEBUG=y +- CONFIG_ACPI_EXTLOG - CONFIG_MEMCG_SWAP=y - CONFIG_MEMCG=y - CONFIG_SWAP=y -- CONFIG_HWPOISON_INJECT - CONFIG_DEBUG_KERNEL - CONFIG_PROC_FS=y +- CONFIG_HOTPLUG_CPU=y +- CONFIG_BOOTPARAM_HOTPLUG_CPU0=y diff --git a/jobs/mce-test.yaml b/jobs/mce-test.yaml index 3d554cb81..15f004633 100644 --- a/jobs/mce-test.yaml +++ b/jobs/mce-test.yaml @@ -4,6 +4,7 @@ category: functional disk: - 1HDD +- 1SSD need_memory: 2G @@ -14,6 +15,5 @@ fs: - ext4 mce-test: - test_mode: + mce_case: - all - - ras diff --git a/pack/mce-test b/pack/mce-test index 232041139..aea6e0d4f 100755 --- a/pack/mce-test +++ b/pack/mce-test @@ -3,10 +3,10 @@ download() { git_clone_update https://github.com/linux-test-project/ltp.git - git_clone_update git://git.kernel.org/pub/scm/utils/cpu/mce/mce-inject.git + git_clone_update https://git.kernel.org/pub/scm/utils/cpu/mce/mce-inject.git git_clone_update git://bee.sh.intel.com:/git/ras.git # keep it in the last to set the effective source_dir - git_clone_update git://git.kernel.org/pub/scm/utils/cpu/mce/mce-test.git + git_clone_update https://git.kernel.org/pub/scm/utils/cpu/mce/mce-test.git } build() @@ -23,15 +23,15 @@ build() install() { make install || return - cp -af * $BM_ROOT + cp -af ./* "$BM_ROOT" make install -C ../mce-inject || return - cp -af ../mce-inject/mce-inject $BM_ROOT + cp -af ../mce-inject/mce-inject "$BM_ROOT" - cp -af ../ltp $BM_ROOT + cp -af ../ltp "$BM_ROOT" - cp -af ../ras $BM_ROOT + cp -af ../ras "$BM_ROOT" } pack() @@ -42,9 +42,9 @@ pack() echo /usr/sbin/mce-inject echo /lkp echo /lkp/benchmarks - echo /lkp/benchmarks/$BM_NAME - find /lkp/benchmarks/$BM_NAME/* + echo /lkp/benchmarks/"$BM_NAME" + find /lkp/benchmarks/"$BM_NAME"/* } | - cpio --quiet -o -H newc --owner=root.root | gzip -n -9 > /lkp/benchmarks/${BM_NAME}.cgz + cpio --quiet -o -H newc --owner=root.root | gzip -n -9 > /lkp/benchmarks/"${BM_NAME}".cgz [[ $arch ]] && mv "/lkp/benchmarks/${BM_NAME}.cgz" "/lkp/benchmarks/${BM_NAME}-${arch}.cgz" } diff --git a/tests/mce-test b/tests/mce-test index f3904ee28..8529cc10f 100755 --- a/tests/mce-test +++ b/tests/mce-test @@ -1,5 +1,5 @@ #!/bin/bash -# - test_mode +# - mce_case ## The MCE test suite is a collection of tools and test scripts for ## testing the Linux RAS related features, including CPU/Memory @@ -7,33 +7,43 @@ shopt -s nullglob -cd $BENCHMARK_ROOT/mce-test || exit +[ -n "$mount_points" ] || die "\"mount_points\" is empty" -. $LKP_SRC/lib/upload.sh -. $LKP_SRC/lib/job.sh -. $LKP_SRC/lib/debug.sh +cd "$BENCHMARK_ROOT"/mce-test || exit + +. "$LKP_SRC"/lib/upload.sh +. "$LKP_SRC"/lib/job.sh +. "$LKP_SRC"/lib/debug.sh read_env_vars exit_value=0 -[[ "$test_mode" ]] || die "parameter \"test_mode\" is empty" +[[ "$mce_case" ]] || die "parameter \"mce_case\" is empty" + +MCE_TOOLDIR=./bin +MCE_TMPDIR=./work +MCE_LOGDIR=./results +MCE_SUMDIR=./summary +MCE_SCENARIO_DIR=./groups +MCE_CASELIST=./work/rastest.caselist test_all() { - echo > ./work/rastest.caselist < $MCE_CASELIST <&1 + umount "$partition" + wipefs -a "$partition" + echo y | ./hwpoison.sh -c /dev/null -t $duration -d "$partition" -o "$BENCHMARK_ROOT"/mce-test/ltp -f "$fs" -L 2>&1 exit_value=$? ## currently, always can not pass this testing, so disable it temporarily. @@ -61,29 +71,48 @@ EOF # exit_value=$? #fi - upload_files -t results $BENCHMARK_ROOT/mce-test/cases/stress/hwpoison/log \ - $BENCHMARK_ROOT/mce-test/cases/stress/hwpoison/result + upload_files -t results ./log \ + ./result rm -fr "$tmp_dir" } -test_ras() +test_choice() { - cd ras || die "can not find ras dir" - ./mcetest_exec.sh + local file + log_cmd cp -af ras "$mount_points" || die "can not find ras dir" + #log_cmd umount /tmp; ln -s /opt/rootfs/tmp /tmp + #umount /tmp; rm -rf /tmp + #ln -s /opt/rootfs/tmp /tmp + cd "$mount_points"/ras + for i in ${mce_case}; do + if grep -q "^$i" "$MCE_SCENARIO_DIR"/*; then + grep -h "^$i" "$MCE_SCENARIO_DIR"/* | awk '{print $1" "$2}' >> $MCE_CASELIST + else + echo "mce test case: $i not found" + exit_value=1 + return + fi + done + + ./runmcetest -t $MCE_TMPDIR -s $MCE_SUMDIR -o $MCE_LOGDIR -b $MCE_TOOLDIR -l $MCE_CASELIST -r 1 exit_value=$? - file=($BENCHMARK_ROOT/mce-test/ras/summary/*.log) + #upload_files -t results $MCE_LOGDIR/* + + file=($MCE_SUMDIR/*.log) if [[ $file ]]; then - cat $file + cat "$file" else echo "WARNING: ras test results is not exist." fi + rm -rf "$mount_points"/ras } -case "$test_mode" in - all) test_all;; - ras) test_ras;; -esac +if [ "$mce_case" == "all" ]; then + test_all +else + test_choice +fi exit $exit_value From 0c626c147b259a5d4513ebae68914af7439c5b09 Mon Sep 17 00:00:00 2001 From: Wen Jin Date: Mon, 10 Jul 2017 17:26:21 +0800 Subject: [PATCH 014/108] modify stats output info to distinguish the result for which mce-test case Signed-off-by: Wen Jin Signed-off-by: Philip Li --- stats/mce-test | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/stats/mce-test b/stats/mce-test index b0acde867..4f31b9e37 100755 --- a/stats/mce-test +++ b/stats/mce-test @@ -14,11 +14,14 @@ while (line = STDIN.gets) when /^\s+(.+) --.* skip/ stats << "#{$1}.skip: 1" nr_test += 1 - when /^HWPOISON-SOFT[ ]+(\w+)[ ]+/ - stats << "ras.#{$1.downcase}: 1" + when /(^[a-zA-Z].*?)\s+PASS\s+/ + stats << "#{$1.downcase}.pass: 1" + nr_test += 1 + when /(^[a-zA-Z].*?)\s+FAIL\s+/ + stats << "#{$1.downcase}.fail: 1" nr_test += 1 end end -stats.each { |stat| puts stat } +stats.each {|stat| puts stat} puts "total_test: #{nr_test}" From 075b51c559ec269c4ea5feceec5e1a8f93d85eed Mon Sep 17 00:00:00 2001 From: Wen Jin Date: Mon, 10 Jul 2017 17:26:22 +0800 Subject: [PATCH 015/108] remove internal ras repo, when need, pack it manually Signed-off-by: Wen Jin Signed-off-by: Philip Li --- pack/mce-test | 6 ------ tests/mce-test | 10 +++++----- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/pack/mce-test b/pack/mce-test index aea6e0d4f..499fe6ae3 100755 --- a/pack/mce-test +++ b/pack/mce-test @@ -4,7 +4,6 @@ download() { git_clone_update https://github.com/linux-test-project/ltp.git git_clone_update https://git.kernel.org/pub/scm/utils/cpu/mce/mce-inject.git - git_clone_update git://bee.sh.intel.com:/git/ras.git # keep it in the last to set the effective source_dir git_clone_update https://git.kernel.org/pub/scm/utils/cpu/mce/mce-test.git } @@ -15,9 +14,6 @@ build() make make -C ../mce-inject - - cd ../ras - ./mcetest_build.sh } install() @@ -30,8 +26,6 @@ install() cp -af ../mce-inject/mce-inject "$BM_ROOT" cp -af ../ltp "$BM_ROOT" - - cp -af ../ras "$BM_ROOT" } pack() diff --git a/tests/mce-test b/tests/mce-test index 8529cc10f..ffd859aaf 100755 --- a/tests/mce-test +++ b/tests/mce-test @@ -80,11 +80,11 @@ EOF test_choice() { local file - log_cmd cp -af ras "$mount_points" || die "can not find ras dir" + log_cmd cp -af "$BENCHMARK_ROOT"/mce-test "$mount_points" || die "can not find mce-test dir" #log_cmd umount /tmp; ln -s /opt/rootfs/tmp /tmp #umount /tmp; rm -rf /tmp #ln -s /opt/rootfs/tmp /tmp - cd "$mount_points"/ras + cd "$mount_points"/mce-test for i in ${mce_case}; do if grep -q "^$i" "$MCE_SCENARIO_DIR"/*; then grep -h "^$i" "$MCE_SCENARIO_DIR"/* | awk '{print $1" "$2}' >> $MCE_CASELIST @@ -94,7 +94,7 @@ test_choice() return fi done - + ./runmcetest -t $MCE_TMPDIR -s $MCE_SUMDIR -o $MCE_LOGDIR -b $MCE_TOOLDIR -l $MCE_CASELIST -r 1 exit_value=$? @@ -104,9 +104,9 @@ test_choice() if [[ $file ]]; then cat "$file" else - echo "WARNING: ras test results is not exist." + echo "WARNING: mce-test test results is not exist." fi - rm -rf "$mount_points"/ras + rm -rf "$mount_points"/mce-test } if [ "$mce_case" == "all" ]; then From 96bf80dd3a527d8538e57faf73a31b7c2b739d7f Mon Sep 17 00:00:00 2001 From: Zhang Rui Date: Mon, 10 Jul 2017 22:38:38 +0800 Subject: [PATCH 016/108] don't use kexec on lkp-skl-d01 This machine is used for testing an alternative solution of kexec. Thus don't use kexec to switch jobs kernels. Signed-off-by: Zhang Rui Signed-off-by: Philip Li --- lib/bootstrap.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/bootstrap.sh b/lib/bootstrap.sh index b585885a6..dd1fc07f0 100755 --- a/lib/bootstrap.sh +++ b/lib/bootstrap.sh @@ -388,6 +388,7 @@ tbox_cant_kexec() [ "${HOSTNAME#*lkp-ivb-d02}" != "$HOSTNAME" ] && return 0 [ "${HOSTNAME#*lkp-kbl-lenovo1}" != "$HOSTNAME" ] && return 0 [ "${HOSTNAME#*lkp-sklu-lenovo1}" != "$HOSTNAME" ] && return 0 + [ "${HOSTNAME#*lkp-skl-d01}" != "$HOSTNAME" ] && return 0 [ -x '/sbin/kexec' ] || return 0 From ba66f4f894f73ed6bd959ab0ac42ea3dcf8c7baf Mon Sep 17 00:00:00 2001 From: Philip Li Date: Tue, 11 Jul 2017 09:25:00 +0800 Subject: [PATCH 017/108] compare: show interested fields by -f option MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit $ lkp compare -f "aim7\.[^t]" -a -g aim7 -g lkp-ivb-ep01 v4.11 v4.12 v4.11 v4.12 testcase/testparams/testbox ---------------- -------------------------- --------------------------- %stddev change %stddev \ | \ 55159 -9% 49980 aim7/1BRD_48G-btrfs-disk_cp-1500-performance/lkp-ivb-ep01 2049857 5% 2151265 aim7/1BRD_48G-btrfs-disk_rd-9000-performance/lkp-ivb-ep01 27861 -4% 26626 aim7/1BRD_48G-btrfs-disk_rw-1500-performance/lkp-ivb-ep01 55214 -10% 49634 aim7/1BRD_48G-btrfs-disk_wrt-1500-performance/lkp-ivb-ep01 167 166 aim7/1BRD_48G-btrfs-sync_disk_rw-10-performance/lkp-ivb-ep01 13718 6% 14484 aim7/1BRD_48G-ext4-sync_disk_rw-600-performance/lkp-ivb-ep01 5423 -22% 4211 ± 3% aim7/1BRD_48G-f2fs-creat-clo-1500-performance/lkp-ivb-ep01 118708 5% 124624 aim7/1BRD_48G-f2fs-disk_cp-3000-performance/lkp-ivb-ep01 117862 5% 124203 aim7/1BRD_48G-f2fs-disk_rr-3000-performance/lkp-ivb-ep01 108816 10% 119566 aim7/1BRD_48G-f2fs-disk_rw-3000-performance/lkp-ivb-ep01 117783 6% 124381 aim7/1BRD_48G-f2fs-disk_wrt-3000-performance/lkp-ivb-ep01 3430 3343 aim7/1BRD_48G-f2fs-sync_disk_rw-600-performance/lkp-ivb-ep01 75578 74805 aim7/1BRD_48G-xfs-creat-clo-1500-performance/lkp-ivb-ep01 11769 11624 aim7/1BRD_48G-xfs-sync_disk_rw-600-performance/lkp-ivb-ep01 1984838 7% 2120882 aim7/4BRD_12G-RAID0-btrfs-disk_rd-9000-performance/lkp-ivb-ep01 2002275 ± 3% 8% 2158615 aim7/4BRD_12G-RAID1-btrfs-disk_rd-9000-performance/lkp-ivb-ep01 1982116 ± 4% 10% 2170938 aim7/4BRD_12G-RAID1-ext4-disk_rd-9000-performance/lkp-ivb-ep01 11365 -8% 10429 ± 3% aim7/4BRD_12G-RAID1-f2fs-creat-clo-1500-performance/lkp-ivb-ep01 60156 59952 GEO-MEAN aim7.jobs-per-min Signed-off-by: Philip Li --- sbin/compare | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sbin/compare b/sbin/compare index fb8730ef0..b8fcc1407 100755 --- a/sbin/compare +++ b/sbin/compare @@ -31,7 +31,7 @@ PERF_INDEX_KCONFIG = 'x86_64-rhel' ABS_CHANGE_STATS_RE = /^(perf-profile|latency_stats)/ $opt_dimension = 'commit' -$opt_field = 'vmstat.cpu.sy' +$opt_field = nil $opt_grep = Array.new $opt_vgrep = Array.new $options = {'perf-profile' => 5} @@ -388,6 +388,8 @@ def setup_changed_stats() changed_stats = get_changed_stats matrix_file2, matrix_file1, $options next unless changed_stats and changed_stats.size > 0 changed_stats.each { |stat, record| + next if $opt_field && stat !~ /#{$opt_field}/ + if $opt_save_changes result_root = "#{File.dirname matrix_file2}/0" result_path = ResultPath.new From f0802903ada259a262a8be612bf9955921599606 Mon Sep 17 00:00:00 2001 From: Xiaolong Ye Date: Tue, 11 Jul 2017 08:30:37 +0800 Subject: [PATCH 018/108] repo: add Joe Lawrence's tree Cc: Joe Lawrence Signed-off-by: Xiaolong Ye Signed-off-by: Philip Li --- repo/linux/joe-lawrence | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 repo/linux/joe-lawrence diff --git a/repo/linux/joe-lawrence b/repo/linux/joe-lawrence new file mode 100644 index 000000000..73fa340e0 --- /dev/null +++ b/repo/linux/joe-lawrence @@ -0,0 +1,3 @@ +url: https://github.com/joe-lawrence/linux +owner: Joe Lawrence +notify_build_success_branch: .* From b098e84eff65baf1801722f3fe7ba01c24ec5b99 Mon Sep 17 00:00:00 2001 From: Hailin Gu Date: Tue, 11 Jul 2017 14:01:51 +0800 Subject: [PATCH 019/108] depends/piglit-dev: Add some dependency packages Add some packages needed during compilation. libpng12-dev could not get, use libpng-dev instead. And other packages are prompted to lose during compilation Signed-off-by: Hailin Gu Signed-off-by: Philip Li --- distro/depends/piglit-dev | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/distro/depends/piglit-dev b/distro/depends/piglit-dev index d7df34966..f7b9cf120 100644 --- a/distro/depends/piglit-dev +++ b/distro/depends/piglit-dev @@ -16,9 +16,16 @@ libegl1-mesa-dev libgl1-mesa-dev libpciaccess-dev zlib1g-dev -libpng12-dev +libpng-dev libcairo2-dev libglu-dev libwaffle-dev libxkbcommon-dev libprocps-dev +systemd +libudev-dev +libudev1 +udev +kmod +libkmod-dev +libkmod2 From b4b7a852f8f01658025f0a9728009bef3c532a77 Mon Sep 17 00:00:00 2001 From: Hailin Gu Date: Tue, 11 Jul 2017 14:01:52 +0800 Subject: [PATCH 020/108] pack/piglit: fix an error in function pack The stdout of `echo /usr/lib/x86_64-linux-gnu/libwaffle-1.so.0.*` will be on the same line. So it will be considered as one file by cpio, no matter how many file could match the name. The error log of pack shows below. ''''''''''''''''' cpio: /usr/lib/x86_64-linux-gnu/libwaffle-1.so.0.5.2 /usr/lib/x86 _64-linux-gnu/libwaffle-1.so.0.5.90: Cannot stat: No such file or directory ''''''''''''''''' To fix it, we use find instead of echo. I have confirmed that it could work as we want. Signed-off-by: Hailin Gu Signed-off-by: Philip Li --- pack/piglit | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pack/piglit b/pack/piglit index 3d0404e39..8ae2564e7 100755 --- a/pack/piglit +++ b/pack/piglit @@ -87,9 +87,7 @@ pack() echo /lkp echo /lkp/benchmarks find /lkp/benchmarks/$BM_NAME - echo /usr/lib/x86_64-linux-gnu/libwaffle-1.so - echo /usr/lib/x86_64-linux-gnu/libwaffle-1.so.0 - echo /usr/lib/x86_64-linux-gnu/libwaffle-1.so.0.* + find /usr/lib/x86_64-linux-gnu/libwaffle-1.so* } | cpio --quiet -o -H newc | gzip -n -9 > /lkp/benchmarks/${BM_NAME}.cgz [[ $arch ]] && mv "/lkp/benchmarks/${BM_NAME}.cgz" "/lkp/benchmarks/${BM_NAME}-${arch}.cgz" From 7b63fcb1d62d9f29bbf5c91939afadd9a52a5d85 Mon Sep 17 00:00:00 2001 From: Li Zhijian Date: Tue, 11 Jul 2017 21:24:05 +0800 Subject: [PATCH 021/108] phoronix-test-suite-needx: enlarge timeout to 2h unigine-heaven-1.6.2 will take near 90 min at lkp-hsw-d01 Signed-off-by: Li Zhijian Signed-off-by: Philip Li --- jobs/phoronix-test-suite-needx.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/jobs/phoronix-test-suite-needx.yaml b/jobs/phoronix-test-suite-needx.yaml index ead26f4be..9e6c22110 100644 --- a/jobs/phoronix-test-suite-needx.yaml +++ b/jobs/phoronix-test-suite-needx.yaml @@ -4,6 +4,7 @@ category: benchmark rootfs: inn:/export/debian-full-x86_64 need_x: true +timeout: 2h phoronix-test-suite: test: From 6e66a4e98cde29fb5ff21c60dd79c279121be40c Mon Sep 17 00:00:00 2001 From: Lei Lu Date: Wed, 12 Jul 2017 10:43:25 +0800 Subject: [PATCH 022/108] hosts: upgrade ivb42 memory size to 128G Signed-off-by: Lei Lu Signed-off-by: Philip Li --- hosts/ivb42 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/ivb42 b/hosts/ivb42 index 03e4e4276..f1ebc5936 100644 --- a/hosts/ivb42 +++ b/hosts/ivb42 @@ -1,6 +1,6 @@ model: Ivytown Ivy Bridge-EP nr_cpu: 48 -memory: 64G +memory: 128G nr_socket: 2 nr_ssd_partitions: 1 ssd_partitions: /dev/disk/by-id/ata-INTEL_SSDSC2BB480G6_BTWA5444064C480FGN-part1 From 3e5cc1676e07ac915031a8fab70acf6d2fedb934 Mon Sep 17 00:00:00 2001 From: Lei Lu Date: Wed, 12 Jul 2017 10:43:26 +0800 Subject: [PATCH 023/108] allot/cyclic: remove ivb42 cyclic jobs Signed-off-by: Lei Lu Signed-off-by: Philip Li --- allot/cyclic/ivb42/ebizzy.yaml | 1 - allot/cyclic/ivb42/fio-basic-1ssd-write-ivb42.yaml | 1 - allot/cyclic/ivb42/hackbench.yaml | 1 - allot/cyclic/ivb42/ku-latency.yaml | 1 - allot/cyclic/ivb42/libhugetlbfs.yaml | 1 - allot/cyclic/ivb42/linpack.yaml | 1 - allot/cyclic/ivb42/locktorture.yaml | 1 - allot/cyclic/ivb42/netpipe.yaml | 1 - allot/cyclic/ivb42/nuttcp.yaml | 1 - allot/cyclic/ivb42/pbzip2.yaml | 1 - allot/cyclic/ivb42/unixbench.yaml | 1 - allot/cyclic/ivb42/will-it-scale-100.yaml | 1 - 12 files changed, 12 deletions(-) delete mode 120000 allot/cyclic/ivb42/ebizzy.yaml delete mode 120000 allot/cyclic/ivb42/fio-basic-1ssd-write-ivb42.yaml delete mode 120000 allot/cyclic/ivb42/hackbench.yaml delete mode 120000 allot/cyclic/ivb42/ku-latency.yaml delete mode 120000 allot/cyclic/ivb42/libhugetlbfs.yaml delete mode 120000 allot/cyclic/ivb42/linpack.yaml delete mode 120000 allot/cyclic/ivb42/locktorture.yaml delete mode 120000 allot/cyclic/ivb42/netpipe.yaml delete mode 120000 allot/cyclic/ivb42/nuttcp.yaml delete mode 120000 allot/cyclic/ivb42/pbzip2.yaml delete mode 120000 allot/cyclic/ivb42/unixbench.yaml delete mode 120000 allot/cyclic/ivb42/will-it-scale-100.yaml diff --git a/allot/cyclic/ivb42/ebizzy.yaml b/allot/cyclic/ivb42/ebizzy.yaml deleted file mode 120000 index 3afc72318..000000000 --- a/allot/cyclic/ivb42/ebizzy.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../jobs/ebizzy.yaml \ No newline at end of file diff --git a/allot/cyclic/ivb42/fio-basic-1ssd-write-ivb42.yaml b/allot/cyclic/ivb42/fio-basic-1ssd-write-ivb42.yaml deleted file mode 120000 index 1b7e34850..000000000 --- a/allot/cyclic/ivb42/fio-basic-1ssd-write-ivb42.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../jobs/fio-basic-1ssd-write-ivb42.yaml \ No newline at end of file diff --git a/allot/cyclic/ivb42/hackbench.yaml b/allot/cyclic/ivb42/hackbench.yaml deleted file mode 120000 index eac446c1f..000000000 --- a/allot/cyclic/ivb42/hackbench.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../jobs/hackbench.yaml \ No newline at end of file diff --git a/allot/cyclic/ivb42/ku-latency.yaml b/allot/cyclic/ivb42/ku-latency.yaml deleted file mode 120000 index f25f99b17..000000000 --- a/allot/cyclic/ivb42/ku-latency.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../jobs/ku-latency.yaml \ No newline at end of file diff --git a/allot/cyclic/ivb42/libhugetlbfs.yaml b/allot/cyclic/ivb42/libhugetlbfs.yaml deleted file mode 120000 index 3b7db8a54..000000000 --- a/allot/cyclic/ivb42/libhugetlbfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../jobs/libhugetlbfs.yaml \ No newline at end of file diff --git a/allot/cyclic/ivb42/linpack.yaml b/allot/cyclic/ivb42/linpack.yaml deleted file mode 120000 index 7e55806ab..000000000 --- a/allot/cyclic/ivb42/linpack.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../jobs/linpack.yaml \ No newline at end of file diff --git a/allot/cyclic/ivb42/locktorture.yaml b/allot/cyclic/ivb42/locktorture.yaml deleted file mode 120000 index 5d720b866..000000000 --- a/allot/cyclic/ivb42/locktorture.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../jobs/locktorture.yaml \ No newline at end of file diff --git a/allot/cyclic/ivb42/netpipe.yaml b/allot/cyclic/ivb42/netpipe.yaml deleted file mode 120000 index af5bb8ef7..000000000 --- a/allot/cyclic/ivb42/netpipe.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../jobs/netpipe.yaml \ No newline at end of file diff --git a/allot/cyclic/ivb42/nuttcp.yaml b/allot/cyclic/ivb42/nuttcp.yaml deleted file mode 120000 index 74820da42..000000000 --- a/allot/cyclic/ivb42/nuttcp.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../jobs/nuttcp.yaml \ No newline at end of file diff --git a/allot/cyclic/ivb42/pbzip2.yaml b/allot/cyclic/ivb42/pbzip2.yaml deleted file mode 120000 index e8c796144..000000000 --- a/allot/cyclic/ivb42/pbzip2.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../jobs/pbzip2.yaml \ No newline at end of file diff --git a/allot/cyclic/ivb42/unixbench.yaml b/allot/cyclic/ivb42/unixbench.yaml deleted file mode 120000 index 12d21dcb6..000000000 --- a/allot/cyclic/ivb42/unixbench.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../jobs/unixbench.yaml \ No newline at end of file diff --git a/allot/cyclic/ivb42/will-it-scale-100.yaml b/allot/cyclic/ivb42/will-it-scale-100.yaml deleted file mode 120000 index e8d569f72..000000000 --- a/allot/cyclic/ivb42/will-it-scale-100.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../jobs/will-it-scale-100.yaml \ No newline at end of file From db3897f12115805bef4dd8ade049dea2ef4b46a4 Mon Sep 17 00:00:00 2001 From: Lei Lu Date: Wed, 12 Jul 2017 10:43:27 +0800 Subject: [PATCH 024/108] allot/diag: remove ivb42 diag jobs Signed-off-by: Lei Lu Signed-off-by: Philip Li --- allot/diag/ivb42/ku-latency.yaml | 1 - allot/diag/ivb42/linpack.yaml | 1 - allot/diag/ivb42/netpipe.yaml | 1 - allot/diag/ivb42/pbzip2.yaml | 1 - allot/diag/ivb42/stutter.yaml | 1 - 5 files changed, 5 deletions(-) delete mode 120000 allot/diag/ivb42/ku-latency.yaml delete mode 120000 allot/diag/ivb42/linpack.yaml delete mode 120000 allot/diag/ivb42/netpipe.yaml delete mode 120000 allot/diag/ivb42/pbzip2.yaml delete mode 120000 allot/diag/ivb42/stutter.yaml diff --git a/allot/diag/ivb42/ku-latency.yaml b/allot/diag/ivb42/ku-latency.yaml deleted file mode 120000 index f25f99b17..000000000 --- a/allot/diag/ivb42/ku-latency.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../jobs/ku-latency.yaml \ No newline at end of file diff --git a/allot/diag/ivb42/linpack.yaml b/allot/diag/ivb42/linpack.yaml deleted file mode 120000 index 7e55806ab..000000000 --- a/allot/diag/ivb42/linpack.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../jobs/linpack.yaml \ No newline at end of file diff --git a/allot/diag/ivb42/netpipe.yaml b/allot/diag/ivb42/netpipe.yaml deleted file mode 120000 index af5bb8ef7..000000000 --- a/allot/diag/ivb42/netpipe.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../jobs/netpipe.yaml \ No newline at end of file diff --git a/allot/diag/ivb42/pbzip2.yaml b/allot/diag/ivb42/pbzip2.yaml deleted file mode 120000 index e8c796144..000000000 --- a/allot/diag/ivb42/pbzip2.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../jobs/pbzip2.yaml \ No newline at end of file diff --git a/allot/diag/ivb42/stutter.yaml b/allot/diag/ivb42/stutter.yaml deleted file mode 120000 index fa471a082..000000000 --- a/allot/diag/ivb42/stutter.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../jobs/stutter.yaml \ No newline at end of file From f6c98e157b1669a34a87412198e22a7bcebe90dd Mon Sep 17 00:00:00 2001 From: Lei Lu Date: Wed, 12 Jul 2017 10:53:11 +0800 Subject: [PATCH 025/108] hosts: upgrade ivb43 memory size to 128G Signed-off-by: Lei Lu Signed-off-by: Philip Li --- hosts/ivb43 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/ivb43 b/hosts/ivb43 index 6473d5603..077926e5d 100644 --- a/hosts/ivb43 +++ b/hosts/ivb43 @@ -1,6 +1,6 @@ model: Ivytown Ivy Bridge-EP nr_cpu: 48 -memory: 64G +memory: 128G nr_hdd_partitions: 3 hdd_partitions: /dev/disk/by-id/ata-ST2000NM0011*-part1 rootfs_partition: /dev/disk/by-id/ata-ST2000NM0011_Z1P67EBL-part3 From d182465ce75c6d77238e8787f868874a7a9a022f Mon Sep 17 00:00:00 2001 From: Lei Lu Date: Wed, 12 Jul 2017 10:53:12 +0800 Subject: [PATCH 026/108] allot: remove ivb43 cyclic and diag jobs Signed-off-by: Lei Lu Signed-off-by: Philip Li --- allot/cyclic/ivb43/aim9.yaml | 1 - allot/cyclic/ivb43/fsmark-stress-journal-1brd.yaml | 1 - allot/cyclic/ivb43/fsmark-stress-journal-1hdd.yaml | 1 - allot/cyclic/ivb43/kbuild-fullload.yaml | 1 - allot/cyclic/ivb43/netperf.yaml | 1 - allot/cyclic/ivb43/pixz.yaml | 1 - allot/cyclic/ivb43/postmark.yaml | 1 - allot/cyclic/ivb43/vm-scalability.yaml | 1 - allot/diag/ivb43/aim9.yaml | 1 - allot/diag/ivb43/fsmark-stress-journal-1brd.yaml | 1 - allot/diag/ivb43/fsmark-stress-journal-1hdd.yaml | 1 - allot/diag/ivb43/kbuild.yaml | 1 - allot/diag/ivb43/postmark.yaml | 1 - allot/diag/ivb43/tbench.yaml | 1 - allot/diag/ivb43/vm-scalability.yaml | 1 - 15 files changed, 15 deletions(-) delete mode 120000 allot/cyclic/ivb43/aim9.yaml delete mode 120000 allot/cyclic/ivb43/fsmark-stress-journal-1brd.yaml delete mode 120000 allot/cyclic/ivb43/fsmark-stress-journal-1hdd.yaml delete mode 120000 allot/cyclic/ivb43/kbuild-fullload.yaml delete mode 120000 allot/cyclic/ivb43/netperf.yaml delete mode 120000 allot/cyclic/ivb43/pixz.yaml delete mode 120000 allot/cyclic/ivb43/postmark.yaml delete mode 120000 allot/cyclic/ivb43/vm-scalability.yaml delete mode 120000 allot/diag/ivb43/aim9.yaml delete mode 120000 allot/diag/ivb43/fsmark-stress-journal-1brd.yaml delete mode 120000 allot/diag/ivb43/fsmark-stress-journal-1hdd.yaml delete mode 120000 allot/diag/ivb43/kbuild.yaml delete mode 120000 allot/diag/ivb43/postmark.yaml delete mode 120000 allot/diag/ivb43/tbench.yaml delete mode 120000 allot/diag/ivb43/vm-scalability.yaml diff --git a/allot/cyclic/ivb43/aim9.yaml b/allot/cyclic/ivb43/aim9.yaml deleted file mode 120000 index 65f36edba..000000000 --- a/allot/cyclic/ivb43/aim9.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../jobs/aim9.yaml \ No newline at end of file diff --git a/allot/cyclic/ivb43/fsmark-stress-journal-1brd.yaml b/allot/cyclic/ivb43/fsmark-stress-journal-1brd.yaml deleted file mode 120000 index cf4bda275..000000000 --- a/allot/cyclic/ivb43/fsmark-stress-journal-1brd.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../jobs/fsmark-stress-journal-1brd.yaml \ No newline at end of file diff --git a/allot/cyclic/ivb43/fsmark-stress-journal-1hdd.yaml b/allot/cyclic/ivb43/fsmark-stress-journal-1hdd.yaml deleted file mode 120000 index 8bc8df55d..000000000 --- a/allot/cyclic/ivb43/fsmark-stress-journal-1hdd.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../jobs/fsmark-stress-journal-1hdd.yaml \ No newline at end of file diff --git a/allot/cyclic/ivb43/kbuild-fullload.yaml b/allot/cyclic/ivb43/kbuild-fullload.yaml deleted file mode 120000 index db73fe877..000000000 --- a/allot/cyclic/ivb43/kbuild-fullload.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../jobs/kbuild-fullload.yaml \ No newline at end of file diff --git a/allot/cyclic/ivb43/netperf.yaml b/allot/cyclic/ivb43/netperf.yaml deleted file mode 120000 index 69217bfb2..000000000 --- a/allot/cyclic/ivb43/netperf.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../jobs/netperf.yaml \ No newline at end of file diff --git a/allot/cyclic/ivb43/pixz.yaml b/allot/cyclic/ivb43/pixz.yaml deleted file mode 120000 index 054e19e02..000000000 --- a/allot/cyclic/ivb43/pixz.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../jobs/pixz.yaml \ No newline at end of file diff --git a/allot/cyclic/ivb43/postmark.yaml b/allot/cyclic/ivb43/postmark.yaml deleted file mode 120000 index f8293a833..000000000 --- a/allot/cyclic/ivb43/postmark.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../jobs/postmark.yaml \ No newline at end of file diff --git a/allot/cyclic/ivb43/vm-scalability.yaml b/allot/cyclic/ivb43/vm-scalability.yaml deleted file mode 120000 index a7d5d6122..000000000 --- a/allot/cyclic/ivb43/vm-scalability.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../jobs/vm-scalability.yaml \ No newline at end of file diff --git a/allot/diag/ivb43/aim9.yaml b/allot/diag/ivb43/aim9.yaml deleted file mode 120000 index 65f36edba..000000000 --- a/allot/diag/ivb43/aim9.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../jobs/aim9.yaml \ No newline at end of file diff --git a/allot/diag/ivb43/fsmark-stress-journal-1brd.yaml b/allot/diag/ivb43/fsmark-stress-journal-1brd.yaml deleted file mode 120000 index cf4bda275..000000000 --- a/allot/diag/ivb43/fsmark-stress-journal-1brd.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../jobs/fsmark-stress-journal-1brd.yaml \ No newline at end of file diff --git a/allot/diag/ivb43/fsmark-stress-journal-1hdd.yaml b/allot/diag/ivb43/fsmark-stress-journal-1hdd.yaml deleted file mode 120000 index 8bc8df55d..000000000 --- a/allot/diag/ivb43/fsmark-stress-journal-1hdd.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../jobs/fsmark-stress-journal-1hdd.yaml \ No newline at end of file diff --git a/allot/diag/ivb43/kbuild.yaml b/allot/diag/ivb43/kbuild.yaml deleted file mode 120000 index b0570e16e..000000000 --- a/allot/diag/ivb43/kbuild.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../jobs/kbuild.yaml \ No newline at end of file diff --git a/allot/diag/ivb43/postmark.yaml b/allot/diag/ivb43/postmark.yaml deleted file mode 120000 index f8293a833..000000000 --- a/allot/diag/ivb43/postmark.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../jobs/postmark.yaml \ No newline at end of file diff --git a/allot/diag/ivb43/tbench.yaml b/allot/diag/ivb43/tbench.yaml deleted file mode 120000 index 903ca4610..000000000 --- a/allot/diag/ivb43/tbench.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../jobs/tbench.yaml \ No newline at end of file diff --git a/allot/diag/ivb43/vm-scalability.yaml b/allot/diag/ivb43/vm-scalability.yaml deleted file mode 120000 index a7d5d6122..000000000 --- a/allot/diag/ivb43/vm-scalability.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../jobs/vm-scalability.yaml \ No newline at end of file From b94835d3ec1fca4fade2f0688ba1a070662c2de6 Mon Sep 17 00:00:00 2001 From: Kemi Wang Date: Tue, 11 Jul 2017 10:25:40 +0800 Subject: [PATCH 027/108] Update cgroup2 read-writable parameters Add a read-writable parameter pids.max of subsystem controller pid in cgroup2 Signed-off-by: Kemi Wang Reviewed-by: "Huang, Ying" Signed-off-by: Philip Li --- setup/cgroup2 | 1 + 1 file changed, 1 insertion(+) diff --git a/setup/cgroup2 b/setup/cgroup2 index ab847a3c0..1035b4a39 100755 --- a/setup/cgroup2 +++ b/setup/cgroup2 @@ -6,6 +6,7 @@ # - io.max # - io.weight # - rdma.max +# - pids.max . $LKP_SRC/lib/reproduce-log.sh . $LKP_SRC/lib/debug.sh From 0ee49f3e333bf43d20a01a6826f5e56b8d050616 Mon Sep 17 00:00:00 2001 From: Kemi Wang Date: Tue, 11 Jul 2017 10:25:41 +0800 Subject: [PATCH 028/108] fix a bug that causes the failure of writting pid into cgroup.procs 2017-07-04 14:10:16 echo 21243 > '/cgroup2/hackbench/cgroup.procs' /home/kemi/git/lkp-tests/lib/reproduce-log.sh: line 13: echo: write error: Device or resource busy Unlike in cgroups v1, in cgroups v2 you can attach processes only to leaves. E.g. Root cgroup has child cgroup B, and B has its child cgroup C and cgroup D. If cgroup C and cgroup D don't have their child, the process id can only be written into C or D instead of B. Signed-off-by: Kemi Wang Reviewed-by: "Huang, Ying" Signed-off-by: Philip Li --- lib/cgroup.sh | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/lib/cgroup.sh b/lib/cgroup.sh index 07d1e8381..ba5243e87 100644 --- a/lib/cgroup.sh +++ b/lib/cgroup.sh @@ -35,7 +35,7 @@ clear_cgroup2() cgroups2=$(find $cgroup2_mount -type d | tail -n +2 | tac) for cgroup2 in $cgroups2 do - rmdir cgroup2 + rmdir $cgroup2 done umount $cgroup2_mount fi @@ -79,10 +79,4 @@ create_cgroup2() done log_cmd mkdir -p $CGROUP2_MNT/$testcase - sub_controllers=$(cat $CGROUP2_MNT/$testcase/cgroup.controllers) - - for controller in $sub_controllers - do - log_eval "echo '+$controller' > '$CGROUP2_MNT/$testcase/cgroup.subtree_control'" - done } From ac50213fc19b58437960fff06b70b85a1c533d29 Mon Sep 17 00:00:00 2001 From: Xiaolong Ye Date: Wed, 12 Jul 2017 14:35:53 +0800 Subject: [PATCH 029/108] compare: fix invalid bisect stat issue commif 9ae92a0 ("stats: adjust --regression-only behavior for compare ") would list inappropriate dmesg bug as bisectable changes. $ yexl @ inn in /result/boot/1/vm-lkp-nhm-dp2-yocto-ia32/yocto-tiny-i386-2016-04-22.cgz/x86_64-randconfig-s1-05151251/gcc-6/7699f1e358ec60958a153e365901cb1e7ca62e93 [10:17:12] $ changed-stats --perf -s -R $PWD {"perf"=>true, "regression-only"=>1, "bisect_axis"=>"commit", "bisect_project"=>"linux", "BAD_COMMIT"=>"7699f1e358ec60958a153e365901cb1e7ca62e93"} {"testcase"=>"boot", "path_params"=>"1", "tbox_group"=>"vm-lkp-nhm-dp2-yocto-ia32", "rootfs"=>"yocto-tiny-i386-2016-04-22.cgz", "kconfig"=>"x86_64-randconfig-s1-05151251", "compiler"=>"gcc-6", "commit"=>"7699f1e358ec60958a153e365901cb1e7ca62e93", "run"=>nil} project: linux, version: v4.12-rc1, is exact match: false 2017-07-12 10:17:18 +0800 DEBUG base_matrix_file: /result/boot/1/vm-lkp-nhm-dp2-yocto-ia32/yocto-tiny-i386-2016-04-22.cgz/x86_64-randconfig-s1-05151251/gcc-6/v4.12-rc1/matrix.json 2017-07-12 10:17:18 +0800 DEBUG compare with release matrix: /result/boot/1/vm-lkp-nhm-dp2-yocto-ia32/yocto-tiny-i386-2016-04-22.cgz/x86_64-randconfig-s1-05151251/gcc-6/7699f1e358ec60958a153e365901cb1e7ca62e93 ["v4.12-rc1"] +dmesg.Mem-Info +dmesg.page_allocation_failure:order:#,mode:#(__GFP_COMP|__GFP_NOTRACK),nodemask=(null) +dmesg.Kernel_panic-not_syncing:kmem_cache_create:Failed_to_create_slab'filp'.Error -dmesg.Kernel_panic-not_syncing:memblock_virt_alloc_try_nid:Failed_to_allocate#bytes_align=#nid=-#from=#max_addr= Here "dmesg.Kernel_panic-not_syncing:memblock_virt_alloc_try_nid:Failed_to_allocate#bytes_align=#nid=-#from=#max_addr=" is not a inappropriate bisectable stat as it doesn't exist in current commit but in base, this would lead to a lot of useless bisections which are a huge waste of server/time resource. After this patch: $ changed-stats --perf -s -R $PWD {"perf"=>true, "regression-only"=>1, "bisect_axis"=>"commit", "bisect_project"=>"linux", "BAD_COMMIT"=>"7699f1e358ec60958a153e365901cb1e7ca62e93"} {"testcase"=>"boot", "path_params"=>"1", "tbox_group"=>"vm-lkp-nhm-dp2-yocto-ia32", "rootfs"=>"yocto-tiny-i386-2016-04-22.cgz", "kconfig"=>"x86_64-randconfig-s1-05151251", "compiler"=>"gcc-6", "commit"=>"7699f1e358ec60958a153e365901cb1e7ca62e93", "run"=>nil} project: linux, version: v4.12-rc1, is exact match: false 2017-07-12 10:41:00 +0800 DEBUG base_matrix_file: /result/boot/1/vm-lkp-nhm-dp2-yocto-ia32/yocto-tiny-i386-2016-04-22.cgz/x86_64-randconfig-s1-05151251/gcc-6/v4.12-rc1/matrix.json 2017-07-12 10:41:00 +0800 DEBUG compare with release matrix: /result/boot/1/vm-lkp-nhm-dp2-yocto-ia32/yocto-tiny-i386-2016-04-22.cgz/x86_64-randconfig-s1-05151251/gcc-6/7699f1e358ec60958a153e365901cb1e7ca62e93 ["v4.12-rc1"] +dmesg.Mem-Info +dmesg.page_allocation_failure:order:#,mode:#(__GFP_COMP|__GFP_NOTRACK),nodemask=(null) +dmesg.Kernel_panic-not_syncing:kmem_cache_create:Failed_to_create_slab'filp'.Error Signed-off-by: Xiaolong Ye Signed-off-by: Philip Li --- lib/stats.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/stats.rb b/lib/stats.rb index 22fb1c275..bf00486c0 100755 --- a/lib/stats.rb +++ b/lib/stats.rb @@ -488,7 +488,7 @@ def __get_changed_stats(a, b, is_incomplete_run, options) if is_failure_stat if max_a == 0 has_boot_fix = true if k =~ /^dmesg\./ - next if k !~ $kill_pattern_whitelist_re + next end # this relies on the fact dmesg.* comes ahead # of kmsg.* in etc/default_stats.yaml From 7622fb04188c93973588811f2332728c717480d6 Mon Sep 17 00:00:00 2001 From: Xiaolong Ye Date: Wed, 12 Jul 2017 14:35:54 +0800 Subject: [PATCH 030/108] compare: add --all-critical option for compare It is the alternative of previous '--regression-only', it will show all critical changes not matter it shows in head or base. Signed-off-by: Xiaolong Ye Signed-off-by: Philip Li --- lib/stats.rb | 7 ++++--- sbin/compare | 4 ++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/stats.rb b/lib/stats.rb index bf00486c0..a4748cd07 100755 --- a/lib/stats.rb +++ b/lib/stats.rb @@ -410,7 +410,7 @@ def filter_incomplete_run(hash) def __get_changed_stats(a, b, is_incomplete_run, options) changed_stats = {} - if options['regression-only'] + if options['regression-only'] || options['all-critical'] has_boot_fix = (b['last_state.booting'] && !a['last_state.booting']) else has_boot_fix = nil @@ -484,11 +484,12 @@ def __get_changed_stats(a, b, is_incomplete_run, options) is_failure_stat, is_latency_stat, k, options) - if options['regression-only'] + if options['regression-only'] || options['all-critical'] if is_failure_stat if max_a == 0 has_boot_fix = true if k =~ /^dmesg\./ - next + next if options['regression-only'] || + (k !~ $kill_pattern_whitelist_re && options['all-critical']) end # this relies on the fact dmesg.* comes ahead # of kmsg.* in etc/default_stats.yaml diff --git a/sbin/compare b/sbin/compare index b8fcc1407..d338581b1 100755 --- a/sbin/compare +++ b/sbin/compare @@ -124,6 +124,10 @@ opts = OptionParser.new do |opts| $options['regression-only'] = true end + opts.on('--all-critical', 'show all critical changes') do + $options['all-critical'] = true + end + opts.on("-D N", "--distance N", "threshold of changes") { |n| $options['distance'] = n.to_i } From f72f50d4c721b2d19e6d9a87f99f7cc2b9baa9bd Mon Sep 17 00:00:00 2001 From: Hailin Gu Date: Wed, 12 Jul 2017 14:04:07 +0800 Subject: [PATCH 031/108] depends/kernel_selftests: Fix factal error: asm/unistd.h: No such file or directory Fix the error during make run_tests "In file included from single_step_syscall.c:26:0:" "/usr/include/sys/syscall.h:24:24: fatal error: asm/unistd.h: No such file or directory" We found that the asm directory link to x86_64-linux-gnu/asm and this file is contained in the package gcc-multilib. Signed-off-by: Hailin Gu Signed-off-by: Philip Li --- distro/depends/kernel_selftests | 1 + 1 file changed, 1 insertion(+) diff --git a/distro/depends/kernel_selftests b/distro/depends/kernel_selftests index 2d07538f0..383c3a8f4 100644 --- a/distro/depends/kernel_selftests +++ b/distro/depends/kernel_selftests @@ -13,3 +13,4 @@ libelf-dev gcc-5-multilib libfuse-dev clang +gcc-multilib From 0e9f0cbce815ab059af994a3630e71c2fb47b7ef Mon Sep 17 00:00:00 2001 From: Lei Lu Date: Thu, 13 Jul 2017 09:30:30 +0800 Subject: [PATCH 032/108] hosts: fix ivb43 hdd partitions mismatch issue Signed-off-by: Lei Lu Signed-off-by: Philip Li --- hosts/ivb43 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/hosts/ivb43 b/hosts/ivb43 index 077926e5d..1295779ee 100644 --- a/hosts/ivb43 +++ b/hosts/ivb43 @@ -1,8 +1,5 @@ model: Ivytown Ivy Bridge-EP nr_cpu: 48 memory: 128G -nr_hdd_partitions: 3 -hdd_partitions: /dev/disk/by-id/ata-ST2000NM0011*-part1 -rootfs_partition: /dev/disk/by-id/ata-ST2000NM0011_Z1P67EBL-part3 -swap_partitions: /dev/disk/by-id/ata-ST2000NM0011_Z1P67EBL-part2 +swap_partitions: LABEL=SWAP brand: Intel(R) Xeon(R) CPU E5-2697 v2 @ 2.70GHz From e8b1a7879892965868accb34e1b42ce9e53766c1 Mon Sep 17 00:00:00 2001 From: Aaron Lu Date: Thu, 13 Jul 2017 09:43:09 +0800 Subject: [PATCH 033/108] jobs/vm-scalability-swap-1pmem: adjust pmem range With the previous 96G!4G setting, we left too few pages on node 0 and that will make OOM easier to be triggered. Change it to 96G!18G so that each node has 16G(18G used here due to 2G physical space hole). Jira: https://jira01.devtools.intel.com/browse/OLT-2891 Signed-off-by: Aaron Lu Signed-off-by: Philip Li --- jobs/vm-scalability-swap-1pmem.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jobs/vm-scalability-swap-1pmem.yaml b/jobs/vm-scalability-swap-1pmem.yaml index 58c9c7db5..ec8731766 100644 --- a/jobs/vm-scalability-swap-1pmem.yaml +++ b/jobs/vm-scalability-swap-1pmem.yaml @@ -3,5 +3,6 @@ disk: nr_pmem: 1 +# applicable to 128G EP system, not for other systems boot_params: - bp_memmap: 96G!4G + bp_memmap: 96G!18G From c990912846994c5caa18d3a42032284351f10d83 Mon Sep 17 00:00:00 2001 From: Kemi Wang Date: Wed, 12 Jul 2017 16:40:38 +0800 Subject: [PATCH 034/108] create cgroup2.yaml in jobs cgroup2.yaml specifies the parameter values of subsystem controllers in cgroup2. It can be used to enhance the capability of system resource allocation for benchmark Signed-off-by: Kemi Wang Reviewed-by: "Huang, Ying" Signed-off-by: Philip Li --- jobs/cgroup2.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 jobs/cgroup2.yaml diff --git a/jobs/cgroup2.yaml b/jobs/cgroup2.yaml new file mode 100644 index 000000000..4b74ff782 --- /dev/null +++ b/jobs/cgroup2.yaml @@ -0,0 +1,9 @@ +cgroup2: + memory.high: 90% + memory.low: 50% + memory.max: max + memory.swap.max: + io.max: + io.weight: + rdma.max: + pids.max: 10000 From bb3155904e776999cd9e195daaf160e794196342 Mon Sep 17 00:00:00 2001 From: Kemi Wang Date: Wed, 12 Jul 2017 16:40:39 +0800 Subject: [PATCH 035/108] add parameter parsing for memory subsystem of cgroup2 add parameter parsing for memory.high, memory.low and memory.max Note: only integer is allowed to be setup for these parameters ChangeLog: v1: a) using to_byte for value conversion b) add a rule for absolute value parsing (e.g. 1.5K --> 6144) v2: a) use softlink instead of creating a new file for memory.low/memory.high/memory.max parsing Signed-off-by: Kemi Wang Reviewed-by: "Huang, Ying" Signed-off-by: Philip Li --- params/memory.high | 1 + params/memory.low | 1 + params/memory.max | 1 + 3 files changed, 3 insertions(+) create mode 120000 params/memory.high create mode 120000 params/memory.low create mode 120000 params/memory.max diff --git a/params/memory.high b/params/memory.high new file mode 120000 index 000000000..76080e5ba --- /dev/null +++ b/params/memory.high @@ -0,0 +1 @@ +test_memory_size \ No newline at end of file diff --git a/params/memory.low b/params/memory.low new file mode 120000 index 000000000..76080e5ba --- /dev/null +++ b/params/memory.low @@ -0,0 +1 @@ +test_memory_size \ No newline at end of file diff --git a/params/memory.max b/params/memory.max new file mode 120000 index 000000000..76080e5ba --- /dev/null +++ b/params/memory.max @@ -0,0 +1 @@ +test_memory_size \ No newline at end of file From 627ef26c811148b9c84291a04e1a3fa60923a383 Mon Sep 17 00:00:00 2001 From: Kemi Wang Date: Wed, 12 Jul 2017 16:40:40 +0800 Subject: [PATCH 036/108] create a file hackbench-cgroup2.yaml to add cgroup2 setup for netperf Signed-off-by: Kemi Wang Reviewed-by: "Huang, Ying" Signed-off-by: Philip Li --- jobs/hackbench-cgroup2.yaml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 jobs/hackbench-cgroup2.yaml diff --git a/jobs/hackbench-cgroup2.yaml b/jobs/hackbench-cgroup2.yaml new file mode 100644 index 000000000..080ba33ac --- /dev/null +++ b/jobs/hackbench-cgroup2.yaml @@ -0,0 +1,2 @@ +<< : jobs/cgroup2.yaml +<< : jobs/hackbench.yaml From 7433e13129ded2e91bf33d6149a99254b3114946 Mon Sep 17 00:00:00 2001 From: Kemi Wang Date: Wed, 12 Jul 2017 16:40:41 +0800 Subject: [PATCH 037/108] create a new file kbuild-cgroup2.yaml to add cgroup2 setup for kbuild Signed-off-by: Kemi Wang Reviewed-by: "Huang, Ying" Signed-off-by: Philip Li --- jobs/kbuild-cgroup2.yaml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 jobs/kbuild-cgroup2.yaml diff --git a/jobs/kbuild-cgroup2.yaml b/jobs/kbuild-cgroup2.yaml new file mode 100644 index 000000000..88e223a79 --- /dev/null +++ b/jobs/kbuild-cgroup2.yaml @@ -0,0 +1,2 @@ +<< : jobs/cgroup2.yaml +<< : jobs/kbuild.yaml From ad4f0fe71e2614ccdabf0521211da0d0b900f525 Mon Sep 17 00:00:00 2001 From: Kemi Wang Date: Wed, 12 Jul 2017 16:40:42 +0800 Subject: [PATCH 038/108] create a new file ebizzy-cgroup2.yaml to add cgroup2 setup for ebizzy Signed-off-by: Kemi Wang Reviewed-by: "Huang, Ying" Signed-off-by: Philip Li --- jobs/ebizzy-cgroup2.yaml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 jobs/ebizzy-cgroup2.yaml diff --git a/jobs/ebizzy-cgroup2.yaml b/jobs/ebizzy-cgroup2.yaml new file mode 100644 index 000000000..d326c0ea5 --- /dev/null +++ b/jobs/ebizzy-cgroup2.yaml @@ -0,0 +1,2 @@ +<< : jobs/cgroup2.yaml +<< : jobs/ebizzy.yaml From b677efcad67afb33efceb9b7a17f6de935ede268 Mon Sep 17 00:00:00 2001 From: Kemi Wang Date: Wed, 12 Jul 2017 16:40:43 +0800 Subject: [PATCH 039/108] create a file will-it-scale-cgroup2.yaml to add cgroup2 setup for will-it-scale Signed-off-by: Kemi Wang Reviewed-by: "Huang, Ying" Signed-off-by: Philip Li --- jobs/will-it-scale-cgroup2.yaml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 jobs/will-it-scale-cgroup2.yaml diff --git a/jobs/will-it-scale-cgroup2.yaml b/jobs/will-it-scale-cgroup2.yaml new file mode 100644 index 000000000..394bb21ca --- /dev/null +++ b/jobs/will-it-scale-cgroup2.yaml @@ -0,0 +1,2 @@ +<< : jobs/cgroup2.yaml +<< : jobs/will-it-scale.yaml From 756ed4d71f3593edd64189e80dacf8fe56cc5023 Mon Sep 17 00:00:00 2001 From: Kemi Wang Date: Wed, 12 Jul 2017 16:40:44 +0800 Subject: [PATCH 040/108] create a file netperf-cgroup2.yaml to add cgroup2 setup for netperf Signed-off-by: Kemi Wang Reviewed-by: "Huang, Ying" Signed-off-by: Philip Li --- jobs/netperf-cgroup2.yaml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 jobs/netperf-cgroup2.yaml diff --git a/jobs/netperf-cgroup2.yaml b/jobs/netperf-cgroup2.yaml new file mode 100644 index 000000000..88fb94013 --- /dev/null +++ b/jobs/netperf-cgroup2.yaml @@ -0,0 +1,2 @@ +<< : jobs/cgroup2.yaml +<< : jobs/netperf.yaml From c9ea07387450534df0b8fd2596ae3fbc4352f2be Mon Sep 17 00:00:00 2001 From: Kemi Wang Date: Wed, 12 Jul 2017 16:40:45 +0800 Subject: [PATCH 041/108] create a file unixbench-cgroup2.yaml to add cgroup2 setup for unixbench Signed-off-by: Kemi Wang Reviewed-by: "Huang, Ying" Signed-off-by: Philip Li --- jobs/unixbench-cgroup2.yaml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 jobs/unixbench-cgroup2.yaml diff --git a/jobs/unixbench-cgroup2.yaml b/jobs/unixbench-cgroup2.yaml new file mode 100644 index 000000000..06bf164ab --- /dev/null +++ b/jobs/unixbench-cgroup2.yaml @@ -0,0 +1,2 @@ +<< : jobs/cgroup2.yaml +<< : jobs/unixbench.yaml From 29d5ab529e1416ba876db37148ff0fdef5cba405 Mon Sep 17 00:00:00 2001 From: Kemi Wang Date: Wed, 12 Jul 2017 16:40:46 +0800 Subject: [PATCH 042/108] create a file pigz-cgroup2.yaml to add cgroup2 setup for pigz Signed-off-by: Kemi Wang Reviewed-by: "Huang, Ying" Signed-off-by: Philip Li --- jobs/pigz-cgroup2.yaml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 jobs/pigz-cgroup2.yaml diff --git a/jobs/pigz-cgroup2.yaml b/jobs/pigz-cgroup2.yaml new file mode 100644 index 000000000..582149f90 --- /dev/null +++ b/jobs/pigz-cgroup2.yaml @@ -0,0 +1,2 @@ +<< : jobs/cgroup2.yaml +<< : jobs/pigz.yaml From 859789a62624150e54c845bf89855585ab5c2b32 Mon Sep 17 00:00:00 2001 From: Kemi Wang Date: Thu, 13 Jul 2017 09:36:39 +0800 Subject: [PATCH 043/108] update benchmark download mechanism Downloading benchmark fails if the given url is invaild or can't be accessed in current time. E.g. netperf benchmark can't be downloaded in the previous url:ftp://ftp.netperf.org/netperf/netperf-2.7.0.tar.gz, at least in my work environment with proxy child-prc.intel.com:913 Life would be better if any one in the given URL list works. Also, no need to wait too long or try too many times. ChaneLog: v1: a) keep the original parameter name WEB_URL b) wrap the line in netperf v2: a) merge two lines code into one line v3: a) adjust patches order to avoid regression Signed-off-by: Kemi Wang Reviewed-by: "Huang, Ying" Signed-off-by: Philip Li --- pack/default | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pack/default b/pack/default index 5ce5b937c..ffcecb428 100755 --- a/pack/default +++ b/pack/default @@ -10,8 +10,11 @@ pre_download() download() { pre_download - [[ $WEB_URL ]] && wget --no-clobber $WEB_URL - [[ $source_package ]] || source_package=$(basename $WEB_URL) + for url in $WEB_URL + do + wget -t 3 -T 3 --no-clobber $url && break + done + [[ $source_package ]] || source_package=$(basename $url) [[ $source_dir ]] || source_dir=${source_package%%.tar.*} [[ $source_dir ]] || source_dir=${source_package%%.tgz} [[ -d $source_dir ]] || From 01c06dd138e20c5afd184a15307b920caa191d8b Mon Sep 17 00:00:00 2001 From: Kemi Wang Date: Thu, 13 Jul 2017 09:36:40 +0800 Subject: [PATCH 044/108] add another web URL for netperf Current web URL for downloading netperf is not available, add another web URL as a backup Signed-off-by: Kemi Wang Reviewed-by: "Huang, Ying" Signed-off-by: Philip Li --- pack/netperf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pack/netperf b/pack/netperf index d9a232e79..ee72fb6e3 100755 --- a/pack/netperf +++ b/pack/netperf @@ -1,7 +1,8 @@ #!/bin/bash VERSION="2.7.0" -WEB_URL="ftp://ftp.netperf.org/netperf/netperf-${VERSION}.tar.gz" +WEB_URL="ftp://ftp.netperf.org/netperf/netperf-${VERSION}.tar.gz \ + https://fossies.org/linux/misc/netperf-${VERSION}.tar.gz" build() { From 8e8b877906dc9ab9823cab04ad0ba076a58b7dba Mon Sep 17 00:00:00 2001 From: Hailin Gu Date: Thu, 13 Jul 2017 11:03:40 +0800 Subject: [PATCH 045/108] lib/tests/nvml: fix the rpmem_obc/TEST2 crashed According to the tips from github, enable the remote nodes follow the steps in example of configuration. In the past, rpmem-none has 2 cases failed. Error log shows below "rpmem_obc/TEST2 crashed (signal 6)." "node_0_err2.log below." "rpmem_obc/TEST2 node_0_err2.log {rpmem_obc_test_misc.c:154 client_monitor} rpmem_obc/TEST2: Error: usage: client_monitor [:]" "rpmem_obc/TEST2 node_0_err2.log {ut_backtrace.c:198 ut_sighandler} rpmem_obc/TEST2:" "rpmem_obc/TEST2 node_0_err2.log" Adding the node_addr in testconfig and starting the host, it could be passed. Signed-off-by: Hailin Gu Signed-off-by: Philip Li --- lib/tests/nvml.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/tests/nvml.sh b/lib/tests/nvml.sh index 72e98bc19..ecddaa455 100644 --- a/lib/tests/nvml.sh +++ b/lib/tests/nvml.sh @@ -49,12 +49,17 @@ enable_remote_node() # To fix no nodes provide. It takes another machines as remote nodes. We can use # localhost as remote node but need to do some configs as below. + # reference on follow link + # https://github.com/pmem/nvml/blob/3ab708efad653aeda0bcbc6b8d2b61d9ba9d5310/utils/docker/configure-tests.sh#L53 for n in {0..3} do echo "NODE[$n]=127.0.0.1" >> testconfig.sh - echo "NODE_WORKING_DIR[$n]=$BENCHMARK_ROOT/$casename/src/testremote" >> testconfig.sh + echo "NODE_WORKING_DIR[$n]=/tmp/node$n" >> testconfig.sh + echo "NODE_ADDR[$n]=127.0.0.1" >> testconfig.sh + echo "NODE_ENV[$n]=\"PMEM_IS_PMEM_FORCE=1\"" >> testconfig.sh done + echo "TEST_PROVIDERS=sockets" >> testconfig.sh # enable ssh localhost without password pgrep -l sshd || die "ssh server do not run" From 68ada005371475ec091f80bb7b385a41501e5d69 Mon Sep 17 00:00:00 2001 From: Xiaolong Ye Date: Thu, 13 Jul 2017 16:44:15 +0800 Subject: [PATCH 046/108] repo: add git_am_branch for renesas tree On Thu, Jul 13, 2017 at 08:25:56AM +0800, kbuild test robot wrote: > Hi Chris, > > [auto build test ERROR on renesas/next] > [also build test ERROR on next-20170712] > [cannot apply to v4.12] > [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] > > url: https://github.com/0day-ci/linux/commits/Chris-Paterson/Add-MMCIF0-support-for-r8a7743-iwg20m/20170713-042814 > base: https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next > config: arm-at91_dt_defconfig (attached as .config) > compiler: arm-linux-gnueabi-gcc (Debian 6.1.1-9) 6.1.1 20160705 > reproduce: > wget https://raw.githubusercontent.com/01org/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross > chmod +x ~/bin/make.cross > # save the attached .config to linux build tree > make.cross ARCH=arm > > All errors (new ones prefixed by >>): > > >> Error: arch/arm/boot/dts/r8a7743-iwg20m.dtsi:40.1-5 Label or path pfc not found > FATAL ERROR: Syntax error parsing input tree This seems to be a false positive. The node in question is present in the devel branch which is the base of these changes. Signed-off-by: Xiaolong Ye Signed-off-by: Philip Li --- repo/linux/renesas | 1 + 1 file changed, 1 insertion(+) diff --git a/repo/linux/renesas b/repo/linux/renesas index fed97e478..144d8c2b9 100644 --- a/repo/linux/renesas +++ b/repo/linux/renesas @@ -1,5 +1,6 @@ url: https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git integration_testing_branches: next +git_am_branch: devel mail_cc: - linux-renesas-soc@vger.kernel.org owner: Simon Horman From a9706bf3303e75181fde453d26bcb4539aa83753 Mon Sep 17 00:00:00 2001 From: Li Zhijian Date: Thu, 13 Jul 2017 18:02:36 +0800 Subject: [PATCH 047/108] pack-deps: store packages's depends to cgz it's very useful for developer to analysis what's the changes Signed-off-by: Li Zhijian Signed-off-by: Philip Li --- tests/pack-deps | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/pack-deps b/tests/pack-deps index e61ee5f11..dcf61e26f 100755 --- a/tests/pack-deps +++ b/tests/pack-deps @@ -62,6 +62,7 @@ do # libssl1.1 # gawk echo "$PACKAGE_LIST" | grep -F -f "$LKP_SRC/distro/keep-deb" > opt/deb/sequence-deb.$BM_NAME + echo "$PACKAGE_VERSION_LIST" > opt/deb/${BM_NAME}-deps.packages if download "$PACKAGE_VERSION_LIST"; then install || exit 1 From 4339884d3fbee0976cde2434799fc2441763f9ad Mon Sep 17 00:00:00 2001 From: Philip Li Date: Fri, 14 Jul 2017 11:54:18 +0800 Subject: [PATCH 048/108] allot: remove mce-test from vm/lkp-sb02 which requires newer hw platform Signed-off-by: Philip Li --- allot/cyclic/lkp-sb02/mce-test.yaml | 1 - allot/rand/vm-vp-2G/mce-test.yaml | 1 - 2 files changed, 2 deletions(-) delete mode 120000 allot/cyclic/lkp-sb02/mce-test.yaml delete mode 120000 allot/rand/vm-vp-2G/mce-test.yaml diff --git a/allot/cyclic/lkp-sb02/mce-test.yaml b/allot/cyclic/lkp-sb02/mce-test.yaml deleted file mode 120000 index 7e20c3228..000000000 --- a/allot/cyclic/lkp-sb02/mce-test.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../jobs/mce-test.yaml \ No newline at end of file diff --git a/allot/rand/vm-vp-2G/mce-test.yaml b/allot/rand/vm-vp-2G/mce-test.yaml deleted file mode 120000 index 7e20c3228..000000000 --- a/allot/rand/vm-vp-2G/mce-test.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../jobs/mce-test.yaml \ No newline at end of file From a1f9d05b40398f1e12eaa95c6b703c58b085832f Mon Sep 17 00:00:00 2001 From: Philip Li Date: Fri, 14 Jul 2017 12:47:18 +0800 Subject: [PATCH 049/108] rubocop: update to use latest cop namespace Signed-off-by: Philip Li --- .rubocop.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index fe21e5ffc..a29e4527d 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -7,16 +7,13 @@ Style/Documentation: Style/FrozenStringLiteralComment: Enabled: false -Style/IndentArray: +Layout/IndentArray: Enabled: false -Style/SpaceInsideHashLiteralBraces: +Layout/SpaceInsideHashLiteralBraces: Enabled: false -Style/IndentationWidth: - Enabled: false - -Style/CommentIndentation: +Layout/CommentIndentation: Enabled: false Style/PerlBackrefs: From f65bbc90a15e239b5656d72ae76326f0108b420b Mon Sep 17 00:00:00 2001 From: Hailin Gu Date: Fri, 14 Jul 2017 13:37:44 +0800 Subject: [PATCH 050/108] lib/tests/kernel_selftests: use gcc-5 for x86 testcase Due to the change of dependency packages, gcc is in the depend package now. So we can't specify the gcc-5 in origin method. Whether gcc exist or not link the gcc-5 to gcc Ignore the x86 testcase if gcc-5 doesn't exist Signed-off-by: Hailin Gu Signed-off-by: Philip Li --- lib/tests/kernel_selftests.sh | 2 +- tests/kernel_selftests | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/tests/kernel_selftests.sh b/lib/tests/kernel_selftests.sh index 5743cf737..f024011a2 100644 --- a/lib/tests/kernel_selftests.sh +++ b/lib/tests/kernel_selftests.sh @@ -15,7 +15,7 @@ prepare_for_test() mount --bind /lib/modules/`uname -r`/kernel/lib $linux_selftests_dir/lib || die # temporarily workaround compile error on gcc-6 - command -v gcc >/dev/null || ln -sf /usr/bin/gcc-5 /usr/bin/gcc + command -v gcc-5 >/dev/null && log_cmd ln -sf /usr/bin/gcc-5 /usr/bin/gcc # fix cc: command not found command -v cc >/dev/null || log_cmd ln -sf /usr/bin/gcc /usr/bin/cc } diff --git a/tests/kernel_selftests b/tests/kernel_selftests index d3bb7e68c..fc572f3c6 100755 --- a/tests/kernel_selftests +++ b/tests/kernel_selftests @@ -21,6 +21,7 @@ prepare_for_test # timers: counting 5 update interrupts from reading /dev/rtc0 # hanging for a long time and cannot be finished skip_filter="breakpoints timers powerpc" +command gcc-5 >/dev/null || skip_filter="x86 $skip_filter" for mf in */Makefile; do subtest=${mf%/Makefile} From d0ec0890aa59e6fd4662dd84f513305aafb689ac Mon Sep 17 00:00:00 2001 From: Xiang Dai Date: Fri, 14 Jul 2017 14:01:55 +0800 Subject: [PATCH 051/108] jobs/phoronix-test-suite.yaml: ignore parboil The issue like below: g++ build/omp_base_default/main.o build/omp_base_default/file.o build/omp_base_default/parboil.o -o build/omp_base_default/mri-q -lm -lpthread -lm -lstdc++ -lgomp build/omp_base_default/main.o: In function `main': main.c:(.text+0x304): undefined reference to `ComputePhiMagCPU' <=== main.c:(.text+0x3ed): undefined reference to `ComputeQCPU' <=== collect2: error: ld returned 1 exit status /home/test/.phoronix-test-suite/installed-tests/pts/parboil-1.1.2/parboil-2.5-tree/common/mk/c.mk:70: recipe for target 'build/omp_base_default/mri-q' failed make: *** [build/omp_base_default/mri-q] Error 1 Parboil parallel benchmark suite, version 0.2 It is a code bug of parboil and ignore this during waiting for community response. Signed-off-by: Xiang Dai Signed-off-by: Philip Li --- jobs/phoronix-test-suite.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/phoronix-test-suite.yaml b/jobs/phoronix-test-suite.yaml index 98ff0b06e..1ad652ae9 100644 --- a/jobs/phoronix-test-suite.yaml +++ b/jobs/phoronix-test-suite.yaml @@ -8,7 +8,7 @@ need_memory: 8G phoronix-test-suite: test: - - parboil-1.1.2 +# - parboil-1.1.2 - open-porous-media-1.3.1 - x264-opencl-1.9.0 - x264-1.9.0 From 0684ec403c4c312a60fc80ca37b597ef797c0ca8 Mon Sep 17 00:00:00 2001 From: Aaron Lu Date: Fri, 14 Jul 2017 14:14:29 +0800 Subject: [PATCH 052/108] stats/vm-scalability: sort kbps before getting median The array should be sorted before we can get median. This isn't a big problem since individual numbers are roughly in a high to low order(task that finished early will output a higher value) but better not depend on this. Signed-off-by: Aaron Lu Signed-off-by: Philip Li --- stats/vm-scalability | 1 + 1 file changed, 1 insertion(+) diff --git a/stats/vm-scalability b/stats/vm-scalability index a5792277c..bb4dc3861 100755 --- a/stats/vm-scalability +++ b/stats/vm-scalability @@ -15,6 +15,7 @@ ret['warned'] = false def add_one_sample(kbps, throughput, median, ret) return if kbps.empty? throughput << kbps.sum + kbps.sort! median << kbps[kbps.size / 2] puts "# #{kbps.size} #{kbps.sum}" return unless kbps.size != 1 && (kbps.size & 1) != 0 && !ret['warned'] From 1c8428e58186baff7dd52e0b76cbf5a67029d091 Mon Sep 17 00:00:00 2001 From: Aaron Lu Date: Fri, 14 Jul 2017 16:12:15 +0800 Subject: [PATCH 053/108] lib/ftrace-funcgraph: set RESULT_ROOT if it's not set Reported-by: "Li, Philip" Signed-off-by: Aaron Lu Signed-off-by: Philip Li --- lib/ftrace-funcgraph.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/ftrace-funcgraph.rb b/lib/ftrace-funcgraph.rb index c5c39a356..404c4c39c 100644 --- a/lib/ftrace-funcgraph.rb +++ b/lib/ftrace-funcgraph.rb @@ -1,6 +1,7 @@ #!/usr/bin/env ruby LKP_SRC ||= ENV['LKP_SRC'] +RESULT_ROOT ||= ENV['RESULT_ROOT'] require "#{LKP_SRC}/lib/common.rb" require "#{LKP_SRC}/lib/ftrace.rb" From d49c0791d710fb65f472e0d1d87efbaa01bcf867 Mon Sep 17 00:00:00 2001 From: Bai Yu Date: Fri, 14 Jul 2017 14:35:28 +0800 Subject: [PATCH 054/108] add threshold parameter to pmbench Signed-off-by: Bai Yu Reviewed-by: "Huang, Ying" Signed-off-by: Philip Li --- tests/pmbench | 2 ++ tests/pmbench.yaml | 1 + 2 files changed, 3 insertions(+) diff --git a/tests/pmbench b/tests/pmbench index 022e73912..2a2a3c435 100755 --- a/tests/pmbench +++ b/tests/pmbench @@ -12,6 +12,7 @@ # - offset # - quiet # - ratio +# - threshold . "$LKP_SRC/lib/common.sh" @@ -33,6 +34,7 @@ set_opt() [ -n "$offset" ] && opt="${opt} -o${offset}" parse_bool -q "$quiet" && opt="${opt} -q" [ -n "$ratio" ] && opt="${opt} -r${ratio}" + [ -n "$threshold" ] && opt="${opt} -h${threshold}" } run_pmbench() diff --git a/tests/pmbench.yaml b/tests/pmbench.yaml index 4b32e2724..1a536df77 100644 --- a/tests/pmbench.yaml +++ b/tests/pmbench.yaml @@ -23,6 +23,7 @@ parameters: offset: Specify static page access offset (default random) quiet: [y, n] Don't produce any output until finish ratio: Percentage read/write ratio (0 = write only, 100 = read only; default 50) + threshold: The threshold time to trigger the ftrace log, unit is ns. results: pmbench.latency.ns.average: From a618fc485d5aa483b7b2e122d5fe920ca1807e82 Mon Sep 17 00:00:00 2001 From: Wu Chenggang Date: Mon, 17 Jul 2017 13:11:37 +0800 Subject: [PATCH 055/108] Update the source and install path of turbostat Change the install root to /lkp/benchmark for turbostat update the source of the package Signed-off-by: Wu Chenggang Reviewed-by: "Huang, Ying" Signed-off-by: Philip Li --- pkg/turbostat/PKGBUILD | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkg/turbostat/PKGBUILD b/pkg/turbostat/PKGBUILD index a36c0f997..08db41bf8 100644 --- a/pkg/turbostat/PKGBUILD +++ b/pkg/turbostat/PKGBUILD @@ -9,10 +9,10 @@ arch=('x86_64' 'i686') url="http://acpi.sourceforge.net/dsdt/index.php" license=('GPL') conflicts=('pmtools') -source=("http://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz") +source=("https://github.com/aaronlu/turbostat.git") #"http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz") -sha256sums=('becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd') +sha256sums=('SKIP') #prepare() { # cd "$_srcname" @@ -20,11 +20,12 @@ sha256sums=('becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd') #} build() { - cd "$_srcname/tools/power/x86/$pkgname" + cd "$srcdir/$pkgname" make } package() { - cd "$_srcname/tools/power/x86/$pkgname" - make DESTDIR="$pkgdir" install + cd "$srcdir/$pkgname" + mkdir -p "$pkgdir/lkp/benchmarks" + cp -a turbostat "$pkgdir/lkp/benchmarks/${pkgname}" } From fdc2b137a4a1923821af3def7d3b04683785c59c Mon Sep 17 00:00:00 2001 From: Wu Chenggang Date: Mon, 17 Jul 2017 15:00:14 +0800 Subject: [PATCH 056/108] pkg/turbostat: Add additional directory Add addtional parent directory turbostat to the install root. Make the installation path the same as the pack method Signed-off-by: Wu Chenggang Reviewed-by: "Huang, Ying" Signed-off-by: Philip Li --- pkg/turbostat/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/turbostat/PKGBUILD b/pkg/turbostat/PKGBUILD index 08db41bf8..6064dcc2e 100644 --- a/pkg/turbostat/PKGBUILD +++ b/pkg/turbostat/PKGBUILD @@ -26,6 +26,6 @@ build() { package() { cd "$srcdir/$pkgname" - mkdir -p "$pkgdir/lkp/benchmarks" - cp -a turbostat "$pkgdir/lkp/benchmarks/${pkgname}" + mkdir -p "$pkgdir/lkp/benchmarks/${pkgname}" + cp -a turbostat "$pkgdir/lkp/benchmarks/${pkgname}/${pkgname}" } From 947edef35b2105b8cbb84d8ef6510f1275b73293 Mon Sep 17 00:00:00 2001 From: Xiaolong Ye Date: Mon, 17 Jul 2017 16:51:37 +0800 Subject: [PATCH 057/108] oops-pattern: add new WARNING pattern To capture below error: kern :warn : [ 57.182374 ] ============================================ kern :warn : [ 57.182582 ] WARNING: possible recursive locking detected kern :warn : [ 57.182788 ] 4.12.0-rc4-wt-ath-05992-g2728455 #1 Not tainted kern :warn : [ 57.183009 ] -------------------------------------------- kern :warn : [ 57.183237 ] repro-8659a50e./13114 is trying to acquire lock: kern :warn : [ 57.183449 ] (sb_writers#5){.+.+.+}, at: [] do_iter_write+0x352/0x7d0 kern :warn : [ 57.183781 ] but task is already holding lock: kern :warn : [ 57.184087 ] (sb_writers#5){.+.+.+}, at: [] do_sendfile+0x9bd/0xcc0 kern :warn : [ 57.184407 ] other info that might help us debug this: kern :warn : [ 57.184705 ] Possible unsafe locking scenario: kern :warn : [ 57.184998 ] CPU0 kern :warn : [ 57.185170 ] ---- kern :warn : [ 57.185332 ] lock(sb_writers#5); kern :warn : [ 57.185510 ] lock(sb_writers#5); kern :warn : [ 57.185685 ] *** DEADLOCK *** kern :warn : [ 57.186067 ] May be due to missing lock nesting notation Signed-off-by: Xiaolong Ye Signed-off-by: Philip Li --- etc/oops-pattern | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/oops-pattern b/etc/oops-pattern index a925b1ac1..f2d1ec661 100644 --- a/etc/oops-pattern +++ b/etc/oops-pattern @@ -9,6 +9,7 @@ BUG .* \(.*\): .* Oops: .* WARNING: at .* WARNING: CPU: [0-9]+ PID: [0-9]+ at .* +WARNING: possible recursive locking detected INFO: .*detected stall.* INFO: .* cpu=.* INFO: Slab 0x.* From d007b2ed404456dbb4ae0e5bc7deec337052b591 Mon Sep 17 00:00:00 2001 From: Wu Chenggang Date: Mon, 17 Jul 2017 16:46:50 +0800 Subject: [PATCH 058/108] sbin/pacman: Change the rpm build position Change the rpm build positiion from INSTALL_DIR to RPM_BUILD_DIR Split the program files and the package files Signed-off-by: Wu Chenggang Reviewed-by: "Huang, Ying" Signed-off-by: Philip Li --- sbin/pacman-LKP | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/sbin/pacman-LKP b/sbin/pacman-LKP index 4966aece1..900d0b224 100755 --- a/sbin/pacman-LKP +++ b/sbin/pacman-LKP @@ -48,8 +48,8 @@ pack_deb() { pack_rpm() { local pkg_name=$1 - mkdir -p $INSTALL_DIR/{BUILD,RPMS,S{OURCE,PEC,RPM}S} - cat > "$INSTALL_DIR/SPECS/$pkg_name.spec" <<-EOF + mkdir -p $RPM_BUILD_DIR/{BUILD,RPMS,S{OURCE,PEC,RPM}S} + cat > "$RPM_BUILD_DIR/SPECS/$pkg_name.spec" <<-EOF Name: $pkg_name-LKP Version: 1 License: None @@ -71,13 +71,13 @@ pack_rpm() { EOF - cat > "$INSTALL_DIR/.rpmmacros" <<-EOF - %_topdir $INSTALL_DIR + cat > "$RPM_BUILD_DIR/.rpmmacros" <<-EOF + %_topdir $RPM_BUILD_DIR %_rpmfilename %%{NAME}.rpm EOF if have_function post_install; then - cat >> "$INSTALL_DIR/SPECS/$pkg_name.spec" <<-EOF + cat >> "$RPM_BUILD_DIR/SPECS/$pkg_name.spec" <<-EOF %post . $SRC_DIR/.install/.INSTALL post_install @@ -86,8 +86,8 @@ pack_rpm() { fi ( - export HOME=$INSTALL_DIR - rpmbuild -bb "$INSTALL_DIR/SPECS/$pkg_name.spec" + export HOME=$RPM_BUILD_DIR + rpmbuild -bb "$RPM_BUILD_DIR/SPECS/$pkg_name.spec" ) } @@ -122,8 +122,9 @@ upgrade() { } ;; rpm) + RPM_BUILD_DIR="$SRC_DIR/rpm_build" pack_rpm "$pkg_name" - rpm -ivh --replacepkgs --force "install/RPMS/$pkg_name-LKP.rpm" || return 1 ;; + rpm -ivh --replacepkgs --force "$RPM_BUILD_DIR/RPMS/$pkg_name-LKP.rpm" || return 1 ;; *) cp -r "$INSTALL_DIR/usr" / || return 1 ;; esac From 06bcb1bce0ad04d9d4d9bb10b5968b7e0142dafb Mon Sep 17 00:00:00 2001 From: Wu Chenggang Date: Mon, 17 Jul 2017 16:46:51 +0800 Subject: [PATCH 059/108] sbin/pacman-LKP: support more root directories in rpm install Signed-off-by: Wu Chenggang Reviewed-by: "Huang, Ying" Signed-off-by: Philip Li --- sbin/pacman-LKP | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/pacman-LKP b/sbin/pacman-LKP index 900d0b224..f44f9f088 100755 --- a/sbin/pacman-LKP +++ b/sbin/pacman-LKP @@ -63,7 +63,7 @@ pack_rpm() { %install # create directories where the files will be located # put the files in the relevant directories - cp -a $INSTALL_DIR/usr \$RPM_BUILD_ROOT + cp -a $INSTALL_DIR/* \$RPM_BUILD_ROOT %files %defattr(-,root,root) From 54a840cf3c952d43c4809ab4b3538f4cc5f2d04c Mon Sep 17 00:00:00 2001 From: Wu Chenggang Date: Mon, 17 Jul 2017 16:46:52 +0800 Subject: [PATCH 060/108] sbin/pacman-LKP: change the file name of deb package change the deb file and directory name "install" to $pkg_name-lkp Signed-off-by: Wu Chenggang Reviewed-by: "Huang, Ying" Signed-off-by: Philip Li --- sbin/pacman-LKP | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sbin/pacman-LKP b/sbin/pacman-LKP index f44f9f088..79800bf5b 100755 --- a/sbin/pacman-LKP +++ b/sbin/pacman-LKP @@ -43,7 +43,7 @@ pack_deb() { EOF chmod +x $INSTALL_DIR/DEBIAN/postinst fi - dpkg-deb --build install + dpkg-deb --build "$pkg_name-lkp" } pack_rpm() { @@ -106,7 +106,7 @@ upgrade() { local SRC_DIR SRC_DIR=$(pwd) local pkg_name=${SRC_DIR##*/} - local INSTALL_DIR=$SRC_DIR/install + local INSTALL_DIR="$SRC_DIR/$pkg_name-lkp" [ -d "$INSTALL_DIR" ] || mkdir "$INSTALL_DIR" [ -d "$SRC_DIR/.install" ] || mkdir "$SRC_DIR/.install" tar -zxf "$@" -C "$INSTALL_DIR" @@ -116,7 +116,7 @@ upgrade() { case $(distro_pkg_format) in deb) pack_deb "$pkg_name" - dpkg -i install.deb 2>/tmp/dpkg_error || { + dpkg -i "$pkg_name-lkp.deb" 2>/tmp/dpkg_error || { grep -v "dpkg: warning: files list file for package '.*' missing;" /tmp/dpkg_error return 1 } From 34a9b52d1f504a5e21cc6ce71b41bf64efb22ffc Mon Sep 17 00:00:00 2001 From: Xiang Dai Date: Tue, 18 Jul 2017 11:51:38 +0800 Subject: [PATCH 061/108] add phoronix-test-suite-large-memory.yaml dbench test need large memory to run, so specify 128G for it. Signed-off-by: Xiang Dai Signed-off-by: Philip Li --- jobs/phoronix-test-suite-large-memory.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 jobs/phoronix-test-suite-large-memory.yaml diff --git a/jobs/phoronix-test-suite-large-memory.yaml b/jobs/phoronix-test-suite-large-memory.yaml new file mode 100644 index 000000000..fadf6076e --- /dev/null +++ b/jobs/phoronix-test-suite-large-memory.yaml @@ -0,0 +1,11 @@ +suite: phoronix-test-suite +testcase: phoronix-test-suite +category: benchmark + +rootfs: inn:/export/debian-full-x86_64 + +need_memory: 128G + +phoronix-test-suite: + test: + - dbench-1.0.0 From 2b5b5626f2716c7741c99d8656fef38d8e78fc3d Mon Sep 17 00:00:00 2001 From: Xiang Dai Date: Tue, 18 Jul 2017 12:00:37 +0800 Subject: [PATCH 062/108] jobs/phoronix-test-suite.yaml: exclude dbench dbench test needs large memory to run, so handle it alone in a new job. Signed-off-by: Xiang Dai Signed-off-by: Philip Li --- jobs/phoronix-test-suite.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/jobs/phoronix-test-suite.yaml b/jobs/phoronix-test-suite.yaml index 1ad652ae9..9724d6260 100644 --- a/jobs/phoronix-test-suite.yaml +++ b/jobs/phoronix-test-suite.yaml @@ -23,7 +23,6 @@ phoronix-test-suite: - system-decompress-bzip2-1.0.2 - openssl-1.9.0 - system-decompress-xz-1.0.2 - - dbench-1.0.0 - pgbench-1.5.2 - botan-1.1.0 - minion-1.4.0 From 16e42bef0eee694d9a091739842f0a24fdb66251 Mon Sep 17 00:00:00 2001 From: Li Zhijian Date: Wed, 19 Jul 2017 13:26:54 +0800 Subject: [PATCH 063/108] phoronix-test-suite: set ffmepg max thread number to 64 lizj@500R5H:~/.phoronix-test-suite/installed-tests/pts/ffmpeg-2.5.0/ffmpeg-2.8.1$ git grep MAX_THREADS libavcodec/frame_thread_encoder.c libavcodec/frame_thread_encoder.c:#define MAX_THREADS 64 before this patch, ffmpeg can not run correctly due to they have beyond 64 cups(threads) ------------ /result/phoronix-test-suite/ffmpeg-2.5.0-performance/lkp-hsx04/debian-full-x86_64/x86_64-rhel-7.2/gcc-6/6f7da290413ba713f0cdd9ff1a2a9bb129ef4f6c/0 FFmpeg 2.8.1: pts/ffmpeg-2.5.0 Test 1 of 1 Estimated Trial Run Count: 3 Estimated Time To Completion: 2 Minutes Started Run 1 @ 21:31:10 The test exited with a non-zero exit status. Started Run 2 @ 21:31:17 The test exited with a non-zero exit status. Started Run 3 @ 21:31:19 The test exited with a non-zero exit status. Test Results: Average: 0 Seconds This test failed to run properly. The following tests failed to properly run: pts/ffmpeg-2.5.0: H.264 HD To NTSC DV ------------ this patch will insert '[ $NUM_CPU_CORES -gt 64 ] && export NUM_CPU_CORES=64' to test script root@lkp-hsw-ep4 /var/lib/phoronix-test-suite/installed-tests/pts/ffmpeg-2.5.0# cat ffmpeg [ $NUM_CPU_CORES -gt 64 ] && export NUM_CPU_CORES=64 <======= ./ffmpeg_/bin/ffmpeg -i HD2-h264.ts -f rawvideo -threads $NUM_CPU_CORES -y -target ntsc-dv /dev/null 2>&1 echo $? > ~/test-exit-status Signed-off-by: Li Zhijian Signed-off-by: Philip Li --- tests/phoronix-test-suite.xinitrc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/phoronix-test-suite.xinitrc b/tests/phoronix-test-suite.xinitrc index 116348695..3b270a02c 100755 --- a/tests/phoronix-test-suite.xinitrc +++ b/tests/phoronix-test-suite.xinitrc @@ -6,6 +6,13 @@ start_time=$(date +%s.%N) +# ffmpeg only support max 64 threads +fixup_ffmpeg() +{ + local target=/var/lib/phoronix-test-suite/installed-tests/pts/ffmpeg-2.5.0/ffmpeg + grep -q -w 'NUM_CPU_CORES=64' $target || sed "2a[ \$NUM_CPU_CORES -gt 64 ] && export NUM_CPU_CORES=64" -i "$target" +} + case $test in systester-[0-9]*) # Choose @@ -15,6 +22,9 @@ case $test in # todo: select different test according to testbox's hardware test_opt="\n1\n2\n3\nn" ;; + ffmpeg-2.5.0) + fixup_ffmpeg + ;; esac export PTS_SILENT_MODE=1 From 4714eb692153c2067f41cc28bc2eb78adf4614a5 Mon Sep 17 00:00:00 2001 From: Li Zhijian Date: Wed, 19 Jul 2017 13:26:55 +0800 Subject: [PATCH 064/108] tests/phoronix-test-suite.xinitrc: allow open-porous-media run as root root@inn /var/lib/phoronix-test-suite/installed-tests/pts/open-porous-media-1.3.1# cat /var/lib/phoronix-test-suite/installed-tests/pts/open-porous-media-1.3.1/open-porous-media-1.3.1-1499850300-1.log -------------------------------------------------------------------------- mpirun has detected an attempt to run as root. Running at root is *strongly* discouraged as any mistake (e.g., in defining TMPDIR) or bug can result in catastrophic damage to the OS file system, leaving your system in an unusable state. You can override this protection by adding the --allow-run-as-root option to your cmd line. However, we reiterate our strong advice against doing so - please do so at your own risk. -------------------------------------------------------------------------- Signed-off-by: Li Zhijian Signed-off-by: Philip Li --- tests/phoronix-test-suite.xinitrc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/phoronix-test-suite.xinitrc b/tests/phoronix-test-suite.xinitrc index 3b270a02c..b25513388 100755 --- a/tests/phoronix-test-suite.xinitrc +++ b/tests/phoronix-test-suite.xinitrc @@ -13,6 +13,13 @@ fixup_ffmpeg() grep -q -w 'NUM_CPU_CORES=64' $target || sed "2a[ \$NUM_CPU_CORES -gt 64 ] && export NUM_CPU_CORES=64" -i "$target" } +# add --allow-run-as-root to open-porous-media-1.3.1 +fixup_open_porous_media() +{ + local target=/var/lib/phoronix-test-suite/installed-tests/pts/open-porous-media-1.3.1/open-porous-media + sed -i 's/nice mpirun -np/nice mpirun --allow-run-as-root -np/' "$target" +} + case $test in systester-[0-9]*) # Choose @@ -25,6 +32,9 @@ case $test in ffmpeg-2.5.0) fixup_ffmpeg ;; + open-porous-media-1.3.1) + fixup_open_porous_media + ;; esac export PTS_SILENT_MODE=1 From f03d5c4acc7bc94a8276e6efa2d2a8e5d6a127c0 Mon Sep 17 00:00:00 2001 From: Li Zhijian Date: Thu, 20 Jul 2017 10:33:39 +0800 Subject: [PATCH 065/108] distro/keep-deb: put dbus into keep-deb since dbus 1.10.20, dbus service can not be started if we pack them into deps/xxx.cgz dbus provide a postints stript to do a setup job, put it as deb so that it has chance to do this. ---------- root@debian9:/lkp/benchmarks/piglit/lib/piglit/bin/igt/tests# ls /var/lib/dpkg/info/dbus.* /var/lib/dpkg/info/dbus.conffiles /var/lib/dpkg/info/dbus.md5sums /var/lib/dpkg/info/dbus.postrm /var/lib/dpkg/info/dbus.prerm /var/lib/dpkg/info/dbus.list /var/lib/dpkg/info/dbus.postinst <=== /var/lib/dpkg/info/dbus.preinst /var/lib/dpkg/info/dbus.triggers --------- Signed-off-by: Li Zhijian Signed-off-by: Philip Li --- distro/keep-deb | 1 + 1 file changed, 1 insertion(+) diff --git a/distro/keep-deb b/distro/keep-deb index d780333e6..2a8ff52ea 100644 --- a/distro/keep-deb +++ b/distro/keep-deb @@ -25,3 +25,4 @@ liblua libicu57 libxml2 apache2 +dbus From 6b0c8cb9db37d1c9a4d3b45b044401b0656313b7 Mon Sep 17 00:00:00 2001 From: Chen Rong Date: Thu, 20 Jul 2017 18:36:15 +0800 Subject: [PATCH 066/108] include/hwsim: add CONFIG_MAC80211_DEBUGFS requirement for running wext_wpa_psk test fix the following issue: ----------------- Skip test case: tkip_mic_test not supported in mac80211 hwsim.suite_b_192 skip -> pass ----------------- Signed-off-by: Chen Rong Signed-off-by: Philip Li --- include/hwsim | 1 + 1 file changed, 1 insertion(+) diff --git a/include/hwsim b/include/hwsim index e66ff8359..900d1c0a2 100644 --- a/include/hwsim +++ b/include/hwsim @@ -6,3 +6,4 @@ need_kconfig: - CONFIG_MAC80211_HWSIM=m - CONFIG_MAC80211_LEDS=y - CONFIG_MAC80211_MESH=y +- CONFIG_MAC80211_DEBUGFS=y From 991bc1b8c18c099d3d62e50e7322076c1ef4c78d Mon Sep 17 00:00:00 2001 From: Chen Rong Date: Thu, 20 Jul 2017 17:02:44 +0800 Subject: [PATCH 067/108] hwsim: manage skip cases in specified directory save skip cases into a specified directory, and use a loop to get skip cases from the directory. Signed-off-by: Chen Rong Signed-off-by: Philip Li --- pack/hwsim | 20 ++++++++++---------- tests/hwsim | 14 +++++++------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/pack/hwsim b/pack/hwsim index 4d38c6085..3f8734d30 100755 --- a/pack/hwsim +++ b/pack/hwsim @@ -50,8 +50,12 @@ build_hwsim_param_long() git grep -B 2 -w 'if not params\['\'long\'] | grep '.*\.py\-def' | awk -F 'def ' '{print $2}' | awk -F'(' '{print $1}' | sed s/test_//g > require_long_param } -build_hwsim_require_under_vm() +build_ignored_by_lkp() { + local ignored_by_lkp=$source_dir/tests/hwsim/ignored-by-lkp/ + [[ -d $ignored_by_lkp ]] || mkdir $ignored_by_lkp || return + cd $ignored_by_lkp + # try to find out the case requiring under vm # root@debian9:/lkp/benchmarks/hwsim/tests/hwsim# git grep -B 2 -w 'require_under_vm' # test_ap_dynamic.py-import hwsim_utils @@ -61,21 +65,17 @@ build_hwsim_require_under_vm() # test_ap_dynamic.py-def test_ap_iapp(dev, apdev): # test_ap_dynamic.py- """IAPP and multiple BSSes""" # test_ap_dynamic.py: require_under_vm() - cd $source_dir/tests/hwsim - git grep -B 2 -w 'require_under_vm' | grep '\-def ' | grep -v _test | awk -F' test_' '{print $2}' | awk -F'(' '{print $1}' > require_under_vm -} + git grep -B 2 -w 'require_under_vm' .. | grep '\-def ' | grep -v _test | awk -F' test_' '{print $2}' | awk -F'(' '{print $1}' > require_under_vm -build_hwsim_setup_oom() -{ - cd $source_dir/tests/hwsim - git grep -E -e 'def test.*oom' -e 'def test.*out_of_memory' | awk -F 'test_' '{print $3}'| awk -F '(' '{print $1}' > setup_oom + git grep -E -e 'def test.*oom' -e 'def test.*out_of_memory' .. | awk -F 'test_' '{print $3}'| awk -F '(' '{print $1}' > setup_oom } install() { build_hwsim_param_long - build_hwsim_require_under_vm - build_hwsim_setup_oom + + build_ignored_by_lkp || return + cd $source_dir $LKP_SRC/tools/hwsim-extract-testcase $source_dir/tests/hwsim cp -af $source_dir/* $BM_ROOT diff --git a/tests/hwsim b/tests/hwsim index f5e9e0db4..992e99b13 100755 --- a/tests/hwsim +++ b/tests/hwsim @@ -28,18 +28,18 @@ log_cmd ./start.sh || die "fail to setup test environment" check_ignore_case() { local casename=$1 + local ignored_by_lkp=$BENCHMARK_ROOT/hwsim/tests/hwsim/ignored-by-lkp/ [ -f $LKP_SRC/pack/hwsim-addon/oom_is_passed ] && grep -q -w $casename $LKP_SRC/pack/hwsim-addon/oom_is_passed && return 1 - # skip cases that want to setup oom environment - ([ -f $BENCHMARK_ROOT/hwsim/tests/hwsim/setup_oom ] && - grep -q -w $casename $BENCHMARK_ROOT/hwsim/tests/hwsim/setup_oom) || # skip rrm_beacon_req_table_vht at 0Day environment - ([ "$LKP_LOCAL_RUN" != "1" ] && [ "$casename" = "rrm_beacon_req_table_vht" ]) || - # skip require run under vm - ([ -f $BENCHMARK_ROOT/hwsim/tests/hwsim/require_under_vm ] && - grep -q -w $casename $BENCHMARK_ROOT/hwsim/tests/hwsim/require_under_vm) + [ "$LKP_LOCAL_RUN" != "1" ] && [ "$casename" = "rrm_beacon_req_table_vht" ] && return 0 + + # skip cases that in ignored_by_lkp + [ -d "$ignored_by_lkp" ] && grep -q -w $casename "$ignored_by_lkp"/* && return 0 + + return 1 } while read casename From c83fccb7cba8f9aa883209971e6c4a095759c488 Mon Sep 17 00:00:00 2001 From: Chen Rong Date: Thu, 20 Jul 2017 17:02:45 +0800 Subject: [PATCH 068/108] pack/hwsim: ignore tdls_chan_switch testcase Driver(mac80211_hwsim) doesn't implemented this in the code Signed-off-by: Chen Rong Signed-off-by: Philip Li --- pack/hwsim | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pack/hwsim b/pack/hwsim index 3f8734d30..ad7a21cb8 100755 --- a/pack/hwsim +++ b/pack/hwsim @@ -68,6 +68,8 @@ build_ignored_by_lkp() git grep -B 2 -w 'require_under_vm' .. | grep '\-def ' | grep -v _test | awk -F' test_' '{print $2}' | awk -F'(' '{print $1}' > require_under_vm git grep -E -e 'def test.*oom' -e 'def test.*out_of_memory' .. | awk -F 'test_' '{print $3}'| awk -F '(' '{print $1}' > setup_oom + + echo "tdls_chan_switch" > tdls_chan_switch } install() From 8d6da7a07f432d81aeb89a928516261c8cc4f323 Mon Sep 17 00:00:00 2001 From: Xiang Dai Date: Fri, 21 Jul 2017 09:27:20 +0800 Subject: [PATCH 069/108] jobs/phoronix-test-suite-needx.yaml: ignore xonotic test The test needs too much time to run, so ignore it. Signed-off-by: Xiang Dai Signed-off-by: Philip Li --- jobs/phoronix-test-suite-needx.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/phoronix-test-suite-needx.yaml b/jobs/phoronix-test-suite-needx.yaml index 9e6c22110..ab636cdd2 100644 --- a/jobs/phoronix-test-suite-needx.yaml +++ b/jobs/phoronix-test-suite-needx.yaml @@ -38,6 +38,6 @@ phoronix-test-suite: - viennacl-1.0.0 - warsow-1.5.1 - x11perf-1.1.1 - - xonotic-1.4.0 + #- xonotic-1.4.0 # runtime too long [more than 5 Hours] - xplane9-1.3.0 - etqw-demo-iqc-1.0.0 From d1b15723f0bb083230dfe6c38b4fb92f071af7b6 Mon Sep 17 00:00:00 2001 From: Chen Rong Date: Fri, 21 Jul 2017 14:58:46 +0800 Subject: [PATCH 070/108] pack/hwsim: combine all ignored files to single one combine the files (ignored_by_lkp/*) to a file (ignored_by_lkp), use ignored_by_lkp as a file, not a directory. Signed-off-by: Chen Rong Signed-off-by: Philip Li --- pack/hwsim | 14 ++++++++------ tests/hwsim | 4 ++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/pack/hwsim b/pack/hwsim index ad7a21cb8..adb2944dd 100755 --- a/pack/hwsim +++ b/pack/hwsim @@ -52,9 +52,8 @@ build_hwsim_param_long() build_ignored_by_lkp() { - local ignored_by_lkp=$source_dir/tests/hwsim/ignored-by-lkp/ - [[ -d $ignored_by_lkp ]] || mkdir $ignored_by_lkp || return - cd $ignored_by_lkp + local ignored_by_lkp="ignored_by_lkp" + cd $source_dir/tests/hwsim # try to find out the case requiring under vm # root@debian9:/lkp/benchmarks/hwsim/tests/hwsim# git grep -B 2 -w 'require_under_vm' @@ -65,11 +64,14 @@ build_ignored_by_lkp() # test_ap_dynamic.py-def test_ap_iapp(dev, apdev): # test_ap_dynamic.py- """IAPP and multiple BSSes""" # test_ap_dynamic.py: require_under_vm() - git grep -B 2 -w 'require_under_vm' .. | grep '\-def ' | grep -v _test | awk -F' test_' '{print $2}' | awk -F'(' '{print $1}' > require_under_vm + echo "# ignore _require_under_vm_" >> $ignored_by_lkp + git grep -B 2 -w 'require_under_vm' | grep '\-def ' | grep -v _test | awk -F' test_' '{print $2}' | awk -F'(' '{print $1}' >> $ignored_by_lkp - git grep -E -e 'def test.*oom' -e 'def test.*out_of_memory' .. | awk -F 'test_' '{print $3}'| awk -F '(' '{print $1}' > setup_oom + echo "# ignore _setup_oom_" >> $ignored_by_lkp + git grep -E -e 'def test.*oom' -e 'def test.*out_of_memory' | awk -F 'test_' '{print $3}'| awk -F '(' '{print $1}' >> $ignored_by_lkp - echo "tdls_chan_switch" > tdls_chan_switch + echo "# ignore _tdls_chan_switch_" >> $ignored_by_lkp + echo "tdls_chan_switch" >> $ignored_by_lkp } install() diff --git a/tests/hwsim b/tests/hwsim index 992e99b13..2bc36924f 100755 --- a/tests/hwsim +++ b/tests/hwsim @@ -28,7 +28,7 @@ log_cmd ./start.sh || die "fail to setup test environment" check_ignore_case() { local casename=$1 - local ignored_by_lkp=$BENCHMARK_ROOT/hwsim/tests/hwsim/ignored-by-lkp/ + local ignored_by_lkp=$BENCHMARK_ROOT/hwsim/tests/hwsim/ignored_by_lkp [ -f $LKP_SRC/pack/hwsim-addon/oom_is_passed ] && grep -q -w $casename $LKP_SRC/pack/hwsim-addon/oom_is_passed && return 1 @@ -37,7 +37,7 @@ check_ignore_case() [ "$LKP_LOCAL_RUN" != "1" ] && [ "$casename" = "rrm_beacon_req_table_vht" ] && return 0 # skip cases that in ignored_by_lkp - [ -d "$ignored_by_lkp" ] && grep -q -w $casename "$ignored_by_lkp"/* && return 0 + [ -f "$ignored_by_lkp" ] && grep -q -w $casename "$ignored_by_lkp" && return 0 return 1 } From 342d9fa20f4ed0c1ee9f6fa73840b70af1fb254b Mon Sep 17 00:00:00 2001 From: Chen Rong Date: Fri, 21 Jul 2017 14:58:47 +0800 Subject: [PATCH 071/108] pack/hwsim: ignore test cases named *lifetime_in_memory the tests try to read the process memory, but hostap doesn't parse memory correctly. ---------- $ git grep -E -e 'def test.*lifetime_in_memory' .. | awk -F 'test_' '{print $3}'| awk -F '(' '{print $1}' wpa2_eap_ttls_pap_key_lifetime_in_memory ft_psk_key_lifetime_in_memory wpa2_psk_key_lifetime_in_memory erp_key_lifetime_in_memory sae_key_lifetime_in_memory ---------- Signed-off-by: Chen Rong Signed-off-by: Philip Li --- pack/hwsim | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pack/hwsim b/pack/hwsim index adb2944dd..de46822df 100755 --- a/pack/hwsim +++ b/pack/hwsim @@ -70,6 +70,9 @@ build_ignored_by_lkp() echo "# ignore _setup_oom_" >> $ignored_by_lkp git grep -E -e 'def test.*oom' -e 'def test.*out_of_memory' | awk -F 'test_' '{print $3}'| awk -F '(' '{print $1}' >> $ignored_by_lkp + echo "# ignore _lifetime_in_memory_" >> $ignored_by_lkp + git grep -E -e 'def test.*lifetime_in_memory' | awk -F 'test_' '{print $3}'| awk -F '(' '{print $1}' >> $ignored_by_lkp + echo "# ignore _tdls_chan_switch_" >> $ignored_by_lkp echo "tdls_chan_switch" >> $ignored_by_lkp } From 39074ad7695dd0485d02bbccfb8107ba018bd04f Mon Sep 17 00:00:00 2001 From: Chen Rong Date: Fri, 21 Jul 2017 14:58:48 +0800 Subject: [PATCH 072/108] pack/hwsim: ignore test cases named ap_vht160_no_dfs* hostap always skip the cases so far by itself (http://buildbot.w1.fi/hwsim/tests.php) ---------- $ git grep -E -e 'def test.ap_vht160_no_dfs' .. | awk -F 'test_' '{print $3}'| awk -F '(' '{print $1}' ap_vht160_no_dfs_100_plus ap_vht160_no_dfs ap_vht160_no_dfs_108_plus ap_vht160_no_dfs_112_minus ap_vht160_no_dfs_116_plus ap_vht160_no_dfs_120_minus ap_vht160_no_dfs_124_plus ap_vht160_no_dfs_128_minus ---------- Signed-off-by: Chen Rong Signed-off-by: Philip Li --- pack/hwsim | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pack/hwsim b/pack/hwsim index de46822df..885ba4da2 100755 --- a/pack/hwsim +++ b/pack/hwsim @@ -73,6 +73,9 @@ build_ignored_by_lkp() echo "# ignore _lifetime_in_memory_" >> $ignored_by_lkp git grep -E -e 'def test.*lifetime_in_memory' | awk -F 'test_' '{print $3}'| awk -F '(' '{print $1}' >> $ignored_by_lkp + echo "# ignore _ap_vht160_no_dfs_" >> $ignored_by_lkp + git grep -E -e 'def test.ap_vht160_no_dfs' .. | awk -F 'test_' '{print $3}'| awk -F '(' '{print $1}' >> $ignored_by_lkp + echo "# ignore _tdls_chan_switch_" >> $ignored_by_lkp echo "tdls_chan_switch" >> $ignored_by_lkp } From 52694b88f0a84a93598136ab07bb60aec66e2c91 Mon Sep 17 00:00:00 2001 From: Chen Rong Date: Fri, 21 Jul 2017 14:58:49 +0800 Subject: [PATCH 073/108] pack/hwsim: ignore autogo_join_auto_go_neg_after_seeing_go test case The test result is erratically, we cann't ensure that the test is always pass. Signed-off-by: Chen Rong Signed-off-by: Philip Li --- pack/hwsim | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pack/hwsim b/pack/hwsim index 885ba4da2..8601fa248 100755 --- a/pack/hwsim +++ b/pack/hwsim @@ -78,6 +78,9 @@ build_ignored_by_lkp() echo "# ignore _tdls_chan_switch_" >> $ignored_by_lkp echo "tdls_chan_switch" >> $ignored_by_lkp + + echo "# ignore _autogo_join_auto_go_neg_after_seeing_go_" >> $ignored_by_lkp + echo "autogo_join_auto_go_neg_after_seeing_go" >> $ignored_by_lkp } install() From ad96b6f02819bc260715db575e8ae35dfac0b561 Mon Sep 17 00:00:00 2001 From: Li Zhijian Date: Fri, 21 Jul 2017 16:07:33 +0800 Subject: [PATCH 074/108] stats/perf-sanity-tests: support handle ignored_by_lkp cases Signed-off-by: Li Zhijian Signed-off-by: Philip Li --- stats/perf-sanity-tests | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/stats/perf-sanity-tests b/stats/perf-sanity-tests index c9430bcc0..56f9fc63e 100755 --- a/stats/perf-sanity-tests +++ b/stats/perf-sanity-tests @@ -16,6 +16,10 @@ while (line = STDIN.gets) case_name = $2.strip.tr(' ', '_') puts "#{case_name}.skip: 1" case_number += 1 + when /ignored_by_lkp: (.*)/ + case_name = $1.strip.tr(' ', '_') + puts "#{case_name}.ignored_by_lkp: 1" + case_number += 1 end end From 07e47be61ce4ba19c66e4d8fca461a838511a561 Mon Sep 17 00:00:00 2001 From: Huang Ying Date: Fri, 21 Jul 2017 13:52:35 +0800 Subject: [PATCH 075/108] setup/cpufreq_governor: Fix CPU reproduce log Signed-off-by: Huang Ying Signed-off-by: Philip Li --- setup/cpufreq_governor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/cpufreq_governor b/setup/cpufreq_governor index c249806ef..8ec4f0766 100755 --- a/setup/cpufreq_governor +++ b/setup/cpufreq_governor @@ -17,7 +17,7 @@ do [ -f "$online_file" ] && [ "$(cat "$online_file")" -eq 0 ] && continue file="$cpu_dir"/cpufreq/scaling_governor - [ -f "$file" ] && echo "$scaling_governor" > "$file" + [ -f "$file" ] && echo "'"$scaling_governor"'" > "$file" done ' From ca595cd958b65d6d4c8b47f4c8c21a64693f37fa Mon Sep 17 00:00:00 2001 From: Xiang Dai Date: Mon, 24 Jul 2017 15:36:11 +0800 Subject: [PATCH 076/108] jobs/libhugetlbfs.yaml: correct category Libhugetlbfs test suite is a functional suite indeed, so correct its category. Signed-off-by: Xiang Dai Signed-off-by: Philip Li --- jobs/libhugetlbfs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/libhugetlbfs.yaml b/jobs/libhugetlbfs.yaml index bea7fd99d..d22a72d49 100644 --- a/jobs/libhugetlbfs.yaml +++ b/jobs/libhugetlbfs.yaml @@ -1,6 +1,6 @@ suite: libhugetlbfs testcase: libhugetlbfs -category: benchmark +category: functional libhugetlbfs: pagesize: From a775e9d39ff1de1e940f727786531bdbf25a6366 Mon Sep 17 00:00:00 2001 From: Xiang Dai Date: Mon, 24 Jul 2017 15:36:36 +0800 Subject: [PATCH 077/108] tests/xfstests: uniform ignore logic Signed-off-by: Xiang Dai Signed-off-by: Philip Li --- tests/xfstests | 68 +++++++++++++++++++++----------------------------- 1 file changed, 29 insertions(+), 39 deletions(-) diff --git a/tests/xfstests b/tests/xfstests index afd1d02a5..e2801f19b 100755 --- a/tests/xfstests +++ b/tests/xfstests @@ -62,6 +62,25 @@ set_env() fi } +ignore_and_do_tests() +{ + local all_tests_cmd="$1" + local ignore_files="$2" + for ignore_file in $ignore_files + do + [ -s "$ignore_file" ] || continue + ignored_tests_cmd=${all_tests_cmd}" | grep -F -f $ignore_file" + all_tests_cmd=${all_tests_cmd}" | grep -v -F -f $ignore_file" + done + log_eval $ignored_tests_cmd + for ignored_test in $(eval $ignored_tests_cmd) + do + echo "ignored by lkp: $ignored_test" + done + log_eval $all_tests_cmd + log_cmd ./check $(eval $all_tests_cmd) +} + run_test() { ## Currently, we support the following several format's test item. @@ -78,54 +97,25 @@ run_test() local test_ignore="$test_dir/${test%-*}-ignore" if [ "${test#*-}" = "all" ]; then - all_tests=$(cd tests && ls ${test%-*}/[0-9][0-9][0-9]) + all_tests_cmd="cd tests && ls ${test%-*}/[0-9][0-9][0-9]" + ignore_and_do_tests "$all_tests_cmd" elif [ "${test#*-}" = "new" ]; then - all_tests=$(cd tests && sed "s:^:${test%-*}/:" $test) + all_tests_cmd="cd tests && sed \"s:^:${test%-*}/:\" $test" + ignore_and_do_tests "$all_tests_cmd" elif [ "${test%[a-z]-[0-9][0-9][0-9]}" != "$test" ]; then - all_tests="${test%-*}/${test#*-}" + all_tests_cmd="echo ${test%-*}/${test#*-}" + ignore_and_do_tests "$all_tests_cmd" elif [ "${test#*-}" != "$test" ]; then - generic_fs_ignore="/$BENCHMARK_ROOT/xfstests/generic-$fs-ignore" - ignored_tests=$(sed "s:^:${test%-*}/:" $test_dir/$test | grep -F -f "$test_ignore") - for ignored_test in $ignored_tests - do - echo "ignored by lkp: $ignored_test" - done - - # Ignore generic-btrfs test cases by generic-btrfs-ignore which call _require_xfs_io_command since only in this case they would fail. - if [ "${test%-*}" = "generic" ] && [ -s "$generic_fs_ignore" ]; then - ignored_generic_tests=$(sed "s:^:${test%-*}/:" $test_dir/$test | grep -F -f "$generic_fs_ignore") - for ignored_test in $ignored_generic_tests - do - echo "ignored by lkp: $ignored_test" - done - all_tests=$(sed "s:^:${test%-*}/:" $test_dir/$test | grep -v -F -f "$test_ignore" | grep -v -F -f "$generic_fs_ignore") - else - all_tests=$(sed "s:^:${test%-*}/:" $test_dir/$test | grep -v -F -f "$test_ignore") - fi + all_tests_cmd="sed \"s:^:${test%-*}/:\" $test_dir/$test" + ignore_and_do_tests "$all_tests_cmd" "$test_ignore $generic_fs_ignore" else # Now rename $test-broken to $test-ignore wihch is easier to understand. # Use $test_ignore and $BENCHMARK_ROOT/$casename/ignore to skip tests which are hard to enable. pack_ignore="/$BENCHMARK_ROOT/xfstests/ignore" - ignored_tests=$(cd tests && ls $test/[0-9][0-9][0-9] | grep -F -f "$test_ignore") - for ignored_test in $ignored_tests - do - echo "ignored by lkp: $ignored_test" - done - - if [ -s "$pack_ignore" ]; then - all_tests=$(cd tests && ls $test/[0-9][0-9][0-9] | grep -v -F -f "$test_ignore" | grep -v -F -f "$pack_ignore") - ignore_pack_tests=$(cd tests && ls $test/[0-9][0-9][0-9] | grep -F -f "$pack_ignore") - for ignored_test in $ignored_pack_tests - do - echo "ignored by lkp: $ignored_test" - done - else - all_tests=$(cd tests && ls $test/[0-9][0-9][0-9] | grep -v -F -f "$test_ignore") - fi + all_tests_cmd="cd tests && ls $test/[0-9][0-9][0-9]" + ignore_and_do_tests "$all_tests_cmd" "$test_ignore $pack_ignore" fi - - log_cmd ./check $all_tests } export LC_ALL=C From 46945bd00b86542a3161b7a9ad74e3352c33e70d Mon Sep 17 00:00:00 2001 From: Huang Ying Date: Mon, 24 Jul 2017 15:38:35 +0800 Subject: [PATCH 078/108] jobs/fio-basic-2pmem.yaml: Revise test_size To avoid the test instability (failed to fallocate) because the test_size near the disk size (200G vs. 208G). Signed-off-by: Huang Ying Signed-off-by: Philip Li --- jobs/fio-basic-2pmem.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/fio-basic-2pmem.yaml b/jobs/fio-basic-2pmem.yaml index e15c1f5d6..cb6325924 100644 --- a/jobs/fio-basic-2pmem.yaml +++ b/jobs/fio-basic-2pmem.yaml @@ -22,6 +22,6 @@ fio-setup-basic: rw: write bs: 4k ioengine: sync - test_size: 200G + test_size: 190G fio: From ea651a120a44b6c6de769431e69e74042d23b6d1 Mon Sep 17 00:00:00 2001 From: Bai Yu Date: Wed, 19 Jul 2017 16:26:36 +0800 Subject: [PATCH 079/108] add setup-oltp into jobs/oltp.yaml This patch may fix https://jira01.devtools.intel.com/browse/OLT-2744. Signed-off-by: Bai Yu Reviewed-by: "Huang, Ying" Signed-off-by: Philip Li --- jobs/oltp.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jobs/oltp.yaml b/jobs/oltp.yaml index 42d067a02..207589bde 100644 --- a/jobs/oltp.yaml +++ b/jobs/oltp.yaml @@ -5,5 +5,7 @@ category: benchmark runtime: 600s nr_threads: 100% +setup-oltp: + oltp: table_size: 1000000 From b76a145f625ff57847c8e959192355e6214ea216 Mon Sep 17 00:00:00 2001 From: Yixin Zhang Date: Mon, 24 Jul 2017 21:35:28 +0800 Subject: [PATCH 080/108] Bug Fix: remove trailing spaces for lib/bootstrap.sh Signed-off-by: Yixin Zhang Signed-off-by: Philip Li --- lib/bootstrap.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/bootstrap.sh b/lib/bootstrap.sh index dd1fc07f0..a759e9be9 100755 --- a/lib/bootstrap.sh +++ b/lib/bootstrap.sh @@ -276,10 +276,10 @@ install_deb() for keepfile in $(ls -rt /opt/deb/keep-deb*) do echo "handle $keepfile..." - # due to gwak pkg including pre-dependency definition, + # due to gwak pkg including pre-dependency definition, # gawk dependent libreadline7 install first. - # so we generated keep-deb file which contains installation sequence, - # and line by line installation. + # so we generated keep-deb file which contains installation sequence, + # and line by line installation. while read -r filename do echo "install debs round two: dpkg -i --force-depends /opt/deb/$filename" From 42aa083b470da5ae84f802c3ce3a6dc2a2062488 Mon Sep 17 00:00:00 2001 From: Yixin Zhang Date: Mon, 24 Jul 2017 21:38:21 +0800 Subject: [PATCH 081/108] Add lkp-kbly01 into kexec buggy host list Signed-off-by: Yixin Zhang Signed-off-by: Philip Li --- lib/bootstrap.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/bootstrap.sh b/lib/bootstrap.sh index a759e9be9..6b8f4b504 100755 --- a/lib/bootstrap.sh +++ b/lib/bootstrap.sh @@ -387,6 +387,7 @@ tbox_cant_kexec() [ "${HOSTNAME#*lkp-denverton2}" != "$HOSTNAME" ] && return 0 [ "${HOSTNAME#*lkp-ivb-d02}" != "$HOSTNAME" ] && return 0 [ "${HOSTNAME#*lkp-kbl-lenovo1}" != "$HOSTNAME" ] && return 0 + [ "${HOSTNAME#*lkp-kbly01}" != "$HOSTNAME" ] && return 0 [ "${HOSTNAME#*lkp-sklu-lenovo1}" != "$HOSTNAME" ] && return 0 [ "${HOSTNAME#*lkp-skl-d01}" != "$HOSTNAME" ] && return 0 From 506d652b0821919045699a51b86bfe4e5bb3618a Mon Sep 17 00:00:00 2001 From: Li Zhijian Date: Tue, 25 Jul 2017 14:52:04 +0800 Subject: [PATCH 082/108] allot/cyclic: move perf-sanity-tests job to lkp-hsw-ep4/5 the previous tbox can not run all sub cases properly Signed-off-by: Li Zhijian Signed-off-by: Philip Li --- allot/cyclic/{snb-black => lkp-hsw-ep4}/perf-sanity-tests.yaml | 0 allot/cyclic/{vm-lkp-a07 => lkp-hsw-ep5}/perf-sanity-tests.yaml | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename allot/cyclic/{snb-black => lkp-hsw-ep4}/perf-sanity-tests.yaml (100%) rename allot/cyclic/{vm-lkp-a07 => lkp-hsw-ep5}/perf-sanity-tests.yaml (100%) diff --git a/allot/cyclic/snb-black/perf-sanity-tests.yaml b/allot/cyclic/lkp-hsw-ep4/perf-sanity-tests.yaml similarity index 100% rename from allot/cyclic/snb-black/perf-sanity-tests.yaml rename to allot/cyclic/lkp-hsw-ep4/perf-sanity-tests.yaml diff --git a/allot/cyclic/vm-lkp-a07/perf-sanity-tests.yaml b/allot/cyclic/lkp-hsw-ep5/perf-sanity-tests.yaml similarity index 100% rename from allot/cyclic/vm-lkp-a07/perf-sanity-tests.yaml rename to allot/cyclic/lkp-hsw-ep5/perf-sanity-tests.yaml From 0126fbd8f96559b99483802a483d2c04be957076 Mon Sep 17 00:00:00 2001 From: Xiang Dai Date: Tue, 25 Jul 2017 17:37:17 +0800 Subject: [PATCH 083/108] lib/job.rb: re-read jobfile if jobfile is not empty Signed-off-by: Xiang Dai Signed-off-by: Philip Li --- lib/job.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/job.rb b/lib/job.rb index 51582a86f..cfef6efa1 100755 --- a/lib/job.rb +++ b/lib/job.rb @@ -195,6 +195,16 @@ def source_file_symkey(file) def load(jobfile, expand_template = false) yaml = File.read jobfile + # give a chance + if yaml.size.zero? && !File.size(jobfile).zero? + log_error "start reload #{jobfile}" + yaml = File.read jobfile + if yaml.size.zero? + log_error "reload #{jobfile} failed" + else + log_error "reload #{jobfile} succeed" + end + end raise ArgumentError.new("empty jobfile #{jobfile}") if yaml.size == 0 # keep comment lines as symbols From 73e0ff947c710f143c9a1fdfee2778c5a3be1af7 Mon Sep 17 00:00:00 2001 From: Li Zhijian Date: Tue, 25 Jul 2017 17:53:51 +0800 Subject: [PATCH 084/108] pack/ocfs2test: fixup do_mkfs more details please refer to the patch Signed-off-by: Li Zhijian Signed-off-by: Lu Fengqi Signed-off-by: Philip Li --- pack/ocfs2test | 1 + pack/ocfs2test02.patch | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 pack/ocfs2test02.patch diff --git a/pack/ocfs2test b/pack/ocfs2test index e6e8fe8f7..7a1865ba8 100755 --- a/pack/ocfs2test +++ b/pack/ocfs2test @@ -31,6 +31,7 @@ build() cd ../ocfs2-test patch_source + patch -p1 < $LKP_SRC/pack/ocfs2test02.patch || return ./autogen.sh prefix=/ || return # include libc6-dev_2.23's header diff --git a/pack/ocfs2test02.patch b/pack/ocfs2test02.patch new file mode 100644 index 000000000..3abef3a03 --- /dev/null +++ b/pack/ocfs2test02.patch @@ -0,0 +1,40 @@ +From 7cedc010df3e37c4995af7a3094e89921bdd5045 Mon Sep 17 00:00:00 2001 +From: Li Zhijian +Date: Tue, 25 Jul 2017 13:22:04 +0800 +Subject: [PATCH] programs/mkfs-tests/mkfs-test.sh: don't specify 4M journal + size at do_mkfs + +from mkfs.ocfs2 source code: +static unsigned int journal_min_size(uint32_t cluster_size) +{ + return (cluster_size << OCFS2_MIN_CLUSTER_TO_JOURNAL_SIZE_SHIFT) + + cluster_size; +} + +it requires the a min joural size, but at this test suite, we will test +cluster size (4096 ... 524288, 1048576), when we specify cluster size >= 524288 +mkfs.ocfs requires journal size greater than 4M. so here we remove the journal +size and let mkfs.ocfs calculate it. + +Signed-off-by: Li Zhijian +Signed-off-by: Lu Fengqi +--- + programs/mkfs-tests/mkfs-test.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/programs/mkfs-tests/mkfs-test.sh b/programs/mkfs-tests/mkfs-test.sh +index 313de1d..1dac68a 100755 +--- a/programs/mkfs-tests/mkfs-test.sh ++++ b/programs/mkfs-tests/mkfs-test.sh +@@ -108,7 +108,7 @@ do_mkfs() { + echo ${MKFS} -b ${B} -C ${C} ${D} ${V} >> ${LOGFILE} + echo -n "mkfs ..... " |tee -a ${LOGFILE} + echo ${MKFS} -b ${B} -C ${C} ${D} ${V} >> ${O} +- ${MKFS} -x -F -b ${B} -C ${C} -N 1 -J size=4M ${D} ${V} >> ${O} 2>&1 ++ ${MKFS} -x -F -b ${B} -C ${C} -N 1 ${D} ${V} >> ${O} 2>&1 + echo "OK" |tee -a ${LOGFILE} + echo "" >> ${O} + } +-- +2.7.4 + From b76bd600877f891d7a7d98441f2360bb91ef1d24 Mon Sep 17 00:00:00 2001 From: Li Zhijian Date: Tue, 25 Jul 2017 17:53:52 +0800 Subject: [PATCH 085/108] tests/ocfs2test: correct umount argument Signed-off-by: Li Zhijian Signed-off-by: Philip Li --- tests/ocfs2test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/ocfs2test b/tests/ocfs2test index da2910a32..cb5d4c6c0 100755 --- a/tests/ocfs2test +++ b/tests/ocfs2test @@ -67,7 +67,7 @@ setup_test_env() [[ -d /mnt/ocfs2 ]] || mkdir -p /mnt/ocfs2 - umount $partition 2>/dev/null + umount /mnt/ocfs2 2>/dev/null return 0 } From 53d002f76a6f66a178893552762f8bb4f447487b Mon Sep 17 00:00:00 2001 From: Li Zhijian Date: Tue, 25 Jul 2017 17:53:53 +0800 Subject: [PATCH 086/108] tests/ocfs2test: get partition real path the test suite will check $partition after do mount, but the mount only info the real partition root@lkp-hsw-ep2 /# mount /dev/disk/by-id/ata-INTEL_SSDSC2BA800G3_BTTV451305A2800JGN-part1 /mnt/ocfs2 root@lkp-hsw-ep2 /# mount | grep '/dev/disk/by-id/ata-INTEL_SSDSC2BA800G3_BTTV451305A2800JGN-part1' root@lkp-hsw-ep2 /# realpath /dev/disk/by-id/ata-INTEL_SSDSC2BA800G3_BTTV451305A2800JGN-part1 /dev/sdb1 root@lkp-hsw-ep2 /# mount | grep '/dev/sdb1' /dev/sdb1 on /mnt/ocfs2 type ocfs2 (rw,relatime,_netdev,heartbeat=local,nointr,data=ordered,errors=remount-ro,atime_quantum=60,coherency=full,user_xattr,acl) Signed-off-by: Li Zhijian Signed-off-by: Philip Li --- tests/ocfs2test | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/ocfs2test b/tests/ocfs2test index cb5d4c6c0..1d7237aba 100755 --- a/tests/ocfs2test +++ b/tests/ocfs2test @@ -63,6 +63,8 @@ setup_test_env() partition=${hdd_partitions%% *} fi + partition=$(realpath $partition) + chmod 755 $partition [[ -d /mnt/ocfs2 ]] || mkdir -p /mnt/ocfs2 From 808506702f0f02c588c2ef74b662d17115f317dd Mon Sep 17 00:00:00 2001 From: Xiang Dai Date: Tue, 25 Jul 2017 18:21:14 +0800 Subject: [PATCH 087/108] add distro/depends/libhugetlbfs-dev To support pip and use pip download python resource module. Signed-off-by: Xiang Dai Signed-off-by: Philip Li --- distro/depends/libhugetlbfs-dev | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 distro/depends/libhugetlbfs-dev diff --git a/distro/depends/libhugetlbfs-dev b/distro/depends/libhugetlbfs-dev new file mode 100644 index 000000000..b3abd5550 --- /dev/null +++ b/distro/depends/libhugetlbfs-dev @@ -0,0 +1,2 @@ +python-pip +python-setuptools From ec88c35f0077251dd8142bc3117561cb804e6490 Mon Sep 17 00:00:00 2001 From: Xiang Dai Date: Tue, 25 Jul 2017 18:21:15 +0800 Subject: [PATCH 088/108] pack/libhugetlbfs: download resource module To fix below issue: Traceback (most recent call last): File "./run_tests.py", line 8, in import resource ImportError: No module named resource make: *** [check] Error 1 Signed-off-by: Xiang Dai Signed-off-by: Philip Li --- pack/libhugetlbfs | 1 + 1 file changed, 1 insertion(+) diff --git a/pack/libhugetlbfs b/pack/libhugetlbfs index 25ecdc0ea..ee36b5c24 100644 --- a/pack/libhugetlbfs +++ b/pack/libhugetlbfs @@ -1,6 +1,7 @@ #!/bin/bash download() { + pip download resource git_clone_update https://github.com/libhugetlbfs/libhugetlbfs.git } From d4c1d6f55820e225fedf0840f6e6f59fc98e8deb Mon Sep 17 00:00:00 2001 From: Xiang Dai Date: Tue, 25 Jul 2017 18:21:16 +0800 Subject: [PATCH 089/108] distro/depends/libhugetlbfs: add pip depence To support use pip to install python resource module. Signed-off-by: Xiang Dai Signed-off-by: Philip Li --- distro/depends/libhugetlbfs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/distro/depends/libhugetlbfs b/distro/depends/libhugetlbfs index 99fc84e3d..6e1b8c932 100644 --- a/distro/depends/libhugetlbfs +++ b/distro/depends/libhugetlbfs @@ -1,3 +1,5 @@ make git gcc-multilib +python-pip +python-setuptools From f79acd4f45700c9527b99b35fae428778c02f061 Mon Sep 17 00:00:00 2001 From: Xiang Dai Date: Tue, 25 Jul 2017 18:21:17 +0800 Subject: [PATCH 090/108] tests/libhugetlbfs: install resource module To fix below issue: Traceback (most recent call last): File "./run_tests.py", line 8, in import resource ImportError: No module named resource make: *** [check] Error 1 Signed-off-by: Xiang Dai Signed-off-by: Philip Li --- tests/libhugetlbfs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/libhugetlbfs b/tests/libhugetlbfs index ed117058b..1ed80bdc5 100755 --- a/tests/libhugetlbfs +++ b/tests/libhugetlbfs @@ -6,6 +6,11 @@ cd $BENCHMARK_ROOT/libhugetlbfs || die "can not cd libhugetlbfs" +resource=$(ls resource-*.tar.gz) +[ -f $resource ] || die "can not find resource*.tar.gz file" + +pip install $resource + log_cmd make || die "make failed" [ -z $pagesize -o -z $pagenum ] && die "invalid parameter" From e95531e19e73f35c53c57434ca8d67bbe1a73260 Mon Sep 17 00:00:00 2001 From: Philip Li Date: Tue, 25 Jul 2017 21:29:50 +0800 Subject: [PATCH 091/108] jobs: update category to functional for packetdrill Signed-off-by: Philip Li --- jobs/packetdrill.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/packetdrill.yaml b/jobs/packetdrill.yaml index a37f3ddb5..35eb6c229 100644 --- a/jobs/packetdrill.yaml +++ b/jobs/packetdrill.yaml @@ -1,5 +1,5 @@ suite: packetdrill testcase: packetdrill -category: benchmark +category: functional packetdrill: From de8ef4f5a3d258ef0c2863455df17165a047741a Mon Sep 17 00:00:00 2001 From: Philip Li Date: Tue, 25 Jul 2017 21:30:30 +0800 Subject: [PATCH 092/108] jobs: update category to functional for ext4-frags Signed-off-by: Philip Li --- jobs/ext4-frags.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/ext4-frags.yaml b/jobs/ext4-frags.yaml index caa292b5f..4148f2bb7 100644 --- a/jobs/ext4-frags.yaml +++ b/jobs/ext4-frags.yaml @@ -1,6 +1,6 @@ suite: ext4-frags testcase: ext4-frags -category: benchmark +category: functional disk: - 1HDD From 0f2c67377874c2b7d9846d74853219a8b0501995 Mon Sep 17 00:00:00 2001 From: Fengguang Wu Date: Wed, 26 Jul 2017 09:30:18 +0800 Subject: [PATCH 093/108] repo: add fsgsbase tree CC: Bae Chang Seok Signed-off-by: Fengguang Wu Signed-off-by: Philip Li --- repo/linux/fsgsbase | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 repo/linux/fsgsbase diff --git a/repo/linux/fsgsbase b/repo/linux/fsgsbase new file mode 100644 index 000000000..a4a6ad15e --- /dev/null +++ b/repo/linux/fsgsbase @@ -0,0 +1,2 @@ +url: https://github.com/changbae/FSGSBASE +notify_build_success_branch: .* From 97055c7d194b669129896e977ed69c60170f7a0e Mon Sep 17 00:00:00 2001 From: Kemi Wang Date: Wed, 26 Jul 2017 10:47:09 +0800 Subject: [PATCH 094/108] lkp-exec/install: avoid repeated benchmark installation Bug fix:Benchmark package is installed repeately Current parse_yaml() used for jobfile parse in lkp-exec/install does not remove the redaundant line(s), that leads to repeated benchmark installation especially for these C-S mode benchmarks(e.g. netperf)/netserver). After parsing netperf.yaml, the result would be "netserver netperf netperf...", that leads to redaudant installation of netperf. Signed-off-by: Kemi Wang Reviewed-by: "Huang, Ying" Signed-off-by: Philip Li --- lkp-exec/install | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lkp-exec/install b/lkp-exec/install index c01bf47a3..9921f1d14 100755 --- a/lkp-exec/install +++ b/lkp-exec/install @@ -58,7 +58,8 @@ parse_yaml() { ls -LR $LKP_SRC/setup $LKP_SRC/monitors $LKP_SRC/tests $LKP_SRC/daemon > $tmp_filter scripts=$(cat $1 | sed -ne "s|^\($s\):|\1|" \ -e "s|^\($s\)\($w\)$s:$s[\"']\(.*\)[\"']$s\$|\2|p" \ - -e "s|^\($s\)\($w\)$s:$s\(.*\)$s\$|\2|p" | grep -x -F -f $tmp_filter | grep -v -e ':$' -e '^$') + -e "s|^\($s\)\($w\)$s:$s\(.*\)$s\$|\2|p" | grep -x -F -f \ + $tmp_filter | grep -v -e ':$' -e '^$' | sort -u) rm "$tmp_filter" } From e59173839bfd59b84b77c7fbbbbe26df54a605d5 Mon Sep 17 00:00:00 2001 From: Wu Chenggang Date: Wed, 26 Jul 2017 13:08:12 +0800 Subject: [PATCH 095/108] tools/test_install: Add a test script to test installing Signed-off-by: Wu Chenggang Reviewed-by: "Huang, Ying" Signed-off-by: Philip Li --- tools/test_install.sh | 71 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100755 tools/test_install.sh diff --git a/tools/test_install.sh b/tools/test_install.sh new file mode 100755 index 000000000..c4ceac8b7 --- /dev/null +++ b/tools/test_install.sh @@ -0,0 +1,71 @@ +#!/bin/sh + +[ -n "$LKP_SRC" ] || LKP_SRC=$(dirname $(dirname $(readlink -e -v $0))) + +msg() { + message=$1 + path=$2 + echo "$message" + echo "$message" >> "$path" +} + +log_path="./test_install_log" + +[ $# != 0 ] && { + option="$1" + if [ "$option" = '-o' ]; then + log_path="$2" + fi +} + +error_path="$log_path/errors" +install_log="$log_path/install_log" + +result_log="$log_path/result.log" +_wrong_pkg="$log_path/_wrong_pkg.log" +wrong_pkg="$log_path/wrong_pkg.log" + +rm -rf "$install_log" +rm -rf "$error_path" +rm -rf "$_wrong_pkg" +mkdir -p "$error_path" +mkdir -p "$install_log" + +i=1 +job_files=$(find "$LKP_SRC/jobs/" -type f -name "*.yaml") +job_number=$(echo "$job_files"|wc -w) +for job in $job_files +do + is_failed= + msg "$i/$job_number" "$result_log" + msg "$job" "$result_log" + i=$((i+1)) + msg "installing packages..." "$result_log" + + job_name=$(basename "$job") + job_log_file="$install_log/${job_name%%.*}.log" + + lkp install "$job" > "$job_log_file" 2>&1 + + err=$(grep -E "(No package)|(locate package)" "$job_log_file") + [ ! -z "$err" ] && { + echo "$err" >> "$_wrong_pkg" + msg "leak some packages" "$result_log" + is_failed=1 + } + + err=$(grep -E -w -n -r "error|E:|fatal|wrong|fail|failed" "$job_log_file") + [ ! -z "$err" ] && { + echo "$err" > "$error_path/${job_name%%.*}.log" + is_failed=1 + } + + if [ "$is_failed" != 1 ]; then + msg "successed installing" "$result_log" + else + msg 'failed installing' "$result_log" + fi + msg '' "$result_log" +done + +sort -k2n "$_wrong_pkg" 2> /dev/null | uniq > "$wrong_pkg" && rm "$_wrong_pkg" 2> /dev/null From 3cb755238e9ae0b8b8bad22dacfffc98fbec97eb Mon Sep 17 00:00:00 2001 From: Wu Chenggang Date: Wed, 26 Jul 2017 16:09:27 +0800 Subject: [PATCH 096/108] sbin/pacma-LKP: fix wrong pack directory bug fix: fail to install job linpack This problem is caused by the post install file were not packed The post install target directory were not changed after the install directory name is changed. Signed-off-by: Wu Chenggang Acked-by: "Huang, Ying" Signed-off-by: Philip Li --- sbin/pacman-LKP | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/pacman-LKP b/sbin/pacman-LKP index 79800bf5b..153101785 100755 --- a/sbin/pacman-LKP +++ b/sbin/pacman-LKP @@ -27,7 +27,7 @@ query() { pack_deb() { local pkg_name=$1 mkdir -p "$INSTALL_DIR/DEBIAN" - [ -f "$SRC_DIR/.install/.INSTALL" ] && mv "$SRC_DIR/.install/.INSTALL" "$SRC_DIR/install/DEBIAN/INSTALL" + [ -f "$SRC_DIR/.install/.INSTALL" ] && mv "$SRC_DIR/.install/.INSTALL" "$INSTALL_DIR/DEBIAN/INSTALL" cat > "$INSTALL_DIR/DEBIAN/control" <<-EOF Package: $pkg_name-LKP Version: $(date +%F) From 8551f980bf301ff012ced083627ae106eb823eb8 Mon Sep 17 00:00:00 2001 From: Chen Rong Date: Wed, 26 Jul 2017 17:08:54 +0800 Subject: [PATCH 097/108] distro/depends/hwsim: add crda wireless-regdb fix the following issue: ----------------- autogo_ht_vht run failed: No regdom change event seen hwsim.autogo_ht_vht fail -> pass dfs_radar_chanlist: Skip test case: Assume DFS testing not supported hwsim.dfs_radar_chanlist fail -> pass p2p_go_move_reg_change run failed: P2P_GROUP_ADD failed hwsim.p2p_go_move_reg_change fail -> pass wpas_ap_dfs run failed: CAC did not complete hwsim.wpas_ap_dfs fail -> pass ap_ht_op_class_115 skipped: Channel not supported hwsim.ap_ht_op_class_115 fail -> pass ap_open_tdls_vht run failed: AP startup failed hwsim.ap_open_tdls_vht fail -> pass ----------------- Signed-off-by: Chen Rong Signed-off-by: Philip Li --- distro/depends/hwsim | 2 ++ 1 file changed, 2 insertions(+) diff --git a/distro/depends/hwsim b/distro/depends/hwsim index ed179c55c..72cc0b4d9 100644 --- a/distro/depends/hwsim +++ b/distro/depends/hwsim @@ -19,3 +19,5 @@ python-openssl python-gobject python-dbus wpasupplicant +crda +wireless-regdb From 3c794a3fcae74a200098a367c4f04674d2a66cf3 Mon Sep 17 00:00:00 2001 From: Chen Rong Date: Wed, 26 Jul 2017 17:08:55 +0800 Subject: [PATCH 098/108] pack/hwsim: ignore rrm_link_measurement testcase Driver(mac80211_hwsim) doesn't implemented this in the code Signed-off-by: Chen Rong Signed-off-by: Philip Li --- pack/hwsim | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pack/hwsim b/pack/hwsim index 8601fa248..23d8621a8 100755 --- a/pack/hwsim +++ b/pack/hwsim @@ -81,6 +81,9 @@ build_ignored_by_lkp() echo "# ignore _autogo_join_auto_go_neg_after_seeing_go_" >> $ignored_by_lkp echo "autogo_join_auto_go_neg_after_seeing_go" >> $ignored_by_lkp + + echo "# ignore _rrm_link_measurement_" >> $ignored_by_lkp + echo "rrm_link_measurement" >> $ignored_by_lkp } install() From 93ada1e480593bc7d322af980675f8ca2570ca05 Mon Sep 17 00:00:00 2001 From: Hailin Gu Date: Thu, 27 Jul 2017 13:39:39 +0800 Subject: [PATCH 099/108] include/piglit: add need_kconfig for piglit Some testcase need the vgem module in piglit. Origin log shows below, it could be pass with this module ``` /lkp/benchmarks/piglit/lib/piglit/bin/igt/tests/gem_ringfill --run-subtest basic-default IGT-Version: 1.19-g4258cc8e (x86_64) (Linux: 4.12.0-rc1-00405-gf3926e4 x86_64) Test requirement not met in function drm_open_driver, file drmtest.c:359: Test requirement: !(fd<0) No known gpu found Last errno: 2, No such file or directory Subtest basic-default: SKIP ``` Signed-off-by: Hailin Gu Signed-off-by: Philip Li --- include/piglit | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 include/piglit diff --git a/include/piglit b/include/piglit new file mode 100644 index 000000000..88b2afeb0 --- /dev/null +++ b/include/piglit @@ -0,0 +1,2 @@ +need_kconfig: +- CONFIG_DRM_VGEM=m From f37a4d4051293c98d321cc5498950c60219cf2f4 Mon Sep 17 00:00:00 2001 From: Chen Rong Date: Thu, 27 Jul 2017 14:52:09 +0800 Subject: [PATCH 100/108] test/hwsim: add test with multi-channels fix the following issue: ----------------- p2ps_channel_active_go_and_station_different_mcc: Skip test case: Skip due to MCC not being enabled hwsim.p2ps_channel_active_go_and_station_different_mcc skip -> pass ----------------- Signed-off-by: Chen Rong Signed-off-by: Philip Li --- pack/hwsim | 7 +++++++ tests/hwsim | 33 +++++++++++++++++++++++++++++---- 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/pack/hwsim b/pack/hwsim index 23d8621a8..af057ba15 100755 --- a/pack/hwsim +++ b/pack/hwsim @@ -50,6 +50,12 @@ build_hwsim_param_long() git grep -B 2 -w 'if not params\['\'long\'] | grep '.*\.py\-def' | awk -F 'def ' '{print $2}' | awk -F'(' '{print $1}' | sed s/test_//g > require_long_param } +build_hwsim_require_mcc() +{ + cd $source_dir/tests/hwsim + git grep -E -e 'def test.*mcc' | awk -F 'test_' '{print $3}'| awk -F '(' '{print $1}' > require_mcc +} + build_ignored_by_lkp() { local ignored_by_lkp="ignored_by_lkp" @@ -89,6 +95,7 @@ build_ignored_by_lkp() install() { build_hwsim_param_long + build_hwsim_require_mcc build_ignored_by_lkp || return diff --git a/tests/hwsim b/tests/hwsim index 2bc36924f..3cd3bc88c 100755 --- a/tests/hwsim +++ b/tests/hwsim @@ -23,7 +23,14 @@ EOF" [ $USER ] || log_eval export USER=root -log_cmd ./start.sh || die "fail to setup test environment" +require_mcc=$BENCHMARK_ROOT/hwsim/tests/hwsim/require_mcc + +add_extra_options() +{ + opt= + [ -f $BENCHMARK_ROOT/hwsim/tests/hwsim/require_long_param ] && + grep -q -w $casename $BENCHMARK_ROOT/hwsim/tests/hwsim/require_long_param && opt="--long" +} check_ignore_case() { @@ -42,15 +49,33 @@ check_ignore_case() return 1 } +log_cmd ./start.sh || die "fail to setup test environment" + while read casename do check_ignore_case $casename && echo "ignored_by_lkp $casename" && continue - [ -f $BENCHMARK_ROOT/hwsim/tests/hwsim/require_long_param ] && - grep -q -w $casename $BENCHMARK_ROOT/hwsim/tests/hwsim/require_long_param && opt="--long" + [ -f $require_mcc ] && + grep -q -w $casename $require_mcc && continue + + add_extra_options log_echo "\ ./run-tests.py $casename $opt" ./run-tests.py $casename $opt 2>&1 - opt= done < $group_file log_cmd ./stop.sh + +# test with multi-channels +[ -f $require_mcc ] || exit 0 +log_cmd ./start.sh channels=4 || die "fail to setup mcc test environment" + +grep -wf $group_file $require_mcc | while read casename +do + check_ignore_case $casename && continue + + add_extra_options + log_echo "\ + ./run-tests.py $casename $opt" + ./run-tests.py $casename $opt 2>&1 +done +log_cmd ./stop.sh From ed74783c1814557cd889f9ba349e86cdda8168c3 Mon Sep 17 00:00:00 2001 From: Li Zhijian Date: Thu, 27 Jul 2017 17:01:10 +0800 Subject: [PATCH 101/108] tests/pack-deps: use apt-get install -f to fix previous potential broken installation after remove libreadline7 from keep-deb and update lkp.cgz, gawk will be installed at bootstrap stage with 'dpkg -i gawk_xx.deb --force-depends' proprely but it will break the following apt-get install xxx for pack-deps: it will 'apt-get --simulate --no-install-recommends install $packages' to find all related packages, if there are a previous broken installation, it will throw out like: --------------------- ==> /tmp/stderr <== E: Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a solution). E: Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a solution). ==> /tmp/stdout <== original package list for apachebench: apache2 libapache2-mpm-itk libssl1.1 empty PACKAGE_LIST for apachebench --------------------- Signed-off-by: Li Zhijian Signed-off-by: Philip Li --- tests/pack-deps | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/pack-deps b/tests/pack-deps index dcf61e26f..07f6952cb 100755 --- a/tests/pack-deps +++ b/tests/pack-deps @@ -27,6 +27,8 @@ check_shared_package "$benchmark" && exit update +apt-get install -yf + [[ "$benchmark" = "all" ]] && benchmark="$(ls $LKP_SRC/distro/depends | grep -v -e '-dev' -e '-whitelist')" for BM_NAME in $benchmark From 898300d4db1f8a7876b1d9eb43f93e4eeb888b5e Mon Sep 17 00:00:00 2001 From: Chen Rong Date: Thu, 27 Jul 2017 17:49:33 +0800 Subject: [PATCH 102/108] hwsim: build and test hostap in the same environment move build.sh to tests/hwsim, add several depends(gcc, make, zlib1g-dev) fix the following issue: ----------------- cd hostap/tests/hwsim $git grep -n --show-function -E -e 'during OOM' .. | grep "def test_" | grep -v "oom" | awk -F 'test_' '{print $3}'| awk -F '(' '{print $1}' ap_config_eap_user_file_parsing ap_hs20_deauth_req_without_pmf ap_qosmap_invalid ap_vlan_file_parsing ap_wps_upnp_subscribe ap_wps_pin_start_failure gas_failures hapd_ctrl_new_sta hapd_dup_network_global_wpa2 hapd_ctrl_ext_io_errors hapd_ctrl_vendor_errors mbo_failures nfc_wps_password_token_sta nfc_wps_config_token nfc_wps_handover_errors wnm_bss_tm_errors $git grep -n --show-function -E -e 'with fail_test' .. | grep "def test_" | grep -v "oom" | awk -F 'test_' '{print $3}'| awk -F '(' '{print $1}' ap_acs_errors eap_mschapv2_errors eap_gpsk_errors ap_ft_reassoc_local_fail ap_bss_load_fail ap_open_drv_fail ap_pmf_sta_sa_query_local_failure ap_wpa2_psk_no_random ... ----------------- Signed-off-by: Chen Rong Signed-off-by: Philip Li --- distro/depends/hwsim | 3 +++ pack/hwsim | 2 -- tests/hwsim | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/distro/depends/hwsim b/distro/depends/hwsim index 72cc0b4d9..34e43d2af 100644 --- a/distro/depends/hwsim +++ b/distro/depends/hwsim @@ -1,4 +1,7 @@ sudo +gcc +make +zlib1g-dev iw bridge-utils libnl-route-3-dev diff --git a/pack/hwsim b/pack/hwsim index af057ba15..5ef3cd879 100755 --- a/pack/hwsim +++ b/pack/hwsim @@ -34,8 +34,6 @@ build() else echo "Warning: $hostapd_config not exist, failed to set CONFIG_SUITEB192=y" fi - - $RUN_QUIET ./tests/hwsim/build.sh } build_hwsim_param_long() diff --git a/tests/hwsim b/tests/hwsim index 3cd3bc88c..413a2db64 100755 --- a/tests/hwsim +++ b/tests/hwsim @@ -49,6 +49,8 @@ check_ignore_case() return 1 } +log_cmd ./build.sh || die "fail to build test environment" + log_cmd ./start.sh || die "fail to setup test environment" while read casename From 636807f017571171e418f61a8c7c9de8b533e9d5 Mon Sep 17 00:00:00 2001 From: Li Zhijian Date: Fri, 28 Jul 2017 10:05:49 +0800 Subject: [PATCH 103/108] distro/keep-deb: only keep debs if deb has postinst/postrm/preinst/prerm root@debian9:/# ls /var/lib/dpkg/info/{libblas3*,automake*,liblapack3*,libgdbm3*,libperl*,perl-modules*,perl*,m4*,libquadmath0*,gcc-6-base*,libgfortran3*,libblas-common*,autoconf*,autotools-dev*,libssl1.1*,openssl*,ca-certificates*,libreadline7*,gawk*,netcat-openbsd*,mime-support*,libapr*,libsqlite3*,liblua*,libicu57*,libxml2*,apache2*,dbus*} | grep -e inst -e pre /var/lib/dpkg/info/apache2.postinst /var/lib/dpkg/info/apache2.preinst /var/lib/dpkg/info/apache2.prerm /var/lib/dpkg/info/automake.postinst /var/lib/dpkg/info/automake.preinst /var/lib/dpkg/info/automake.prerm /var/lib/dpkg/info/ca-certificates.postinst /var/lib/dpkg/info/dbus.postinst /var/lib/dpkg/info/dbus.preinst /var/lib/dpkg/info/dbus.prerm /var/lib/dpkg/info/gawk.postinst /var/lib/dpkg/info/gawk.prerm /var/lib/dpkg/info/libblas3.postinst /var/lib/dpkg/info/libblas3.prerm /var/lib/dpkg/info/liblapack3.postinst /var/lib/dpkg/info/liblapack3.prerm /var/lib/dpkg/info/libssl1.1:amd64.postinst /var/lib/dpkg/info/mime-support.postinst /var/lib/dpkg/info/mime-support.prerm /var/lib/dpkg/info/netcat-openbsd.postinst /var/lib/dpkg/info/netcat-openbsd.prerm /var/lib/dpkg/info/openssl.postinst /var/lib/dpkg/info/perl.postinst /var/lib/dpkg/info/perl.prerm Signed-off-by: Li Zhijian Signed-off-by: Philip Li --- distro/keep-deb | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/distro/keep-deb b/distro/keep-deb index 2a8ff52ea..d3e1129b8 100644 --- a/distro/keep-deb +++ b/distro/keep-deb @@ -1,28 +1,12 @@ -libgdbm3 -libperl -perl-modules perl -m4 -autoconf -autotools-dev automake libblas3 -libgfortran3 -libquadmath0 -libblas-common -gcc-6-base liblapack3 libssl1.1 openssl ca-certificates -libreadline7 gawk netcat-openbsd mime-support -libapr -libsqlite3 -liblua -libicu57 -libxml2 apache2 dbus From c6ff2f57cfa90b5d3fe87669cbbd0ece54ef2f7f Mon Sep 17 00:00:00 2001 From: Li Zhijian Date: Fri, 28 Jul 2017 10:05:50 +0800 Subject: [PATCH 104/108] distro/depends/lkp: add perl Previously, perf will be installed into lkp.cgz before May though we don't change distro/depends/lkp, for be compatible with previous and reduce the impact to other test suites, here we add it back obviously. below packages will be add to lkp.cgz root@vm-lkp-nex04-4G-17 /opt/deb# apt-get --simulate --no-install-recommends install perl | awk '/^Inst / { print $2 }' debconf libtext-charwidth-perl libtext-iconv-perl perl-base liblocale-gettext-perl perl-modules-5.26 libgdbm3 libperl5.26 perl Signed-off-by: Li Zhijian Signed-off-by: Philip Li --- distro/depends/lkp | 1 + 1 file changed, 1 insertion(+) diff --git a/distro/depends/lkp b/distro/depends/lkp index 5a3b89864..f02e333cd 100644 --- a/distro/depends/lkp +++ b/distro/depends/lkp @@ -9,3 +9,4 @@ bzip2 bsdtar fakeroot sysstat +perl From b4bb28a90aab38594bfda2de41f16f22493c2216 Mon Sep 17 00:00:00 2001 From: Li Zhijian Date: Fri, 28 Jul 2017 10:05:51 +0800 Subject: [PATCH 105/108] distro/keep-deb: put debconf to keep-deb debconf has postinst and lkp.cgz will install the package ------------- dpkg: regarding .../perl-base_5.26.0-4_amd64.deb containing perl-base: perl-base breaks debconf (<< 1.5.61) debconf (version 1.5.59) is present and installed. ------------- Signed-off-by: Li Zhijian Signed-off-by: Philip Li --- distro/keep-deb | 1 + 1 file changed, 1 insertion(+) diff --git a/distro/keep-deb b/distro/keep-deb index d3e1129b8..16040cea2 100644 --- a/distro/keep-deb +++ b/distro/keep-deb @@ -10,3 +10,4 @@ netcat-openbsd mime-support apache2 dbus +debconf From 1ca5fec043dd57bf0e8ef32629eb34861023de84 Mon Sep 17 00:00:00 2001 From: Hailin Gu Date: Fri, 28 Jul 2017 13:22:50 +0800 Subject: [PATCH 106/108] pack/piglit-addon: rename the file which store the ignored test case rename pack/piglit-addon/groups/broken -> pack/piglit-addon/groups/ignored_by_lkp Signed-off-by: Hailin Gu Signed-off-by: Philip Li --- pack/piglit-addon/groups/{broken => ignored_by_lkp} | 2 +- tests/piglit.xinitrc | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) rename pack/piglit-addon/groups/{broken => ignored_by_lkp} (98%) diff --git a/pack/piglit-addon/groups/broken b/pack/piglit-addon/groups/ignored_by_lkp similarity index 98% rename from pack/piglit-addon/groups/broken rename to pack/piglit-addon/groups/ignored_by_lkp index 85b460b60..b5544ddef 100644 --- a/pack/piglit-addon/groups/broken +++ b/pack/piglit-addon/groups/ignored_by_lkp @@ -1,4 +1,4 @@ -# broken basic testcase +# testcase ignored by lkp igt/drv_module_reload_basic igt/gem_exec_suspend/basic-s3 igt/gem_exec_suspend/basic-s4 diff --git a/tests/piglit.xinitrc b/tests/piglit.xinitrc index 93a5e9d37..d3d35a3bf 100755 --- a/tests/piglit.xinitrc +++ b/tests/piglit.xinitrc @@ -22,10 +22,10 @@ fi tmp_results="$TMP/piglit-results" -if [ -s "$LKP_SRC/pack/piglit-addon/groups/broken" ]; then - testcases=$(grep -F -x -f $BENCHMARK_ROOT/piglit/groups/$tset-all $config_file | grep -F -x -v -f $LKP_SRC/pack/piglit-addon/groups/broken) +if [ -s "$LKP_SRC/pack/piglit-addon/groups/ignored_by_lkp" ]; then + testcases=$(grep -F -x -f $BENCHMARK_ROOT/piglit/groups/$tset-all $config_file | grep -F -x -v -f $LKP_SRC/pack/piglit-addon/groups/ignored_by_lkp) - ignored_cases=$(grep -F -x -f $BENCHMARK_ROOT/piglit/groups/$tset-all $config_file | grep -F -x -f $LKP_SRC/pack/piglit-addon/groups/broken) + ignored_cases=$(grep -F -x -f $BENCHMARK_ROOT/piglit/groups/$tset-all $config_file | grep -F -x -f $LKP_SRC/pack/piglit-addon/groups/ignored_by_lkp) for ignored_case in $ignored_cases do echo "$ignored_case: ignored_by_lkp" From 6e2a578e07b4f17fd7a6a987b8db2742efd08aa3 Mon Sep 17 00:00:00 2001 From: Chen Rong Date: Fri, 28 Jul 2017 14:49:59 +0800 Subject: [PATCH 107/108] hwsim: enable most oom cases and some other cases build + test hostap together can fix the following issues: 1. Most oom cases can be pass except eap_fast_tlv_nak_oom and fils_sk_hlp_oom, hostap always skip the two cases so far by itself (http://buildbot.w1.fi/hwsim/tests.php) 2. All cases with prefix 'ap_vht160_no_dfs' can be pass 3. Case rrm_beacon_req_table_vht can be pass Signed-off-by: Chen Rong Signed-off-by: Philip Li --- pack/hwsim | 6 ++---- pack/hwsim-addon/oom_is_passed | 4 ---- tests/hwsim | 6 ------ 3 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 pack/hwsim-addon/oom_is_passed diff --git a/pack/hwsim b/pack/hwsim index 5ef3cd879..7482e6a61 100755 --- a/pack/hwsim +++ b/pack/hwsim @@ -72,14 +72,12 @@ build_ignored_by_lkp() git grep -B 2 -w 'require_under_vm' | grep '\-def ' | grep -v _test | awk -F' test_' '{print $2}' | awk -F'(' '{print $1}' >> $ignored_by_lkp echo "# ignore _setup_oom_" >> $ignored_by_lkp - git grep -E -e 'def test.*oom' -e 'def test.*out_of_memory' | awk -F 'test_' '{print $3}'| awk -F '(' '{print $1}' >> $ignored_by_lkp + echo "eap_fast_tlv_nak_oom" >> $ignored_by_lkp + echo "fils_sk_hlp_oom" >> $ignored_by_lkp echo "# ignore _lifetime_in_memory_" >> $ignored_by_lkp git grep -E -e 'def test.*lifetime_in_memory' | awk -F 'test_' '{print $3}'| awk -F '(' '{print $1}' >> $ignored_by_lkp - echo "# ignore _ap_vht160_no_dfs_" >> $ignored_by_lkp - git grep -E -e 'def test.ap_vht160_no_dfs' .. | awk -F 'test_' '{print $3}'| awk -F '(' '{print $1}' >> $ignored_by_lkp - echo "# ignore _tdls_chan_switch_" >> $ignored_by_lkp echo "tdls_chan_switch" >> $ignored_by_lkp diff --git a/pack/hwsim-addon/oom_is_passed b/pack/hwsim-addon/oom_is_passed deleted file mode 100644 index 75411500b..000000000 --- a/pack/hwsim-addon/oom_is_passed +++ /dev/null @@ -1,4 +0,0 @@ -hostapd_oom_open -hostapd_oom_wpa2_eap -hostapd_oom_wpa2_eap_radius -hostapd_oom_wpa2_psk_connect diff --git a/tests/hwsim b/tests/hwsim index 413a2db64..6e1b2427b 100755 --- a/tests/hwsim +++ b/tests/hwsim @@ -37,12 +37,6 @@ check_ignore_case() local casename=$1 local ignored_by_lkp=$BENCHMARK_ROOT/hwsim/tests/hwsim/ignored_by_lkp - [ -f $LKP_SRC/pack/hwsim-addon/oom_is_passed ] && - grep -q -w $casename $LKP_SRC/pack/hwsim-addon/oom_is_passed && return 1 - - # skip rrm_beacon_req_table_vht at 0Day environment - [ "$LKP_LOCAL_RUN" != "1" ] && [ "$casename" = "rrm_beacon_req_table_vht" ] && return 0 - # skip cases that in ignored_by_lkp [ -f "$ignored_by_lkp" ] && grep -q -w $casename "$ignored_by_lkp" && return 0 From f9320053ad694659d53d20b1fd9a183c6fab49bf Mon Sep 17 00:00:00 2001 From: Andrey Andreyev Date: Fri, 28 Jul 2017 17:17:34 +0300 Subject: [PATCH 108/108] Add initial Oracle Linux support --- distro/adaptation/oracle | 138 +++++++++++++++++++++++++++++++++++++++ distro/installer/oracle | 6 ++ lib/detect-system.sh | 7 +- lib/install.sh | 1 + 4 files changed, 151 insertions(+), 1 deletion(-) create mode 100644 distro/adaptation/oracle create mode 100755 distro/installer/oracle diff --git a/distro/adaptation/oracle b/distro/adaptation/oracle new file mode 100644 index 000000000..a4246ef2f --- /dev/null +++ b/distro/adaptation/oracle @@ -0,0 +1,138 @@ +apache2: httpd +apt-file: +autotools-dev: autoconf +binutils-dev: binutils-devel +btrfs-tools: btrfs-progs +build-essential: make automake gcc gcc-c++ kernel-uek-devel rpm-build +cgroup-bin: libcgroup +dbench=4.0-2: dbench +dpkg-dev: dpkg-devel +f2fs-tools: +freeglut3: freeglut +fsmark: fs_mark +gcc-4.9: gcc +gcc-5: gcc +gcc-6: gcc +gfortran: gcc-c++ +hpcc: +initramfs-tools: dracut +iozone3: gnuplot* +iproute2: iproute +klibc-utils: +libacl1-dev: libacl-devel +libaio1: libaio libaio-devel +libaio-dev: libaio-devel +libarchive-dev: libarchive-devel +libattr1-dev: libattr-devel +libaudit-dev: audit-libs-devel +libblas3: liblas-libs +libblkid-dev: libblkid-devel +libc6-dev: glibc-devel glibc-static +libc6-dev:i386: glibc-devel.i686 glibc-static.i686 +libcairo2-dev: cairo-devel +libcap2: libcap +libcap-dev: libcap-devel +libcap-ng-dev: libcap-ng-devel +libdbd-mysql-perl: perl-DBD-MySQL +libdbi-perl: perl-DBI +libdbus-1-dev: dbus-devel +libdrm-dev: libdrm-devel +libdw-dev: libdwarf-devel +libegl1-mesa-dev: mesa-libEGL-devel +libelf-dev: elfutils-libelf-devel +libfabric-dev: libfabric-devel +libfdt-dev: +libfuse-dev: fuse-devel +libgbm-dev: mesa-libgbm-devel +libgl1-mesa-dev: mesa-libglapi +libgles2-mesa: mesa-libGLES +libglib2.0-0: glib +libglib2.0-dev: glib2-devel +libglu-dev: mesa-libGLU-devel +libgomp1: libgomp +libhwloc-dev: hwloc-devel +libiberty-dev: +libibverbs-dev: libibverbs-devel +libjson-c-dev: json-c-devel +libklibc-dev: +libkmod2: kmod-libs +libkmod-dev: kmod-devel +liblz-dev: +liblzma-dev: xz-devel +libmount-dev: libmount-devel +libncurses5-dev: ncurses-devel +libnl-3-200: libnl3 +libnl-3-dev: libnl3-devel +libnl-genl-3-200: libnl3 +libnl-genl-3-dev: libnl3-devel +libnl-route-3-dev: libnl3-devel +libnuma1: numactl +libnuma-dev: numactl-devel +liboop-dev: +liboop-dev: liboop +libpcap0.8-dev: libpcap-devel +libpcap0.8: libpcap +libpcap-dev: libpcap-devel +libpciaccess-dev: libpciaccess-devel +libperl5.20: perl-libs +libperl5.22: perl-libs +libpixman-1-dev: pixman-devel +libpng12-dev: libpng12-devel +libpopt0: popt +libpopt-dev: popt-devel +librdmacm-dev: librdmacm-devel +libreadline5: readline +libsctp-dev: lksctp-tools-devel +libselinux1: +libsqlite3-dev: sqlite-devel +libssl1.0.0: openssl-devel +libssl1.1: openssl-devel +libssl-dev: openssl-devel +libtool-bin: libtool +libudev1: systemd-libs +libudev-dev: systemd-devel +libunwind-dev: libunwind-devel +libuuid1: libuuid +libuv1-dev: libuv-devel +libx11-xcb-dev: libX11-devel +linux-libc-dev: +linux-libc-dev:i386: +linux-perf: perf +linux-tools: perf +mysql-server: mariadb +ncurses-bin: ncurses +netpipe-lam: +netpipe-mpich2: +netpipe-openmpi: +netpipe-pvm: +netpipe-tcp: +nfs-common: nfs-utils +nfs-kernel-server: nfs-utils +perl-base: +perl-modules-5.22: perl-CPAN +perl-modules: perl-CPAN +pixz: pxz +pkg-config: pkgconfig +plzip: +postmark: +python3-mako: python-pyramid-mako +python3-markupsafe: python34-markupsafe +python3-numpy: python34-numpy +python3-six: python34-six +python-minimal: python2 +python-numpy: numpy +rt-tests: numactl-devel +ruby-dev: ruby-devel +ruby-git: +ruby-gnuplot: +sg3-utils: sg3_utils +stress-ng: +trinity: +tshark: wireshark +uuid-dev: libuuid-devel +xfslibs-dev: xfsprogs-devel +xinit: xorg-x11-xinit +xorg: +xutils-dev: imake +xz-utils: xz +zlib1g-dev: zlib-devel diff --git a/distro/installer/oracle b/distro/installer/oracle new file mode 100755 index 000000000..b09abc945 --- /dev/null +++ b/distro/installer/oracle @@ -0,0 +1,6 @@ +if ! rpm -q epel-release >/dev/null; then + yum install -y epel-release + yum makecache fast +fi + +yum install -y $* diff --git a/lib/detect-system.sh b/lib/detect-system.sh index 0a16fa696..ba703c054 100755 --- a/lib/detect-system.sh +++ b/lib/detect-system.sh @@ -167,7 +167,7 @@ detect_system() _system_name="Fedora" _system_version="$(GREP_OPTIONS="" \command \grep -Eo '[0-9]+' ${rootfs}/etc/fedora-release | head -n 1)" elif - [ -f ${rootfs}/etc/redhat-release ] + [ -f ${rootfs}/etc/redhat-release ] && [ ! -f ${rootfs}/etc/oracle-release ] then _system_name="$( GREP_OPTIONS="" \command \grep -Eo 'CentOS|ClearOS|Mageia|PCLinuxOS|Scientific|ROSA Desktop|OpenMandriva' ${rootfs}/etc/redhat-release 2>/dev/null | \command \head -n 1 | \command \sed "s/ //" @@ -179,6 +179,11 @@ detect_system() then _system_name="CentOS" _system_version="$(GREP_OPTIONS="" \command \grep -Eo '[0-9\.]+' ${rootfs}/etc/centos-release | \command \awk -F. '{print $1}' | head -n 1)" + elif + [ -f ${rootfs}/etc/oracle-release ] + then + _system_name="Oracle" + _system_version="$(GREP_OPTIONS="" \command \grep -Eo '[0-9\.]+' ${rootfs}/etc/oracle-release | \command \awk -F. '{print $1}' | head -n 1)" elif [ -f ${rootfs}/etc/os-release ] && GREP_OPTIONS="" \command \grep "ID=\"eywa\"" ${rootfs}/etc/os-release >/dev/null diff --git a/lib/install.sh b/lib/install.sh index 7b44dba6a..0b938512a 100755 --- a/lib/install.sh +++ b/lib/install.sh @@ -19,6 +19,7 @@ sync_distro_sources() archlinux) yaourt -Sy ;; opensuse) zypper update ;; + oracle) yum update ;; *) echo "Not support $distro to do update" ;; esac }