From patchwork Wed Jan 5 06:13:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 12704111 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6C99AC433F5 for ; Wed, 5 Jan 2022 06:48:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:References: Mime-Version:Message-Id:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=ihoiMmKIH6Qr+s4n345/EWRa6fEwOv9ZbqQtsfTPUos=; b=JJ+3+BZ4GDjDh9UMnYET15xpV4 3iKB/qIwvshbkGJ1opyAonVlC0dDC1Xl2RI5HMI6nGPJ01fmRrPwazR0+NXAth/UesJEOwRrREQSi JiJdDpCzdCKuGAEQssmuys65PUjGDZ/3SC0q5x+IVuseFPJjNyEoTNCFyQHIy9GYfmnM1uhFCrCBw 3SGo5NikDCNikn7wqhs6WuwCNIVZzxs39KZEy0HjnpjNZazwAXjIKeNlPORVWzhmjb9DTdNfzMBLb hJiOtHyq9NswXiK757Irgs02N/z7m687TdbIx9BTmIVWi0ma5hZAIqca73/9R8REynPuZWe+7wx53 Gb+nBiqw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n504v-00Dsbe-UO; Wed, 05 Jan 2022 06:47:23 +0000 Received: from mail-yb1-xb49.google.com ([2607:f8b0:4864:20::b49]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n4zaE-00DgUk-VB for linux-arm-kernel@lists.infradead.org; Wed, 05 Jan 2022 06:15:40 +0000 Received: by mail-yb1-xb49.google.com with SMTP id g130-20020a255288000000b0060ba07af29eso54564461ybb.2 for ; Tue, 04 Jan 2022 22:15:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=zv8Au8yEBbpBWPa207TVw47r1vENU76hbFmK75NTzaI=; b=nj53JweT0o8JQE1cXVShURIFeG81f8GT634PDEs5PiNjUEUVlHpEzMIZWm5JK1JX8N cqW0XBg8wnke9NXMSPW0r2Gt1l+/lY8eqI/qJMxWru5Rv38Vm19ihzDDdALPDhny9svb WkGWnmHw4BjCjqWzSnNGIzmiXADnhBEu09MhAZiedW6JGmXnp/kAyMIHjm+Tcxayjto4 pCgpJ9JYs7Yv587QqUWCw+17omhs5IIPXM+Yv4+TWrivcaQdxYfh4l7p2k7YONp/Ow0y vOomDE7a3mFKzS+6oZQ/IPdvhMiZDFFp1zkwyZ6ttHGvgvlUMcAOSe/6oaSL8afCPFPN O6Fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=zv8Au8yEBbpBWPa207TVw47r1vENU76hbFmK75NTzaI=; b=TDP07FYcO90jValNkjFhbWp4J9+p4+q1mEs5NXL6hLGOCvi5urmaZYSXlynuaEf/sI 0lvXhodsuRZonx5JHbE0BHW6L1TMNgY1kityzY8HX/X28tSY4b9zd4rwQKB38dUUmAOT roPhyiCY1PAIDZUpTYu08Z+fEVjhFOXjV0Xiw5KS6ELYh1xzGVWmnsgx4o6+EOOzCats NvIsPs3eRT8o/77B2NCTgIZGlTnPDfIs7UFMrAPZrqRccHYd4A2ouiYEFA/4NLpFJ92r 2nwjaE+JnSkXBHlvUWudmb4uWRrnaJW7VX37FXpa83UJR6Ih5t0bsj2cCQXHTIMycSQ3 uz3g== X-Gm-Message-State: AOAM530XxwfMII45kbUs+qXAnNnQPLGCnGUphTN3CF5DhfkO6U1fT2sf R19cilFYsxZXEn4CNTxpkP8dO3pFvAIU X-Google-Smtp-Source: ABdhPJyUFsTyra2KgSOrWWX4yAUZr3w074njqYa35mD36sCTPkOultYBLd/U+dkYJgXrSuS7Lty4CK+NBh/W X-Received: from irogers.svl.corp.google.com ([2620:15c:2cd:202:3af1:caef:2937:5d2b]) (user=irogers job=sendgmr) by 2002:a5b:881:: with SMTP id e1mr52376656ybq.602.1641363337450; Tue, 04 Jan 2022 22:15:37 -0800 (PST) Date: Tue, 4 Jan 2022 22:13:43 -0800 In-Reply-To: <20220105061351.120843-1-irogers@google.com> Message-Id: <20220105061351.120843-41-irogers@google.com> Mime-Version: 1.0 References: <20220105061351.120843-1-irogers@google.com> X-Mailer: git-send-email 2.34.1.448.ga2b2bfdf31-goog Subject: [PATCH v4 40/48] perf test: Use perf_cpu_map__for_each_cpu From: Ian Rogers To: Andi Kleen , Jiri Olsa , Namhyung Kim , John Garry , Kajol Jain , "Paul A . Clarke" , Arnaldo Carvalho de Melo , Riccardo Mancini , Kan Liang , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Vineet Singh , James Clark , Mathieu Poirier , Suzuki K Poulose , Mike Leach , Leo Yan , coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, zhengjun.xing@intel.com Cc: eranian@google.com, Ian Rogers X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220104_221539_053490_E6771E8C X-CRM114-Status: GOOD ( 15.44 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Clean up variable naming to make cpu and index clearer. Signed-off-by: Ian Rogers --- tools/perf/tests/openat-syscall-all-cpus.c | 28 +++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/tools/perf/tests/openat-syscall-all-cpus.c b/tools/perf/tests/openat-syscall-all-cpus.c index 544db0839b3b..ca0a50e92839 100644 --- a/tools/perf/tests/openat-syscall-all-cpus.c +++ b/tools/perf/tests/openat-syscall-all-cpus.c @@ -22,7 +22,7 @@ static int test__openat_syscall_event_on_all_cpus(struct test_suite *test __maybe_unused, int subtest __maybe_unused) { - int err = -1, fd, cpu; + int err = -1, fd, idx, cpu; struct perf_cpu_map *cpus; struct evsel *evsel; unsigned int nr_openat_calls = 111, i; @@ -58,23 +58,23 @@ static int test__openat_syscall_event_on_all_cpus(struct test_suite *test __mayb goto out_evsel_delete; } - for (cpu = 0; cpu < cpus->nr; ++cpu) { - unsigned int ncalls = nr_openat_calls + cpu; + perf_cpu_map__for_each_cpu(cpu, idx, cpus) { + unsigned int ncalls = nr_openat_calls + idx; /* * XXX eventually lift this restriction in a way that * keeps perf building on older glibc installations * without CPU_ALLOC. 1024 cpus in 2010 still seems * a reasonable upper limit tho :-) */ - if (cpus->map[cpu] >= CPU_SETSIZE) { - pr_debug("Ignoring CPU %d\n", cpus->map[cpu]); + if (cpu >= CPU_SETSIZE) { + pr_debug("Ignoring CPU %d\n", cpu); continue; } - CPU_SET(cpus->map[cpu], &cpu_set); + CPU_SET(cpu, &cpu_set); if (sched_setaffinity(0, sizeof(cpu_set), &cpu_set) < 0) { pr_debug("sched_setaffinity() failed on CPU %d: %s ", - cpus->map[cpu], + cpu, str_error_r(errno, sbuf, sizeof(sbuf))); goto out_close_fd; } @@ -82,29 +82,29 @@ static int test__openat_syscall_event_on_all_cpus(struct test_suite *test __mayb fd = openat(0, "/etc/passwd", O_RDONLY); close(fd); } - CPU_CLR(cpus->map[cpu], &cpu_set); + CPU_CLR(cpu, &cpu_set); } evsel->core.cpus = perf_cpu_map__get(cpus); err = 0; - for (cpu = 0; cpu < cpus->nr; ++cpu) { + perf_cpu_map__for_each_cpu(cpu, idx, cpus) { unsigned int expected; - if (cpus->map[cpu] >= CPU_SETSIZE) + if (cpu >= CPU_SETSIZE) continue; - if (evsel__read_on_cpu(evsel, cpu, 0) < 0) { + if (evsel__read_on_cpu(evsel, idx, 0) < 0) { pr_debug("evsel__read_on_cpu\n"); err = -1; break; } - expected = nr_openat_calls + cpu; - if (perf_counts(evsel->counts, cpu, 0)->val != expected) { + expected = nr_openat_calls + idx; + if (perf_counts(evsel->counts, idx, 0)->val != expected) { pr_debug("evsel__read_on_cpu: expected to intercept %d calls on cpu %d, got %" PRIu64 "\n", - expected, cpus->map[cpu], perf_counts(evsel->counts, cpu, 0)->val); + expected, cpu, perf_counts(evsel->counts, idx, 0)->val); err = -1; } }