Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp576009pxk; Fri, 11 Sep 2020 14:53:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzeFUb+z+c/QK2P7ItJKM+skDciuov4PYVvzS5XD0kQIBbDC3kg7p5vX3IXiLN5nZqH0Arl X-Received: by 2002:a50:fb15:: with SMTP id d21mr4909878edq.150.1599861223112; Fri, 11 Sep 2020 14:53:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599861223; cv=none; d=google.com; s=arc-20160816; b=NxqePL+kFzh0Y3leGxbtxziOXcACnMKdKre6jJliHjL4qoiq3QZOow0wJabVHAg9JV D4xJOISyqs441cTaHTdqJBmVYuQKGDoAPn4Q1A2aY1KhnNpF55rRkMdgXRo5Aa2DlE4U RnfJPqGVpfBZBlYWhIPgXda1RFNMk97PtQxwJn5jTLNXLKaoa1WhpN5yVbMr+L+psWot mK0EvN0kcWPtsBQOu5IjunqkZck/TC5G0lhpvXa6Go6LWToJz3MLcDC3O6OZmFHc7w1t R0KXxztdD24Ug1ZDgAE49BxqQF6pS1+tJ4B2coC7q5ziLBVQaRoi6hPJSpU/zbU3ICf+ j/iQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=nPZFL/7y5I5kGHvP0roH88e8RweLKgu5ardwJtO3aSo=; b=G9JLC19NpDyIWB6qa8++2AqwPwoFzRM0T9f2yJxgKzyZANelfDp5o/OLXMxKcfy9jb CK8RYi0O2VfmYBZ0E9LU6WGvTuedypDmpdB1qZCvXjzy7iJ7kaAJZTRUha8Fr76QhZoL t374PX6ZYrT24M5APlXsuKle4EQ7kIzRfcrLOhwwhkXWABlhs6527vg/2X/pgosAfl9X 7mK1agrSIsvyoROj4Rt0G2S8O7bw/rwmPE6sUTRCklothCod8lQSbe4lMzuv2TOCqoyT kto6q5SxD8rjSfCuEgIBdNX1L1PtWpIA4364W3ZQ+cTh2sBQdKZvA8N5mUPoZcsuQR+E kWiQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m3si2189988edr.29.2020.09.11.14.53.19; Fri, 11 Sep 2020 14:53:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725895AbgIKVwX (ORCPT + 99 others); Fri, 11 Sep 2020 17:52:23 -0400 Received: from mail-io1-f65.google.com ([209.85.166.65]:36177 "EHLO mail-io1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725931AbgIKVvp (ORCPT ); Fri, 11 Sep 2020 17:51:45 -0400 Received: by mail-io1-f65.google.com with SMTP id d190so12652878iof.3 for ; Fri, 11 Sep 2020 14:51:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nPZFL/7y5I5kGHvP0roH88e8RweLKgu5ardwJtO3aSo=; b=YMJpbx57U1RiEU5W0G5ClIQrR6D+Z/iQxtb1slOqjMAlrOXuNT767zrM6ewSLwyoNl DABkHSwyYaV55aWjIYoZ8PiUaTxYqqh3M5e5jr/rbUU4TW28C6tkp1WYKvTK246fnmfg Hz8BYzZGiyW1RgUGfp/j80wXmhvAbLQt2O0qhwddFIqG3G7Wp3Z8iNZcmRKiFLTf5Xt3 cZmFFLos378R4Pogh/DlHbGceahtCCnifYi/UR1gXkw9FwsEQy1HjRCTxa8KNtsk2A/W +bTmk9IfaC7GmLkeUhFKbG0Q/RY9AvwEjC4aflxLzjURNED8XyaRIVHDbAkfwsTA6ASW k1/A== X-Gm-Message-State: AOAM530Jo3GDKe/H0KesbYP1vMaXG8qFa1rf6K7O66rG1B45z9e9jUDI lDRnmWzAZLr0sxDEsF6jQg== X-Received: by 2002:a6b:3e06:: with SMTP id l6mr3356043ioa.160.1599861093401; Fri, 11 Sep 2020 14:51:33 -0700 (PDT) Received: from xps15.herring.priv ([64.188.179.251]) by smtp.googlemail.com with ESMTPSA id a20sm1927966ilq.57.2020.09.11.14.51.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Sep 2020 14:51:32 -0700 (PDT) From: Rob Herring To: Will Deacon , Catalin Marinas , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Jiri Olsa Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Alexander Shishkin , Namhyung Kim , Raphael Gault , Mark Rutland , Jonathan Cameron , Ian Rogers , honnappa.nagarahalli@arm.com Subject: [PATCH v3 09/10] perf: arm64: Add test for userspace counter access on heterogeneous systems Date: Fri, 11 Sep 2020 15:51:17 -0600 Message-Id: <20200911215118.2887710-10-robh@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200911215118.2887710-1-robh@kernel.org> References: <20200911215118.2887710-1-robh@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Userspace counter access only works on heterogeneous systems with some restrictions. The userspace process must be pinned to a homogeneous subset of CPUs and must open the corresponding PMU for those CPUs. This commit adds a test implementing these requirements. Signed-off-by: Rob Herring --- v2: - Drop all but heterogeneous test as others covered by libperf tests - Rework to use libperf --- tools/perf/arch/arm64/include/arch-tests.h | 7 + tools/perf/arch/arm64/tests/Build | 1 + tools/perf/arch/arm64/tests/arch-tests.c | 4 + tools/perf/arch/arm64/tests/user-events.c | 170 +++++++++++++++++++++ 4 files changed, 182 insertions(+) create mode 100644 tools/perf/arch/arm64/tests/user-events.c diff --git a/tools/perf/arch/arm64/include/arch-tests.h b/tools/perf/arch/arm64/include/arch-tests.h index 90ec4c8cb880..380ad34a3f09 100644 --- a/tools/perf/arch/arm64/include/arch-tests.h +++ b/tools/perf/arch/arm64/include/arch-tests.h @@ -2,11 +2,18 @@ #ifndef ARCH_TESTS_H #define ARCH_TESTS_H +#include + #ifdef HAVE_DWARF_UNWIND_SUPPORT struct thread; struct perf_sample; +int test__arch_unwind_sample(struct perf_sample *sample, + struct thread *thread); #endif extern struct test arch_tests[]; +int test__rd_pinned(struct test __maybe_unused *test, + int __maybe_unused subtest); + #endif diff --git a/tools/perf/arch/arm64/tests/Build b/tools/perf/arch/arm64/tests/Build index a61c06bdb757..3f9a20c17fc6 100644 --- a/tools/perf/arch/arm64/tests/Build +++ b/tools/perf/arch/arm64/tests/Build @@ -1,4 +1,5 @@ perf-y += regs_load.o perf-$(CONFIG_DWARF_UNWIND) += dwarf-unwind.o +perf-y += user-events.o perf-y += arch-tests.o diff --git a/tools/perf/arch/arm64/tests/arch-tests.c b/tools/perf/arch/arm64/tests/arch-tests.c index 5b1543c98022..80ce7bd3c16d 100644 --- a/tools/perf/arch/arm64/tests/arch-tests.c +++ b/tools/perf/arch/arm64/tests/arch-tests.c @@ -10,6 +10,10 @@ struct test arch_tests[] = { .func = test__dwarf_unwind, }, #endif + { + .desc = "Pinned CPU user counter access", + .func = test__rd_pinned, + }, { .func = NULL, }, diff --git a/tools/perf/arch/arm64/tests/user-events.c b/tools/perf/arch/arm64/tests/user-events.c new file mode 100644 index 000000000000..9cf30adf39d9 --- /dev/null +++ b/tools/perf/arch/arm64/tests/user-events.c @@ -0,0 +1,170 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include +#include + +#include +#include +#include + +#include "pmu.h" +#include "debug.h" +#include "tests/tests.h" +#include "arch-tests.h" + +static int run_test(struct perf_evsel *evsel) +{ + int n; + volatile int tmp = 0; + u64 delta, i, loops = 1000; + struct perf_counts_values counts = { .val = 0 }; + + for (n = 0; n < 6; n++) { + u64 stamp, now; + + perf_evsel__read(evsel, 0, 0, &counts); + stamp = counts.val; + + for (i = 0; i < loops; i++) + tmp++; + + perf_evsel__read(evsel, 0, 0, &counts); + now = counts.val; + loops *= 10; + + delta = now - stamp; + pr_debug("%14d: %14llu\n", n, (long long)delta); + + if (!delta) + break; + } + return delta ? 0 : -1; +} + +static struct perf_pmu *pmu_for_cpu(int cpu) +{ + int acpu, idx; + struct perf_pmu *pmu = NULL; + + while ((pmu = perf_pmu__scan(pmu)) != NULL) { + if (pmu->is_uncore) + continue; + perf_cpu_map__for_each_cpu(acpu, idx, pmu->cpus) + if (acpu == cpu) + return pmu; + } + return NULL; +} + +static bool pmu_is_homogeneous(void) +{ + int core_cnt = 0; + struct perf_pmu *pmu = NULL; + + while ((pmu = perf_pmu__scan(pmu)) != NULL) { + if (!pmu->is_uncore && !perf_cpu_map__empty(pmu->cpus)) + core_cnt++; + } + return core_cnt == 1; +} + +static int libperf_print(enum libperf_print_level level, + const char *fmt, va_list ap) +{ + (void)level; + return vfprintf(stderr, fmt, ap); +} + +static struct perf_evsel *perf_init(struct perf_event_attr *attr) +{ + int err; + struct perf_thread_map *threads; + struct perf_evsel *evsel; + + libperf_init(libperf_print); + + threads = perf_thread_map__new_dummy(); + if (!threads) { + pr_err("failed to create threads\n"); + return NULL; + } + + perf_thread_map__set_pid(threads, 0, 0); + + evsel = perf_evsel__new(attr); + if (!evsel) { + pr_err("failed to create evsel\n"); + goto out_thread; + } + + err = perf_evsel__open(evsel, NULL, threads); + if (err) { + pr_err("failed to open evsel\n"); + goto out_open; + } + + if (!perf_evsel__mmap(evsel)) { + pr_err("failed to mmap evsel\n"); + goto out_mmap; + } + + return evsel; + +out_mmap: + perf_evsel__close(evsel); +out_open: + perf_evsel__delete(evsel); +out_thread: + perf_thread_map__put(threads); + return NULL; +} + +int test__rd_pinned(struct test __maybe_unused *test, + int __maybe_unused subtest) +{ + int cpu, cputmp, ret = -1; + struct perf_evsel *evsel; + struct perf_event_attr attr = { + .config = 0x8, /* Instruction count */ + .config1 = 0, /* 32-bit counter */ + .exclude_kernel = 1, + }; + cpu_set_t cpu_set; + struct perf_pmu *pmu; + + if (pmu_is_homogeneous()) + return TEST_SKIP; + + cpu = sched_getcpu(); + pmu = pmu_for_cpu(cpu); + if (!pmu) + return -1; + attr.type = pmu->type; + + CPU_ZERO(&cpu_set); + perf_cpu_map__for_each_cpu(cpu, cputmp, pmu->cpus) + CPU_SET(cpu, &cpu_set); + if (sched_setaffinity(0, sizeof(cpu_set), &cpu_set) < 0) + pr_err("Could not set affinity\n"); + + evsel = perf_init(&attr); + if (!evsel) + return -1; + + perf_cpu_map__for_each_cpu(cpu, cputmp, pmu->cpus) { + CPU_ZERO(&cpu_set); + CPU_SET(cpu, &cpu_set); + if (sched_setaffinity(0, sizeof(cpu_set), &cpu_set) < 0) + pr_err("Could not set affinity\n"); + + pr_debug("Running on CPU %d\n", cpu); + + ret = run_test(evsel); + if (ret) + break; + } + + perf_evsel__close(evsel); + perf_evsel__delete(evsel); + return ret; +} -- 2.25.1