From nobody Thu Apr 2 17:02:37 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 BCA2636C0BC for ; Fri, 27 Mar 2026 04:50:38 +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=1774587040; cv=none; b=uPZvwBITIjxfilDjElBjY0Qh2qJeu3k0gIbF8bDwXMJ7CGXomaCnvMnsuCmrC5fVleuL3e0gGsXNoqCy1OtE1k2i/HbPdV9HB9l89sEqcMN9MvubT5Osd1ot61++vGXu+OGfEZrNN2BFseOXctBYTzXYHilBETOUfzcLb6nlshg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774587040; c=relaxed/simple; bh=uxlEApcoFt3zoagTt4W9dkYrIKl7vQczKfyJY/2/YdM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=n3RC6TLZNxKck3wu7HwfKPCp9buE2V/XeIwyxJByO84JhwqaHxIVCvZx3AeVCbYK6vubBOcsvhW5dMHA9CPggpxoUpd1A3+8MwguF5BLP2Zqnls7JoLyDwjFqk19wLiMan9NMiLMjwc4lu5n4cGrfAa/bctXrqt6rAWrlRoHLmY= 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=CyhCju7M; 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="CyhCju7M" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-2c0bddb9196so1136674eec.1 for ; Thu, 26 Mar 2026 21:50:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1774587038; x=1775191838; 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=IGyUKvzRwcUnG4/Npnp/POwUnKzsH4cjggqTcUHOoLQ=; b=CyhCju7MVvxPRxfRlEF54EmYfqbqoUAQk7n+CtBSEkJhvoFLnRbZMomoEmnQQaFDOp piCo2nTURkP70CNxWmPUY+1DnNloqhTQqNSEnXE3EvNwsaJTc2oBdk7aw7//KclSMCXt IR7iF60jmF3KfIyQP/1k6NEjnbFgOJyuw8fVIFZQCz4gvV6O9Rn3FdOrA/CEvUGwp3o+ 2wDoGKJI8K3uhmYpHkcms9bvqsoCMrvJ9y8cc92LZVzvYvlPhcly9Ybo0ChssnVlo8yw VDnymFzdclq0CprvEjQjjS7RyoScsJBsWaQkpMYRt+9Apl4DtkKGgZqOq+ndgyFUuyk+ o6tQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774587038; x=1775191838; 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=IGyUKvzRwcUnG4/Npnp/POwUnKzsH4cjggqTcUHOoLQ=; b=NolsdqUhwOZcDRGm4XXKVzqBVUX5vJx2WzcGj1xhygrDaG4YvAFEET1dT6EfARNKhK zchP7qknAWM3c1PFmYS7LHrcwGDhoiENTAk8BtJQPIN3/aL+3E91axAVmnp9D9aOGI74 hoCl5rVl6PmnxU+EflAXTk+nvLNtY9EJTFcduhMVEIT6Q33cBu7JFtwf2zNeyypCRRCg l+s03zaiPaZZevQhpDYZcwOpLJVcu0twywqRkUmlwctjNvvCll1WGTDMi9SGH22giKfb Rx3772TCN4i7zn8rrbvDbTiAc69MlEV1ceL0davWVvz/zOMbp+Fn0zNDL6ydmnQIvcBc JNAw== X-Forwarded-Encrypted: i=1; AJvYcCU7LUk6YARCuTlxoLKGLDCVYiS3J7U1r+fO3E+7/aa/40FdrGfcFVhzTtBiVH8G9OIslRXeSXvfiXjl3Ps=@vger.kernel.org X-Gm-Message-State: AOJu0YxrGThc59eHvxOIXi5zsadLXm8QLJmm9q/0Ikk9AJ4Q+DBTJgyY Cu3h4moaB7MmONhJClX0Dwcwk9XQYVNlXYPq9mARNU6bz/hp+qu09Lk9gheUx9Y5/s6ezQgrPRa p6S8bOZfkLw== X-Received: from dybsi15.prod.google.com ([2002:a05:7301:488f:b0:2c1:e58:5b95]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7301:129b:b0:2c0:be45:6811 with SMTP id 5a478bee46e88-2c185f9710emr544942eec.32.1774587037692; Thu, 26 Mar 2026 21:50:37 -0700 (PDT) Date: Thu, 26 Mar 2026 21:50:24 -0700 In-Reply-To: <20260327045025.2276517-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> <20260327045025.2276517-1-irogers@google.com> X-Mailer: git-send-email 2.53.0.1018.g2bb0e51243-goog Message-ID: <20260327045025.2276517-2-irogers@google.com> Subject: [PATCH v4 1/2] perf env: Add perf_env__e_machine helper and use in perf_env__arch From: Ian Rogers To: acme@kernel.org, namhyung@kernel.org, tmricht@linux.ibm.com 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 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 | 185 ++++++++++++++++++++++++++++++-------- tools/perf/util/env.h | 1 + tools/perf/util/session.c | 14 +-- 3 files changed, 157 insertions(+), 43 deletions(-) diff --git a/tools/perf/util/env.c b/tools/perf/util/env.c index 93d475a80f14..ae08178870d7 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,160 @@ 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}, + {"s390", EM_S390}, + {"sa110", EM_ARM}, + {"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 env->e_flags; + + 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) { + /* + * Lazily compute/allocate arch. The e_machine may have been + * read from a data file and so may not be EM_HOST. + */ + uint16_t e_machine =3D perf_env__e_machine(env, /*e_flags=3D*/NULL); =20 - return normalize_arch(arch_name); + env->arch =3D strdup(e_machine_to_perf_arch(e_machine)); + } + 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 17:02:37 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 848EC36C0BA for ; Fri, 27 Mar 2026 04:50:40 +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=1774587042; cv=none; b=ir7RvTeXGO7ClUbD2oxEaLo0y8q5s9N8NTBMOm0mVLqJ2lO8yvW8VkmcB24HHte39K3cwv152F6R+NaNJpFyibeCuPNWTfqzjG6rbDCQNDVA3VZWYW/OqELIWzpxeqDJ5wTc9ysHqMj3fL/U+sJD77zqot1LGGHIy9hEE94XNWk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774587042; c=relaxed/simple; bh=NCcIU10XTd3SGeVusKnvgxNMrwlwC9QtqLQnM5rLO/U=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=nenE2XDZbl+Bq0PRIycUmOheSpu5YkFS0PePz6cEWCHSaX6PD6gYVzZT5JlkscFsSrya+NiRzHNTF34woXvRfAOSTW69fTZKbV9XPuohIy1G/6NmCYqoUR+m54TqXRGjrqqJ/blEUaOUtXDtoeX8XBA0ZqC91bVJ2Gjy6I+MNwQ= 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=pKa38xhX; 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="pKa38xhX" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-2c0f6593ef5so1771898eec.1 for ; Thu, 26 Mar 2026 21:50:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1774587040; x=1775191840; 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=6USNK8LwVt72TXtOFsH/nIJ3+Iz3fMRW+lu24S2g8Ts=; b=pKa38xhXtbXF9phpV8RqjD/msKwBD5OGjag/HTRg9TUNRpc6T3NbTLHVaJLbZh/Tlr 1M5/ODZObWv4n4TIuXCwdbvdt3iUvfIjYUzphVIZAclfwa/GigUCvUuuyjbCAaLHUrIx hc2/SqCE+wB15rQlJrv0N4byZoAPL5MXR6umqPzt0KLBqCqGlFxpKL3P4M2h1oI48R4W NXnKEYYGtfDTYcyqsAj3jNX3x4yhdBcQKOB2XkbR4Qx/Jn37b4IiO3JTSwTdStv2FjZW dLASH9cDkHu1lX6tC9R6662yzGNakjFtNjKuplg//JYPwtAOSn7eSvQqoPFyVai4EUfZ scWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774587040; x=1775191840; 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=6USNK8LwVt72TXtOFsH/nIJ3+Iz3fMRW+lu24S2g8Ts=; b=WMcqr36D5O+iXd1IKTnhngX8G4dMX4dw/Tz5/web1MpmRXuY2S6VuAeuxIPLpwA6Tm ZzHwTb9FahA+B6ouFaJeSbiFsAttdEquwqS0J48RlJ03rRMQqtUu/kqgcDC2fzv9mrNg ARse3Hy7qKP1r9dLceU/Hj4+cxNzDqA/5QFHrgYJcabKix20dBD/zuW3RNaDJktZXkwT TYeWLMl9flsCMN2zIYKvw8bDyrtqUhPXS7CEF09UssZjyY3SDEuOp1wCizCvXqvpYyOu d0CLSeRt48OAXWFKCsIxchbk+xlpVDEKyZdwBaaY3Dt1iUPtpbquSWNYXUjEPFs7CSkJ d0QQ== X-Forwarded-Encrypted: i=1; AJvYcCWboto2/W74ApO8+hOflr5Ku+oeCws7pDOH6i3RgaFQ6oKivUSO8+TRoiTQwBY2twEPE5KpTOkns8iyXlI=@vger.kernel.org X-Gm-Message-State: AOJu0YyW9AC7FkIkp+ZRLgHaMunUStrRPz6/2qnrOygw5a1lAAYukm8j yX2WfaogMmSl+4DJu8M2b0hVdHD8kCMsly6nG0u0WH4/RA0lE7kgVgAMf97d49goQk/MCkb75bz PDO9qjrh1ZA== X-Received: from dleb13-n2.prod.google.com ([2002:a05:701b:424d:20b0:128:d37d:9d64]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:6b94:b0:11b:923d:7753 with SMTP id a92af1059eb24-12ab2838a6emr674301c88.3.1774587039387; Thu, 26 Mar 2026 21:50:39 -0700 (PDT) Date: Thu, 26 Mar 2026 21:50:25 -0700 In-Reply-To: <20260327045025.2276517-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> <20260327045025.2276517-1-irogers@google.com> X-Mailer: git-send-email 2.53.0.1018.g2bb0e51243-goog Message-ID: <20260327045025.2276517-3-irogers@google.com> Subject: [PATCH v4 2/2] perf symbol: Lazily compute idle and use the perf_env From: Ian Rogers To: acme@kernel.org, namhyung@kernel.org, tmricht@linux.ibm.com 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 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 | 104 ++++++++++++++++++++++------------- tools/perf/util/symbol.h | 15 +++-- 4 files changed, 83 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..9ff709edeb88 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,86 @@ 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); + + if (sym->idle) + return sym->idle =3D=3D SYMBOL_IDLE__IDLE; + + if (!dso || dso__kernel(dso) =3D=3D DSO_SPACE__USER) { + sym->idle =3D SYMBOL_IDLE__NOT_IDLE; + return false; + } =20 - if (idle_symbols_list) - return strlist__has_entry(idle_symbols_list, name); + /* + * ppc64 uses function descriptors and appends a '.' to the + * start of every instruction address. Remove it. + */ + if (name[0] =3D=3D '.') + name++; =20 - idle_symbols_list =3D strlist__new(NULL, NULL); + if (bsearch(name, idle_symbols, ARRAY_SIZE(idle_symbols), + sizeof(idle_symbols[0]), sym_name_cmp)) { + sym->idle =3D SYMBOL_IDLE__IDLE; + return true; + } =20 - for (i =3D 0; idle_symbols[i]; i++) - strlist__add(idle_symbols_list, idle_symbols[i]); + 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; + } + } =20 - return strlist__has_entry(idle_symbols_list, name); + 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 && strstarts(name, "psw_idle")) { + int major =3D 0, minor =3D 0; + const char *release =3D env && env->os_release + ? env->os_release : perf_version_string; + + /* Before v6.10, s390 used psw_idle. */ + if (sscanf(release, "%d.%d", &major, &minor) !=3D 2 || + major < 6 || (major =3D=3D 6 && minor < 10)) { + 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 +813,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..2f5f90f547aa 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 holding enum symbol_idle_kind values. */ + u8 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