Browse Source

Merge commit 'torture.2015.02.23a' into core/rcu

Signed-off-by: Ingo Molnar <mingo@kernel.org>
Ingo Molnar 9 years ago
parent
commit
670191572e
2 changed files with 5 additions and 2 deletions
  1. 1 0
      kernel/rcu/update.c
  2. 4 2
      tools/testing/selftests/rcutorture/bin/parse-console.sh

+ 1 - 0
kernel/rcu/update.c

@@ -128,6 +128,7 @@ bool rcu_gp_is_normal(void)
 {
 {
 	return READ_ONCE(rcu_normal);
 	return READ_ONCE(rcu_normal);
 }
 }
+EXPORT_SYMBOL_GPL(rcu_gp_is_normal);
 
 
 static atomic_t rcu_expedited_nesting =
 static atomic_t rcu_expedited_nesting =
 	ATOMIC_INIT(IS_ENABLED(CONFIG_RCU_EXPEDITE_BOOT) ? 1 : 0);
 	ATOMIC_INIT(IS_ENABLED(CONFIG_RCU_EXPEDITE_BOOT) ? 1 : 0);

+ 4 - 2
tools/testing/selftests/rcutorture/bin/parse-console.sh

@@ -33,7 +33,7 @@ if grep -Pq '\x00' < $file
 then
 then
 	print_warning Console output contains nul bytes, old qemu still running?
 	print_warning Console output contains nul bytes, old qemu still running?
 fi
 fi
-egrep 'Badness|WARNING:|Warn|BUG|===========|Call Trace:|Oops:|detected stalls on CPUs/tasks:|Stall ended before state dump start' < $file | grep -v 'ODEBUG: ' | grep -v 'Warning: unable to open an initial console' > $1.diags
+egrep 'Badness|WARNING:|Warn|BUG|===========|Call Trace:|Oops:|detected stalls on CPUs/tasks:|self-detected stall on CPU|Stall ended before state dump start|\?\?\? Writer stall state' < $file | grep -v 'ODEBUG: ' | grep -v 'Warning: unable to open an initial console' > $1.diags
 if test -s $1.diags
 if test -s $1.diags
 then
 then
 	print_warning Assertion failure in $file $title
 	print_warning Assertion failure in $file $title
@@ -64,10 +64,12 @@ then
 	then
 	then
 		summary="$summary  lockdep: $n_badness"
 		summary="$summary  lockdep: $n_badness"
 	fi
 	fi
-	n_stalls=`egrep -c 'detected stalls on CPUs/tasks:|Stall ended before state dump start' $1`
+	n_stalls=`egrep -c 'detected stalls on CPUs/tasks:|self-detected stall on CPU|Stall ended before state dump start|\?\?\? Writer stall state' $1`
 	if test "$n_stalls" -ne 0
 	if test "$n_stalls" -ne 0
 	then
 	then
 		summary="$summary  Stalls: $n_stalls"
 		summary="$summary  Stalls: $n_stalls"
 	fi
 	fi
 	print_warning Summary: $summary
 	print_warning Summary: $summary
+else
+	rm $1.diags
 fi
 fi