linux-kernel - Re: [PATCH] tools/rcutorture: Make identify_qemu

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Thu, 19 Nov 2020 13:59:03 -0800
From:   "Paul E. McKenney" <paulmck@...nel.org>
To:     Frederic Weisbecker <frederic@...nel.org>
Cc:     LKML <linux-kernel@...r.kernel.org>,
        Steven Rostedt <rostedt@...dmis.org>, rcu@...r.kernel.org,
        Mathieu Desnoyers <mathieu.desnoyers@...icios.com>,
        Lai Jiangshan <jiangshanlai@...il.com>,
        Josh Triplett <josh@...htriplett.org>
Subject: Re: [PATCH] tools/rcutorture: Make identify_qemu_vcpus() independant
 of local language

On Thu, Nov 19, 2020 at 01:30:24AM +0100, Frederic Weisbecker wrote:
> The implementation expects `lscpu` to have a "CPU: " line, for example:
> 
> 	CPU(s):		8
> 
> But some local language settings may advocate for their own version:
> 
> 	Processeur(s) :		8
> 
> As a result the function may return an empty string and rcutorture would
> dump the following warning (still with the local taste):
> 
> 	kvm-test-1-run.sh: ligne 138 : test:  : nombre entier attendu comme expression
> 
> Just use a command whose output every language agree with.
> 
> Signed-off-by: Frederic Weisbecker <frederic@...nel.org>
> Cc: Paul E. McKenney <paulmck@...nel.org>
> Cc: Josh Triplett <josh@...htriplett.org>
> Cc: Steven Rostedt <rostedt@...dmis.org>
> Cc: Mathieu Desnoyers <mathieu.desnoyers@...icios.com>
> Cc: Lai Jiangshan <jiangshanlai@...il.com>
> Cc: rcu@...r.kernel.org

Queued for review and testing, thank you!  As usual, I could not resist
the urge to edit a bit, so please let me know if I messed anything up.

If there are too many of these, it might be easier for kvm.sh to switch
itself to EN-US mode, but this change both simplified the code and helped
defend the purity of the French language, so steady as she goes!  ;-)

							Thanx, Paul

------------------------------------------------------------------------

commit 655f941b96cbfc6f8869142ece092d8617425948
Author: Frederic Weisbecker <frederic@...nel.org>
Date:   Thu Nov 19 01:30:24 2020 +0100

    tools/rcutorture: Make identify_qemu_vcpus() independent of local language
    
    The rcutorture scripts' identify_qemu_vcpus() function expects `lscpu`
    to have a "CPU: " line, for example:
    
            CPU(s):         8
    
    But different local language settings can give different results:
    
            Processeur(s) :         8
    
    As a result, identify_qemu_vcpus() may return an empty string, resulting
    in the following warning (with the same local language settings):
    
            kvm-test-1-run.sh: ligne 138 : test:  : nombre entier attendu comme expression
    
    This commit therefore changes identify_qemu_vcpus() to use getconf,
    which produces local-language-independend output.
    
    Signed-off-by: Frederic Weisbecker <frederic@...nel.org>
    Cc: Paul E. McKenney <paulmck@...nel.org>
    Cc: Josh Triplett <josh@...htriplett.org>
    Cc: Steven Rostedt <rostedt@...dmis.org>
    Cc: Mathieu Desnoyers <mathieu.desnoyers@...icios.com>
    Cc: Lai Jiangshan <jiangshanlai@...il.com>
    Cc: rcu@...r.kernel.org

diff --git a/tools/testing/selftests/rcutorture/bin/functions.sh b/tools/testing/selftests/rcutorture/bin/functions.sh
index 8266349..fef8b4b 100644
--- a/tools/testing/selftests/rcutorture/bin/functions.sh
+++ b/tools/testing/selftests/rcutorture/bin/functions.sh
@@ -232,7 +232,7 @@ identify_qemu_args () {
 # Returns the number of virtual CPUs available to the aggregate of the
 # guest OSes.
 identify_qemu_vcpus () {
-	lscpu | grep '^CPU(s):' | sed -e 's/CPU(s)://' -e 's/[ 	]*//g'
+	getconf _NPROCESSORS_ONLN
 }
 
 # print_bug