From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6D1B7C021A2 for ; Tue, 11 Feb 2025 02:41:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=f6fO6ENk+/6RJwbHFhohh2LYSGPeGtLq21Tc4JEEd0s=; b=SepoHpOYuunbNLhlSdBrY1ItjK uoac0JUsTXOKFcR7D0lVVab1sURLu1WviwDOX6IkJz+QZnri41KiTzXCw0apfmG/zQHQ+XhPzYcnj gNVpjY/fgLDAUhRrsxHqwIkP3njGX6IoL1+mLMXCPX0U86+ZmSoMzLDAaJgHWuXENk3P6sImaV6HV OeMgc3JCvaFQf5hbWY2zYMHkisjDqPWNWGaCMRGDpAOyoG5Ie9dg7bDKxImO4rPxDKkJDuFOy1J5q 2CZgHeIPKN0rwD0l+XEbYJTDfNIe+GyiQ9MEYkWHr5bwo2MDlmOnQMUml1MHXMv8DmsTH88VX4ylH 4b5Ksd8g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1thgCq-00000002IYY-0Cg7; Tue, 11 Feb 2025 02:41:00 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1the1C-00000001xk2-30WL for linux-arm-kernel@bombadil.infradead.org; Tue, 11 Feb 2025 00:20:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=f6fO6ENk+/6RJwbHFhohh2LYSGPeGtLq21Tc4JEEd0s=; b=I3CM+v4JK+WM3tzbdsPnlAfjzd k7BjFftNZSh63iAL8dp1gN3XgJ0UlnF2Isrlhzf52oswO1sDq3mf7MX+LH/PZMBrvw9Agzgr+/gCa tJN6C3m5lUo8IsA3x2arWbBXgKtl/R4OPmmHnKo6LZ0Qfh4U++jkFI9TJsw4FZqikSAW7u2s1N/WN obVo01TgmPBzYVSXSNCVSfCJcImSHcPh5/hsiIXJqRCo6C6pOxeDQLXqDquyfJEA73Y4J+3TXFdh8 Nn4MvGUbzhc0bQCw7WugbyoJeiCS0IgcxVa0xK3OpRr5uhQ9UW/WNjlqa5nO+GzwUWjo6QKL85XWX bCyg2kag==; Received: from mail-yb1-xb2f.google.com ([2607:f8b0:4864:20::b2f]) by desiato.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1the19-00000000OPd-1iNM for linux-arm-kernel@lists.infradead.org; Tue, 11 Feb 2025 00:20:49 +0000 Received: by mail-yb1-xb2f.google.com with SMTP id 3f1490d57ef6-e5b4d615362so2982395276.2 for ; Mon, 10 Feb 2025 16:20:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1739233246; x=1739838046; darn=lists.infradead.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=f6fO6ENk+/6RJwbHFhohh2LYSGPeGtLq21Tc4JEEd0s=; b=fIoe9fHCTLWfrM0xUcqvmKUP8vg1t2djK9midnw40fyVyEgm04PBGz8nHZnBdTgHL/ awHepvzoPug7xZuidM8VdHC6bJQX1btIw4A80LAWg8B7YDzTEg39MbbDlhUAnGJJL5N0 +GR7tVI59urLLpwPSOT7DRoRiKoQiYBYqYPKiE3X/t+OXsAPe796UhkW6AlBqA0cSvmh Fc5gX0BHwJqjDTysVvGP84rmcGxvAAQ2MZZrMMrTSZIGyAgFfw6yC/8vv7jLWOkUqdju Gx0H3AF4SNIswjodbGntJ7xU5ML0HqKs1rpA0tVbkb4JyTKamV7PPFgQUzG001f8sbgb QZnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739233246; x=1739838046; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=f6fO6ENk+/6RJwbHFhohh2LYSGPeGtLq21Tc4JEEd0s=; b=Rjm4Ho8H314tsXv702X/dMdG4HhtRdCHEIuun1EscddC03J8hh3L/0P9RN8zzQZuGZ xoUdKe8OC/gwGDnobn+clFyrKyty3w7cq6Xb0YcgMIxRRcO8/EYIwrxAi26uDccif3Iw DNAQY6DGEekqPOrxr4nRnBpUOPaO+QyBC/0TK4cS9g5OybQvTnFhL9zmRqtw+9pcOKUH my17p3meoTCFW5kC1ViUlYhucd3GR/gGBr1VbCVn0uPduos7WBZvqh0M9YyystaMdmN9 7wQw+Wmy95Mdd8vR6/L3qVD/IM4u7CEPp4XRV0TwrWj6GlHhUzFP2geF/sXVWmUrlYjD aTpA== X-Forwarded-Encrypted: i=1; AJvYcCWOqEXeHKBYSOMx7g0b0G2t9MB+/n9U1t1Kr0WcdioGjSIn2LT0b/ewGbQW+UtsTgEJ//EbmyhwuKcg+1ERyj9k@lists.infradead.org X-Gm-Message-State: AOJu0YyRb9EqXMgLj4C+pab2bu6feKlPCf3k5Gq3PAvAZrVfugWyDXKw gxZywEpCbWWOwvgbKYzBl5N9yYs3mv8oymG3AEfXAXNSU+L3MeZ8cS0o4szFe5s= X-Gm-Gg: ASbGncu0bGOkSWFIZBuLcfbaKQYDyBwLp+InavnzGa0S5V161DM11nr9YVVf84Xv8im LbDJ8Zg8xFJOA1F8Wjg2dtQTbd9eKCEncuH1jByC5a3AywcNLbIyYyQiE+IcvVFQWskQH2sqvBJ 7+Pp4iFvCMYl33n0yNXTZpH0p1UTJPrhcZwUo8tmwhIAUfoUYx6SiqJr+8nmIYRL+c4fq2PsRAb 5UKCSBik6ZpiKDEB+Y/jzs7TnhmKcyX7wjDzSLQWXiaP9JhqgsEEyhwyc6rCnhQPyGSKSLMCSNn 2sE= X-Google-Smtp-Source: AGHT+IEgCF8HyG8asrx19RO4/BfI2121j03BDe3RR1UsBBXC3q3qfBJKowis2DMzSxDhdyfGfdvrSA== X-Received: by 2002:a05:690c:4b8f:b0:6f9:4f93:c805 with SMTP id 00721157ae682-6f9b287bafamr146119417b3.21.1739233245476; Mon, 10 Feb 2025 16:20:45 -0800 (PST) Received: from ghost ([50.146.0.9]) by smtp.gmail.com with ESMTPSA id 00721157ae682-6f99ff6a903sm18915387b3.84.2025.02.10.16.20.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 16:20:44 -0800 (PST) Date: Mon, 10 Feb 2025 16:20:42 -0800 From: Charlie Jenkins To: Ian Rogers Cc: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Adrian Hunter , Kan Liang , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Guo Ren , Paul Walmsley , Palmer Dabbelt , Albert Ou , Bibo Mao , Arnd Bergmann , Huacai Chen , Catalin Marinas , Jiri Slaby , =?iso-8859-1?Q?Bj=F6rn_T=F6pel?= , Howard Chu , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-riscv@lists.infradead.org Subject: Re: [PATCH v2 4/7] perf thread: Add support for reading the e_machine type for a thread Message-ID: References: <20250210165108.95894-1-irogers@google.com> <20250210165108.95894-5-irogers@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250210165108.95894-5-irogers@google.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250211_002047_867003_C24497F0 X-CRM114-Status: GOOD ( 31.85 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Feb 10, 2025 at 08:51:05AM -0800, Ian Rogers wrote: > Use the executable from /proc/pid/exe and read the e_machine from the > ELF header. On failure use EM_HOST. Change builtin-trace syscall > functions to pass e_machine from the thread rather than EM_HOST, so > that in later patches when syscalltbl can use the e_machine the system > calls are specific to the architecture. Reviewed-by: Charlie Jenkins Tested-by: Charlie Jenkins > > Signed-off-by: Ian Rogers > Reviewed-by: Howard Chu > --- > tools/perf/builtin-trace.c | 41 ++++++++++++++++--------------- > tools/perf/util/thread.c | 50 ++++++++++++++++++++++++++++++++++++++ > tools/perf/util/thread.h | 14 ++++++++++- > 3 files changed, 85 insertions(+), 20 deletions(-) > > diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c > index 4b77c2ab3dba..1ae609555018 100644 > --- a/tools/perf/builtin-trace.c > +++ b/tools/perf/builtin-trace.c > @@ -2678,16 +2678,17 @@ static int trace__sys_enter(struct trace *trace, struct evsel *evsel, > int printed = 0; > struct thread *thread; > int id = perf_evsel__sc_tp_uint(evsel, id, sample), err = -1; > - int augmented_args_size = 0; > + int augmented_args_size = 0, e_machine; > void *augmented_args = NULL; > /* TODO: get e_machine from thread. */ > - struct syscall *sc = trace__syscall_info(trace, evsel, EM_HOST, id); > + struct syscall *sc; > struct thread_trace *ttrace; > > - if (sc == NULL) > - return -1; > - > thread = machine__findnew_thread(trace->host, sample->pid, sample->tid); > + e_machine = thread__e_machine(thread, trace->host); > + sc = trace__syscall_info(trace, evsel, e_machine, id); > + if (sc == NULL) > + goto out_put; > ttrace = thread__trace(thread, trace->output); > if (ttrace == NULL) > goto out_put; > @@ -2756,16 +2757,18 @@ static int trace__fprintf_sys_enter(struct trace *trace, struct evsel *evsel, > struct thread *thread; > int id = perf_evsel__sc_tp_uint(evsel, id, sample), err = -1; > /* TODO: get e_machine from thread. */ > - struct syscall *sc = trace__syscall_info(trace, evsel, EM_HOST, id); > + struct syscall *sc; > char msg[1024]; > void *args, *augmented_args = NULL; > - int augmented_args_size; > + int augmented_args_size, e_machine; > size_t printed = 0; > > - if (sc == NULL) > - return -1; > > thread = machine__findnew_thread(trace->host, sample->pid, sample->tid); > + e_machine = thread__e_machine(thread, trace->host); > + sc = trace__syscall_info(trace, evsel, e_machine, id); > + if (sc == NULL) > + return -1; > ttrace = thread__trace(thread, trace->output); > /* > * We need to get ttrace just to make sure it is there when syscall__scnprintf_args() > @@ -2830,15 +2833,15 @@ static int trace__sys_exit(struct trace *trace, struct evsel *evsel, > bool duration_calculated = false; > struct thread *thread; > int id = perf_evsel__sc_tp_uint(evsel, id, sample), err = -1, callchain_ret = 0, printed = 0; > - int alignment = trace->args_alignment; > - /* TODO: get e_machine from thread. */ > - struct syscall *sc = trace__syscall_info(trace, evsel, EM_HOST, id); > + int alignment = trace->args_alignment, e_machine; > + struct syscall *sc; > struct thread_trace *ttrace; > > - if (sc == NULL) > - return -1; > - > thread = machine__findnew_thread(trace->host, sample->pid, sample->tid); > + e_machine = thread__e_machine(thread, trace->host); > + sc = trace__syscall_info(trace, evsel, e_machine, id); > + if (sc == NULL) > + goto out_put; > ttrace = thread__trace(thread, trace->output); > if (ttrace == NULL) > goto out_put; > @@ -3185,8 +3188,8 @@ static int trace__event_handler(struct trace *trace, struct evsel *evsel, > > if (evsel == trace->syscalls.events.bpf_output) { > int id = perf_evsel__sc_tp_uint(evsel, id, sample); > - /* TODO: get e_machine from thread. */ > - struct syscall *sc = trace__syscall_info(trace, evsel, EM_HOST, id); > + int e_machine = thread ? thread__e_machine(thread, trace->host) : EM_HOST; > + struct syscall *sc = trace__syscall_info(trace, evsel, e_machine, id); > > if (sc) { > fprintf(trace->output, "%s(", sc->name); > @@ -4764,6 +4767,7 @@ static size_t trace__fprintf_thread(FILE *fp, struct thread *thread, struct trac > { > size_t printed = 0; > struct thread_trace *ttrace = thread__priv(thread); > + int e_machine = thread__e_machine(thread, trace->host); > double ratio; > > if (ttrace == NULL) > @@ -4783,8 +4787,7 @@ static size_t trace__fprintf_thread(FILE *fp, struct thread *thread, struct trac > else if (fputc('\n', fp) != EOF) > ++printed; > > - /* TODO: get e_machine from thread. */ > - printed += thread__dump_stats(ttrace, trace, EM_HOST, fp); > + printed += thread__dump_stats(ttrace, trace, e_machine, fp); > > return printed; > } > diff --git a/tools/perf/util/thread.c b/tools/perf/util/thread.c > index 0ffdd52d86d7..a07446a280ed 100644 > --- a/tools/perf/util/thread.c > +++ b/tools/perf/util/thread.c > @@ -1,5 +1,7 @@ > // SPDX-License-Identifier: GPL-2.0 > +#include > #include > +#include > #include > #include > #include > @@ -16,6 +18,7 @@ > #include "symbol.h" > #include "unwind.h" > #include "callchain.h" > +#include "dwarf-regs.h" > > #include > > @@ -51,6 +54,7 @@ struct thread *thread__new(pid_t pid, pid_t tid) > thread__set_ppid(thread, -1); > thread__set_cpu(thread, -1); > thread__set_guest_cpu(thread, -1); > + thread__set_e_machine(thread, EM_NONE); > thread__set_lbr_stitch_enable(thread, false); > INIT_LIST_HEAD(thread__namespaces_list(thread)); > INIT_LIST_HEAD(thread__comm_list(thread)); > @@ -423,6 +427,52 @@ void thread__find_cpumode_addr_location(struct thread *thread, u64 addr, > } > } > > +static uint16_t read_proc_e_machine_for_pid(pid_t pid) > +{ > + char path[6 /* "/proc/" */ + 11 /* max length of pid */ + 5 /* "/exe\0" */]; > + int fd; > + uint16_t e_machine = EM_NONE; > + > + snprintf(path, sizeof(path), "/proc/%d/exe", pid); > + fd = open(path, O_RDONLY); > + if (fd >= 0) { > + _Static_assert(offsetof(Elf32_Ehdr, e_machine) == 18, "Unexpected offset"); > + _Static_assert(offsetof(Elf64_Ehdr, e_machine) == 18, "Unexpected offset"); > + if (pread(fd, &e_machine, sizeof(e_machine), 18) != sizeof(e_machine)) > + e_machine = EM_NONE; > + close(fd); > + } > + return e_machine; > +} > + > +uint16_t thread__e_machine(struct thread *thread, struct machine *machine) > +{ > + pid_t tid, pid; > + uint16_t e_machine = RC_CHK_ACCESS(thread)->e_machine; > + > + if (e_machine != EM_NONE) > + return e_machine; > + > + tid = thread__tid(thread); > + pid = thread__pid(thread); > + if (pid != tid) { > + struct thread *parent = machine__findnew_thread(machine, pid, pid); > + > + if (parent) { > + e_machine = thread__e_machine(parent, machine); > + thread__set_e_machine(thread, e_machine); > + return e_machine; > + } > + /* Something went wrong, fallback. */ > + } > + e_machine = read_proc_e_machine_for_pid(pid); > + if (e_machine != EM_NONE) > + thread__set_e_machine(thread, e_machine); > + else > + e_machine = EM_HOST; > + return e_machine; > +} > + > struct thread *thread__main_thread(struct machine *machine, struct thread *thread) > { > if (thread__pid(thread) == thread__tid(thread)) > diff --git a/tools/perf/util/thread.h b/tools/perf/util/thread.h > index 6cbf6eb2812e..cd574a896418 100644 > --- a/tools/perf/util/thread.h > +++ b/tools/perf/util/thread.h > @@ -60,7 +60,11 @@ DECLARE_RC_STRUCT(thread) { > struct srccode_state srccode_state; > bool filter; > int filter_entry_depth; > - > + /** > + * @e_machine: The ELF EM_* associated with the thread. EM_NONE if not > + * computed. > + */ > + uint16_t e_machine; > /* LBR call stack stitch */ > bool lbr_stitch_enable; > struct lbr_stitch *lbr_stitch; > @@ -302,6 +306,14 @@ static inline void thread__set_filter_entry_depth(struct thread *thread, int dep > RC_CHK_ACCESS(thread)->filter_entry_depth = depth; > } > > +uint16_t thread__e_machine(struct thread *thread, struct machine *machine); > + > +static inline void thread__set_e_machine(struct thread *thread, uint16_t e_machine) > +{ > + RC_CHK_ACCESS(thread)->e_machine = e_machine; > +} > + > + > static inline bool thread__lbr_stitch_enable(const struct thread *thread) > { > return RC_CHK_ACCESS(thread)->lbr_stitch_enable; > -- > 2.48.1.502.g6dc24dfdaf-goog >