From nobody Sun Jun 21 06:28:39 2026 Received: from mail-oi1-f202.google.com (mail-oi1-f202.google.com [209.85.167.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 1EC931A9FB7 for ; Mon, 6 Apr 2026 17:18:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775495901; cv=none; b=ZK6gwhZHRx0MeArhXfdlTXTbBdWpPEWJ74Ux310+8q2GnAk69zzr2GHWM/rC34wAvTD0Drt4RVMcK0TS2pwhkpL641WzCF6ykrhzuV73YDXhdZIT/2ldCBDpW7CT2JzdAytVuHP8hjA+V8P1tYmqr3CdFvD8laSVIAOgKkEMcCQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775495901; c=relaxed/simple; bh=6pPwJ3Y3K3R1Zl4F6LRnbjgChDanyTaOvtmgp8kOxn4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=in7DX6c5Iao0zOHbopX93UIx6ko1n/OZAqO+iDZPla7ZD9ks5f9MFY2QvB8Wv5zzYuGZidXdK9LBx/cCwO5ow+0yX6vwgiM1LHOZ5cXPC2W8uu7nZkhADRNdwEUcFcyl210o0jNOE0L7V/dIFdqOxFW8p0h7w1Du3wV2H+tzxok= 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=TbHskZnS; arc=none smtp.client-ip=209.85.167.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="TbHskZnS" Received: by mail-oi1-f202.google.com with SMTP id 5614622812f47-472728429d6so1849880b6e.1 for ; Mon, 06 Apr 2026 10:18:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1775495899; x=1776100699; 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=uMwV+iexBoPvRet+aGfIAdiBzyQ5LRX+vggT69KIKj4=; b=TbHskZnS0McP+5UYsRmKmIIqVlxhojpESTFNq84POH9tgoPW/xi+VFRrT/w6v9TgGQ 7Q793ZneqTHNRTj7m1kF4Auq8LoevWRWHr0hao1rZOBr0/S9RSZoRUkOh/zlzj9T9zLK lHGHdvm2/CfJSxqSLyVPkdPZ9bQgVceeW5p7KuqSvDw/mrupuu0dSawRNWwnRKEHeRA7 TiMNPbJhAkRDB93QT/lgptRp7AgInLVLmnx924D+1aKxiqzAM87lcR1kVLgDHZ3uXXqD FVuwKhW1C1R0uwcJlHEjYtMnjs4zMe3cDZRsCxYwyuX29CzjWmHlwCU2TeoLfQL0bYPx uLNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775495899; x=1776100699; 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=uMwV+iexBoPvRet+aGfIAdiBzyQ5LRX+vggT69KIKj4=; b=UP0TyuLHQNWJhoUqpmZKyzrdgMh77MwwN+9tRlhcCiuKYB+VsNbgfSCg7/Tt2Hp/zH 1+Z3IiqzwIcFl5H8IP3uX7G0yS+exf8t+7FXJTjYJPjmYzZAw+Qe3O4fn88yVAo8KpqJ swgO06m/Zva3qJCFuHpBRQKVozUcmOvqeRWswX2IDfaj+PXrBd3a8QSQp2rAkqlCN1i3 lbDSK38V7+3xQM9IYqbwcVZr8+xpVI077JjIYNXBI0JbFZkBT0OZ77HLpOjRLubWKzJo 59urQZFbJcfzIQDb9sLPIk6lz2CK09Azt6Wj+QO7CBCIcdJIQvNrGRMOV8mOxq5p2Tys AOCw== X-Forwarded-Encrypted: i=1; AJvYcCVqA2XXtdJsUnusDUa9adrYnqlg9UTQ0kz9ArPq3emtF5TPfJDbiKNSmqRTCtWPcUgkFYGR0ZqhJzXs3Rg=@vger.kernel.org X-Gm-Message-State: AOJu0YyE4V51Joija4z71VeFEmIB94/NHmrzbOe5BUluVlnVXG3kf4jf 8PH5aLa6D2Nc+Epa2K/WdwQ0l1hVBvySl8e55iHpvutxa9BjW1JEiJJbiRgLscA4IHYxUaII/1m DSEYYWkU10A== X-Received: from dlec10-n2.prod.google.com ([2002:a05:701b:428a:20b0:12b:fc23:6fcb]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:1284:b0:128:cf41:d6e4 with SMTP id a92af1059eb24-12bf0899182mr6371396c88.21.1775495350378; Mon, 06 Apr 2026 10:09:10 -0700 (PDT) Date: Mon, 6 Apr 2026 10:09:03 -0700 In-Reply-To: <20260406170905.2614260-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: <20260406170905.2614260-1-irogers@google.com> X-Mailer: git-send-email 2.53.0.1213.gd9a14994de-goog Message-ID: <20260406170905.2614260-2-irogers@google.com> Subject: [PATCH v5 1/3] perf env: Add perf_env__e_machine helper and use in perf_env__arch 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" 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 1e54e2c86360..339d62ca37bb 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 3a911c70cd0e..070dd78772f2 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -3009,14 +3009,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.1213.gd9a14994de-goog From nobody Sun Jun 21 06:28:39 2026 Received: from mail-qv1-f73.google.com (mail-qv1-f73.google.com [209.85.219.73]) (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 2782B1A9FB7 for ; Mon, 6 Apr 2026 17:17:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775495867; cv=none; b=h7Xt/wrzwNBMv9U3Rel/xOlJPh4duRtBgL8oT1p2Z4MO5LMA1gNkz6yVtphngZMclv6k55oBXrXKxwUicfLP+yXCXXVuXLNSvmoXZ3Lmol9g4g+shxDPE73UHORn1j4KmcHHevHTJ0BJAUoyKx6lb4HtIp78U/lpdjPqNo5EbuY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775495867; c=relaxed/simple; bh=LZdCoMke5/0u4HN9HKrDslh21tKocju+fLLNMYjItQg=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=eRuWFi9g525dZvySdPy+L39YVPrFhF8Ynob2PtJhYbDkPkr7f5Nq8JD8SCcmP1SCTR5wMgdISvxgUinKbEDzRxa8qtcE+R7WO15FVBxvQIO8LjfBAfMeBABud2TOOK5TWiTSeigJVy+alaS9LiArXGaN1BoZtIDD3WzgFp1+QLM= 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=V1VURBFQ; arc=none smtp.client-ip=209.85.219.73 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="V1VURBFQ" Received: by mail-qv1-f73.google.com with SMTP id 6a1803df08f44-89fa878662bso16528196d6.2 for ; Mon, 06 Apr 2026 10:17:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1775495865; x=1776100665; 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=ZPRV5zYhae9dacVlewfNI7WCT0hXtp/bTPy6oXFI5wI=; b=V1VURBFQDkpOP2v4XB2TZF12F8m93efCSIQg+5WQ8LeoG+s7x2MCXN+eH1KqF8CblP aD9/C57aRpHiW6Rm7gfAQBAsCCE0Y2WYJaHk1Zve5EULAyqA84QCRofPhd3PM2np0/tV PN7kdOPN2Na7MtIMg7F/ycB/oY7j9m3HXeVLM3rBbqrk/vZjBweq+r5Q7quUuTZqgQGm UPiBGIueb7TOt5DganYGudr1jPSGA71lK+IEwe6sOrVwCiqxmQ0NqKRCOvLruBlW7lqP p9dte5aJZCI/uqOmZCkT68AJLAy4Y8mXvQrPbCazqp1uDdC1ISVvU3eFS3d44tRv050L XR6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775495865; x=1776100665; 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=ZPRV5zYhae9dacVlewfNI7WCT0hXtp/bTPy6oXFI5wI=; b=QOxzGzgrzD5x9eKSxgu1OcJv96SqjfSSdowgxj1rTxJHO8BJ/P7JEQPINyIKQ6tikx ZDI+sYeC7uFrhq5TymttJbKC6jQoUUtYLKgT7Kte8J1yg4Sdh0dbcGvAJUstP/cXOPoP trz2zxFkYLnQu4CCC0Nb9/zJIA4p61pAqjMKAL6cenDJmwHtylAEEYjFXKnMYnMfBdm9 qfvKKeFoFYjrtGfHlPMHN7eh/ZfwYLlDWVU7hDnFBFnPh0t8jue2utOremUAgOqNJZvo pMsOpyIX/m8NDbf/qmw1EOJrIaIipj6cH0U4JrRTqJf7abSDsSZKZG/hMmE0ZmvTHdlk VwxA== X-Forwarded-Encrypted: i=1; AJvYcCUvjwmXwrE5BtepSD6XEfUArrc5XNOtdWwPkEKZOIUVl0ekffBef3ARIadCicILZkRmi/oP+by8hzIIrwA=@vger.kernel.org X-Gm-Message-State: AOJu0Yw+BWcIXH/df8yCnAjTABn8QPGSlFD6A/DVn+qqOUiHnaPa53OW uKlM0Y6Jam9STJVY23Ucu38e/ewLejAE2Fmgch7OmXbjXJeRBINsKHaVqxUe6BzTCAAZ5osoNWK ERwGcYJvgJA== X-Received: from dyhd22.prod.google.com ([2002:a05:7300:8296:b0:2c0:b626:c453]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7301:4090:b0:2c8:7172:3b97 with SMTP id 5a478bee46e88-2cbfa8ba560mr5981842eec.13.1775495352516; Mon, 06 Apr 2026 10:09:12 -0700 (PDT) Date: Mon, 6 Apr 2026 10:09:04 -0700 In-Reply-To: <20260406170905.2614260-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: <20260406170905.2614260-1-irogers@google.com> X-Mailer: git-send-email 2.53.0.1213.gd9a14994de-goog Message-ID: <20260406170905.2614260-3-irogers@google.com> Subject: [PATCH v5 2/3] perf env: Add helper to lazily compute the os_release 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" In live mode the os_release isn't being initialized, make a lazy initialization helper that assumes when the os_release isn't initialized this is live mode. Signed-off-by: Ian Rogers --- tools/perf/util/data-convert-bt.c | 2 +- tools/perf/util/env.c | 21 +++++++++++++++++++++ tools/perf/util/env.h | 1 + tools/perf/util/symbol.c | 4 ++-- 4 files changed, 25 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/data-convert-bt.c b/tools/perf/util/data-conve= rt-bt.c index bece77cbc493..bc5805183100 100644 --- a/tools/perf/util/data-convert-bt.c +++ b/tools/perf/util/data-convert-bt.c @@ -1414,7 +1414,7 @@ do { \ =20 ADD("host", env->hostname); ADD("sysname", "Linux"); - ADD("release", env->os_release); + ADD("release", perf_env__os_release(env)); ADD("version", env->version); ADD("machine", env->arch); ADD("domain", "kernel"); diff --git a/tools/perf/util/env.c b/tools/perf/util/env.c index 339d62ca37bb..34b737950f73 100644 --- a/tools/perf/util/env.c +++ b/tools/perf/util/env.c @@ -330,6 +330,27 @@ int perf_env__kernel_is_64_bit(struct perf_env *env) return env->kernel_is_64_bit; } =20 +const char *perf_env__os_release(struct perf_env *env) +{ + struct utsname uts; + int ret; + + if (!env) + return perf_version_string; + + if (env->os_release) + return env->os_release; + + /* + * The os_release is being accessed but wasn't initialized from a data + * file, assume this is 'live' mode and use the release from uname. If + * uname fails then use the current perf tool version. + */ + ret =3D uname(&uts); + env->os_release =3D strdup(ret < 0 ? perf_version_string : uts.release); + return env->os_release; +} + int perf_env__set_cmdline(struct perf_env *env, int argc, const char *argv= []) { int i; diff --git a/tools/perf/util/env.h b/tools/perf/util/env.h index 91ff252712f4..bf30a02dccf7 100644 --- a/tools/perf/util/env.h +++ b/tools/perf/util/env.h @@ -174,6 +174,7 @@ void free_cpu_domain_info(struct cpu_domain_map **cd_ma= p, u32 schedstat_version, void perf_env__exit(struct perf_env *env); =20 int perf_env__kernel_is_64_bit(struct perf_env *env); +const char *perf_env__os_release(struct perf_env *env); =20 int perf_env__set_cmdline(struct perf_env *env, int argc, const char *argv= []); =20 diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c index b4b30675688d..ea7d2f2dbcb7 100644 --- a/tools/perf/util/symbol.c +++ b/tools/perf/util/symbol.c @@ -2208,7 +2208,7 @@ static int vmlinux_path__init(struct perf_env *env) { struct utsname uts; char bf[PATH_MAX]; - char *kernel_version; + const char *kernel_version; unsigned int i; =20 vmlinux_path =3D malloc(sizeof(char *) * (ARRAY_SIZE(vmlinux_paths) + @@ -2225,7 +2225,7 @@ static int vmlinux_path__init(struct perf_env *env) return 0; =20 if (env) { - kernel_version =3D env->os_release; + kernel_version =3D perf_env__os_release(env); } else { if (uname(&uts) < 0) goto out_fail; --=20 2.53.0.1213.gd9a14994de-goog From nobody Sun Jun 21 06:28: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 8A19538E5E6 for ; Mon, 6 Apr 2026 17:09:15 +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=1775495357; cv=none; b=cnwFlMaQnPPstxbhD6wpHDiFBCexUzcQ0ZJT83cwgaUNwnUq5INGYtGRtWQlzQpX7kv8MGXrEAg7zniJMNnCShDusbF69uRaTDKnhqaXWV5mdWTLAUFQYpG5D3Uwv9apYqaeoPY67K0X3GnFi14KR6eu5VxUrLXjTgKIxlG0SmI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775495357; c=relaxed/simple; bh=4Os0+jKLRaBgJko26dQihuQCue8BhWEIfHBY6eVw9Sw=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=WmtnUhmIeivKpCi8iseM9Epio12Nrlb6arVh/f62UMlHqNOrQSFIYvNE3n7iQWlK0Ziw5X1sScIRxMdwTb8AUSsfO5bi/V1yJ6QhEdQO4TZHTZTi201pfKokFtdfL5gmFEzsMASO4KGXRKP7ElZVZ+eP2Dva8i5BAcBUa0GGd44= 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=rewW3VFX; 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="rewW3VFX" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-2bda35eab74so4708570eec.0 for ; Mon, 06 Apr 2026 10:09:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1775495355; x=1776100155; 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=mV4T/iz0x4/aegrMsTtxNhW2gWIomo5/3voFpOikukA=; b=rewW3VFXrvgyvn87tqvbqbmQLaBA7J3k4J0ST9uLug/0XhMFyHT1+wv6Ruh2DkcfN3 ZdJF515KpcFVcfnoUrT2VlhDi1gLvhtv0JxIXgdNfm+gctRFkTEOLB+hBgTYlO2gC7XN SZufX0x4thb+UsFvz4FYRMhLsYqorLD9gXfxy1UfXxK6r1xbUf/xtOpMrjABFWR7+g6y HdEFz31NB/XnvJA+dGDzYxEJ2D61HpAQndGxk+QReWE93l5uC0q75P3BpfNahh43ZViU 7zBGvhIt3NOsZTzAtYWg1Pe6b/OmkNwYeMKEXKsEy08pS9dpobNunEmQM0AgLev3TRYZ yw+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775495355; x=1776100155; 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=mV4T/iz0x4/aegrMsTtxNhW2gWIomo5/3voFpOikukA=; b=bslt6uduCHCrTzVmAvDIo6pBQgcTS8F4xFCyYOhMkpRoV8BpmSU7oSr4OUEdMDkmFC jcf4EWirG/eLb6Wqm/JsbgGMQ/tcqTwKPtGkUyxZy8vyREnW3ucKsmRcovvXoS8XHHQi yNFV+0orDDORptIOpMsNLM3ocGnn9lbOwvGawmae1v4Y3qi7a8oWtNl0naLhaIIQBWwA EHVTDdx2dEErgOWj9vI6jMLp3DKNKq9iHTknET7AC7Sm+XLKSiSHCEy0ACE9TUuMug73 Yr47iyofEuQE8Kep3hnHfVqgM5onw9sElGmAh23iERoiaZdZ5aPm/A8+5ShnssQnXzd6 Mv7w== X-Forwarded-Encrypted: i=1; AJvYcCUqnHTpiN9eFWWBgB01GkEW3kR77TU5jMlzKwr2/0pvG4nlJXTT65lqnF28GOcDagyY6DHwMKNa8vnOD/c=@vger.kernel.org X-Gm-Message-State: AOJu0Yzf8apFtzynnIMq8k5j6Z03TogxLC2O9t1SRijcf2XnuhoLxNPb XCQmc5uHJ6eeWheT70x6CC6DqkH4WVL8xdAyyBMqQrQVE8bdSouOLVSij/LbA0aS8BP9bMhUuf7 QppdD1oYP5g== X-Received: from dycqw25-n2.prod.google.com ([2002:a05:7300:c019:20b0:2d1:9c1:deab]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7301:1288:b0:2c1:5889:779c with SMTP id 5a478bee46e88-2cad853b80cmr6443067eec.16.1775495354484; Mon, 06 Apr 2026 10:09:14 -0700 (PDT) Date: Mon, 6 Apr 2026 10:09:05 -0700 In-Reply-To: <20260406170905.2614260-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: <20260406170905.2614260-1-irogers@google.com> X-Mailer: git-send-email 2.53.0.1213.gd9a14994de-goog Message-ID: <20260406170905.2614260-4-irogers@google.com> Subject: [PATCH v5 3/3] perf symbol: Lazily compute idle and use the perf_env 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" 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 | 103 ++++++++++++++++++++++------------- tools/perf/util/symbol.h | 15 +++-- 4 files changed, 82 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 7afa8a117139..e8f7fe3f19fc 100644 --- a/tools/perf/util/symbol-elf.c +++ b/tools/perf/util/symbol-elf.c @@ -1727,7 +1727,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 ea7d2f2dbcb7..8c23802b39ad 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,85 @@ 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 perf_env__os_release(env); + + /* 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 +812,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.1213.gd9a14994de-goog