diff --git a/lib/tests/nvml.sh b/lib/tests/nvml.sh index 3244dcbcd..d39870afb 100644 --- a/lib/tests/nvml.sh +++ b/lib/tests/nvml.sh @@ -104,6 +104,9 @@ run() } } + # export this env variable to enable obj_tx_a* tests + [[ $testcase =~ obj_tx_a ]] && export MALLOC_MMAP_THRESHOLD_=0 + if [ "$LKP_LOCAL_RUN" != "1" ] && [[ -s "$user_filter" ]] && grep -w -q "$testcase" "$user_filter"; then log_cmd chown lkp:lkp -R $BENCHMARK_ROOT/$casename log_cmd chown lkp:lkp -R /tmp @@ -112,5 +115,8 @@ run() else log_cmd ./RUNTESTS -f $test $testcase 2>&1 fi + + # unset env variable in case it do impact on other tests + [[ $testcase =~ obj_tx_a ]] && unset MALLOC_MMAP_THRESHOLD_ done <<< "$testcases" } diff --git a/pack/nvml b/pack/nvml index a8113c7b6..61b511104 100755 --- a/pack/nvml +++ b/pack/nvml @@ -60,6 +60,7 @@ build_ignore_file() git grep "require_dax_devices" | awk -F '[:/]' '{if (!a[$3]++ && $3 != "unittest") {print $3} }' >> ignore echo "vmmalloc_fork" >> ignore echo "pmempool_check" >> ignore + echo "obj_pmalloc_mt" >> ignore } # The dax tests need ndctl tool to create dax device. diff --git a/pack/xfstests-addon/tests/btrfs-ignore b/pack/xfstests-addon/tests/btrfs-ignore index a73147121..da0489c01 100644 --- a/pack/xfstests-addon/tests/btrfs-ignore +++ b/pack/xfstests-addon/tests/btrfs-ignore @@ -14,7 +14,6 @@ 088 101 006 -010 012 035 061 diff --git a/pack/xfstests-addon/tests/xfs-group1 b/pack/xfstests-addon/tests/xfs-group1 index 122770098..ea9e728af 100644 --- a/pack/xfstests-addon/tests/xfs-group1 +++ b/pack/xfstests-addon/tests/xfs-group1 @@ -21,6 +21,7 @@ 182 183 184 +191 192 193 196 diff --git a/pack/xfstests-addon/tests/xfs-ignore b/pack/xfstests-addon/tests/xfs-ignore index df77db078..f538e36d3 100644 --- a/pack/xfstests-addon/tests/xfs-ignore +++ b/pack/xfstests-addon/tests/xfs-ignore @@ -60,7 +60,6 @@ 186 187 189 -191 197 224 267 diff --git a/repo/linux/f2fs b/repo/linux/f2fs index b4f9959a1..8e3e0c73d 100644 --- a/repo/linux/f2fs +++ b/repo/linux/f2fs @@ -1,5 +1,6 @@ url: https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git integration_testing_branches: dev +git_am_branch: dev-test mail_cc: linux-f2fs-devel@lists.sourceforge.net owner: Jaegeuk Kim subsystems: diff --git a/repo/linux/ragnatech b/repo/linux/ragnatech index 4ff4acea9..8c8bed283 100644 --- a/repo/linux/ragnatech +++ b/repo/linux/ragnatech @@ -1,2 +1,3 @@ -url: https://git.ragnatech.se/linux +url: git://git.ragnatech.se/linux owner: Niklas Söderlund +notify_build_success_branch: .* diff --git a/sbin/make.cross b/sbin/make.cross index 7f802b195..17a36bbb8 100755 --- a/sbin/make.cross +++ b/sbin/make.cross @@ -180,6 +180,9 @@ setup_crosstool() mn10300) gcc_arch=am33_2.0-linux ;; + h8300) + gcc_arch=h8300-elf + ;; *) gcc_arch=$ARCH-linux ;; diff --git a/spec/stats/kmsg.05 b/spec/stats/kmsg.05 new file mode 100644 index 000000000..904971be7 --- /dev/null +++ b/spec/stats/kmsg.05 @@ -0,0 +1,26 @@ +<0>[ 42.962798] BUG: spinlock bad magic on CPU#0, trinity-c0/1747 +<0>[ 42.964565] lock: 0xffff880009c31088, .magic: ffff8800, .owner: ����/0, .owner_cpu: 378112 +<4>[ 42.969299] CPU: 0 PID: 1747 Comm: trinity-c0 Tainted: G W 4.11.0-01315-g16b7629 #1 +<4>[ 42.971951] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.9.3-20161025_171302-gandalf 04/01/2014 +<4>[ 42.974995] Call Trace: +<4>[ 42.975769] dump_stack+0xf9/0x17d +<4>[ 42.976808] spin_bug+0xc5/0x110 +<4>[ 42.977809] do_raw_spin_lock+0x5d/0x160 +<4>[ 42.979004] _raw_spin_lock_irq+0x2b/0x30 +<4>[ 42.980230] rwsem_down_read_failed+0x5d/0x1e0 +<4>[ 42.981590] ? _find_next_bit+0xe5/0x100 +<4>[ 42.985178] call_rwsem_down_read_failed+0x18/0x30 +<4>[ 42.986627] ? call_rwsem_down_read_failed+0x18/0x30 +<4>[ 42.988148] down_read+0x2e/0x60 +<4>[ 42.989142] iterate_supers+0x9b/0x1b0 +<4>[ 42.990296] ? sync_fs_one_sb+0x70/0x70 +<4>[ 42.991475] sys_sync+0x3f/0xd0 +<4>[ 42.992438] do_syscall_64+0x11a/0x390 +<4>[ 42.993584] entry_SYSCALL64_slow_path+0x25/0x25 +<4>[ 42.994982] RIP: 0033:0x7ff003a526d9 +<4>[ 42.996082] RSP: 002b:00007fffb1687828 EFLAGS: 00000246 ORIG_RAX: 00000000000000a2 +<4>[ 43.001246] RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007ff003a526d9 +<4>[ 43.003390] RDX: ffffffffff000010 RSI: ffffffffffffff00 RDI: ffffffffffffff4f +<4>[ 43.005535] RBP: 00000000000000a2 R08: a400000000000000 R09: ffffffffffffff95 +<4>[ 43.007692] R10: ffffffffffffff9f R11: 0000000000000246 R12: 0000000000000000 +<4>[ 43.009835] R13: 00000000000000a2 R14: 00000000000000a2 R15: ffffffffffffff95 diff --git a/spec/stats/kmsg.05.yaml b/spec/stats/kmsg.05.yaml new file mode 100644 index 000000000..674a51027 --- /dev/null +++ b/spec/stats/kmsg.05.yaml @@ -0,0 +1,8 @@ + +# lock: .* .magic: .* .owner: .* .owner_cpu: +lock:#,.magic:#,.owner:____,.owner_cpu: 1 +message:lock:#,.magic:#,.owner:____,.owner_cpu: <0>[ 42.964565] lock: 0xffff880009c31088, .magic: ffff8800, .owner: ____/0, .owner_cpu: 378112 +pattern:lock:#,.magic:#,.owner:____,.owner_cpu: lock: .* .magic: .* .owner: .* .owner_cpu: + +timestamp:last: 43.009835 +timestamp:lock:#,.magic:#,.owner:____,.owner_cpu: 42.964565 diff --git a/stats/dmesg b/stats/dmesg index 82fedeb6b..e7f614f24 100755 --- a/stats/dmesg +++ b/stats/dmesg @@ -23,6 +23,7 @@ LKP_SRC = ENV['LKP_SRC'] || File.dirname(File.dirname(File.realpath($PROGRAM_NAM require "#{LKP_SRC}/lib/dmesg" require "#{LKP_SRC}/lib/log" +require "#{LKP_SRC}/lib/string_ext" if ARGV[0] kmsg_file = ARGV[0] @@ -96,6 +97,7 @@ else lines = kmsg_lines output = grep_printk_errors kmsg_file, kmsg + output.replace_invalid_utf8! oops_map = {} output.each_line do |line| diff --git a/stats/ftrace b/stats/ftrace index b0377ba7b..7ea739889 100755 --- a/stats/ftrace +++ b/stats/ftrace @@ -8,7 +8,11 @@ TIME_DELTA = YAML.load_file(RESULT_ROOT + '/job.yaml')['time_delta'].to_f FMT_DIR = RESULT_ROOT + '/trace_event/' KEY_PREFIX_MAPPING = YAML.load_file(File.dirname(__FILE__) + '/../etc/ftrace_key_prefix') -BDI_DEV_MAPPING = YAML.load_file(RESULT_ROOT + '/bdi_dev_mapping') if File.exist? RESULT_ROOT + '/bdi_dev_mapping' +BDI_DEV_MAPPING = if File.exist? RESULT_ROOT + '/bdi_dev_mapping' + YAML.load_file(RESULT_ROOT + '/bdi_dev_mapping') + else + nil + end # A hash to make sure we record one event data only # for each event in 1s unit