From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 549CEC433EF for ; Thu, 7 Oct 2021 17:06:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3FF3761040 for ; Thu, 7 Oct 2021 17:06:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242989AbhJGRID (ORCPT ); Thu, 7 Oct 2021 13:08:03 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:23737 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242379AbhJGRH7 (ORCPT ); Thu, 7 Oct 2021 13:07:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633626364; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lLoCTPVohlerSIUXI4ZWSTbwvNW2/UqoUz2lzzfT+/c=; b=Ig4rgkDMAAUOT7u76et5iiuJX97SD3YCpL1PJDtfMizJj6iiOekHX2FciYdDjHXIaYRoq4 dYQwceSYTME3vyXkEH6CG3pm/PJBecGoldFovFblwJgsKPyZxdTH5IPJr0CIkmixKBrPjZ 1jNILND6fpUgCVeOJ4kkoc0M5MUABog= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-204-plvNMN28OT-Mr6XsG5aMXA-1; Thu, 07 Oct 2021 13:06:03 -0400 X-MC-Unique: plvNMN28OT-Mr6XsG5aMXA-1 Received: by mail-wr1-f70.google.com with SMTP id v15-20020adfa1cf000000b00160940b17a2so5216461wrv.19 for ; Thu, 07 Oct 2021 10:06:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=lLoCTPVohlerSIUXI4ZWSTbwvNW2/UqoUz2lzzfT+/c=; b=th/Yffs3ydslt8ih4HGdkqdw8ruY8o6dSlgXHMoGN7EIyHSqII274idtG/5UoU5GwT xF5MT/kxZjEEebK50Dz4NzLAdSR3LtFbTAOw5iyAv3ya7JAgOFrjDBSv8NH21g+3pfJ+ 1G82m8bSuOYbUQy/nX/4yVDmaGiOFsmkkOSI6TK6GLpeNzwfSUxsCFFUBgKi/v47/NIi kyLiW0tiDSt+qZXoeR6xwElt+F3NcV6sz+Nh/2VtuZTeVSRvP9q2eRZH373m9k+kugk4 z6EAfD7a+QfTznz4MMP6W6Nmc0K46uSseRpGUkLNzBHrmAATgpIiACXmYbAqh2qNQtkL Voew== X-Gm-Message-State: AOAM5334W+2VeBS813NxPx96MbvuSYuEhnQnc8R7xq0aIBrDG9Tli3we 1RQ6zAvX5M7qeqrPZX06kCR6qL4c2Sj7P0Ex1tYC79no9RIElm5NgSCfQwLX8siNtammm8SplS5 JC6hZmIWN3xbpzyRgWO6GGTH6 X-Received: by 2002:a5d:6e8d:: with SMTP id k13mr7099401wrz.295.1633626360516; Thu, 07 Oct 2021 10:06:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyOatek8T1Hz7EyxncFwUgGA7nSQhYqd/ri1ydtIqJlrxZ83BkQievmgi/bv7w+VVnMAx47Bg== X-Received: by 2002:a5d:6e8d:: with SMTP id k13mr7099373wrz.295.1633626360300; Thu, 07 Oct 2021 10:06:00 -0700 (PDT) Received: from krava (nat-pool-brq-u.redhat.com. [213.175.37.12]) by smtp.gmail.com with ESMTPSA id v10sm215064wri.29.2021.10.07.10.05.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 10:06:00 -0700 (PDT) Date: Thu, 7 Oct 2021 19:05:58 +0200 From: Jiri Olsa To: Shunsuke Nakamura Cc: peterz@infradead.org, mingo@redhat.com, acme@kernel.org, mark.rutland@arm.com, alexander.shishkin@linux.intel.com, namhyung@kernel.org, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Subject: Re: [PATCH v2] libperf tests: Fix test_stat_cpu Message-ID: References: <20211006094817.477494-1-nakamura.shun@fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20211006094817.477494-1-nakamura.shun@fujitsu.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Oct 06, 2021 at 06:48:17PM +0900, Shunsuke Nakamura wrote: > `cpu` of perf_evsel__read() must be specified the cpu index. > perf_cpu_map__for_each_cpu is for iterating the cpu number (not index) > and is not appropriate. > So, if there is an offline CPU, the cpu number specified in the argument > may point out of range because the cpu number and the cpu index are > different. nice catch > > Fix test_stat_cpu. > > Committer testing: > > # make tests -C tools/lib/perf/ > make: Entering directory '/home/nakamura/kernel_src/linux-5.15-rc4_fix/tools/lib/perf' > running static: > - running tests/test-cpumap.c...OK > - running tests/test-threadmap.c...OK > - running tests/test-evlist.c...OK > - running tests/test-evsel.c...OK > running dynamic: > - running tests/test-cpumap.c...OK > - running tests/test-threadmap.c...OK > - running tests/test-evlist.c...OK > - running tests/test-evsel.c...OK > make: Leaving directory '/home/nakamura/kernel_src/linux-5.15-rc4_fix/tools/lib/perf' > > > Signed-off-by: Shunsuke Nakamura > --- > Previous version at: > https://lore.kernel.org/lkml/20211006080456.474273-1-nakamura.shun@fujitsu.com/ > > Changes in v2: > - Remove "2/2" from Patch Subject > > tools/lib/perf/tests/test-evlist.c | 6 +++--- > tools/lib/perf/tests/test-evsel.c | 6 +++--- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/tools/lib/perf/tests/test-evlist.c b/tools/lib/perf/tests/test-evlist.c > index c67c83399170..47badd7eabf2 100644 > --- a/tools/lib/perf/tests/test-evlist.c > +++ b/tools/lib/perf/tests/test-evlist.c > @@ -40,7 +40,7 @@ static int test_stat_cpu(void) > .type = PERF_TYPE_SOFTWARE, > .config = PERF_COUNT_SW_TASK_CLOCK, > }; > - int err, cpu, tmp; > + int err, idx; > > cpus = perf_cpu_map__new(NULL); > __T("failed to create cpus", cpus); > @@ -70,10 +70,10 @@ static int test_stat_cpu(void) > perf_evlist__for_each_evsel(evlist, evsel) { > cpus = perf_evsel__cpus(evsel); > > - perf_cpu_map__for_each_cpu(cpu, tmp, cpus) { > + for (idx = 0, idx < perf_cpu_map__nr(cpus); idx++) { s/,/;/ ^ tests/test-evlist.c: In function ‘test_stat_cpu’: tests/test-evlist.c:73:52: error: expected ‘;’ before ‘)’ token 73 | for (idx = 0, idx < perf_cpu_map__nr(cpus); idx++) { | ^ | ; perf_cpu_map__for_each_cpu also returns the cpu index (tmp), maybe we could use that instead? thanks, jirka > struct perf_counts_values counts = { .val = 0 }; > > - perf_evsel__read(evsel, cpu, 0, &counts); > + perf_evsel__read(evsel, idx, 0, &counts); > __T("failed to read value for evsel", counts.val != 0); > } > } > diff --git a/tools/lib/perf/tests/test-evsel.c b/tools/lib/perf/tests/test-evsel.c > index 9abd4c0bf6db..33ae9334861a 100644 > --- a/tools/lib/perf/tests/test-evsel.c > +++ b/tools/lib/perf/tests/test-evsel.c > @@ -22,7 +22,7 @@ static int test_stat_cpu(void) > .type = PERF_TYPE_SOFTWARE, > .config = PERF_COUNT_SW_CPU_CLOCK, > }; > - int err, cpu, tmp; > + int err, idx; > > cpus = perf_cpu_map__new(NULL); > __T("failed to create cpus", cpus); > @@ -33,10 +33,10 @@ static int test_stat_cpu(void) > err = perf_evsel__open(evsel, cpus, NULL); > __T("failed to open evsel", err == 0); > > - perf_cpu_map__for_each_cpu(cpu, tmp, cpus) { > + for (idx = 0; idx < perf_cpu_map__nr(cpus); idx++) { > struct perf_counts_values counts = { .val = 0 }; > > - perf_evsel__read(evsel, cpu, 0, &counts); > + perf_evsel__read(evsel, idx, 0, &counts); > __T("failed to read value for evsel", counts.val != 0); > } > > -- > 2.25.1 >