From nobody Thu Apr 2 18:47:39 2026 Received: from mail-dy1-f201.google.com (mail-dy1-f201.google.com [74.125.82.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 385FC39182E for ; Thu, 26 Mar 2026 17:45:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774547130; cv=none; b=qwPTQMj8xFq8aUuuE7d7KXOkj61BiDJmEBzgeo8Xv0EZT1aVIj1h1a44ZrbgBFf8GzAdXoj9XyPdjzAurv/JHPXv80kt1EStpBrCgGUWZ8raaHBWHC4GXhZRJiyNECuvjcySAj5UfqH7e+378CQhVpfvW3cjSozQ2m5YfIcvhfY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774547130; c=relaxed/simple; bh=j6rgEXApqjZizFGFXtuk1RkCvFKzS+Zod19klE5fm4w=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=guZV4DSA7kjyNnfLHvrH0sd5MkeJeJ82D16EnM9HF4EW2krU6qRdrIgSI+alCK1ASnCH7W4vXBPFWzRkrE34/wAA5kiIBSus3Z8hzrmt5Lq/gSXoh1R+0Mh5hj6MB8e8slM72LcaDyGFQI1RTsmJo9zpU5A/4W6NSIKtRiD0Z54= 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=DuWnx/DT; arc=none smtp.client-ip=74.125.82.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="DuWnx/DT" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-2c1631e6189so8601865eec.0 for ; Thu, 26 Mar 2026 10:45:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1774547127; x=1775151927; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=3hQPlIkV5UQpTmKo/dttZUaxWmixCoCT0jtakDd3Tn4=; b=DuWnx/DTxNW7olGMWPQtYwvIiUISpZEZtzXECEegHxS1GaKAYop0QjYVuByfXhPHS2 L5irZET00zeuwNygTgKxtrhsN73GLpNcqDnLM7Y/Jx5FQNOvXoZlgPCIo82Rr/mC6yDr Wcnpjw34S7jxB70RbFIlq8QVe9+y3Rvx1u+LhN+3Hs2TItrVp9sZKqoZge6ShJT+2MTJ J52mQUJwf1avaZZKzrn3KJr3hHFHsWAWMqFJjkAjcewYwFu/ZHlORdo3gavCBgaWD7cb v7I774XYJZ6erXq3LN7J+JQ980B22zFL9kbH9Swn3rEWIwbCTCvJ9GbvTJcmp+2WyKyC qf+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774547127; x=1775151927; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=3hQPlIkV5UQpTmKo/dttZUaxWmixCoCT0jtakDd3Tn4=; b=F7cuoelW2atsIGMB92Ai9VPyQnc9ng2C3OtasljWIS1UqYuzvKGiVI8e8+QTw9XM9H ZGFycGDyf34G1fZzex+6cd82M5rh4d0dZguZy5KnHDqRNYAtG/PyEtbB15N+rG8YazDJ X4FmgaLkVp9gdAsZVs1qZ1NTwFwPAquTjsK+wW2jgQUODU6I9lHgN5vKiy9S2X8qi+dO q0Mn5BIdYEoLtW6KJI3Mw3K4SMEhLd6Sz9yUq9qrhTH1GU2F4ANjQz3CyGWjVqcYCRyt 4nshFxUpx3Cyp01U4L9gOEkp0Mm5u46P20sYcDzMuGP5RAWlQajCLlol12DbqjE1sbcC +7hA== X-Forwarded-Encrypted: i=1; AJvYcCXwyPqyuFHfG32ikA9OfLTwCqEFlF1WwLf1eU83AgJUB8GHLywsuTlDQsng2nvYbyt3Ze02VqYgs5mcKvc=@vger.kernel.org X-Gm-Message-State: AOJu0YxzqllKk7pkgVF+SRFM39CRqNqd0cSVEX4UwezOZg9yWfdonqYW lm/gxAcZvVJ7/3RlC2sfEeaCMGmcoGol94AwmKpDM8wO/EnY0CfQuihE2/DMb33L6Qa3djdKhV/ qlFlMVYa6HQ== X-Received: from dybod2.prod.google.com ([2002:a05:7301:3f82:b0:2c0:be02:79e8]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7301:60b:b0:2be:884e:17af with SMTP id 5a478bee46e88-2c15d2b6ef1mr4509661eec.2.1774547127178; Thu, 26 Mar 2026 10:45:27 -0700 (PDT) Date: Thu, 26 Mar 2026 10:45:20 -0700 In-Reply-To: <20260326174521.1829203-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260326174521.1829203-1-irogers@google.com> X-Mailer: git-send-email 2.53.0.1018.g2bb0e51243-goog Message-ID: <20260326174521.1829203-2-irogers@google.com> Subject: [PATCH v3 1/2] perf env: Add perf_env__e_machine helper and use in perf_env__arch From: Ian Rogers To: irogers@google.com Cc: acme@kernel.org, agordeev@linux.ibm.com, gor@linux.ibm.com, hca@linux.ibm.com, jameshongleiwang@126.com, japo@linux.ibm.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-s390@vger.kernel.org, namhyung@kernel.org, sumanthk@linux.ibm.com, tmricht@linux.ibm.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add a helper that lazily computes the e_machine and falls back of EM_HOST. Use the perf_env's arch to compute the e_machine if available. Use a binary search for some efficiency in this, but handle somewhat complex duplicate rules. Switch perf_env__arch to be derived the e_machine for consistency. This switches arch from being uname derived to matching that of the perf binary (via EM_HOST). Update session to use the helper, which may mean using EM_HOST when no threads are available. This also updates the perf data file header that gets the e_machine/e_flags from the session. Signed-off-by: Ian Rogers --- tools/perf/util/env.c | 179 ++++++++++++++++++++++++++++++-------- tools/perf/util/env.h | 1 + tools/perf/util/session.c | 14 +-- 3 files changed, 151 insertions(+), 43 deletions(-) diff --git a/tools/perf/util/env.c b/tools/perf/util/env.c index 93d475a80f14..304bd8245485 100644 --- a/tools/perf/util/env.c +++ b/tools/perf/util/env.c @@ -1,10 +1,12 @@ // SPDX-License-Identifier: GPL-2.0 #include "cpumap.h" +#include "dwarf-regs.h" #include "debug.h" #include "env.h" #include "util/header.h" #include "util/rwsem.h" #include +#include #include #include #include @@ -588,51 +590,154 @@ void cpu_cache_level__free(struct cpu_cache_level *c= ache) zfree(&cache->size); } =20 +struct arch_to_e_machine { + const char *prefix; + uint16_t e_machine; +}; + /* - * Return architecture name in a normalized form. - * The conversion logic comes from the Makefile. + * A mapping from an arch prefix string to an ELF machine that can be used= in a + * bsearch. Some arch prefixes are shared an need additional processing as + * marked next to the architecture. The prefixes handle both perf's archit= ecture + * naming and those from uname. */ -static const char *normalize_arch(char *arch) -{ - if (!strcmp(arch, "x86_64")) - return "x86"; - if (arch[0] =3D=3D 'i' && arch[2] =3D=3D '8' && arch[3] =3D=3D '6') - return "x86"; - if (!strcmp(arch, "sun4u") || !strncmp(arch, "sparc", 5)) - return "sparc"; - if (!strncmp(arch, "aarch64", 7) || !strncmp(arch, "arm64", 5)) - return "arm64"; - if (!strncmp(arch, "arm", 3) || !strcmp(arch, "sa110")) - return "arm"; - if (!strncmp(arch, "s390", 4)) - return "s390"; - if (!strncmp(arch, "parisc", 6)) - return "parisc"; - if (!strncmp(arch, "powerpc", 7) || !strncmp(arch, "ppc", 3)) - return "powerpc"; - if (!strncmp(arch, "mips", 4)) - return "mips"; - if (!strncmp(arch, "sh", 2) && isdigit(arch[2])) - return "sh"; - if (!strncmp(arch, "loongarch", 9)) - return "loongarch"; - - return arch; +static const struct arch_to_e_machine prefix_to_e_machine[] =3D { + {"aarch64", EM_AARCH64}, + {"alpha", EM_ALPHA}, + {"arc", EM_ARC}, + {"arm", EM_ARM}, /* Check also for EM_AARCH64. */ + {"avr", EM_AVR}, /* Check also for EM_AVR32. */ + {"bfin", EM_BLACKFIN}, + {"blackfin", EM_BLACKFIN}, + {"cris", EM_CRIS}, + {"csky", EM_CSKY}, + {"hppa", EM_PARISC}, + {"i386", EM_386}, + {"i486", EM_386}, + {"i586", EM_386}, + {"i686", EM_386}, + {"loongarch", EM_LOONGARCH}, + {"m32r", EM_M32R}, + {"m68k", EM_68K}, + {"microblaze", EM_MICROBLAZE}, + {"mips", EM_MIPS}, + {"msp430", EM_MSP430}, + {"parisc", EM_PARISC}, + {"powerpc", EM_PPC}, /* Check also for EM_PPC64. */ + {"ppc", EM_PPC}, /* Check also for EM_PPC64. */ + {"riscv", EM_RISCV}, + {"sa110", EM_ARM}, + {"s390", EM_S390}, + {"sh", EM_SH}, + {"sparc", EM_SPARC}, /* Check also for EM_SPARCV9. */ + {"sun4u", EM_SPARC}, + {"x86", EM_X86_64}, /* Check also for EM_386. */ + {"xtensa", EM_XTENSA}, +}; + +static int compare_prefix(const void *key, const void *element) +{ + const char *search_key =3D key; + const struct arch_to_e_machine *map_element =3D element; + size_t prefix_len =3D strlen(map_element->prefix); + + return strncmp(search_key, map_element->prefix, prefix_len); +} + +static uint16_t perf_arch_to_e_machine(const char *perf_arch, bool is_64_b= it) +{ + /* Binary search for a matching prefix. */ + const struct arch_to_e_machine *result; + + if (!perf_arch) + return EM_HOST; + + result =3D bsearch(perf_arch, + prefix_to_e_machine, ARRAY_SIZE(prefix_to_e_machine), + sizeof(prefix_to_e_machine[0]), + compare_prefix); + + if (!result) { + pr_debug("Unknown perf arch for ELF machine mapping: %s\n", perf_arch); + return EM_NONE; + } + + /* Handle conflicting prefixes. */ + switch (result->e_machine) { + case EM_ARM: + return !strcmp(perf_arch, "arm64") ? EM_AARCH64 : EM_ARM; + case EM_AVR: + return !strcmp(perf_arch, "avr32") ? EM_AVR32 : EM_AVR; + case EM_PPC: + return is_64_bit || strstarts(perf_arch, "ppc64") ? EM_PPC64 : EM_PPC; + case EM_SPARC: + return is_64_bit || !strcmp(perf_arch, "sparc64") ? EM_SPARCV9 : EM_SPAR= C; + case EM_X86_64: + return is_64_bit || !strcmp(perf_arch, "x86_64") ? EM_X86_64 : EM_386; + default: + return result->e_machine; + } +} + +static const char *e_machine_to_perf_arch(uint16_t e_machine) +{ + /* + * Table for if either the perf arch string differs from uname or there + * are >1 ELF machine with the prefix. + */ + static const struct arch_to_e_machine extras[] =3D { + {"arm64", EM_AARCH64}, + {"avr32", EM_AVR32}, + {"powerpc", EM_PPC}, + {"powerpc", EM_PPC64}, + {"sparc", EM_SPARCV9}, + {"x86", EM_386}, + {"x86", EM_X86_64}, + {"none", EM_NONE}, + }; + + for (size_t i =3D 0; i < ARRAY_SIZE(extras); i++) { + if (extras[i].e_machine =3D=3D e_machine) + return extras[i].prefix; + } + + for (size_t i =3D 0; i < ARRAY_SIZE(prefix_to_e_machine); i++) { + if (prefix_to_e_machine[i].e_machine =3D=3D e_machine) + return prefix_to_e_machine[i].prefix; + + } + return "unknown"; +} + +uint16_t perf_env__e_machine(struct perf_env *env, uint32_t *e_flags) +{ + if (!env) { + if (e_flags) + *e_flags =3D EF_HOST; + + return EM_HOST; + } + if (env->e_machine =3D=3D EM_NONE) { + env->e_machine =3D perf_arch_to_e_machine(env->arch, env->kernel_is_64_b= it); + + if (env->e_machine =3D=3D EM_HOST) + env->e_flags =3D EF_HOST; + } + if (e_flags) + *e_flags =3D EF_HOST; + + return env->e_machine; } =20 const char *perf_env__arch(struct perf_env *env) { - char *arch_name; + if (!env) + return e_machine_to_perf_arch(EM_HOST); =20 - if (!env || !env->arch) { /* Assume local operation */ - static struct utsname uts =3D { .machine[0] =3D '\0', }; - if (uts.machine[0] =3D=3D '\0' && uname(&uts) < 0) - return NULL; - arch_name =3D uts.machine; - } else - arch_name =3D env->arch; + if (!env->arch) + env->arch =3D strdup(e_machine_to_perf_arch(perf_env__e_machine(env, /*e= _flags=3D*/NULL))); =20 - return normalize_arch(arch_name); + return env->arch; } =20 #if defined(HAVE_LIBTRACEEVENT) diff --git a/tools/perf/util/env.h b/tools/perf/util/env.h index a4501cbca375..91ff252712f4 100644 --- a/tools/perf/util/env.h +++ b/tools/perf/util/env.h @@ -186,6 +186,7 @@ int perf_env__read_cpu_topology_map(struct perf_env *en= v); =20 void cpu_cache_level__free(struct cpu_cache_level *cache); =20 +uint16_t perf_env__e_machine(struct perf_env *env, uint32_t *e_flags); const char *perf_env__arch(struct perf_env *env); const char *perf_env__arch_strerrno(struct perf_env *env, int err); const char *perf_env__cpuid(struct perf_env *env); diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 4b465abfa36c..dcc9bef303aa 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -2996,14 +2996,16 @@ uint16_t perf_session__e_machine(struct perf_sessio= n *session, uint32_t *e_flags return EM_HOST; } =20 + /* Is the env caching an e_machine? */ env =3D perf_session__env(session); - if (env && env->e_machine !=3D EM_NONE) { - if (e_flags) - *e_flags =3D env->e_flags; - - return env->e_machine; - } + if (env && env->e_machine !=3D EM_NONE) + return perf_env__e_machine(env, e_flags); =20 + /* + * Compute from threads, note this is more accurate than + * perf_env__e_machine that falls back on EM_HOST and doesn't consider + * mixed 32-bit and 64-bit threads. + */ machines__for_each_thread(&session->machines, perf_session__e_machine_cb, &args); --=20 2.53.0.1018.g2bb0e51243-goog From nobody Thu Apr 2 18:47:39 2026 Received: from mail-dy1-f202.google.com (mail-dy1-f202.google.com [74.125.82.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 58781397E89 for ; Thu, 26 Mar 2026 17:45:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774547132; cv=none; b=t5d723sqgiQMefp4pI5SilX/2gIog2tYSIu/WyMQsmHSR06UOnD1hS+8Sy36nkBWkhx1SpNZq+SN4dtV5U1JuIOPGvKNwTQTZX+G0j9aWmlM00Z2vqc1yqQZmOpDZc7ihQt6+NSPfnjXoa+cMAJF1fM+O9MuWPgD8AYCohvScWo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774547132; c=relaxed/simple; bh=bqRgx5Rzlc/W3YsT8D5UcYBWGN+L7iAfdFcrs8Pd5mo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=McISPYly6okGcrzTBCHkp6uZkj7P1f5vDAlRumXToL/Dm5i2atul/Sy2Hbl8YfjbfJCl+3MrAvJopMg4asOOzBoAkZS3HHgJzhHruq/Kpx7crgYGHQ3FLMMy34xXN+2/3LNvydGJ3zkUBYN+QvZAxcN6up21T+lW9v5D5LwYPrE= 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=TWzm7u53; arc=none smtp.client-ip=74.125.82.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="TWzm7u53" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-2bdf75bc88fso1056797eec.0 for ; Thu, 26 Mar 2026 10:45:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1774547129; x=1775151929; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=q3q6omvrQJ3lloWqzdf8ZnTA5HGIAkIdMH0mfiYyoG0=; b=TWzm7u53SluscaiVvsyXI4kg3lOGGnn05b439LfLRyPdIVuqhf13ahUNZt8z0kTMyX ntWlikEmm4I+SZi0sTD3LsTjz+NPUujITty2XHEK4GNBoz7M8W2RCP9E76K7xO95UWEl 591bYoWhF5iSD7UhWCzaUA/qFNwt1ObGwqjSuDwDVdktk0F2i3DUe0VP0Z2Hc7g9uQ4V ZyOr8XV2IjLmaD/vt0QAyCsGzfwSXx5elB5mXwm6/hmASYkJTTnJysBJmxfRf/xr+Ygx tfvBA+Ep4WqeDzSsHVjVjOMBqpedcN5E/wQcn9o7XF1PSCgZ0tu1YX+rFr91PnP/Rkb1 c6dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774547129; x=1775151929; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=q3q6omvrQJ3lloWqzdf8ZnTA5HGIAkIdMH0mfiYyoG0=; b=ZrEDJSHL0w9QR+BtnaVx4myshpJOWVO+5OL1AyBovUyyTJ/sjLl6K8+lQenlpTvSR5 G4gcePTiH1UXCH23P7JYSke/Fs8ZsMYsBIWC/D5lOjIZhoPBJG6U7y6llZHQwgPPr40c nCnZYYvJr8ArUObEMxjL5Aja8gfOnNoANMdSTg1D1saFzy1MAaSzwAXJO7/415C6ru33 AC9nSwvoWNqkCb3gAV9WDr1FNvHE0nSXoiVpQeu+DA0osfNN4QpncwE//HSfZKqRG1Cn cU7I9w1yW1PiDg02l6p8HsVs0OIv6rwGCENyKP9fv0yWEOWVn59pCxj9COYREbgppsyO kuyA== X-Forwarded-Encrypted: i=1; AJvYcCXJiT8occRTfGATUrUOdmE9FXV4lDo4rHrTxaA+nW9kofASQfuSrFVbjcr+TYs3k71Ju/STgDjp3TYWSD4=@vger.kernel.org X-Gm-Message-State: AOJu0Yx62g0gZcafIsatd8M2tTxNUUZXT6g1TmlZS8sZStwFl7FvH8/a 0jHuSkEAKTalapaEKfFOOMPY0vwDcmgRuTVJYfmAK47uh3ebj9mf+RrCtrQjBA30/u01vV6OLT5 ycmAkUHUq+A== X-Received: from dycal9.prod.google.com ([2002:a05:7301:1c89:b0:2c1:718d:bd7f]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:cac8:b0:2c1:23d:c728 with SMTP id 5a478bee46e88-2c15d452a21mr4856434eec.31.1774547129223; Thu, 26 Mar 2026 10:45:29 -0700 (PDT) Date: Thu, 26 Mar 2026 10:45:21 -0700 In-Reply-To: <20260326174521.1829203-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260326174521.1829203-1-irogers@google.com> X-Mailer: git-send-email 2.53.0.1018.g2bb0e51243-goog Message-ID: <20260326174521.1829203-3-irogers@google.com> Subject: [PATCH v3 2/2] perf symbol: Lazily compute idle and use the perf_env From: Ian Rogers To: irogers@google.com Cc: acme@kernel.org, agordeev@linux.ibm.com, gor@linux.ibm.com, hca@linux.ibm.com, jameshongleiwang@126.com, japo@linux.ibm.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-s390@vger.kernel.org, namhyung@kernel.org, sumanthk@linux.ibm.com, tmricht@linux.ibm.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Move the idle boolean to a helper symbol__is_idle function. In the function lazily compute whether a symbol is an idle function taking into consideration the kernel version and architecture of the machine. As symbols__insert no longer needs to know if a symbol is for the kernel, remove the argument. This change is inspired by mailing list discussion, particularly from Thomas Richter and Heiko Carstens : https://lore.kernel.org/lkml/20260219113850.354271-1-tmricht@linux.ibm.com/ The change switches x86 matches to use strstarts which means intel_idle_irq is matched as part of strstarts(name, "intel_idle"), a change suggested by Honglei Wang in: https://lore.kernel.org/lkml/20260323085255.98173-1-jameshongleiwang@126.co= m/ Signed-off-by: Ian Rogers --- tools/perf/builtin-top.c | 6 +- tools/perf/util/symbol-elf.c | 2 +- tools/perf/util/symbol.c | 105 ++++++++++++++++++++++------------- tools/perf/util/symbol.h | 15 +++-- 4 files changed, 84 insertions(+), 44 deletions(-) diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c index 37950efb28ac..bdc1c761cd61 100644 --- a/tools/perf/builtin-top.c +++ b/tools/perf/builtin-top.c @@ -751,6 +751,7 @@ static void perf_event__process_sample(const struct per= f_tool *tool, { struct perf_top *top =3D container_of(tool, struct perf_top, tool); struct addr_location al; + struct dso *dso =3D NULL; =20 if (!machine && perf_guest) { static struct intlist *seen; @@ -830,7 +831,10 @@ static void perf_event__process_sample(const struct pe= rf_tool *tool, } } =20 - if (al.sym =3D=3D NULL || !al.sym->idle) { + if (al.map) + dso =3D map__dso(al.map); + + if (al.sym =3D=3D NULL || !symbol__is_idle(al.sym, dso, machine->env)) { struct hists *hists =3D evsel__hists(evsel); struct hist_entry_iter iter =3D { .evsel =3D evsel, diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c index 3cd4e5a03cc5..9fabf5146d89 100644 --- a/tools/perf/util/symbol-elf.c +++ b/tools/perf/util/symbol-elf.c @@ -1723,7 +1723,7 @@ dso__load_sym_internal(struct dso *dso, struct map *m= ap, struct symsrc *syms_ss, =20 arch__sym_update(f, &sym); =20 - __symbols__insert(dso__symbols(curr_dso), f, dso__kernel(dso)); + __symbols__insert(dso__symbols(curr_dso), f); nr++; } dso__put(curr_dso); diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c index ce9195717f44..92bc28934f36 100644 --- a/tools/perf/util/symbol.c +++ b/tools/perf/util/symbol.c @@ -25,6 +25,8 @@ #include "demangle-ocaml.h" #include "demangle-rust-v0.h" #include "dso.h" +#include "dwarf-regs.h" +#include "env.h" #include "util.h" // lsdir() #include "event.h" #include "machine.h" @@ -50,7 +52,6 @@ =20 static int dso__load_kernel_sym(struct dso *dso, struct map *map); static int dso__load_guest_kernel_sym(struct dso *dso, struct map *map); -static bool symbol__is_idle(const char *name); =20 int vmlinux_path__nr_entries; char **vmlinux_path; @@ -357,8 +358,7 @@ void symbols__delete(struct rb_root_cached *symbols) } } =20 -void __symbols__insert(struct rb_root_cached *symbols, - struct symbol *sym, bool kernel) +void __symbols__insert(struct rb_root_cached *symbols, struct symbol *sym) { struct rb_node **p =3D &symbols->rb_root.rb_node; struct rb_node *parent =3D NULL; @@ -366,17 +366,6 @@ void __symbols__insert(struct rb_root_cached *symbols, struct symbol *s; bool leftmost =3D true; =20 - if (kernel) { - const char *name =3D sym->name; - /* - * ppc64 uses function descriptors and appends a '.' to the - * start of every instruction address. Remove it. - */ - if (name[0] =3D=3D '.') - name++; - sym->idle =3D symbol__is_idle(name); - } - while (*p !=3D NULL) { parent =3D *p; s =3D rb_entry(parent, struct symbol, rb_node); @@ -393,7 +382,7 @@ void __symbols__insert(struct rb_root_cached *symbols, =20 void symbols__insert(struct rb_root_cached *symbols, struct symbol *sym) { - __symbols__insert(symbols, sym, false); + __symbols__insert(symbols, sym); } =20 static struct symbol *symbols__find(struct rb_root_cached *symbols, u64 ip) @@ -554,7 +543,7 @@ void dso__reset_find_symbol_cache(struct dso *dso) =20 void dso__insert_symbol(struct dso *dso, struct symbol *sym) { - __symbols__insert(dso__symbols(dso), sym, dso__kernel(dso)); + __symbols__insert(dso__symbols(dso), sym); =20 /* update the symbol cache if necessary */ if (dso__last_find_result_addr(dso) >=3D sym->start && @@ -716,47 +705,87 @@ int modules__parse(const char *filename, void *arg, return err; } =20 +static int sym_name_cmp(const void *a, const void *b) +{ + const char *name =3D a; + const char *const *sym =3D b; + + return strcmp(name, *sym); +} + /* * These are symbols in the kernel image, so make sure that * sym is from a kernel DSO. */ -static bool symbol__is_idle(const char *name) +bool symbol__is_idle(struct symbol *sym, const struct dso *dso, struct per= f_env *env) { - const char * const idle_symbols[] =3D { + static const char * const idle_symbols[] =3D { "acpi_idle_do_entry", "acpi_processor_ffh_cstate_enter", "arch_cpu_idle", "cpu_idle", "cpu_startup_entry", - "idle_cpu", - "intel_idle", - "intel_idle_ibrs", "default_idle", - "native_safe_halt", "enter_idle", "exit_idle", - "mwait_idle", - "mwait_idle_with_hints", - "mwait_idle_with_hints.constprop.0", + "idle_cpu", + "native_safe_halt", "poll_idle", - "ppc64_runlatch_off", "pseries_dedicated_idle_sleep", - "psw_idle", - "psw_idle_exit", - NULL }; - int i; - static struct strlist *idle_symbols_list; + const char *name =3D sym->name; + uint16_t e_machine =3D perf_env__e_machine(env, /*e_flags=3D*/NULL); =20 - if (idle_symbols_list) - return strlist__has_entry(idle_symbols_list, name); + if (sym->idle) + return sym->idle =3D=3D SYMBOL_IDLE__IDLE; =20 - idle_symbols_list =3D strlist__new(NULL, NULL); + if (!dso || dso__kernel(dso) =3D=3D DSO_SPACE__USER) { + sym->idle =3D SYMBOL_IDLE__NOT_IDLE; + return false; + } =20 - for (i =3D 0; idle_symbols[i]; i++) - strlist__add(idle_symbols_list, idle_symbols[i]); + /* + * ppc64 uses function descriptors and appends a '.' to the + * start of every instruction address. Remove it. + */ + if (name[0] =3D=3D '.') + name++; =20 - return strlist__has_entry(idle_symbols_list, name); + if (bsearch(name, idle_symbols, ARRAY_SIZE(idle_symbols), + sizeof(idle_symbols[0]), sym_name_cmp)) { + sym->idle =3D SYMBOL_IDLE__IDLE; + return true; + } + + if (e_machine =3D=3D EM_386 || e_machine =3D=3D EM_X86_64) { + if (strstarts(name, "mwait_idle") || + strstarts(name, "intel_idle")) { + sym->idle =3D SYMBOL_IDLE__IDLE; + return true; + } + } + + if (e_machine =3D=3D EM_PPC64 && !strcmp(name, "ppc64_runlatch_off")) { + sym->idle =3D SYMBOL_IDLE__IDLE; + return true; + } + + if (e_machine =3D=3D EM_S390) { + int major =3D 0, minor =3D 0; + const char *release =3D env && env->os_release + ? env->os_release : perf_version_string; + + sscanf(release, "%d.%d", &major, &minor); + + /* Before v6.10, s390 used psw_idle. */ + if ((major < 6 || (major =3D=3D 6 && minor < 10)) && strstarts(name, "ps= w_idle")) { + sym->idle =3D SYMBOL_IDLE__IDLE; + return true; + } + } + + sym->idle =3D SYMBOL_IDLE__NOT_IDLE; + return false; } =20 static int map__process_kallsym_symbol(void *arg, const char *name, @@ -785,7 +814,7 @@ static int map__process_kallsym_symbol(void *arg, const= char *name, * We will pass the symbols to the filter later, in * map__split_kallsyms, when we have split the maps per module */ - __symbols__insert(root, sym, !strchr(name, '[')); + __symbols__insert(root, sym); =20 return 0; } diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h index c67814d6d6d6..65422c1c8fdb 100644 --- a/tools/perf/util/symbol.h +++ b/tools/perf/util/symbol.h @@ -25,6 +25,7 @@ struct dso; struct map; struct maps; struct option; +struct perf_env; struct build_id; =20 /* @@ -42,6 +43,12 @@ Elf_Scn *elf_section_by_name(Elf *elf, GElf_Ehdr *ep, GElf_Shdr *shp, const char *name, size_t *idx); #endif =20 +enum symbol_idle_kind { + SYMBOL_IDLE__UNKNOWN =3D 0, + SYMBOL_IDLE__NOT_IDLE =3D 1, + SYMBOL_IDLE__IDLE =3D 2, +}; + /** * A symtab entry. When allocated this may be preceded by an annotation (s= ee * symbol__annotation) and/or a browser_index (see symbol__browser_index). @@ -57,8 +64,8 @@ struct symbol { u8 type:4; /** ELF binding type as defined for st_info. E.g. STB_WEAK or STB_GLOBAL.= */ u8 binding:4; - /** Set true for kernel symbols of idle routines. */ - u8 idle:1; + /** Cache for symbol__is_idle. */ + enum symbol_idle_kind idle:2; /** Resolvable but tools ignore it (e.g. idle routines). */ u8 ignore:1; /** Symbol for an inlined function. */ @@ -202,8 +209,7 @@ int dso__synthesize_plt_symbols(struct dso *dso, struct= symsrc *ss); =20 char *dso__demangle_sym(struct dso *dso, int kmodule, const char *elf_name= ); =20 -void __symbols__insert(struct rb_root_cached *symbols, struct symbol *sym, - bool kernel); +void __symbols__insert(struct rb_root_cached *symbols, struct symbol *sym); void symbols__insert(struct rb_root_cached *symbols, struct symbol *sym); void symbols__fixup_duplicate(struct rb_root_cached *symbols); void symbols__fixup_end(struct rb_root_cached *symbols, bool is_kallsyms); @@ -286,5 +292,6 @@ enum { }; =20 int symbol__validate_sym_arguments(void); +bool symbol__is_idle(struct symbol *sym, const struct dso *dso, struct per= f_env *env); =20 #endif /* __PERF_SYMBOL */ --=20 2.53.0.1018.g2bb0e51243-goog From nobody Thu Apr 2 18:47:39 2026 Received: from mail-dy1-f202.google.com (mail-dy1-f202.google.com [74.125.82.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 C380D215F6B for ; Fri, 27 Mar 2026 06:00:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774591240; cv=none; b=KtyCofUIGYMB1ki9Fnisa8gh5KlRwIAQPJdPqK7A5PLCYYz1Zy19ZHAP6JnP3WVRTIX6dYk4VO+Pq4uQrfqNI95t/Lcck0XeldqQ14pSpgvGdhdq83L8BIpWSEjQ2/gpirvrPD0ZL8PlbFA7VRpZOG3IHT2xwn4uLBNdxg1FE/c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774591240; c=relaxed/simple; bh=7by32mE098PrC98ifd1wv1RjxNxqtJBI7IB4w/ka4FM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=HBUt4fdRCgOyL0QoP2yZr+EAK+MITJL2BsVOzwQIl9dwzia2rzMQKjSjehYpMkfb/HL5KumdCHZYCgNcFeu76IxzGVlQH+ZueWvTxGqdkb/e2ogeoBmrLExFYHlcOKIg+wP9dVmHnXuij8cn0Q/Q5kwEpcwP1jNgNzla+uS5Z2o= 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=a8F38c1K; arc=none smtp.client-ip=74.125.82.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="a8F38c1K" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-2c166ac27c6so2040228eec.0 for ; Thu, 26 Mar 2026 23:00:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1774591237; x=1775196037; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=bSaSPNMMLz85x3cusqDT6CCMGHSADwo/AJ+TzcNU1qY=; b=a8F38c1Khx0yIDbr9YvVYE7anMkJ1dGK88QNZ+LDKNYCt3FUn/9CP2XhNEKweEIIOu Sx3z6zFIAhujdfKzR3UPhxT6v18/S4XiZbKGPpw1AIw81Nxyf5ki2gCUEk9ynjhUft0A MqYXOIgyY4bXVc3yUg3CeuinZzwxchff56V87wvNBxbuEURd9LBx6wRggmTT5n6y+dAB y65wOy5Ek7s8161B6vOUradw3Ekv8AkN7bsC9rWzL++sLHQIqHvvV8Lq0Cx2VFKKr0g8 YKMF4eUzZL1sGYyyai0NPjvc3iLw0Tc36JBtK3KnWlSuXOxTbVn8qKWMxZ+rO+fvXi0S 9yZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774591237; x=1775196037; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=bSaSPNMMLz85x3cusqDT6CCMGHSADwo/AJ+TzcNU1qY=; b=mcHDg2VFAQ57pyQfx2SFLrEDNu0ndKX5M9Zzjw1dNe0CohGmI2k9KZFg5CXgVsZLzr 0YzaVk8uAPNeyz1gf7oCzUQ6eOtv0c6zdAZap2u2AA/bfoC+K8QSf/vnTC0JPbwhzKt0 l5BhKzLrmk1XqrlsrXQDbue98VX6XLDrksPYhzG89xCkPZvwArrBffauudjxG9bAlY1w Bd2s/AAQfbYj1AQKE7RVzaMcj56aP1XDcCGzLZ8syLsSNCJPKtaKBL5svQCm3R1ifv3T ECAqPE/YLHzGcvclyfODkrJcfAvvnDaKdgf9WXuPewfAeg11Ph40ohsxqOHF65j0/TAl 7Yyw== X-Forwarded-Encrypted: i=1; AJvYcCXDqyrncUA9aSZz3WHkd/2Btd2e4O6SXZb+lPmUx93Imre7+kFKfrfApIYQcBiktbuL65NQmTQU/kLGuX4=@vger.kernel.org X-Gm-Message-State: AOJu0YyOnCLexFpUPcL5lUz8WYy+UCi4TqEsKq2iPhzazl1p92k5N5Ew fakHYCL8214jVOjUQ2mKkvBuVB317K0m4BsF4lDW+Okob5NmElIK+WxaRGH/U748Ngq/m6BKB2Y RNwJSGy1eRg== X-Received: from dycc10.prod.google.com ([2002:a05:693c:60ca:b0:2c0:bee5:18c9]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:f689:b0:128:ced9:9409 with SMTP id a92af1059eb24-12ab291a28dmr523173c88.37.1774591236655; Thu, 26 Mar 2026 23:00:36 -0700 (PDT) Date: Thu, 26 Mar 2026 23:00:33 -0700 In-Reply-To: <20260326174521.1829203-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260326174521.1829203-1-irogers@google.com> X-Mailer: git-send-email 2.53.0.1018.g2bb0e51243-goog Message-ID: <20260327060033.2294469-1-irogers@google.com> Subject: [PATCH v2] perf tests task-analyzer: Write test files to tmpdir From: Ian Rogers To: acme@kernel.org, namhyung@kernel.org Cc: irogers@google.com, agordeev@linux.ibm.com, gor@linux.ibm.com, hca@linux.ibm.com, jameshongleiwang@126.com, japo@linux.ibm.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-s390@vger.kernel.org, sumanthk@linux.ibm.com, tmricht@linux.ibm.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Writing to the test output files in the current working directory can fail in various contexts such as continual test. Other tests write to a mktemp-ed file, make the "perf script task-analyszer tests" follow this convention too. Currently this isn't possible for the perf.data file due to a lack of perf script support, add a variable for when this support is available. Signed-off-by: Ian Rogers --- tools/perf/tests/shell/test_task_analyzer.sh | 38 +++++++++++--------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/tools/perf/tests/shell/test_task_analyzer.sh b/tools/perf/test= s/shell/test_task_analyzer.sh index e194fcf61df3..b1a6a7e017e4 100755 --- a/tools/perf/tests/shell/test_task_analyzer.sh +++ b/tools/perf/tests/shell/test_task_analyzer.sh @@ -3,6 +3,11 @@ # SPDX-License-Identifier: GPL-2.0 =20 tmpdir=3D$(mktemp -d /tmp/perf-script-task-analyzer-XXXXX) +# TODO: perf script report only supports input from the CWD perf.data file= , make +# it support input from any file. +perfdata=3D"perf.data" +csv=3D"$tmpdir/csv" +csvsummary=3D"$tmpdir/csvsummary" err=3D0 =20 # set PERF_EXEC_PATH to find scripts in the source directory @@ -15,11 +20,10 @@ fi export ASAN_OPTIONS=3Ddetect_leaks=3D0 =20 cleanup() { - rm -f perf.data - rm -f perf.data.old - rm -f csv - rm -f csvsummary + rm -f "${perfdata}" + rm -f "${perfdata}".old rm -rf "$tmpdir" + trap - exit term int } =20 @@ -61,7 +65,7 @@ skip_no_probe_record_support() { =20 prepare_perf_data() { # 1s should be sufficient to catch at least some switches - perf record -e sched:sched_switch -a -- sleep 1 > /dev/null 2>&1 + perf record -e sched:sched_switch -a -o "${perfdata}" -- sleep 1 > /dev/n= ull 2>&1 # check if perf data file got created in above step. if [ ! -e "perf.data" ]; then printf "FAIL: perf record failed to create \"perf.data\" \n" @@ -130,28 +134,28 @@ test_extended_times_summary_ns() { } =20 test_csv() { - perf script report task-analyzer --csv csv > /dev/null - check_exec_0 "perf script report task-analyzer --csv csv" - find_str_or_fail "Comm;" csv "${FUNCNAME[0]}" + perf script report task-analyzer --csv "${csv}" > /dev/null + check_exec_0 "perf script report task-analyzer --csv ${csv}" + find_str_or_fail "Comm;" "${csv}" "${FUNCNAME[0]}" } =20 test_csv_extended_times() { - perf script report task-analyzer --csv csv --extended-times > /dev/null - check_exec_0 "perf script report task-analyzer --csv csv --extended-times" - find_str_or_fail "Out-Out;" csv "${FUNCNAME[0]}" + perf script report task-analyzer --csv "${csv}" --extended-times > /dev/n= ull + check_exec_0 "perf script report task-analyzer --csv ${csv} --extended-ti= mes" + find_str_or_fail "Out-Out;" "${csv}" "${FUNCNAME[0]}" } =20 test_csvsummary() { - perf script report task-analyzer --csv-summary csvsummary > /dev/null - check_exec_0 "perf script report task-analyzer --csv-summary csvsummary" - find_str_or_fail "Comm;" csvsummary "${FUNCNAME[0]}" + perf script report task-analyzer --csv-summary "${csvsummary}" > /dev/null + check_exec_0 "perf script report task-analyzer --csv-summary ${csvsummary= }" + find_str_or_fail "Comm;" "${csvsummary}" "${FUNCNAME[0]}" } =20 test_csvsummary_extended() { - perf script report task-analyzer --csv-summary csvsummary --summary-exten= ded \ + perf script report task-analyzer --csv-summary "${csvsummary}" --summary-= extended \ >/dev/null - check_exec_0 "perf script report task-analyzer --csv-summary csvsummary -= -summary-extended" - find_str_or_fail "Out-Out;" csvsummary "${FUNCNAME[0]}" + check_exec_0 "perf script report task-analyzer --csv-summary ${csvsummary= } --summary-extended" + find_str_or_fail "Out-Out;" "${csvsummary}" "${FUNCNAME[0]}" } =20 skip_no_probe_record_support --=20 2.53.0.1018.g2bb0e51243-goog