From nobody Sun Nov 24 04:38:24 2024 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3BDAD1DE4EA for ; Thu, 7 Nov 2024 07:16:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730963769; cv=none; b=PW/TNNE+jzvvaNxdA4iRjqLgqqXJdUzqMCoIkKtWj6QOxC/4lLGuxyzN9MXLenut+2fTbuCgs5wKGrJV54Q3+sSx+UAhNTyh55LSPLVUjP0vvsfkTc0/XxKSvZaWClLg9IJQcbVvu5ZCoVlmVGP4/leyw3VgmC12bBLFxHYso+k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730963769; c=relaxed/simple; bh=owS3gFAXW6+G60tXNdObjtbFPJBTnB5LTfABtjIlfns=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=H5Q7wvbKXZmcD4PXdQ8Hazmu4neK/4bJMrktBfVOigC10+LYn/f9P6iDfvXXoX3NxNX6v1g3aRLvT0egsnHtB2ptWcNn7bqVkN5Z6nXBA8tTYMahx/OMaUFIlZJux8IQZlanZu6lCGq8/onIVR2NY0bXC6WJW86t+vbzWqTzZec= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=PmQwcCmr; arc=none smtp.client-ip=209.85.128.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="PmQwcCmr" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-6ea86f1df79so12647077b3.1 for ; Wed, 06 Nov 2024 23:16:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1730963766; x=1731568566; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=d5CBVRj+oeokqCZ8tX2zkzcVhcgEep+JK2ByfRR+yWc=; b=PmQwcCmrKT0g+lU0C8GqAqIjX3LwTFkw0pboQCie3g5JbxlK6xmz1Cr/3+i94HtuAL Ra5CWXJsU5sMe2eKOJQrLGxVP/UJdur/0zDZaZu4DALQ7+fKQp78tP89SK+DIIBhrvI+ Vi96CmaScOAsZ3EgPwKe/yc7cSBWQsvrxKEMq0kdpJHfKk1Q3UbQb8LicSpvQEzjAiRN L+P770lmr9AH+rx62yL+aSDi0DqBEHkMhcaEV+EyhqktTFtMlGBjwuWwM9KpBYXH9tHA OS0epA/SCc79SKn5PArGCVn+mInt5bKdgnEC0vGEfw592qdisuVehSvPMkZpui1GpG42 0KrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730963766; x=1731568566; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=d5CBVRj+oeokqCZ8tX2zkzcVhcgEep+JK2ByfRR+yWc=; b=Q/g9JcQvnGbDdvBPVJmVbywlkAsZpSt8DH+78dV2+C2jSK22Mm49mTemg293mlINq1 p7GfQb6BDkRPajpgZfoe5hn68vhBGkKFH2iHdNyDNMw6HNP//DWIkCmrpERS1o8SOipN udBA3yMbAyLwTq6g6WJqcE9xX7NzQAWuhqCYgs0kg4NkU6v8KNt1HZJZF3MM7BeJ8jjJ 2TFQhrzpnD8yM6+l+ATBrGY2ls2MHYxAb42GXxv+A6n4jXA+ZfhASqPQUa3GFPS6RrIW 29vnucTpcNC9YYt1XdEuoJLl5xzm59yTNCmSwi18LFG6oPhP314lhC4Ny8Etz4rDG9y8 nLgg== X-Forwarded-Encrypted: i=1; AJvYcCWf10nO7UyrGbrtqLN7Qtm8K9rjWJTB3KDSs4oLZ69gLO4BoTXLKbxxwR1j0fGhYoL6Xedpn3mtyaYcijs=@vger.kernel.org X-Gm-Message-State: AOJu0Yx88sGXxh1MpHZw3k82zbSBRdnnN+ZvRIWC5jLe3h861CnBdwI+ 6lznlS8DNHdwd4C98sZhH1bgruVWE/WUG1SH8S5c5wgAldRPSAi8j35UqCkL25l9sOWzM9PmLpV qlmtVPQ== X-Google-Smtp-Source: AGHT+IEd0XW+XP13/lIdiLfA1JS+O6Mq9dYjD7PUyhpWzqvtXDfGa/+OwNkNynbL8Jl1y47mBuEBrXARi0WE X-Received: from irogers.svl.corp.google.com ([2620:15c:2c5:11:acc7:bda:7167:18d8]) (user=irogers job=sendgmr) by 2002:a25:a305:0:b0:e11:639b:6428 with SMTP id 3f1490d57ef6-e3087722c24mr85002276.0.1730963765469; Wed, 06 Nov 2024 23:16:05 -0800 (PST) Date: Wed, 6 Nov 2024 23:15:54 -0800 In-Reply-To: <20241107071600.9082-1-irogers@google.com> Message-Id: <20241107071600.9082-2-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20241107071600.9082-1-irogers@google.com> X-Mailer: git-send-email 2.47.0.199.ga7371fff76-goog Subject: [PATCH v1 1/7] perf header: Move is_cpu_online to numa bench From: Ian Rogers To: John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Paul Walmsley , Palmer Dabbelt , Albert Ou , Huacai Chen , Bibo Mao , Athira Rajeev , Ben Zong-You Xie , Alexandre Ghiti , Sandipan Das , Benjamin Gray , Xu Yang , Ravi Bangoria , "=?UTF-8?q?Cl=C3=A9ment=20Le=20Goffic?=" , Yicong Yang , "Masami Hiramatsu (Google)" , Dima Kogan , "Dr. David Alan Gilbert" , linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The helper function is only used in the NUMA benchmark as typically online CPUs are determined through perf_cpu_map__new_online_cpus(). Reduce the scope of the function for now. Signed-off-by: Ian Rogers --- tools/perf/bench/numa.c | 51 ++++++++++++++++++++++++++++++++++++++++ tools/perf/util/header.c | 51 ---------------------------------------- tools/perf/util/header.h | 1 - 3 files changed, 51 insertions(+), 52 deletions(-) diff --git a/tools/perf/bench/numa.c b/tools/perf/bench/numa.c index 1fbd7c947abc..611451dbc234 100644 --- a/tools/perf/bench/numa.c +++ b/tools/perf/bench/numa.c @@ -533,6 +533,57 @@ static int parse_cpu_list(const char *arg) return 0; } =20 +/* + * Check whether a CPU is online + * + * Returns: + * 1 -> if CPU is online + * 0 -> if CPU is offline + * -1 -> error case + */ +static int is_cpu_online(unsigned int cpu) +{ + char *str; + size_t strlen; + char buf[256]; + int status =3D -1; + struct stat statbuf; + + snprintf(buf, sizeof(buf), + "/sys/devices/system/cpu/cpu%d", cpu); + if (stat(buf, &statbuf) !=3D 0) + return 0; + + /* + * Check if /sys/devices/system/cpu/cpux/online file + * exists. Some cases cpu0 won't have online file since + * it is not expected to be turned off generally. + * In kernels without CONFIG_HOTPLUG_CPU, this + * file won't exist + */ + snprintf(buf, sizeof(buf), + "/sys/devices/system/cpu/cpu%d/online", cpu); + if (stat(buf, &statbuf) !=3D 0) + return 1; + + /* + * Read online file using sysfs__read_str. + * If read or open fails, return -1. + * If read succeeds, return value from file + * which gets stored in "str" + */ + snprintf(buf, sizeof(buf), + "devices/system/cpu/cpu%d/online", cpu); + + if (sysfs__read_str(buf, &str, &strlen) < 0) + return status; + + status =3D atoi(str); + + free(str); + return status; +} + static int parse_setup_cpu_list(void) { struct thread_data *td; diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index a6386d12afd7..55c28e4377ec 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -987,57 +987,6 @@ static int write_dir_format(struct feat_fd *ff, return do_write(ff, &data->dir.version, sizeof(data->dir.version)); } =20 -/* - * Check whether a CPU is online - * - * Returns: - * 1 -> if CPU is online - * 0 -> if CPU is offline - * -1 -> error case - */ -int is_cpu_online(unsigned int cpu) -{ - char *str; - size_t strlen; - char buf[256]; - int status =3D -1; - struct stat statbuf; - - snprintf(buf, sizeof(buf), - "/sys/devices/system/cpu/cpu%d", cpu); - if (stat(buf, &statbuf) !=3D 0) - return 0; - - /* - * Check if /sys/devices/system/cpu/cpux/online file - * exists. Some cases cpu0 won't have online file since - * it is not expected to be turned off generally. - * In kernels without CONFIG_HOTPLUG_CPU, this - * file won't exist - */ - snprintf(buf, sizeof(buf), - "/sys/devices/system/cpu/cpu%d/online", cpu); - if (stat(buf, &statbuf) !=3D 0) - return 1; - - /* - * Read online file using sysfs__read_str. - * If read or open fails, return -1. - * If read succeeds, return value from file - * which gets stored in "str" - */ - snprintf(buf, sizeof(buf), - "devices/system/cpu/cpu%d/online", cpu); - - if (sysfs__read_str(buf, &str, &strlen) < 0) - return status; - - status =3D atoi(str); - - free(str); - return status; -} - #ifdef HAVE_LIBBPF_SUPPORT static int write_bpf_prog_info(struct feat_fd *ff, struct evlist *evlist __maybe_unused) diff --git a/tools/perf/util/header.h b/tools/perf/util/header.h index a63a361f20f4..e91e89d22537 100644 --- a/tools/perf/util/header.h +++ b/tools/perf/util/header.h @@ -196,7 +196,6 @@ int write_padded(struct feat_fd *fd, const void *bf, =20 #define MAX_CACHE_LVL 4 =20 -int is_cpu_online(unsigned int cpu); int build_caches_for_cpu(u32 cpu, struct cpu_cache_level caches[], u32 *cn= tp); =20 /* --=20 2.47.0.199.ga7371fff76-goog From nobody Sun Nov 24 04:38:24 2024 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2FBD4198E77 for ; Thu, 7 Nov 2024 07:16:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730963770; cv=none; b=JOstsddQwJKBtRqKNrU96k5K4RsQIIYakxg8OrNrsGCR9jIscP7+5HwH/mytVInkZ1ZZHcNyM3UX+hs3V9nzuDMEJoh7cR87OnvoGpShlNoHW7vMiCuQch5bAOX2hqRQxqa9oC0bnXT/Js+jAjBPU8+KpS5gSsGu+9XVQ+wWMNQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730963770; c=relaxed/simple; bh=UGgs7qpyQsaOAD/+38PffSoTksURxSZGP6Fxx9r4zHE=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=nxCXPH4BYhvu+z1tFsvwyE0OSMevNZpYklrhuYk7tlY644T69oxuvbhRAejUXp1ffi+IWabkya2hfamfeHorFenDseaM9Zwy0/ZvYA+pLLcgVhl82craLft6LQyjth3A1t2qNdqVpSCseZwwn0LZnShXSg6bTPv+WSiA0BhixaA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=PJrCX8Od; arc=none smtp.client-ip=209.85.219.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="PJrCX8Od" Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-e292dbfd834so1275951276.3 for ; Wed, 06 Nov 2024 23:16:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1730963768; x=1731568568; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=QeV5H6hULi4PmNWhXYnKicIpV1Vf/5KV4yP0bFilR2g=; b=PJrCX8OdT7c1isBx4Mlmd1XTGV7MUCa+Ssb8EGzUFA7OJp3+Vshy54YRuOLvd0F5La BkMEUeCOMonBy3hDNkyz8os55Y3/eaHWOudpXeTGKefAKyffpwoVb7fzsCHoYCx2MiM0 oUNNi7VeBeSyhC9XmaPiPse5g3xvVJm9ae5RCCtOmbkoDslhW+nAT5Ft4QZsON+/QA7T 7LYYHgJTBL1a5L6QORkmMyM3cGZoeCRQEwxvUZ8FYpmMZVW9JON562pF2zKuXvntxVnm ZyCBnc/IaTb+AyY9GXBBSAR4x7I9S9fKbQdw1V4iHSU3nTlJdx5gUclsW3kO+SR05uxh WUIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730963768; x=1731568568; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=QeV5H6hULi4PmNWhXYnKicIpV1Vf/5KV4yP0bFilR2g=; b=XTH5WCfAsN9O3phdGcys3EXUZqcy426EWYJPPmkuWyLMf3eMVZbTWvd6MH6M3bG1ku To5NX93Q8t6fPvFBjn42loBtvgX3ld2v+6kEdrY+W3/x/09xDLk5z/elQVdw1khOlv8C GExD2HnW5NWqo9t1VV7RgGfFXcihHwrpZyvIPMEa8kpl+cC1ooWtpR2jBgOi9rDCIoxD p9HixVx6LVgHrrY649taP2/9VlyzvhRPYzbH0GTUBaMNxsY1Jf9LMV/CwdUORNuNhn+5 CF4g+fZ5qCIHkfieYUQ/MrPRfxJJGygxjN4r3LBpP7dV6R3mwTfHwJOtQEFGuy0u0uKR 6Ytw== X-Forwarded-Encrypted: i=1; AJvYcCWt/Yue9fyMkn2OFS4accjQonMV/3Kzb6/ZaPnQ9vvx50052FiHcmn4tmfSeJLZgg75TJgQqCXufU7fbfA=@vger.kernel.org X-Gm-Message-State: AOJu0YxAjyOCkr5o09rmQnL2u3n3Uza/iavY0F6NH3TsPTX/IAYAKdcX gnQnWosL8GpH1vfB4l3d0yYrHzdalrRVNQsciq9QiOdFTAHIYzvnHoMr0CK1MIzsRs9BH+IHA7d YtbgU/g== X-Google-Smtp-Source: AGHT+IE/ABVQ+QoaXLev0j3L1bcYVcVKTmJ8bev+UrY6tq85vQOpw2ZTVBgndT6AQUc++Em5ZIlqp477wVKR X-Received: from irogers.svl.corp.google.com ([2620:15c:2c5:11:acc7:bda:7167:18d8]) (user=irogers job=sendgmr) by 2002:a25:d695:0:b0:e2b:d28f:bf28 with SMTP id 3f1490d57ef6-e3302537c7dmr36619276.2.1730963768215; Wed, 06 Nov 2024 23:16:08 -0800 (PST) Date: Wed, 6 Nov 2024 23:15:55 -0800 In-Reply-To: <20241107071600.9082-1-irogers@google.com> Message-Id: <20241107071600.9082-3-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20241107071600.9082-1-irogers@google.com> X-Mailer: git-send-email 2.47.0.199.ga7371fff76-goog Subject: [PATCH v1 2/7] perf header: Refactor get_cpuid to take a CPU for ARM From: Ian Rogers To: John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Paul Walmsley , Palmer Dabbelt , Albert Ou , Huacai Chen , Bibo Mao , Athira Rajeev , Ben Zong-You Xie , Alexandre Ghiti , Sandipan Das , Benjamin Gray , Xu Yang , Ravi Bangoria , "=?UTF-8?q?Cl=C3=A9ment=20Le=20Goffic?=" , Yicong Yang , "Masami Hiramatsu (Google)" , Dima Kogan , "Dr. David Alan Gilbert" , linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" ARM BIG.little has no notion of a constant CPUID for both core types. To reflect this reality, change the get_cpuid function to also pass in a possibly unused logical cpu. If the dummy value (-1) is passed in then ARM can, as currently happens, select the first logical CPU's "CPUID". The changes to ARM getcpuid happen in a follow up change. Signed-off-by: Ian Rogers --- tools/perf/arch/arm64/util/header.c | 2 +- tools/perf/arch/loongarch/util/header.c | 2 +- tools/perf/arch/powerpc/util/header.c | 2 +- tools/perf/arch/riscv/util/header.c | 2 +- tools/perf/arch/s390/util/header.c | 2 +- tools/perf/arch/x86/util/auxtrace.c | 3 ++- tools/perf/arch/x86/util/header.c | 2 +- tools/perf/builtin-kvm.c | 4 +++- tools/perf/util/env.c | 3 ++- tools/perf/util/header.c | 9 +++++---- tools/perf/util/header.h | 2 +- 11 files changed, 19 insertions(+), 14 deletions(-) diff --git a/tools/perf/arch/arm64/util/header.c b/tools/perf/arch/arm64/ut= il/header.c index 741df3614a09..760c21784713 100644 --- a/tools/perf/arch/arm64/util/header.c +++ b/tools/perf/arch/arm64/util/header.c @@ -50,7 +50,7 @@ static int _get_cpuid(char *buf, size_t sz, struct perf_c= pu_map *cpus) return ret; } =20 -int get_cpuid(char *buf, size_t sz) +int get_cpuid(char *buf, size_t sz, struct perf_cpu cpu __maybe_unused) { struct perf_cpu_map *cpus =3D perf_cpu_map__new_online_cpus(); int ret; diff --git a/tools/perf/arch/loongarch/util/header.c b/tools/perf/arch/loon= garch/util/header.c index d962dff55512..f1f0b116962d 100644 --- a/tools/perf/arch/loongarch/util/header.c +++ b/tools/perf/arch/loongarch/util/header.c @@ -70,7 +70,7 @@ static char *_get_cpuid(void) return cpuid; } =20 -int get_cpuid(char *buffer, size_t sz) +int get_cpuid(char *buffer, size_t sz, struct perf_cpu cpu __maybe_unused) { int ret =3D 0; char *cpuid =3D _get_cpuid(); diff --git a/tools/perf/arch/powerpc/util/header.c b/tools/perf/arch/powerp= c/util/header.c index 251cdbf58a4d..6d1a63a2922f 100644 --- a/tools/perf/arch/powerpc/util/header.c +++ b/tools/perf/arch/powerpc/util/header.c @@ -24,7 +24,7 @@ static bool is_compat_mode(void) } =20 int -get_cpuid(char *buffer, size_t sz) +get_cpuid(char *buffer, size_t sz, struct perf_cpu cpu __maybe_unused) { unsigned long pvr; int nb; diff --git a/tools/perf/arch/riscv/util/header.c b/tools/perf/arch/riscv/ut= il/header.c index 1b29030021ee..ebac294c877f 100644 --- a/tools/perf/arch/riscv/util/header.c +++ b/tools/perf/arch/riscv/util/header.c @@ -81,7 +81,7 @@ static char *_get_cpuid(void) return cpuid; } =20 -int get_cpuid(char *buffer, size_t sz) +int get_cpuid(char *buffer, size_t sz, struct perf_cpu cpu __maybe_unused) { char *cpuid =3D _get_cpuid(); int ret =3D 0; diff --git a/tools/perf/arch/s390/util/header.c b/tools/perf/arch/s390/util= /header.c index 7933f6871c81..2add1a561242 100644 --- a/tools/perf/arch/s390/util/header.c +++ b/tools/perf/arch/s390/util/header.c @@ -27,7 +27,7 @@ #define SYSINFO "/proc/sysinfo" #define SRVLVL "/proc/service_levels" =20 -int get_cpuid(char *buffer, size_t sz) +int get_cpuid(char *buffer, size_t sz, struct perf_cpu cpu __maybe_unused) { char *cp, *line =3D NULL, *line2; char type[8], model[33], version[8], manufacturer[32], authorization[8]; diff --git a/tools/perf/arch/x86/util/auxtrace.c b/tools/perf/arch/x86/util= /auxtrace.c index 354780ff1605..ecbf61a7eb3a 100644 --- a/tools/perf/arch/x86/util/auxtrace.c +++ b/tools/perf/arch/x86/util/auxtrace.c @@ -55,11 +55,12 @@ struct auxtrace_record *auxtrace_record__init(struct ev= list *evlist, int *err) { char buffer[64]; + struct perf_cpu cpu =3D perf_cpu_map__min(evlist->core.all_cpus); int ret; =20 *err =3D 0; =20 - ret =3D get_cpuid(buffer, sizeof(buffer)); + ret =3D get_cpuid(buffer, sizeof(buffer), cpu); if (ret) { *err =3D ret; return NULL; diff --git a/tools/perf/arch/x86/util/header.c b/tools/perf/arch/x86/util/h= eader.c index a51444a77a5f..690f86cbbb1c 100644 --- a/tools/perf/arch/x86/util/header.c +++ b/tools/perf/arch/x86/util/header.c @@ -58,7 +58,7 @@ __get_cpuid(char *buffer, size_t sz, const char *fmt) } =20 int -get_cpuid(char *buffer, size_t sz) +get_cpuid(char *buffer, size_t sz, struct perf_cpu cpu __maybe_unused) { return __get_cpuid(buffer, sz, "%s,%u,%u,%u$"); } diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c index 099ce3ebf67c..274568d712d1 100644 --- a/tools/perf/builtin-kvm.c +++ b/tools/perf/builtin-kvm.c @@ -1226,7 +1226,9 @@ static int cpu_isa_config(struct perf_kvm_stat *kvm) int err; =20 if (kvm->live) { - err =3D get_cpuid(buf, sizeof(buf)); + struct perf_cpu cpu =3D {-1}; + + err =3D get_cpuid(buf, sizeof(buf), cpu); if (err !=3D 0) { pr_err("Failed to look up CPU type: %s\n", str_error_r(err, buf, sizeof(buf))); diff --git a/tools/perf/util/env.c b/tools/perf/util/env.c index ccb464026642..93cabdd7ff43 100644 --- a/tools/perf/util/env.c +++ b/tools/perf/util/env.c @@ -373,7 +373,8 @@ int perf_env__read_pmu_mappings(struct perf_env *env) int perf_env__read_cpuid(struct perf_env *env) { char cpuid[128]; - int err =3D get_cpuid(cpuid, sizeof(cpuid)); + struct perf_cpu cpu =3D {-1}; + int err =3D get_cpuid(cpuid, sizeof(cpuid), cpu); =20 if (err) return err; diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 55c28e4377ec..60b42ddc3dac 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -856,18 +856,19 @@ int __weak strcmp_cpuid_str(const char *mapcpuid, con= st char *cpuid) * default get_cpuid(): nothing gets recorded * actual implementation must be in arch/$(SRCARCH)/util/header.c */ -int __weak get_cpuid(char *buffer __maybe_unused, size_t sz __maybe_unused) +int __weak get_cpuid(char *buffer __maybe_unused, size_t sz __maybe_unused, + struct perf_cpu cpu __maybe_unused) { return ENOSYS; /* Not implemented */ } =20 -static int write_cpuid(struct feat_fd *ff, - struct evlist *evlist __maybe_unused) +static int write_cpuid(struct feat_fd *ff, struct evlist *evlist) { + struct perf_cpu cpu =3D perf_cpu_map__min(evlist->core.all_cpus); char buffer[64]; int ret; =20 - ret =3D get_cpuid(buffer, sizeof(buffer)); + ret =3D get_cpuid(buffer, sizeof(buffer), cpu); if (ret) return -1; =20 diff --git a/tools/perf/util/header.h b/tools/perf/util/header.h index e91e89d22537..b77f89de12dd 100644 --- a/tools/perf/util/header.h +++ b/tools/perf/util/header.h @@ -201,7 +201,7 @@ int build_caches_for_cpu(u32 cpu, struct cpu_cache_leve= l caches[], u32 *cntp); /* * arch specific callback */ -int get_cpuid(char *buffer, size_t sz); +int get_cpuid(char *buffer, size_t sz, struct perf_cpu cpu); =20 char *get_cpuid_str(struct perf_pmu *pmu __maybe_unused); int strcmp_cpuid_str(const char *s1, const char *s2); --=20 2.47.0.199.ga7371fff76-goog From nobody Sun Nov 24 04:38:24 2024 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2B6A91DED74 for ; Thu, 7 Nov 2024 07:16:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730963772; cv=none; b=Di/Uh7qX0h6WcieMfcSn7O5WmEvSbGYtANJxXSsEoRpKLeBwoD2qz9lrOiO7m1CqgBtiuoFFMAMoLNY0c2TCVO8Zx728TAhBf3eonsiOz/mjCsb/Ur7zSQsOlRMtEZTeg1a5JVckMRyAuOqPCNmHzyASRXIxycDf0P/mgeTx/Tw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730963772; c=relaxed/simple; bh=OHfFGp0ifWb+zyyGJptLLNowSsK7ixiaUATGyiRfl38=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=gEYAR+1hPC+QlpDsUkihd6gTaxqO482u7MjJrDAZRTJv1raevcXNZn39ZuNRdTcHOjrbHGOVQKV4rlgid/Y1lC9JVbghj1u4aGx7M/ehb9F44oMPmC5A0biUjH+KfjOjnooBOyW3zjT5dRPuyhodQUeE7Z9DWkMI98LeWhFXIvk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=sNZAJK3A; arc=none smtp.client-ip=209.85.219.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="sNZAJK3A" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-e330f65bcd9so1073595276.1 for ; Wed, 06 Nov 2024 23:16:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1730963770; x=1731568570; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=cITlh9ATOoPVTRO1t6obQAYHyRTBK7FrpPuOEFqdekQ=; b=sNZAJK3AWcEnfVeBJZ/b3Lr8LNM7UUyZUuCc8LmfxkApGLDORxS1mAAnCrrd9qdzjG iFUhbNwhPgM+DRMAla6GeS+1nMZh1o//OT7JC8BcBjjT7tfBma1Tp+uEZp1h6SM3zTQr 5M38fQSjkH7gfBplmwsAK8DChBWrcvXVOXp9v8VSwcLNn18Y4ZXpHkMrDAdnmWcL6J3D qmQY/c7YSw/ohX/rkQo7gXfpybJANHEx6rZAzf7lAZoSZheqUfab9CnR5RxcScGMCyRe naCxl+xoKPsmTHH/ORvM6roALAD6l8MqYm9z+NyiA2vvF9HKjRPfxkyQEFW1W15kE+a8 cpiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730963770; x=1731568570; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=cITlh9ATOoPVTRO1t6obQAYHyRTBK7FrpPuOEFqdekQ=; b=aiChiUhGG+YOcX9a7UApOaYs5rrTTYvJcA+grGTckK9wsIkZvBUKGVrIdQTF8prcG8 aIAvpmSmyFuWWKj32CzSl2vvDEQ1HDZjnz7jMKfqGlAkXg8SboJFbfrgAQlEYmLDwwou /QaAKiw9vZguV+7c4Ym/u9FyCWjVKRXWx9hhL29n2t4kxkf0KAS7efKjXfU2GMduwW42 XJn6S6IosP9LCD+E4M+eBtbn2LXA8feF6PU93korUWt5BqolOwAUB/pp3VorZe3neIDY 0ouMN48maSMbox93e2aYG/2+N2XXh5Ge9LFeIoQwRdTZLd62x5uUf+4crIKGzBhscTne ioSw== X-Forwarded-Encrypted: i=1; AJvYcCU3Yf8cHCtZVmkGCRA2kbu9pjnDgNL54B8QvTC1OouXigzlkAVyz9rpKDDbZm/evzCc7HUkiGmOHx7u6fs=@vger.kernel.org X-Gm-Message-State: AOJu0Yz5cE2XZIdvYAsMd4tA9IlDkVumKY1oJtb03DuamaLXZIZDwsao wvBoJgXcC4MOzfHGJQYu65OD6k2XscNZGrdmL29ivTmaw9rbbAQRpHVLsvEnHmi28lzwjb6JYk8 WQAkTyA== X-Google-Smtp-Source: AGHT+IG3hd8yCeGAX7h4k6RVex8boUD3HvG3dEWbSWvGpSoN2fs9Bh/9yh9W9X2pTJW73xmM0xEe1Jlq71HY X-Received: from irogers.svl.corp.google.com ([2620:15c:2c5:11:acc7:bda:7167:18d8]) (user=irogers job=sendgmr) by 2002:a25:901:0:b0:e2e:2c2e:277b with SMTP id 3f1490d57ef6-e33691e2433mr5319276.3.1730963770308; Wed, 06 Nov 2024 23:16:10 -0800 (PST) Date: Wed, 6 Nov 2024 23:15:56 -0800 In-Reply-To: <20241107071600.9082-1-irogers@google.com> Message-Id: <20241107071600.9082-4-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20241107071600.9082-1-irogers@google.com> X-Mailer: git-send-email 2.47.0.199.ga7371fff76-goog Subject: [PATCH v1 3/7] perf arm64 header: Use cpu argument in get_cpuid From: Ian Rogers To: John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Paul Walmsley , Palmer Dabbelt , Albert Ou , Huacai Chen , Bibo Mao , Athira Rajeev , Ben Zong-You Xie , Alexandre Ghiti , Sandipan Das , Benjamin Gray , Xu Yang , Ravi Bangoria , "=?UTF-8?q?Cl=C3=A9ment=20Le=20Goffic?=" , Yicong Yang , "Masami Hiramatsu (Google)" , Dima Kogan , "Dr. David Alan Gilbert" , linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use the cpu to read the MIDR file requested. If the "any" value (-1) is passed that keep the behavior of returning the first MIDR file that can be read. Signed-off-by: Ian Rogers --- tools/perf/arch/arm64/util/header.c | 63 ++++++++++++++--------------- tools/perf/util/header.h | 1 + 2 files changed, 31 insertions(+), 33 deletions(-) diff --git a/tools/perf/arch/arm64/util/header.c b/tools/perf/arch/arm64/ut= il/header.c index 760c21784713..f0907daad3ae 100644 --- a/tools/perf/arch/arm64/util/header.c +++ b/tools/perf/arch/arm64/util/header.c @@ -14,55 +14,52 @@ #define MIDR_REVISION_MASK GENMASK(3, 0) #define MIDR_VARIANT_MASK GENMASK(23, 20) =20 -static int _get_cpuid(char *buf, size_t sz, struct perf_cpu_map *cpus) +static int _get_cpuid(char *buf, size_t sz, struct perf_cpu cpu) { + char path[PATH_MAX]; + FILE *file; const char *sysfs =3D sysfs__mountpoint(); - struct perf_cpu cpu; - int idx, ret =3D EINVAL; =20 + assert(cpu.cpu !=3D -1); if (!sysfs || sz < MIDR_SIZE) return EINVAL; =20 - perf_cpu_map__for_each_cpu(cpu, idx, cpus) { - char path[PATH_MAX]; - FILE *file; - - scnprintf(path, PATH_MAX, "%s/devices/system/cpu/cpu%d" MIDR, - sysfs, cpu.cpu); - - file =3D fopen(path, "r"); - if (!file) { - pr_debug("fopen failed for file %s\n", path); - continue; - } - - if (!fgets(buf, MIDR_SIZE, file)) { - fclose(file); - continue; - } - fclose(file); + scnprintf(path, PATH_MAX, "%s/devices/system/cpu/cpu%d" MIDR, sysfs, cpu.= cpu); =20 - /* got midr break loop */ - ret =3D 0; - break; + file =3D fopen(path, "r"); + if (!file) { + pr_debug("fopen failed for file %s\n", path); + return EINVAL; } =20 - return ret; + if (!fgets(buf, MIDR_SIZE, file)) { + pr_debug("Failed to read file %s\n", path); + fclose(file); + return EINVAL; + } + fclose(file); + return 0; } =20 -int get_cpuid(char *buf, size_t sz, struct perf_cpu cpu __maybe_unused) +int get_cpuid(char *buf, size_t sz, struct perf_cpu cpu) { - struct perf_cpu_map *cpus =3D perf_cpu_map__new_online_cpus(); - int ret; + struct perf_cpu_map *cpus; + int idx; + + if (cpu.cpu !=3D -1) + return _get_cpuid(buf, sz, cpu); =20 + cpus =3D perf_cpu_map__new_online_cpus(); if (!cpus) return EINVAL; =20 - ret =3D _get_cpuid(buf, sz, cpus); - - perf_cpu_map__put(cpus); + perf_cpu_map__for_each_cpu(cpu, idx, cpus) { + int ret =3D _get_cpuid(buf, sz, cpu); =20 - return ret; + if (ret =3D=3D 0) + return 0; + } + return EINVAL; } =20 char *get_cpuid_str(struct perf_pmu *pmu) @@ -78,7 +75,7 @@ char *get_cpuid_str(struct perf_pmu *pmu) return NULL; =20 /* read midr from list of cpus mapped to this pmu */ - res =3D _get_cpuid(buf, MIDR_SIZE, pmu->cpus); + res =3D get_cpuid(buf, MIDR_SIZE, perf_cpu_map__min(pmu->cpus)); if (res) { pr_err("failed to get cpuid string for PMU %s\n", pmu->name); free(buf); diff --git a/tools/perf/util/header.h b/tools/perf/util/header.h index b77f89de12dd..3bb768455a60 100644 --- a/tools/perf/util/header.h +++ b/tools/perf/util/header.h @@ -11,6 +11,7 @@ #include #include "env.h" #include "pmu.h" +#include =20 enum { HEADER_RESERVED =3D 0, /* always cleared */ --=20 2.47.0.199.ga7371fff76-goog From nobody Sun Nov 24 04:38:24 2024 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 754121DF96A for ; Thu, 7 Nov 2024 07:16:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730963775; cv=none; b=qbSlbciG/8Gxd+Bxnra3FJTvZpKarB5aw51wmEzFt0hWdjd0c5rxOXaRdqIt8FJ566GVORX+foi+mKkM2/H+mPW7JD3jI9u4uK6z6OLLjhCurCTceXwgro8vwiYB+U8OHKBLmvgzbQhYPiEAJ+A7EMI88QVWIyKPOusxL4eEqz8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730963775; c=relaxed/simple; bh=Y+vKqYUCxSTt4LSzTKZWPT5tUEvVlBLoT2ItWD2c1T0=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=FGQeFdx4FdaqXyw5TjhpA97Rs7rDLH17ZNoChAQmn3ipt5W86EAESySaA605/tg/kSC4Fz0hekAxlYEEdJqQ4Mex0xJYJLtwPWbxuVIENKbHLdb0oXR/j87ONg3SEmdkuZQJgtMJwzem3vVzYUwKsH+xJ01I1jD5mpGnLnuaADM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=2L0//W6C; arc=none smtp.client-ip=209.85.128.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="2L0//W6C" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-6ea7c5805ccso11355467b3.0 for ; Wed, 06 Nov 2024 23:16:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1730963772; x=1731568572; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=0JtSX1ivElzP67Gy896L9Ack6oYznxDX7izzc96bZIU=; b=2L0//W6C6v6WJQ9QtLDCW3jCP59/rGYz1ugpp7IhRfoHPSn4DbG7JZKu9JPnULVy5t yPWsfuoiJUb1M+C/fB32qB8ZqasoL7Wqv+3YFMTGovON5SmGhwOgpzDqaL9sqsHquEhs nxjlAiA/GLm7GV/1RJMo4YyEtvc5n1zD62IVupUzrKcHEEpGsRlpq0dF4DoAIIiwW6x3 wzMnop52jfYj18sSUzIzesFekizChz7n07m2V7MpoA81tyRbHIlKERh11C4CfOpvPqSR +mujjZTKAg7DYXpI02vC2snegUutLUI4AxmEY7SYR4l6NTOk4BuUbtgQYFA04kNWbfTF cIhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730963772; x=1731568572; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=0JtSX1ivElzP67Gy896L9Ack6oYznxDX7izzc96bZIU=; b=uw2h5Yhs3bW1lBqBPCzCJkan8SQLmTJcrD6LR7ckpC1V29ZkU5dT7mVPh4tv8SQzYY KzJ4AluIgSu7+9Dd38RffgOA6cykmeRcc6BrZApZojbryPlqoYZhrdokp42sYuxYNVej NYid03oh6dh+CGm7oO8TmYvZgSrgOWrXyyUx9IWkkIsuLF4m67354jxodi+0qPKuGynM hB1G+3PbxPOMhQV4PMrRZVxWk/CPa15MUcR3H57pLE1yJlxe7TRk9uIm17Z7UbowdWYe n/KRA2DkRXZHQ6hTdmEdJRNZw/kV3wf3kMiP7MeA29RXbSuLTJIXZtOVGqCXDPnbAZWh i9Uw== X-Forwarded-Encrypted: i=1; AJvYcCXTAM2fLTtujS4+tt3mEXqsqCTXVVBuPO2hYuHPJxtVmRbTYjMVfjl3G/cUa5izXjIjxsRCrLaNIN/4wEc=@vger.kernel.org X-Gm-Message-State: AOJu0YxdxKWvnUvJO5r2g+a44OFMFF5nvvCIm/JqLRPSzO0OfPCECWco RQx87H2fd7Xu1dm22aafZDOfFwRhaGkIgdE+o3lDbj+Laeq2phU4y7/qwCHHWgupAixLKtz4h7U U15yChA== X-Google-Smtp-Source: AGHT+IHo4j7jX9RyogLzkobNcoqsPX4PHdOeTPc0u8XD0m/LH7jjhm2PFEQw7af1FfiKXF3NPlnJLAyyNQZP X-Received: from irogers.svl.corp.google.com ([2620:15c:2c5:11:acc7:bda:7167:18d8]) (user=irogers job=sendgmr) by 2002:a05:690c:60c6:b0:6ea:71c3:6cc3 with SMTP id 00721157ae682-6ead60ddc27mr1107b3.8.1730963772515; Wed, 06 Nov 2024 23:16:12 -0800 (PST) Date: Wed, 6 Nov 2024 23:15:57 -0800 In-Reply-To: <20241107071600.9082-1-irogers@google.com> Message-Id: <20241107071600.9082-5-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20241107071600.9082-1-irogers@google.com> X-Mailer: git-send-email 2.47.0.199.ga7371fff76-goog Subject: [PATCH v1 4/7] perf header: Avoid transitive PMU includes From: Ian Rogers To: John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Paul Walmsley , Palmer Dabbelt , Albert Ou , Huacai Chen , Bibo Mao , Athira Rajeev , Ben Zong-You Xie , Alexandre Ghiti , Sandipan Das , Benjamin Gray , Xu Yang , Ravi Bangoria , "=?UTF-8?q?Cl=C3=A9ment=20Le=20Goffic?=" , Yicong Yang , "Masami Hiramatsu (Google)" , Dima Kogan , "Dr. David Alan Gilbert" , linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Currently satisfied via header.h. Note, pmu.h includes parse-events.h. Signed-off-by: Ian Rogers --- tools/perf/tests/expr.c | 2 ++ tools/perf/util/env.c | 1 + tools/perf/util/probe-event.c | 1 + 3 files changed, 4 insertions(+) diff --git a/tools/perf/tests/expr.c b/tools/perf/tests/expr.c index e3aa9d4fcf3a..d60f1ac1d720 100644 --- a/tools/perf/tests/expr.c +++ b/tools/perf/tests/expr.c @@ -4,6 +4,8 @@ #include "util/expr.h" #include "util/hashmap.h" #include "util/header.h" +#include "util/pmu.h" +#include "util/pmus.h" #include "util/smt.h" #include "tests.h" #include diff --git a/tools/perf/util/env.c b/tools/perf/util/env.c index 93cabdd7ff43..e2843ca2edd9 100644 --- a/tools/perf/util/env.c +++ b/tools/perf/util/env.c @@ -12,6 +12,7 @@ #include #include #include +#include "pmu.h" #include "pmus.h" #include "strbuf.h" #include "trace/beauty/beauty.h" diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c index a580aa2cd512..d399c7e03341 100644 --- a/tools/perf/util/probe-event.c +++ b/tools/perf/util/probe-event.c @@ -40,6 +40,7 @@ #include "session.h" #include "string2.h" #include "strbuf.h" +#include "parse-events.h" =20 #include #include --=20 2.47.0.199.ga7371fff76-goog From nobody Sun Nov 24 04:38:24 2024 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9FE301DF967 for ; Thu, 7 Nov 2024 07:16:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730963777; cv=none; b=ncL+cFh7LEpCr54uUeldJ2L0Pq/o/iPlkg7dpK6Yry+HGYHzajU8aTTeA0D6W5yx0qCB1q/+c2vl7af3LGztY9lnG4IVK3rGD/A1z/oS8YAnyLdrvHtiu/6V6l5FrE6zwkpyxRIe+L3RTdOZLDlBSpWu3/WnGolZdWKG4g/HY5o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730963777; c=relaxed/simple; bh=X+YI2RpbJQ4v7aUq3zphx5ptpenpsNaOLiuh9U/NvuE=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=mYHbeh8ebFQm3DacMDOyTWX9MRBRWLeWPO14L41bX9ZEHE1DRnqQPGBVTdkIEbQfF0RiUFlGf18PBEDqxfWyqeBh93gZU2oSBxg8Aw2Wro3Q4f7YHEXfeVP1KpWVVr9SNtiDL8XSrC9nOMrVseomVTmg+GlQsvAyUH+9au44KHQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=KX2lsdq4; arc=none smtp.client-ip=209.85.128.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="KX2lsdq4" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-6ea7cfb6e0fso14095577b3.0 for ; Wed, 06 Nov 2024 23:16:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1730963774; x=1731568574; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=xNlMMjciLevQNjZxyRD3U9zk6KPHdhrwCerUrHCtyJU=; b=KX2lsdq4dcxVWBQMuQsb5UmULcLpWms/5JY8U/EdCLfJuEjLiP0q3sRujw1vdQjtpb tXu1QPKYCdwt8yR+/7M8gpo6q/YSZQo7NyUdQnh3ehuSfjZDfsv3oajVrLNcoI47+08Q 81/4mbrKLKlYYM6PBQge+HY5UyfRLeS7i/Fhg3hmBQOxoDs7YC558u1giGUvrgLHXn1G D2UjMuM5927o3cnD4uPB7q0dwSxH0hmqcarF0sDWLbKv2zjXx4+Y58mOmhbTURgNDYs3 lUD6NciNqYmgF7fVoHKjc9TRV4iUXNkmFdCh5wKguhtjctchdkKjqK1yLD2erX6u8tOa E8aQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730963774; x=1731568574; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=xNlMMjciLevQNjZxyRD3U9zk6KPHdhrwCerUrHCtyJU=; b=Nn9MOevvcqQ3/ExJZmDt8iidpk9KEsbJw0jcRcu4hydoinUwsxokwuuyR4yewpUVMi FqHRtd+M5vqkI6MrlQcg+yxffI16IjRnunEZKHQ9xvlzdF2TXWu0SFmAhV44yZtYr8l8 owXE1VqSn5hOlZqwhQuIjIovIHA/FVTQzD+GYD68JanHp0NMygVtKI0Cy6A9XyGS5d4i feFB7IJRVOL6ISoGRRHiVaPRUS3BEjPgmE3PgH2btJC+8GqNY1+/L7eUxxwwwmpVRbPg gTzaaRG2aSJ9/5TxwoFZWu+k5b8t/FNM0PGrvU6ENX7TCK+dbuVbbklYblnhN/ZveSyq RioQ== X-Forwarded-Encrypted: i=1; AJvYcCVQ5sD44341SCS5dZKXDidE3vd/UiETBikUny+RiENTZ/KK0qI6CVoKLwN9+9hiDP1IotRt6fD17fBBMjM=@vger.kernel.org X-Gm-Message-State: AOJu0YzbIHXnZZWgTN0rsueaGpMdVfb6W3UJ8QhyDOhrwMa+FV7QUWVN bnxIMF9VfignXVlm3S7RO6i4+8eO3aHKMCqY4MF+lrbg/EPADphewb82b4Z9nmztLddA020/l8J heu5OXg== X-Google-Smtp-Source: AGHT+IG/7XhxHMGfAm7DZPUmoPIpXEULkLsWBXpgZNT6RrqUGymhXMvB92mJcPp186PEHd4y9zeHZVV5R7g4 X-Received: from irogers.svl.corp.google.com ([2620:15c:2c5:11:acc7:bda:7167:18d8]) (user=irogers job=sendgmr) by 2002:a05:690c:4484:b0:6dd:bf69:7e06 with SMTP id 00721157ae682-6e9d8b2173amr9142837b3.7.1730963774596; Wed, 06 Nov 2024 23:16:14 -0800 (PST) Date: Wed, 6 Nov 2024 23:15:58 -0800 In-Reply-To: <20241107071600.9082-1-irogers@google.com> Message-Id: <20241107071600.9082-6-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20241107071600.9082-1-irogers@google.com> X-Mailer: git-send-email 2.47.0.199.ga7371fff76-goog Subject: [PATCH v1 5/7] perf header: Pass a perf_cpu rather than a PMU to get_cpuid_str From: Ian Rogers To: John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Paul Walmsley , Palmer Dabbelt , Albert Ou , Huacai Chen , Bibo Mao , Athira Rajeev , Ben Zong-You Xie , Alexandre Ghiti , Sandipan Das , Benjamin Gray , Xu Yang , Ravi Bangoria , "=?UTF-8?q?Cl=C3=A9ment=20Le=20Goffic?=" , Yicong Yang , "Masami Hiramatsu (Google)" , Dima Kogan , "Dr. David Alan Gilbert" , linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" On ARM the cpuid is dependent on the core type of the CPU in question. The PMU was passed for the sake of the CPU map but this means in places a temporary PMU is created just to pass a CPU value. Just pass the CPU and fix up the callers. As there are no longer PMU users in header.h, shuffle forward declarations earlier to work around build failures. Signed-off-by: Ian Rogers --- tools/perf/arch/arm64/util/arm-spe.c | 14 ++------------ tools/perf/arch/arm64/util/header.c | 12 ++++-------- tools/perf/arch/loongarch/util/header.c | 2 +- tools/perf/arch/powerpc/util/header.c | 2 +- tools/perf/arch/riscv/util/header.c | 2 +- tools/perf/arch/s390/util/header.c | 4 ++-- tools/perf/arch/x86/util/header.c | 3 +-- tools/perf/pmu-events/empty-pmu-events.c | 5 ++++- tools/perf/pmu-events/jevents.py | 5 ++++- tools/perf/tests/expr.c | 7 +++---- tools/perf/util/expr.c | 6 +++--- tools/perf/util/header.c | 22 +++++++++++++++++++++- tools/perf/util/header.h | 19 ++++++++++--------- tools/perf/util/pmu.c | 20 -------------------- tools/perf/util/pmu.h | 1 - 15 files changed, 57 insertions(+), 67 deletions(-) diff --git a/tools/perf/arch/arm64/util/arm-spe.c b/tools/perf/arch/arm64/u= til/arm-spe.c index 7ccdea3cd461..22b19dcc6beb 100644 --- a/tools/perf/arch/arm64/util/arm-spe.c +++ b/tools/perf/arch/arm64/util/arm-spe.c @@ -23,6 +23,7 @@ #include "../../../util/debug.h" #include "../../../util/auxtrace.h" #include "../../../util/record.h" +#include "../../../util/header.h" #include "../../../util/arm-spe.h" #include // reallocarray =20 @@ -85,22 +86,11 @@ static int arm_spe_save_cpu_header(struct auxtrace_reco= rd *itr, struct arm_spe_recording *sper =3D container_of(itr, struct arm_spe_recording, itr); struct perf_pmu *pmu =3D NULL; - struct perf_pmu tmp_pmu; - char cpu_id_str[16]; char *cpuid =3D NULL; u64 val; =20 - snprintf(cpu_id_str, sizeof(cpu_id_str), "%d", cpu.cpu); - tmp_pmu.cpus =3D perf_cpu_map__new(cpu_id_str); - if (!tmp_pmu.cpus) - return -ENOMEM; - /* Read CPU MIDR */ - cpuid =3D perf_pmu__getcpuid(&tmp_pmu); - - /* The CPU map will not be used anymore, release it */ - perf_cpu_map__put(tmp_pmu.cpus); - + cpuid =3D get_cpuid_allow_env_override(cpu); if (!cpuid) return -ENOMEM; val =3D strtol(cpuid, NULL, 16); diff --git a/tools/perf/arch/arm64/util/header.c b/tools/perf/arch/arm64/ut= il/header.c index f0907daad3ae..f445a2dd6293 100644 --- a/tools/perf/arch/arm64/util/header.c +++ b/tools/perf/arch/arm64/util/header.c @@ -62,22 +62,18 @@ int get_cpuid(char *buf, size_t sz, struct perf_cpu cpu) return EINVAL; } =20 -char *get_cpuid_str(struct perf_pmu *pmu) +char *get_cpuid_str(struct perf_cpu cpu) { - char *buf =3D NULL; + char *buf =3D malloc(MIDR_SIZE); int res; =20 - if (!pmu || !pmu->cpus) - return NULL; - - buf =3D malloc(MIDR_SIZE); if (!buf) return NULL; =20 /* read midr from list of cpus mapped to this pmu */ - res =3D get_cpuid(buf, MIDR_SIZE, perf_cpu_map__min(pmu->cpus)); + res =3D get_cpuid(buf, MIDR_SIZE, cpu); if (res) { - pr_err("failed to get cpuid string for PMU %s\n", pmu->name); + pr_err("failed to get cpuid string for CPU %d\n", cpu.cpu); free(buf); buf =3D NULL; } diff --git a/tools/perf/arch/loongarch/util/header.c b/tools/perf/arch/loon= garch/util/header.c index f1f0b116962d..0c6d823334a2 100644 --- a/tools/perf/arch/loongarch/util/header.c +++ b/tools/perf/arch/loongarch/util/header.c @@ -90,7 +90,7 @@ int get_cpuid(char *buffer, size_t sz, struct perf_cpu cp= u __maybe_unused) return ret; } =20 -char *get_cpuid_str(struct perf_pmu *pmu __maybe_unused) +char *get_cpuid_str(struct perf_cpu cpu __maybe_unused) { return _get_cpuid(); } diff --git a/tools/perf/arch/powerpc/util/header.c b/tools/perf/arch/powerp= c/util/header.c index 6d1a63a2922f..c7df534dbf8f 100644 --- a/tools/perf/arch/powerpc/util/header.c +++ b/tools/perf/arch/powerpc/util/header.c @@ -42,7 +42,7 @@ get_cpuid(char *buffer, size_t sz, struct perf_cpu cpu __= maybe_unused) } =20 char * -get_cpuid_str(struct perf_pmu *pmu __maybe_unused) +get_cpuid_str(struct perf_cpu cpu __maybe_unused) { char *bufp; unsigned long pvr; diff --git a/tools/perf/arch/riscv/util/header.c b/tools/perf/arch/riscv/ut= il/header.c index ebac294c877f..4b839203d4a5 100644 --- a/tools/perf/arch/riscv/util/header.c +++ b/tools/perf/arch/riscv/util/header.c @@ -98,7 +98,7 @@ int get_cpuid(char *buffer, size_t sz, struct perf_cpu cp= u __maybe_unused) } =20 char * -get_cpuid_str(struct perf_pmu *pmu __maybe_unused) +get_cpuid_str(struct perf_cpu cpu __maybe_unused) { return _get_cpuid(); } diff --git a/tools/perf/arch/s390/util/header.c b/tools/perf/arch/s390/util= /header.c index 2add1a561242..db54677a17d2 100644 --- a/tools/perf/arch/s390/util/header.c +++ b/tools/perf/arch/s390/util/header.c @@ -137,11 +137,11 @@ int get_cpuid(char *buffer, size_t sz, struct perf_cp= u cpu __maybe_unused) return (nbytes >=3D sz) ? ENOBUFS : 0; } =20 -char *get_cpuid_str(struct perf_pmu *pmu __maybe_unused) +char *get_cpuid_str(struct perf_cpu cpu) { char *buf =3D malloc(128); =20 - if (buf && get_cpuid(buf, 128)) + if (buf && get_cpuid(buf, 128, cpu)) zfree(&buf); return buf; } diff --git a/tools/perf/arch/x86/util/header.c b/tools/perf/arch/x86/util/h= eader.c index 690f86cbbb1c..412977f8aa83 100644 --- a/tools/perf/arch/x86/util/header.c +++ b/tools/perf/arch/x86/util/header.c @@ -63,8 +63,7 @@ get_cpuid(char *buffer, size_t sz, struct perf_cpu cpu __= maybe_unused) return __get_cpuid(buffer, sz, "%s,%u,%u,%u$"); } =20 -char * -get_cpuid_str(struct perf_pmu *pmu __maybe_unused) +char *get_cpuid_str(struct perf_cpu cpu __maybe_unused) { char *buf =3D malloc(128); =20 diff --git a/tools/perf/pmu-events/empty-pmu-events.c b/tools/perf/pmu-even= ts/empty-pmu-events.c index 2b7516946ded..1f7f39a89ffd 100644 --- a/tools/perf/pmu-events/empty-pmu-events.c +++ b/tools/perf/pmu-events/empty-pmu-events.c @@ -515,13 +515,16 @@ static const struct pmu_events_map *map_for_pmu(struc= t perf_pmu *pmu) } last_map_search; static bool has_last_result, has_last_map_search; const struct pmu_events_map *map =3D NULL; + struct perf_cpu cpu =3D {-1}; char *cpuid =3D NULL; size_t i; =20 if (has_last_result && last_result.pmu =3D=3D pmu) return last_result.map; =20 - cpuid =3D perf_pmu__getcpuid(pmu); + if (pmu) + cpu =3D perf_cpu_map__min(pmu->cpus); + cpuid =3D get_cpuid_allow_env_override(cpu); =20 /* * On some platforms which uses cpus map, cpuid can be NULL for diff --git a/tools/perf/pmu-events/jevents.py b/tools/perf/pmu-events/jeven= ts.py index 6e71b09dbc2a..17cd1b1c6b66 100755 --- a/tools/perf/pmu-events/jevents.py +++ b/tools/perf/pmu-events/jevents.py @@ -1031,13 +1031,16 @@ static const struct pmu_events_map *map_for_pmu(str= uct perf_pmu *pmu) } last_map_search; static bool has_last_result, has_last_map_search; const struct pmu_events_map *map =3D NULL; + struct perf_cpu cpu =3D {-1}; char *cpuid =3D NULL; size_t i; =20 if (has_last_result && last_result.pmu =3D=3D pmu) return last_result.map; =20 - cpuid =3D perf_pmu__getcpuid(pmu); + if (pmu) + cpu =3D perf_cpu_map__min(pmu->cpus); + cpuid =3D get_cpuid_allow_env_override(cpu); =20 /* * On some platforms which uses cpus map, cpuid can be NULL for diff --git a/tools/perf/tests/expr.c b/tools/perf/tests/expr.c index d60f1ac1d720..41ff1affdfcd 100644 --- a/tools/perf/tests/expr.c +++ b/tools/perf/tests/expr.c @@ -4,10 +4,9 @@ #include "util/expr.h" #include "util/hashmap.h" #include "util/header.h" -#include "util/pmu.h" -#include "util/pmus.h" #include "util/smt.h" #include "tests.h" +#include #include #include #include @@ -78,8 +77,8 @@ static int test__expr(struct test_suite *t __maybe_unused= , int subtest __maybe_u struct expr_parse_ctx *ctx; bool is_intel =3D false; char strcmp_cpuid_buf[256]; - struct perf_pmu *pmu =3D perf_pmus__find_core_pmu(); - char *cpuid =3D perf_pmu__getcpuid(pmu); + struct perf_cpu cpu =3D {-1}; + char *cpuid =3D get_cpuid_allow_env_override(cpu); char *escaped_cpuid1, *escaped_cpuid2; =20 TEST_ASSERT_VAL("get_cpuid", cpuid); diff --git a/tools/perf/util/expr.c b/tools/perf/util/expr.c index 5e3732bc2fa5..f289044a1f7c 100644 --- a/tools/perf/util/expr.c +++ b/tools/perf/util/expr.c @@ -8,7 +8,6 @@ #include "debug.h" #include "evlist.h" #include "expr.h" -#include "pmu.h" #include "smt.h" #include "tool_pmu.h" #include @@ -16,6 +15,7 @@ #include "util/hashmap.h" #include "util/header.h" #include "util/pmu.h" +#include #include #include #include @@ -456,8 +456,8 @@ double expr__strcmp_cpuid_str(const struct expr_parse_c= tx *ctx __maybe_unused, bool compute_ids __maybe_unused, const char *test_id) { double ret; - struct perf_pmu *pmu =3D perf_pmus__find_core_pmu(); - char *cpuid =3D perf_pmu__getcpuid(pmu); + struct perf_cpu cpu =3D {-1}; + char *cpuid =3D get_cpuid_allow_env_override(cpu); =20 if (!cpuid) return NAN; diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 60b42ddc3dac..06ca5762f61f 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -819,11 +819,31 @@ static int write_group_desc(struct feat_fd *ff, * Each architecture should provide a more precise id string that * can be use to match the architecture's "mapfile". */ -char * __weak get_cpuid_str(struct perf_pmu *pmu __maybe_unused) +char * __weak get_cpuid_str(struct perf_cpu cpu __maybe_unused) { return NULL; } =20 +char *get_cpuid_allow_env_override(struct perf_cpu cpu) +{ + char *cpuid; + static bool printed; + + cpuid =3D getenv("PERF_CPUID"); + if (cpuid) + cpuid =3D strdup(cpuid); + if (!cpuid) + cpuid =3D get_cpuid_str(cpu); + if (!cpuid) + return NULL; + + if (!printed) { + pr_debug("Using CPUID %s\n", cpuid); + printed =3D true; + } + return cpuid; +} + /* Return zero when the cpuid from the mapfile.csv matches the * cpuid string generated on this platform. * Otherwise return non-zero. diff --git a/tools/perf/util/header.h b/tools/perf/util/header.h index 3bb768455a60..5201af6305f4 100644 --- a/tools/perf/util/header.h +++ b/tools/perf/util/header.h @@ -10,9 +10,14 @@ #include #include #include "env.h" -#include "pmu.h" #include =20 +struct evlist; +union perf_event; +struct perf_header; +struct perf_session; +struct perf_tool; + enum { HEADER_RESERVED =3D 0, /* always cleared */ HEADER_FIRST_FEATURE =3D 1, @@ -92,8 +97,6 @@ struct perf_pipe_file_header { u64 size; }; =20 -struct perf_header; - int perf_file_header__read(struct perf_file_header *header, struct perf_header *ph, int fd); =20 @@ -125,11 +128,6 @@ struct perf_header_feature_ops { bool synthesize; }; =20 -struct evlist; -struct perf_session; -struct perf_tool; -union perf_event; - extern const char perf_version_string[]; =20 int perf_session__read_header(struct perf_session *session); @@ -204,6 +202,9 @@ int build_caches_for_cpu(u32 cpu, struct cpu_cache_leve= l caches[], u32 *cntp); */ int get_cpuid(char *buffer, size_t sz, struct perf_cpu cpu); =20 -char *get_cpuid_str(struct perf_pmu *pmu __maybe_unused); +char *get_cpuid_str(struct perf_cpu cpu); + +char *get_cpuid_allow_env_override(struct perf_cpu cpu); + int strcmp_cpuid_str(const char *s1, const char *s2); #endif /* __PERF_HEADER_H */ diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 0789758598c0..514cb865f57b 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -818,26 +818,6 @@ static int is_sysfs_pmu_core(const char *name) return file_available(path); } =20 -char *perf_pmu__getcpuid(struct perf_pmu *pmu) -{ - char *cpuid; - static bool printed; - - cpuid =3D getenv("PERF_CPUID"); - if (cpuid) - cpuid =3D strdup(cpuid); - if (!cpuid) - cpuid =3D get_cpuid_str(pmu); - if (!cpuid) - return NULL; - - if (!printed) { - pr_debug("Using CPUID %s\n", cpuid); - printed =3D true; - } - return cpuid; -} - __weak const struct pmu_metrics_table *pmu_metrics_table__find(void) { return perf_pmu__find_metrics_table(NULL); diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h index b86b3c3685a2..fba3fc608b64 100644 --- a/tools/perf/util/pmu.h +++ b/tools/perf/util/pmu.h @@ -260,7 +260,6 @@ void perf_pmu__arch_init(struct perf_pmu *pmu); void pmu_add_cpu_aliases_table(struct perf_pmu *pmu, const struct pmu_events_table *table); =20 -char *perf_pmu__getcpuid(struct perf_pmu *pmu); const struct pmu_metrics_table *pmu_metrics_table__find(void); bool pmu_uncore_identifier_match(const char *compat, const char *id); =20 --=20 2.47.0.199.ga7371fff76-goog From nobody Sun Nov 24 04:38:24 2024 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1ED361E0090 for ; Thu, 7 Nov 2024 07:16:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730963779; cv=none; b=atohV2oksqW41V98xV1GfNay/tU5E8PkucU/epE9deulAWUqjSAM0760qzWDdrifGjCVe8PWwHF1qQN3AHSYPIzS3fLaSzgTDejYNoAoPTyQEPBgG41HSCCaZSbJfc8k44xupFepfqF8xDX5voiPJYQlNj+rDSuUOsM5S8oS4ZQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730963779; c=relaxed/simple; bh=621nA8jfddmRAyxLcB0DU3OLEEfVq/wb6tXRw65bXDo=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=b+ZLSzmwAPeacQiS5UIp8H/TCq1TFF1uFuC6LSL0yQ77YoWk9gIrWSMr4C/7pU6JeHPcwG/zT4XSHJG+vBVZOZmCP5ccOW4HGMeYDeSiPFnsAsFB1yhir6wpDSAi0JIr8KAVj+AHiylnN9FDuTNsKy8XDsWq1IwDpm4kBw4BPCE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=0SbfZgFO; arc=none smtp.client-ip=209.85.128.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="0SbfZgFO" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-6e59dc7df64so8863667b3.1 for ; Wed, 06 Nov 2024 23:16:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1730963777; x=1731568577; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=KYK64IbVI+oTr67YzD9eKbuyvUN57DhW3er38c63SVk=; b=0SbfZgFOwrcdUHbgH+xbR3fcXdQ4N108Uzf6Mi4F4UQjrjd2UTwtHjdptf411s4vcq pwm7yEARlGkA58G22DlUWKlfZTfnyiLib+iydJdCB7jQca42GzWi+dTwvnI5EZ6uRyT0 IhRuuhYyE/TKdlkIQ7lYtgQyPyF9Fi/x0jkVPWkve1wGRVE2OjirEM90d5c6bryx9o9o 7AqaNoSm7QmpEahVaZRitsOVp7Lkltl+ICX/7TSN17zXcxwgCoptQ11w3kW69+jV09Uk n2l0thVVUlYs3PQ2NKgbhmndGofD6bb6MvJJFetlwTafIg2VyRgIgWNOzxUcuuVizLEw 2fRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730963777; x=1731568577; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=KYK64IbVI+oTr67YzD9eKbuyvUN57DhW3er38c63SVk=; b=NCKTQYAel6SWouFon1UQEjKpY00Gb9QO5/hcpf1hSJS8TPchKAZoNZ0faDAU74vvg9 t7TjwBA+ymdwawxcZoe13ZdSxbIcccIord/kjaLT9b+i/7NNW6An8ZKNpaw+ywobH1eb m2rVkxLjaNJ/1NVPNQCZzLHJAY1h+6XlXHNDD8a5Zp8XNhTV+HkT4ByBMAbSMzh3kDeY NS5zfMZkc96Sme1mp5WmCwCxSWqR3jIXhSRadR3uKjjAm3p3dKl3avcXikTQJgpZhV1d oiY9vbpw9thgOfsXOnhgF8LMuWmHkOvRbf9xjO3G9tJzFgHzIPNJzMI2azQymZ2ilEa+ UXsw== X-Forwarded-Encrypted: i=1; AJvYcCUdOyV8hGE6GjgUccfwYgXUs2zjHPhiGo/eLRO9i5cP2DpM0o4zxgRSfnDuDXIuSIAFKZLUeSuIMMuSQFA=@vger.kernel.org X-Gm-Message-State: AOJu0Yy++hqmkbcbfsg6hKlBc188GMPI+GKIl3Aj0JRcRH/UUIJQF8yj ixIubZBjnzdmDH+e4MS7uSvPfY+WJGqJ9khn3upviEqVI7xfc6Majx06/wyydzl4tRuBUa7klBR f+rYM/w== X-Google-Smtp-Source: AGHT+IEE1yqKHgqlv5intPfLwYeQKNT3vieLxoXotrZ7qIt8KVtU6GVAtqxkz210BAUWXZlbW1ErAef+mNNv X-Received: from irogers.svl.corp.google.com ([2620:15c:2c5:11:acc7:bda:7167:18d8]) (user=irogers job=sendgmr) by 2002:a81:b512:0:b0:6ea:881b:b545 with SMTP id 00721157ae682-6ead646907emr707b3.4.1730963776837; Wed, 06 Nov 2024 23:16:16 -0800 (PST) Date: Wed, 6 Nov 2024 23:15:59 -0800 In-Reply-To: <20241107071600.9082-1-irogers@google.com> Message-Id: <20241107071600.9082-7-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20241107071600.9082-1-irogers@google.com> X-Mailer: git-send-email 2.47.0.199.ga7371fff76-goog Subject: [PATCH v1 6/7] perf jevents: Add map_for_cpu From: Ian Rogers To: John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Paul Walmsley , Palmer Dabbelt , Albert Ou , Huacai Chen , Bibo Mao , Athira Rajeev , Ben Zong-You Xie , Alexandre Ghiti , Sandipan Das , Benjamin Gray , Xu Yang , Ravi Bangoria , "=?UTF-8?q?Cl=C3=A9ment=20Le=20Goffic?=" , Yicong Yang , "Masami Hiramatsu (Google)" , Dima Kogan , "Dr. David Alan Gilbert" , linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The PMU is no longer part of the map finding process and for metrics doesn't make sense as they lack a PMU. Signed-off-by: Ian Rogers --- tools/perf/pmu-events/empty-pmu-events.c | 20 +++++++++++++------- tools/perf/pmu-events/jevents.py | 20 +++++++++++++------- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/tools/perf/pmu-events/empty-pmu-events.c b/tools/perf/pmu-even= ts/empty-pmu-events.c index 1f7f39a89ffd..2151e8a43f16 100644 --- a/tools/perf/pmu-events/empty-pmu-events.c +++ b/tools/perf/pmu-events/empty-pmu-events.c @@ -503,11 +503,11 @@ int pmu_metrics_table__for_each_metric(const struct p= mu_metrics_table *table, return 0; } =20 -static const struct pmu_events_map *map_for_pmu(struct perf_pmu *pmu) +static const struct pmu_events_map *map_for_cpu(struct perf_cpu cpu) { static struct { const struct pmu_events_map *map; - struct perf_pmu *pmu; + struct perf_cpu cpu; } last_result; static struct { const struct pmu_events_map *map; @@ -515,15 +515,12 @@ static const struct pmu_events_map *map_for_pmu(struc= t perf_pmu *pmu) } last_map_search; static bool has_last_result, has_last_map_search; const struct pmu_events_map *map =3D NULL; - struct perf_cpu cpu =3D {-1}; char *cpuid =3D NULL; size_t i; =20 - if (has_last_result && last_result.pmu =3D=3D pmu) + if (has_last_result && last_result.cpu.cpu =3D=3D cpu.cpu) return last_result.map; =20 - if (pmu) - cpu =3D perf_cpu_map__min(pmu->cpus); cpuid =3D get_cpuid_allow_env_override(cpu); =20 /* @@ -555,12 +552,21 @@ static const struct pmu_events_map *map_for_pmu(struc= t perf_pmu *pmu) has_last_map_search =3D true; } out_update_last_result: - last_result.pmu =3D pmu; + last_result.cpu =3D cpu; last_result.map =3D map; has_last_result =3D true; return map; } =20 +static const struct pmu_events_map *map_for_pmu(struct perf_pmu *pmu) +{ + struct perf_cpu cpu =3D {-1}; + + if (pmu) + cpu =3D perf_cpu_map__min(pmu->cpus); + return map_for_cpu(cpu); +} + const struct pmu_events_table *perf_pmu__find_events_table(struct perf_pmu= *pmu) { const struct pmu_events_map *map =3D map_for_pmu(pmu); diff --git a/tools/perf/pmu-events/jevents.py b/tools/perf/pmu-events/jeven= ts.py index 17cd1b1c6b66..6d6780ca0889 100755 --- a/tools/perf/pmu-events/jevents.py +++ b/tools/perf/pmu-events/jevents.py @@ -1019,11 +1019,11 @@ int pmu_metrics_table__for_each_metric(const struct= pmu_metrics_table *table, return 0; } =20 -static const struct pmu_events_map *map_for_pmu(struct perf_pmu *pmu) +static const struct pmu_events_map *map_for_cpu(struct perf_cpu cpu) { static struct { const struct pmu_events_map *map; - struct perf_pmu *pmu; + struct perf_cpu cpu; } last_result; static struct { const struct pmu_events_map *map; @@ -1031,15 +1031,12 @@ static const struct pmu_events_map *map_for_pmu(str= uct perf_pmu *pmu) } last_map_search; static bool has_last_result, has_last_map_search; const struct pmu_events_map *map =3D NULL; - struct perf_cpu cpu =3D {-1}; char *cpuid =3D NULL; size_t i; =20 - if (has_last_result && last_result.pmu =3D=3D pmu) + if (has_last_result && last_result.cpu.cpu =3D=3D cpu.cpu) return last_result.map; =20 - if (pmu) - cpu =3D perf_cpu_map__min(pmu->cpus); cpuid =3D get_cpuid_allow_env_override(cpu); =20 /* @@ -1071,12 +1068,21 @@ static const struct pmu_events_map *map_for_pmu(str= uct perf_pmu *pmu) has_last_map_search =3D true; } out_update_last_result: - last_result.pmu =3D pmu; + last_result.cpu =3D cpu; last_result.map =3D map; has_last_result =3D true; return map; } =20 +static const struct pmu_events_map *map_for_pmu(struct perf_pmu *pmu) +{ + struct perf_cpu cpu =3D {-1}; + + if (pmu) + cpu =3D perf_cpu_map__min(pmu->cpus); + return map_for_cpu(cpu); +} + const struct pmu_events_table *perf_pmu__find_events_table(struct perf_pmu= *pmu) { const struct pmu_events_map *map =3D map_for_pmu(pmu); --=20 2.47.0.199.ga7371fff76-goog From nobody Sun Nov 24 04:38:24 2024 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 47D481E0DA7 for ; Thu, 7 Nov 2024 07:16:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730963781; cv=none; b=gzd1HzN1y+wH3XhmWZVRAT4IekTHOsi3ojEL48ge4L2erOAQKZ/HqiCgdaJem4tH125uKmVt3P3Gp8Osu4ZRFbB5NnBtP/LD95WKUkCkkz60Cec3udIC87q6zjYWWqcWkqk5L/1OuPRyYd8xq9dfD8CObi1QWzBiC1W8a62eXKg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730963781; c=relaxed/simple; bh=OJtFDkIMQi0LcKS0fHYAu+cobbS1tUIrksHvLlNZMRU=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=Qdc0WeCRpQmE3ZgPNtf89i/r6f0KFS/b8WjXgWW7TvoILklZbrhdVZVIdlKmfhAYEykU3fLXP8PfqqWIFyldH9PxqQ5oMZRdrAM7KBE0o7ytf4XJUhiIzc6DKXgvRqbyb6XN5cx6clE9UJLye8LA0Zcpuz+yPdO1h5iAN+yV5ME= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=Tx3QsW1W; arc=none smtp.client-ip=209.85.128.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Tx3QsW1W" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-6ea863ecfe9so12795357b3.3 for ; Wed, 06 Nov 2024 23:16:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1730963779; x=1731568579; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=Jp6Q6rsYTy2pkFfmFp9hLJ/9ui9ITiVOsHTsdSSP0vY=; b=Tx3QsW1WjCSPWu7aFGkSiMS05Dh8AJ+/usChlT91x2Q5MN1zHd150mbzNCd6w+nOtv REFzR2CxFyEoiXXa81XnshVEzXcWVBPuO0t/qKRBO/ja8OcibuaQurWV77Gxw9TNJHLl 91WDDuyb8UZ+rRayiMfQzVduqCrJ6iE0y4g3r9hjiiA+dhhfCb/pTbpPjhZjx4icw87u SosTXIP6HSXOhGBUza4o/SeCJPhkh7sHOAnXYJCBHc1rkPGiiFbkaNdHCtfStoOHc8e+ C437Xr0Yq08NdnbI9jQfTraVhgBpfPYU7X1sBQsz8Rdvv4QGBsJabcFhIu9khHZXQfIt ntrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730963779; x=1731568579; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Jp6Q6rsYTy2pkFfmFp9hLJ/9ui9ITiVOsHTsdSSP0vY=; b=gVAfa1o86WPJQgWeETaj274s8tdMYZd+XTpdM6PY3ySISPuF3nT2Gem41lb/tbzMEC 1OxS8iNvb2n6m6a1LB8yLYacrPyANT+nKLfqOHEcuY4MrmbKfQIKYdPbrqjreSUhBfFe +9q8kAMDOBVywEduc34MHk4SeMKtNh/s9GkUpqXEckbKqw8wehy5HB2MGhGr7gKHIt+K qcO0TOq2P1d8PsuanxIvcQlHqdqyDHEg44sGcTBs4iVcDSL/6D0eJLp3PE3E5v8VyJBm BiLnVb0NfyRVAdmJQwHpE8bYTRGGJCPHBkYPH48jypxdp8rn+6JPZpqndpoBZlKd7Cat LWxA== X-Forwarded-Encrypted: i=1; AJvYcCW0//qf5RS29OuRn2lAsMYRsFn944XujD/3XHQlpbjO2WA2b839OyItxakxDmz2Nzyi6P1HFKu3DzY9UEo=@vger.kernel.org X-Gm-Message-State: AOJu0Yz4B7VRRZV0cGHWgPn1DrzPVBjhExyl/yPAwG7KaJ2gbZhrPtPC HKwyxdtVDQIRnmOOj1tmpBiS8x2VIXSEzhBoTz2/l373OAj8h7ZEc6SIf2EW3ZEtdeSRP//qD6i Cc8WWvQ== X-Google-Smtp-Source: AGHT+IFjJTkBX3Ww5U3GdP9ImzIAFri1PsUtkuPx9cggbPAOvXg0q9D0jMn+HqGO7HRg6a+gW1C87/H1x3x6 X-Received: from irogers.svl.corp.google.com ([2620:15c:2c5:11:acc7:bda:7167:18d8]) (user=irogers job=sendgmr) by 2002:a81:a8c3:0:b0:6e3:d670:f603 with SMTP id 00721157ae682-6e9d8aada53mr4568187b3.3.1730963779222; Wed, 06 Nov 2024 23:16:19 -0800 (PST) Date: Wed, 6 Nov 2024 23:16:00 -0800 In-Reply-To: <20241107071600.9082-1-irogers@google.com> Message-Id: <20241107071600.9082-8-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20241107071600.9082-1-irogers@google.com> X-Mailer: git-send-email 2.47.0.199.ga7371fff76-goog Subject: [PATCH v1 7/7] perf pmu: Move pmu_metrics_table__find and remove ARM override From: Ian Rogers To: John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Paul Walmsley , Palmer Dabbelt , Albert Ou , Huacai Chen , Bibo Mao , Athira Rajeev , Ben Zong-You Xie , Alexandre Ghiti , Sandipan Das , Benjamin Gray , Xu Yang , Ravi Bangoria , "=?UTF-8?q?Cl=C3=A9ment=20Le=20Goffic?=" , Yicong Yang , "Masami Hiramatsu (Google)" , Dima Kogan , "Dr. David Alan Gilbert" , linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Move pmu_metrics_table__find to the jevents.py generated pmu-events.c and remove indirection override for ARM. The movement removes perf_pmu__find_metrics_table that exists to enable the ARM override. The ARM override isn't necessary as just the CPUID, not PMU, is used in the metric table lookup. On non-ARM the CPU argument is just ignored for the CPUID, for ARM -1 is passed so that the CPUID for the first logical CPU is read. Signed-off-by: Ian Rogers --- tools/perf/arch/arm64/util/pmu.c | 20 -------------------- tools/perf/pmu-events/empty-pmu-events.c | 20 ++++---------------- tools/perf/pmu-events/jevents.py | 20 ++++---------------- tools/perf/pmu-events/pmu-events.h | 2 +- tools/perf/util/pmu.c | 5 ----- tools/perf/util/pmu.h | 1 - 6 files changed, 9 insertions(+), 59 deletions(-) diff --git a/tools/perf/arch/arm64/util/pmu.c b/tools/perf/arch/arm64/util/= pmu.c index a0964b191fcb..895fb0d0610c 100644 --- a/tools/perf/arch/arm64/util/pmu.c +++ b/tools/perf/arch/arm64/util/pmu.c @@ -1,29 +1,9 @@ // SPDX-License-Identifier: GPL-2.0 =20 -#include -#include "../../../util/cpumap.h" -#include "../../../util/header.h" #include "../../../util/pmu.h" #include "../../../util/pmus.h" #include "../../../util/tool_pmu.h" #include -#include - -const struct pmu_metrics_table *pmu_metrics_table__find(void) -{ - struct perf_pmu *pmu; - - /* Metrics aren't currently supported on heterogeneous Arm systems */ - if (perf_pmus__num_core_pmus() > 1) - return NULL; - - /* Doesn't matter which one here because they'll all be the same */ - pmu =3D perf_pmus__find_core_pmu(); - if (pmu) - return perf_pmu__find_metrics_table(pmu); - - return NULL; -} =20 u64 tool_pmu__cpu_slots_per_cycle(void) { diff --git a/tools/perf/pmu-events/empty-pmu-events.c b/tools/perf/pmu-even= ts/empty-pmu-events.c index 2151e8a43f16..1c7a2cfa321f 100644 --- a/tools/perf/pmu-events/empty-pmu-events.c +++ b/tools/perf/pmu-events/empty-pmu-events.c @@ -587,24 +587,12 @@ const struct pmu_events_table *perf_pmu__find_events_= table(struct perf_pmu *pmu) return NULL; } =20 -const struct pmu_metrics_table *perf_pmu__find_metrics_table(struct perf_p= mu *pmu) +const struct pmu_metrics_table *pmu_metrics_table__find(void) { - const struct pmu_events_map *map =3D map_for_pmu(pmu); - - if (!map) - return NULL; - - if (!pmu) - return &map->metric_table; - - for (size_t i =3D 0; i < map->metric_table.num_pmus; i++) { - const struct pmu_table_entry *table_pmu =3D &map->metric_t= able.pmus[i]; - const char *pmu_name =3D &big_c_string[table_pmu->pmu_name= .offset]; + struct perf_cpu cpu =3D {-1}; + const struct pmu_events_map *map =3D map_for_cpu(cpu); =20 - if (pmu__name_match(pmu, pmu_name)) - return &map->metric_table; - } - return NULL; + return map ? &map->metric_table : NULL; } =20 const struct pmu_events_table *find_core_events_table(const char *arch, co= nst char *cpuid) diff --git a/tools/perf/pmu-events/jevents.py b/tools/perf/pmu-events/jeven= ts.py index 6d6780ca0889..d781a377757a 100755 --- a/tools/perf/pmu-events/jevents.py +++ b/tools/perf/pmu-events/jevents.py @@ -1103,24 +1103,12 @@ const struct pmu_events_table *perf_pmu__find_event= s_table(struct perf_pmu *pmu) return NULL; } =20 -const struct pmu_metrics_table *perf_pmu__find_metrics_table(struct perf_p= mu *pmu) +const struct pmu_metrics_table *pmu_metrics_table__find(void) { - const struct pmu_events_map *map =3D map_for_pmu(pmu); - - if (!map) - return NULL; - - if (!pmu) - return &map->metric_table; - - for (size_t i =3D 0; i < map->metric_table.num_pmus; i++) { - const struct pmu_table_entry *table_pmu =3D &map->metric_t= able.pmus[i]; - const char *pmu_name =3D &big_c_string[table_pmu->pmu_name= .offset]; + struct perf_cpu cpu =3D {-1}; + const struct pmu_events_map *map =3D map_for_cpu(cpu); =20 - if (pmu__name_match(pmu, pmu_name)) - return &map->metric_table; - } - return NULL; + return map ? &map->metric_table : NULL; } =20 const struct pmu_events_table *find_core_events_table(const char *arch, co= nst char *cpuid) diff --git a/tools/perf/pmu-events/pmu-events.h b/tools/perf/pmu-events/pmu= -events.h index 5435ad92180c..675562e6f770 100644 --- a/tools/perf/pmu-events/pmu-events.h +++ b/tools/perf/pmu-events/pmu-events.h @@ -103,7 +103,7 @@ int pmu_metrics_table__for_each_metric(const struct pmu= _metrics_table *table, pm void *data); =20 const struct pmu_events_table *perf_pmu__find_events_table(struct perf_pmu= *pmu); -const struct pmu_metrics_table *perf_pmu__find_metrics_table(struct perf_p= mu *pmu); +const struct pmu_metrics_table *pmu_metrics_table__find(void); const struct pmu_events_table *find_core_events_table(const char *arch, co= nst char *cpuid); const struct pmu_metrics_table *find_core_metrics_table(const char *arch, = const char *cpuid); int pmu_for_each_core_event(pmu_event_iter_fn fn, void *data); diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 514cb865f57b..45838651b361 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -818,11 +818,6 @@ static int is_sysfs_pmu_core(const char *name) return file_available(path); } =20 -__weak const struct pmu_metrics_table *pmu_metrics_table__find(void) -{ - return perf_pmu__find_metrics_table(NULL); -} - /** * Return the length of the PMU name not including the suffix for uncore P= MUs. * diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h index fba3fc608b64..7b3e71194e49 100644 --- a/tools/perf/util/pmu.h +++ b/tools/perf/util/pmu.h @@ -260,7 +260,6 @@ void perf_pmu__arch_init(struct perf_pmu *pmu); void pmu_add_cpu_aliases_table(struct perf_pmu *pmu, const struct pmu_events_table *table); =20 -const struct pmu_metrics_table *pmu_metrics_table__find(void); bool pmu_uncore_identifier_match(const char *compat, const char *id); =20 int perf_pmu__convert_scale(const char *scale, char **end, double *sval); --=20 2.47.0.199.ga7371fff76-goog