Message ID | 20221113114449.18693-1-leitao@debian.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1652953wru; Sun, 13 Nov 2022 04:08:03 -0800 (PST) X-Google-Smtp-Source: AA0mqf4PSp3xwArHjIdm0dCLzmP2FMCKLaRvZa9Wh2pSuYDNRu5+iBOpqIO4dygcDiAiiMI3h8k3 X-Received: by 2002:a17:907:d30e:b0:781:8003:9b08 with SMTP id vg14-20020a170907d30e00b0078180039b08mr7857599ejc.180.1668341283669; Sun, 13 Nov 2022 04:08:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668341283; cv=none; d=google.com; s=arc-20160816; b=NqzHAhLuFEnQ67v5F+xbsc7e3NQrLtyfkJryZjJXp0+tQGhGJJC40MJjn2JBFpeER0 6Y1I265ds6x76AlqXlJMPs9kgt9EEBWHulZt/NJen8zTedALExns8KibGWjkzxVLXhMW Ku0uSV5fyuEv7vNOhiGE3g2WOzlyytL8eJC+qK3570D0GuF5zf3qKfvv/klYghf6sq4R It9I5/9im/Zk8mx7oMyqn6HlCqjuPoetciC356xMepOb2hDHM8nGIo2FZs7m31eu4CIZ IWAAv857+7CiAnSt0zND2M0UPYBojJbgqdb/knQhTovFDwQ0WvFObLrxCfrKKxDfOAq0 xhOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=SgLDEPBAsaqSd32xdssMnO2SIr7s6T8Rai6MM1Udg1w=; b=Al61PXBQdKB1vJR3KxqIiX251xqvw3METvqs7DoIYmY9y4Qs8t0T1sY+Ttw4K767tm ZFyzNyABuu0I8HsPdfEUuLTnU3s+fysIE5NSKkp92lq97D5lur9nEo56ungZS+poElcC m6ivPgdXM/e3OfOdWiAH+H38c/+Z8wxX6u6N/qUNrx1GGl4bOGpKCVGkTmie3gEDjPn4 cewvrU7SDgcE+i6XlAYOIcHdNh7LesRQnTNjHtEiI89voeJb9Ni2LLBKXkkmdb5vbEtK 6QB332keMxIefichlxrgeoLeam1poZOXgE5cLqfRtndAPx9kWOI9ug0FP2m0xE/witTC Z60g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hq37-20020a1709073f2500b00769d94690fesi6863536ejc.326.2022.11.13.04.07.30; Sun, 13 Nov 2022 04:08:03 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235244AbiKMLqu (ORCPT <rfc822;winker.wchi@gmail.com> + 99 others); Sun, 13 Nov 2022 06:46:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56614 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231252AbiKMLqp (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Sun, 13 Nov 2022 06:46:45 -0500 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C5792B1FE; Sun, 13 Nov 2022 03:46:43 -0800 (PST) Received: by mail-wm1-f42.google.com with SMTP id ja4-20020a05600c556400b003cf6e77f89cso7630296wmb.0; Sun, 13 Nov 2022 03:46:43 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=SgLDEPBAsaqSd32xdssMnO2SIr7s6T8Rai6MM1Udg1w=; b=zA8lqqBDAQp4F662bQitbN5nT5/Rc5iUKJtXbiojzeTVgisPcK/WYeTHKpjEvSzVek WzvDGvVOn186miUfxpMy4dJ+IGsaBolVrYhg/DzZ5mr08lh6VKGMUH8shZfEM/7Bejzj i+TxkqryPvZUnkLdiUqhxH+BX6TTzsGiv1H6P1ALYYDYc6YhRT7EaV6P/LXCqjel9V6z /37Gg1n51rRoLybQ0mJCauKxWBj2xO1wQLmb90vavCk3GgfUrSGxf5w3m0nlruMYItfS 1E01Ko+3ofMqMTMft6+YzpsUzBwiBSZaGqZknTDoTtvFDJAqhTpGgOKxf1B5k3+Mgmla jXzw== X-Gm-Message-State: ANoB5pnLL0Mn2iljztFTUuCVjoQ0k771PoBJykE8ZMsiSjzFgjYvuvGS 6js64SI1/kUGQXutNMYXknc= X-Received: by 2002:a05:600c:4b07:b0:3cf:7267:5b40 with SMTP id i7-20020a05600c4b0700b003cf72675b40mr5661772wmp.164.1668340002304; Sun, 13 Nov 2022 03:46:42 -0800 (PST) Received: from localhost ([2a00:23c8:6c0c:ff01:8fbf:89fd:a697:2959]) by smtp.gmail.com with ESMTPSA id o37-20020a05600c512500b003cf54b77bfesm15808803wms.28.2022.11.13.03.46.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Nov 2022 03:46:41 -0800 (PST) From: Breno Leitao <leitao@debian.org> To: tj@kernel.org, lizefan.x@bytedance.com, hannes@cmpxchg.org, shuah@kernel.org, cgroups@vger.kernel.org Cc: leit@meta.com, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] kselftest/cgroup: Fix gathering number of CPUs Date: Sun, 13 Nov 2022 11:44:49 +0000 Message-Id: <20221113114449.18693-1-leitao@debian.org> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.6 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749382629991867451?= X-GMAIL-MSGID: =?utf-8?q?1749382629991867451?= |
Series |
kselftest/cgroup: Fix gathering number of CPUs
|
|
Commit Message
Breno Leitao
Nov. 13, 2022, 11:44 a.m. UTC
test_cpuset_prs.sh is failing with the following error:
test_cpuset_prs.sh: line 29: [[: 8
57%: syntax error in expression (error token is "57%")
This is happening because `lscpu | grep "^CPU(s)"` returns two lines in
some systems (such as Debian unstable):
# lscpu | grep "^CPU(s)"
CPU(s): 8
CPU(s) scaling MHz: 55%
This is a simple fix that discard the second line.
Signed-off-by: Breno Leitao <leitao@debian.org>
---
tools/testing/selftests/cgroup/test_cpuset_prs.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Comments
On 11/13/22 17:14, Breno Leitao wrote: > test_cpuset_prs.sh is failing with the following error: > > test_cpuset_prs.sh: line 29: [[: 8 > 57%: syntax error in expression (error token is "57%") > > This is happening because `lscpu | grep "^CPU(s)"` returns two lines in > some systems (such as Debian unstable): > > # lscpu | grep "^CPU(s)" > CPU(s): 8 > CPU(s) scaling MHz: 55% > > This is a simple fix that discard the second line. > > Signed-off-by: Breno Leitao <leitao@debian.org> Tested with util-linux v2.38 Reviewed-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> > --- > tools/testing/selftests/cgroup/test_cpuset_prs.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/testing/selftests/cgroup/test_cpuset_prs.sh b/tools/testing/selftests/cgroup/test_cpuset_prs.sh > index 526d2c42d870..564ca8c33035 100755 > --- a/tools/testing/selftests/cgroup/test_cpuset_prs.sh > +++ b/tools/testing/selftests/cgroup/test_cpuset_prs.sh > @@ -25,7 +25,7 @@ WAIT_INOTIFY=$(cd $(dirname $0); pwd)/wait_inotify > CGROUP2=$(mount -t cgroup2 | head -1 | awk -e '{print $3}') > [[ -n "$CGROUP2" ]] || skip_test "Cgroup v2 mount point not found!" > > -CPUS=$(lscpu | grep "^CPU(s)" | sed -e "s/.*:[[:space:]]*//") > +CPUS=$(lscpu | grep "^CPU(s):" | sed -e "s/.*:[[:space:]]*//") > [[ $CPUS -lt 8 ]] && skip_test "Test needs at least 8 cpus available!" > > # Set verbose flag and delay factor
On Sun, Nov 13, 2022 at 11:44:49AM +0000, Breno Leitao wrote: > test_cpuset_prs.sh is failing with the following error: > > test_cpuset_prs.sh: line 29: [[: 8 > 57%: syntax error in expression (error token is "57%") > > This is happening because `lscpu | grep "^CPU(s)"` returns two lines in > some systems (such as Debian unstable): > > # lscpu | grep "^CPU(s)" > CPU(s): 8 > CPU(s) scaling MHz: 55% > > This is a simple fix that discard the second line. > > Signed-off-by: Breno Leitao <leitao@debian.org> Applied to cgroup/for-6.1-fixes. Thanks.
diff --git a/tools/testing/selftests/cgroup/test_cpuset_prs.sh b/tools/testing/selftests/cgroup/test_cpuset_prs.sh index 526d2c42d870..564ca8c33035 100755 --- a/tools/testing/selftests/cgroup/test_cpuset_prs.sh +++ b/tools/testing/selftests/cgroup/test_cpuset_prs.sh @@ -25,7 +25,7 @@ WAIT_INOTIFY=$(cd $(dirname $0); pwd)/wait_inotify CGROUP2=$(mount -t cgroup2 | head -1 | awk -e '{print $3}') [[ -n "$CGROUP2" ]] || skip_test "Cgroup v2 mount point not found!" -CPUS=$(lscpu | grep "^CPU(s)" | sed -e "s/.*:[[:space:]]*//") +CPUS=$(lscpu | grep "^CPU(s):" | sed -e "s/.*:[[:space:]]*//") [[ $CPUS -lt 8 ]] && skip_test "Test needs at least 8 cpus available!" # Set verbose flag and delay factor