| Message ID | 1669165413-12035-1-git-send-email-yangtiezhu@loongson.cn (mailing list archive) |
|---|---|
| Headers | show |
| Series | selftests: Use "grep -E" instead of "egrep" | expand |
It seems that patch #2~#6 has no conflicts with the other related git tree, but patch #1 is conflicted with paulmck/linux-rcu.git dev. What should I do? Shuah, could you please apply patch #2~#6 to your linux-kselftest.git next branch and ignore patch #1? And then let me send a seperate patch #1 rebased on paulmck/linux-rcu.git dev branch to rcu@vger.kernel.org. Thanks, Tiezhu
On 11/22/22 19:27, Tiezhu Yang wrote: > It seems that patch #2~#6 has no conflicts with the other related > git tree, but patch #1 is conflicted with paulmck/linux-rcu.git dev. > > What should I do? > > Shuah, could you please apply patch #2~#6 to your linux-kselftest.git next branch and ignore patch #1? > > And then let me send a seperate patch #1 rebased on paulmck/linux-rcu.git dev branch to rcu@vger.kernel.org. > That won't work because linux-kselftest next won't have the linux-rcu content. I already picked patches 1,2,6 Patches 3 (powerpc) and 5 (net) go through powerpc and net trees. Please resend just those cc'ing the right people. get_maintainers.pl will give you the info. As for patch 1 - perhaps the conflict could be resolved in next. Paul, would you like me to drop rcutorture patch from linux-kselftest next? thanks, -- Shuah
On Tue, Nov 29, 2022 at 02:39:25PM -0700, Shuah Khan wrote: > On 11/22/22 19:27, Tiezhu Yang wrote: > > It seems that patch #2~#6 has no conflicts with the other related > > git tree, but patch #1 is conflicted with paulmck/linux-rcu.git dev. > > > > What should I do? > > > > Shuah, could you please apply patch #2~#6 to your linux-kselftest.git next branch and ignore patch #1? > > > > And then let me send a seperate patch #1 rebased on paulmck/linux-rcu.git dev branch to rcu@vger.kernel.org. > > > > That won't work because linux-kselftest next won't have the linux-rcu content. > I already picked patches 1,2,6 > > Patches 3 (powerpc) and 5 (net) go through powerpc and net trees. Please resend > just those cc'ing the right people. get_maintainers.pl will give you the info. > > As for patch 1 - perhaps the conflict could be resolved in next. > > Paul, would you like me to drop rcutorture patch from linux-kselftest next? I would be happy to carry the rcutorture patch, especially if doing so makes life easier. ;-) But please do send me some sort of pointer to the patch. Otherwise, I guarantee you that I will queue the wrong one. Thanx, Paul
On 11/29/22 15:13, Paul E. McKenney wrote: > On Tue, Nov 29, 2022 at 02:39:25PM -0700, Shuah Khan wrote: >> On 11/22/22 19:27, Tiezhu Yang wrote: >>> It seems that patch #2~#6 has no conflicts with the other related >>> git tree, but patch #1 is conflicted with paulmck/linux-rcu.git dev. >>> >>> What should I do? >>> >>> Shuah, could you please apply patch #2~#6 to your linux-kselftest.git next branch and ignore patch #1? >>> >>> And then let me send a seperate patch #1 rebased on paulmck/linux-rcu.git dev branch to rcu@vger.kernel.org. >>> >> >> That won't work because linux-kselftest next won't have the linux-rcu content. >> I already picked patches 1,2,6 >> >> Patches 3 (powerpc) and 5 (net) go through powerpc and net trees. Please resend >> just those cc'ing the right people. get_maintainers.pl will give you the info. >> >> As for patch 1 - perhaps the conflict could be resolved in next. >> >> Paul, would you like me to drop rcutorture patch from linux-kselftest next? > > I would be happy to carry the rcutorture patch, especially if doing so > makes life easier. ;-) > > But please do send me some sort of pointer to the patch. Otherwise, > I guarantee you that I will queue the wrong one. > I have it queued up in linux-kselftest next for Linux 6.2-rc1 - if it is easier we can just resolve the merge in next. thanks, -- Shuah
On Tue, Nov 29, 2022 at 03:24:32PM -0700, Shuah Khan wrote: > On 11/29/22 15:13, Paul E. McKenney wrote: > > On Tue, Nov 29, 2022 at 02:39:25PM -0700, Shuah Khan wrote: > > > On 11/22/22 19:27, Tiezhu Yang wrote: > > > > It seems that patch #2~#6 has no conflicts with the other related > > > > git tree, but patch #1 is conflicted with paulmck/linux-rcu.git dev. > > > > > > > > What should I do? > > > > > > > > Shuah, could you please apply patch #2~#6 to your linux-kselftest.git next branch and ignore patch #1? > > > > > > > > And then let me send a seperate patch #1 rebased on paulmck/linux-rcu.git dev branch to rcu@vger.kernel.org. > > > > > > > > > > That won't work because linux-kselftest next won't have the linux-rcu content. > > > I already picked patches 1,2,6 > > > > > > Patches 3 (powerpc) and 5 (net) go through powerpc and net trees. Please resend > > > just those cc'ing the right people. get_maintainers.pl will give you the info. > > > > > > As for patch 1 - perhaps the conflict could be resolved in next. > > > > > > Paul, would you like me to drop rcutorture patch from linux-kselftest next? > > > > I would be happy to carry the rcutorture patch, especially if doing so > > makes life easier. ;-) > > > > But please do send me some sort of pointer to the patch. Otherwise, > > I guarantee you that I will queue the wrong one. > > I have it queued up in linux-kselftest next for Linux 6.2-rc1 - if it is easier > we can just resolve the merge in next. Lazybones that I am, I would rather carry the patch than resolve conflicts. Especially given the tendency for new rcutorture patches to appear, thus changing the conflict resolution. My guess is that the patch is this one: https://lore.kernel.org/lkml/1669165413-12035-2-git-send-email-yangtiezhu@loongson.cn/ Or should I be looking elsewhere? Thanx, Paul
On 11/29/22 16:22, Paul E. McKenney wrote: > Lazybones that I am, I would rather carry the patch than resolve > conflicts. Especially given the tendency for new rcutorture patches to > appear, thus changing the conflict resolution. > Sounds good. I will drop the one I applied to my tree. > My guess is that the patch is this one: > > https://lore.kernel.org/lkml/1669165413-12035-2-git-send-email-yangtiezhu@loongson.cn/ > > Or should I be looking elsewhere? > Yup that is one. thanks, -- Shuah
On Tue, Nov 29, 2022 at 04:30:39PM -0700, Shuah Khan wrote: > On 11/29/22 16:22, Paul E. McKenney wrote: > > > Lazybones that I am, I would rather carry the patch than resolve > > conflicts. Especially given the tendency for new rcutorture patches to > > appear, thus changing the conflict resolution. > > > > Sounds good. I will drop the one I applied to my tree. > > > My guess is that the patch is this one: > > > > https://lore.kernel.org/lkml/1669165413-12035-2-git-send-email-yangtiezhu@loongson.cn/ > > > > Or should I be looking elsewhere? > > Yup that is one. Very good, thank you! I have queued it as shown below. Thanx, Paul ------------------------------------------------------------------------ commit 72dcfda0e73be7e2e8b7faf0299b0f43c20af015 Author: Tiezhu Yang <yangtiezhu@loongson.cn> Date: Wed Nov 23 09:03:28 2022 +0800 selftests: rcutorture: Use "grep -E" instead of "egrep" The latest version of grep is deprecating the egrep command, so that its output contains warnings as follows: egrep: warning: egrep is obsolescent; using grep -E Fix this using "grep -E" instead. sed -i "s/egrep/grep -E/g" `grep egrep -rwl tools/testing/selftests/rcutorture` Here are the steps to install the latest grep: wget http://ftp.gnu.org/gnu/grep/grep-3.8.tar.gz tar xf grep-3.8.tar.gz cd grep-3.8 && ./configure && make sudo make install export PATH=/usr/local/bin:$PATH Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn> Signed-off-by: Paul E. McKenney <paulmck@kernel.org> diff --git a/tools/testing/selftests/rcutorture/bin/console-badness.sh b/tools/testing/selftests/rcutorture/bin/console-badness.sh index 69f8a5958cefc..aad51e7c0183d 100755 --- a/tools/testing/selftests/rcutorture/bin/console-badness.sh +++ b/tools/testing/selftests/rcutorture/bin/console-badness.sh @@ -10,7 +10,7 @@ # # Authors: Paul E. McKenney <paulmck@kernel.org> -egrep 'Badness|WARNING:|Warn|BUG|===========|BUG: KCSAN:|Call Trace:|Oops:|detected stalls on CPUs/tasks:|self-detected stall on CPU|Stall ended before state dump start|\?\?\? Writer stall state|rcu_.*kthread starved for|!!!' | +grep -E 'Badness|WARNING:|Warn|BUG|===========|BUG: KCSAN:|Call Trace:|Oops:|detected stalls on CPUs/tasks:|self-detected stall on CPU|Stall ended before state dump start|\?\?\? Writer stall state|rcu_.*kthread starved for|!!!' | grep -v 'ODEBUG: ' | grep -v 'This means that this is a DEBUG kernel and it is' | grep -v 'Warning: unable to open an initial console' | diff --git a/tools/testing/selftests/rcutorture/bin/kvm-build.sh b/tools/testing/selftests/rcutorture/bin/kvm-build.sh index e28a82851f7c4..11f8d232b0ee7 100755 --- a/tools/testing/selftests/rcutorture/bin/kvm-build.sh +++ b/tools/testing/selftests/rcutorture/bin/kvm-build.sh @@ -44,10 +44,10 @@ fi ncpus="`getconf _NPROCESSORS_ONLN`" make -j$((2 * ncpus)) $TORTURE_KMAKE_ARG > $resdir/Make.out 2>&1 retval=$? -if test $retval -ne 0 || grep "rcu[^/]*": < $resdir/Make.out | egrep -q "Stop|Error|error:|warning:" || egrep -q "Stop|Error|error:" < $resdir/Make.out +if test $retval -ne 0 || grep "rcu[^/]*": < $resdir/Make.out | grep -E -q "Stop|Error|error:|warning:" || grep -E -q "Stop|Error|error:" < $resdir/Make.out then echo Kernel build error - egrep "Stop|Error|error:|warning:" < $resdir/Make.out + grep -E "Stop|Error|error:|warning:" < $resdir/Make.out echo Run aborted. exit 3 fi diff --git a/tools/testing/selftests/rcutorture/bin/kvm-find-errors.sh b/tools/testing/selftests/rcutorture/bin/kvm-find-errors.sh index d4dc059843a43..28981007465bd 100755 --- a/tools/testing/selftests/rcutorture/bin/kvm-find-errors.sh +++ b/tools/testing/selftests/rcutorture/bin/kvm-find-errors.sh @@ -32,9 +32,9 @@ for i in ${rundir}/*/Make.out do scenariodir="`dirname $i`" scenariobasedir="`echo ${scenariodir} | sed -e 's/\.[0-9]*$//'`" - if egrep -q "error:|warning:|^ld: .*undefined reference to" < $i + if grep -E -q "error:|warning:|^ld: .*undefined reference to" < $i then - egrep "error:|warning:|^ld: .*undefined reference to" < $i > $i.diags + grep -E "error:|warning:|^ld: .*undefined reference to" < $i > $i.diags files="$files $i.diags $i" elif ! test -f ${scenariobasedir}/vmlinux && ! test -f ${scenariobasedir}/vmlinux.xz && ! test -f "${rundir}/re-run" then diff --git a/tools/testing/selftests/rcutorture/bin/kvm.sh b/tools/testing/selftests/rcutorture/bin/kvm.sh index 7710b1e1cddab..3025a949bc99e 100755 --- a/tools/testing/selftests/rcutorture/bin/kvm.sh +++ b/tools/testing/selftests/rcutorture/bin/kvm.sh @@ -585,7 +585,7 @@ awk < $T/cfgcpu.pack \ echo kvm-end-run-stats.sh "$resdir/$ds" "$starttime" >> $T/script # Extract the tests and their batches from the script. -egrep 'Start batch|Starting build\.' $T/script | grep -v ">>" | +grep -E 'Start batch|Starting build\.' $T/script | grep -v ">>" | sed -e 's/:.*$//' -e 's/^echo //' -e 's/-ovf//' | awk ' /^----Start/ { @@ -622,7 +622,7 @@ then elif test "$dryrun" = sched then # Extract the test run schedule from the script. - egrep 'Start batch|Starting build\.' $T/script | grep -v ">>" | + grep -E 'Start batch|Starting build\.' $T/script | grep -v ">>" | sed -e 's/:.*$//' -e 's/^echo //' nbuilds="`grep 'Starting build\.' $T/script | grep -v ">>" | sed -e 's/:.*$//' -e 's/^echo //' | diff --git a/tools/testing/selftests/rcutorture/bin/parse-console.sh b/tools/testing/selftests/rcutorture/bin/parse-console.sh index 822eb037a0573..9ab0f6bc172cd 100755 --- a/tools/testing/selftests/rcutorture/bin/parse-console.sh +++ b/tools/testing/selftests/rcutorture/bin/parse-console.sh @@ -65,7 +65,7 @@ then fi grep --binary-files=text 'torture:.*ver:' $file | - egrep --binary-files=text -v '\(null\)|rtc: 000000000* ' | + grep -E --binary-files=text -v '\(null\)|rtc: 000000000* ' | sed -e 's/^(initramfs)[^]]*] //' -e 's/^\[[^]]*] //' | sed -e 's/^.*ver: //' | awk ' @@ -128,17 +128,17 @@ then then summary="$summary Badness: $n_badness" fi - n_warn=`grep -v 'Warning: unable to open an initial console' $file | grep -v 'Warning: Failed to add ttynull console. No stdin, stdout, and stderr for the init process' | egrep -c 'WARNING:|Warn'` + n_warn=`grep -v 'Warning: unable to open an initial console' $file | grep -v 'Warning: Failed to add ttynull console. No stdin, stdout, and stderr for the init process' | grep -E -c 'WARNING:|Warn'` if test "$n_warn" -ne 0 then summary="$summary Warnings: $n_warn" fi - n_bugs=`egrep -c '\bBUG|Oops:' $file` + n_bugs=`grep -E -c '\bBUG|Oops:' $file` if test "$n_bugs" -ne 0 then summary="$summary Bugs: $n_bugs" fi - n_kcsan=`egrep -c 'BUG: KCSAN: ' $file` + n_kcsan=`grep -E -c 'BUG: KCSAN: ' $file` if test "$n_kcsan" -ne 0 then if test "$n_bugs" = "$n_kcsan" @@ -158,7 +158,7 @@ then then summary="$summary lockdep: $n_badness" fi - n_stalls=`egrep -c 'detected stalls on CPUs/tasks:|self-detected stall on CPU|Stall ended before state dump start|\?\?\? Writer stall state' $file` + n_stalls=`grep -E -c 'detected stalls on CPUs/tasks:|self-detected stall on CPU|Stall ended before state dump start|\?\?\? Writer stall state' $file` if test "$n_stalls" -ne 0 then summary="$summary Stalls: $n_stalls"