Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp1880963rwd; Sun, 28 May 2023 04:22:54 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5F9wdNgijDz5W32uprG7HxlmrAFsD09+hp5giK8qle/GqrgnKtamesbjXuXCo1hXOD79x+ X-Received: by 2002:a05:6a21:9993:b0:10b:8a27:bb59 with SMTP id ve19-20020a056a21999300b0010b8a27bb59mr6068385pzb.47.1685272974446; Sun, 28 May 2023 04:22:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685272974; cv=none; d=google.com; s=arc-20160816; b=hhy2oB7H/YFXhuUUbWvycovvnecYbexaydDZgkE71EIKO8/C4ujWU1CYQFWiNdQig2 v/Cq3cphoVucfkjfP943CuP914gLHao+s/NvroElbnmPhaKUUwN/Jj6zpIPEMPCUoMSI E2pIouSPyB8opDuZf/wo0v9vfpsLGbYfiZYA2+AML5wwZDOESGIkUma4hm2advUslzeX Jdu9SRFRLfNJ1ZHASgp8NcxbICEn7Ayw0rajpDrJL+xf2adriAa0d4Mb579hWr/YCspF mIo5n9vdDrXJPi6QvUj+rM2G5gz8DioAGfs/u/rgSN51Gz5UAUXaQrCjH0pu9QYB11aw Wmgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=6kFVAo3EuhexKxn0naKo2wrq/yqwbGkE2Idl0RXG/vs=; b=vjKiW3tBPb8XyDRArLgljrPacgX3CfLmB/m2qPzB1NPW6Ttgp75T5ZfhTatZMO6/PU 7kAPZw8LnuaOfQbdDbbODi6+vTkEgbvjkuE5LV7/ytqkmHrDZItEOpX8g97KH8nwlnDS epLqIJYPaYsj0W3XRrFkmjTsSHf9C8xuvrq9ejn52CPECQlvWldEzKmhYXQNpAP/Co7t lpaVO9Lv7kluDaM/rnHBdmsGUHwW2PJbd5dJUCEsbHDtgVrEOWMIGu0/KFzsF5/ZOmXg 62YPxURz9AZ+p4AK+2VnkQjpXaoyh5AEZqBC79tX9mVCmaNCCz6wPqBeFgnaaJrsYWnx igRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ynAteCmw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c66-20020a633545000000b00534792ee482si5106720pga.758.2023.05.28.04.22.42; Sun, 28 May 2023 04:22:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ynAteCmw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229447AbjE1LFd (ORCPT + 99 others); Sun, 28 May 2023 07:05:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34938 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229445AbjE1LFc (ORCPT ); Sun, 28 May 2023 07:05:32 -0400 Received: from mail-pl1-x629.google.com (mail-pl1-x629.google.com [IPv6:2607:f8b0:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E0E48AC for ; Sun, 28 May 2023 04:05:27 -0700 (PDT) Received: by mail-pl1-x629.google.com with SMTP id d9443c01a7336-1ae4baa77b2so14657435ad.2 for ; Sun, 28 May 2023 04:05:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685271927; x=1687863927; 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=6kFVAo3EuhexKxn0naKo2wrq/yqwbGkE2Idl0RXG/vs=; b=ynAteCmw31+RQ5h9pg+xWlM6m0rbMyE5D5UWV6SAHWtYGhFZZTsluqGnmPouGVvqEl XpSInZr00r8tr3UzqlKTPvhQK5rQ5kD5Mb/jUT6ua84Z2txZ2dONn1smeI8lQMIcKZs4 l+rD5oNasQDfgFi6vetuZyncsO3+dNlxJMcDsnzIi6+7WIykjVpIQBOj9hr8j1pacRJg YKd3G9K1N3bf5ZbVQxu1h2Sh8bV/ZetM3JLG9YJYv1yj58JHhy80wYGSox/7ZIOr0t0Z br6tKtctmmOmjNs3HKzxa/EML4ov6mfwmMesDwrzJXA4JTeYBlxrWY31exwZMxalLbqM zXrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685271927; x=1687863927; 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=6kFVAo3EuhexKxn0naKo2wrq/yqwbGkE2Idl0RXG/vs=; b=UsaUeGHH6aUmjzqYPjIhfEoExo2Y8IBZBVNTu0uLH1SaB9mfIbXjS/1flc5nlFr305 AzcEqgO9xoWCWk7lsCyAFUP2tng1koZXF8U+tMzfYRGkuVF/RbNOsacoavtyRAMZCG0o QBUeKoXjPAarIupxPcOH700jN4SvxJf0aYTM8D1SMP4O4u+ullzyOYCEBq3NbWQ83De5 MO76/5Ic/48ocDx4CeeOkTq68KqLPLDSEPNtutRS8XzHt3xTG4E6RG3ImKjYveQDkBLt RLX0/2hqzK7Wkwj4h2Cdp2cPeJB75DGKuAFEpN0eZ8J+q/YKaZ//E6hWRRm17ky2Enor RuLw== X-Gm-Message-State: AC+VfDxX+5SS+CRDxWXbOXQxdGaJuFxgPXTpL2tNH7xsxC9zEIocScjT BuPTpPZ5L0Ny2xaS1TwSKBPyRg== X-Received: by 2002:a17:902:c94d:b0:1b0:1c05:561c with SMTP id i13-20020a170902c94d00b001b01c05561cmr8049496pla.40.1685271927241; Sun, 28 May 2023 04:05:27 -0700 (PDT) Received: from leoy-yangtze.lan ([107.151.177.126]) by smtp.gmail.com with ESMTPSA id v2-20020a170902d68200b001b03842ab78sm931020ply.89.2023.05.28.04.05.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 May 2023 04:05:26 -0700 (PDT) Date: Sun, 28 May 2023 19:05:16 +0800 From: Leo Yan To: James Clark Cc: coresight@lists.linaro.org, denik@chromium.org, Suzuki K Poulose , Mike Leach , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , John Garry , Will Deacon , linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 3/4] perf cs-etm: Track exception level Message-ID: <20230528110516.GC886420@leoy-yangtze.lan> References: <20230524131958.2139331-1-james.clark@arm.com> <20230524131958.2139331-4-james.clark@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230524131958.2139331-4-james.clark@arm.com> X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, May 24, 2023 at 02:19:57PM +0100, James Clark wrote: > Currently we assume all trace belongs to the host machine so when > the decoder should be looking at the guest kernel maps it can crash > because it looks at the host ones instead. > > Avoid one scenario (guest kernel running at EL1) by assigning the > default guest machine to this trace. For userspace trace it's still not > possible to determine guest vs host, but the PIDs should help in this > case. > > Signed-off-by: James Clark > --- > .../perf/util/cs-etm-decoder/cs-etm-decoder.c | 7 +- > tools/perf/util/cs-etm.c | 64 ++++++++++++++----- > tools/perf/util/cs-etm.h | 5 +- > 3 files changed, 56 insertions(+), 20 deletions(-) > > diff --git a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c > index 82a27ab90c8b..ac227cd03eb0 100644 > --- a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c > +++ b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c > @@ -573,12 +573,13 @@ cs_etm_decoder__set_tid(struct cs_etm_queue *etmq, > break; > } > > + if (cs_etm__etmq_set_tid_el(etmq, tid, trace_chan_id, > + elem->context.exception_level)) > + return OCSD_RESP_FATAL_SYS_ERR; > + > if (tid == -1) > return OCSD_RESP_CONT; > > - if (cs_etm__etmq_set_tid(etmq, tid, trace_chan_id)) > - return OCSD_RESP_FATAL_SYS_ERR; > - > /* > * A timestamp is generated after a PE_CONTEXT element so make sure > * to rely on that coming one. > diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c > index a997fe79d458..b9ba19327f26 100644 > --- a/tools/perf/util/cs-etm.c > +++ b/tools/perf/util/cs-etm.c > @@ -14,7 +14,6 @@ > #include > #include > > -#include > #include > > #include "auxtrace.h" > @@ -87,6 +86,8 @@ struct cs_etm_traceid_queue { > union perf_event *event_buf; > struct thread *thread; > struct thread *prev_thread; > + ocsd_ex_level prev_el; > + ocsd_ex_level el; > struct branch_stack *last_branch; > struct branch_stack *last_branch_rb; > struct cs_etm_packet *prev_packet; > @@ -479,6 +480,7 @@ static int cs_etm__init_traceid_queue(struct cs_etm_queue *etmq, > > queue = &etmq->etm->queues.queue_array[etmq->queue_nr]; > tidq->trace_chan_id = trace_chan_id; > + tidq->el = tidq->prev_el = ocsd_EL_unknown; > tidq->thread = machine__findnew_thread(&etm->session->machines.host, -1, > queue->tid); > tidq->prev_thread = machine__idle_thread(&etm->session->machines.host); > @@ -618,6 +620,7 @@ static void cs_etm__packet_swap(struct cs_etm_auxtrace *etm, > tmp = tidq->packet; > tidq->packet = tidq->prev_packet; > tidq->prev_packet = tmp; > + tidq->prev_el = tidq->el; > thread__put(tidq->prev_thread); > tidq->prev_thread = thread__get(tidq->thread); > } > @@ -879,11 +882,34 @@ static bool cs_etm__evsel_is_auxtrace(struct perf_session *session, > return evsel->core.attr.type == aux->pmu_type; > } > > -static u8 cs_etm__cpu_mode(struct cs_etm_queue *etmq, u64 address) > +static struct machine *cs_etm__get_machine(struct cs_etm_auxtrace *etm, > + ocsd_ex_level el) > { > - struct machine *machine; > + /* > + * Not perfect, but assume anything in EL1 is the default guest, and > + * everything else is the host. nHVE and pKVM may not work with this s/nHVE/nVHE ? And it's good to say "if any virtulisation (e.g. pKVM) based on nVHE may not work with this ....". > + * assumption. And distinguishing between guest and host userspaces > + * isn't currently supported either. Neither is multiple guest support. > + * All this does is reduce the likeliness of decode errors where we look > + * into the host kernel maps when it should have been the guest maps. > + */ > + switch (el) { > + case ocsd_EL1: > + return machines__find_guest(&etm->session->machines, > + DEFAULT_GUEST_KERNEL_ID); I share the same concern with Mike that this will break perf for any Armv8 CPUs with nVHE (like Cortex-CA53, etc). You could see CoreSight has trace data "elem->context.vmid", when a guest kernel runs in EL1, can we use "elem->context.vmid" as a guest kernel ID and finally retrieve the corresponding machine pointer? Thanks, Leo > + case ocsd_EL3: > + case ocsd_EL2: > + case ocsd_EL0: > + case ocsd_EL_unknown: > + default: > + return &etm->session->machines.host; > + } > +} > > - machine = &etmq->etm->session->machines.host; > +static u8 cs_etm__cpu_mode(struct cs_etm_queue *etmq, u64 address, > + ocsd_ex_level el) > +{ > + struct machine *machine = cs_etm__get_machine(etmq->etm, el); > > if (address >= machine__kernel_start(machine)) { > if (machine__is_host(machine)) > @@ -893,10 +919,14 @@ static u8 cs_etm__cpu_mode(struct cs_etm_queue *etmq, u64 address) > } else { > if (machine__is_host(machine)) > return PERF_RECORD_MISC_USER; > - else if (perf_guest) > + else { > + /* > + * Can't really happen at the moment because > + * cs_etm__get_machine() will always return > + * machines.host for any non EL1 trace. > + */ > return PERF_RECORD_MISC_GUEST_USER; > - else > - return PERF_RECORD_MISC_HYPERVISOR; > + } > } > } > > @@ -913,11 +943,12 @@ static u32 cs_etm__mem_access(struct cs_etm_queue *etmq, u8 trace_chan_id, > if (!etmq) > return 0; > > - cpumode = cs_etm__cpu_mode(etmq, address); > tidq = cs_etm__etmq_get_traceid_queue(etmq, trace_chan_id); > if (!tidq) > return 0; > > + cpumode = cs_etm__cpu_mode(etmq, address, tidq->el); > + > if (!thread__find_map(tidq->thread, cpumode, address, &al)) > return 0; > > @@ -1296,9 +1327,10 @@ cs_etm__get_trace(struct cs_etm_queue *etmq) > } > > static void cs_etm__set_thread(struct cs_etm_auxtrace *etm, > - struct cs_etm_traceid_queue *tidq, pid_t tid) > + struct cs_etm_traceid_queue *tidq, pid_t tid, > + ocsd_ex_level el) > { > - struct machine *machine = &etm->session->machines.host; > + struct machine *machine = cs_etm__get_machine(etm, el); > > if (tid != -1) { > thread__zput(tidq->thread); > @@ -1308,10 +1340,12 @@ static void cs_etm__set_thread(struct cs_etm_auxtrace *etm, > /* Couldn't find a known thread */ > if (!tidq->thread) > tidq->thread = machine__idle_thread(machine); > + > + tidq->el = el; > } > > -int cs_etm__etmq_set_tid(struct cs_etm_queue *etmq, > - pid_t tid, u8 trace_chan_id) > +int cs_etm__etmq_set_tid_el(struct cs_etm_queue *etmq, pid_t tid, u8 trace_chan_id, > + ocsd_ex_level el) > { > struct cs_etm_traceid_queue *tidq; > > @@ -1319,7 +1353,7 @@ int cs_etm__etmq_set_tid(struct cs_etm_queue *etmq, > if (!tidq) > return -EINVAL; > > - cs_etm__set_thread(etmq->etm, tidq, tid); > + cs_etm__set_thread(etmq->etm, tidq, tid, el); > return 0; > } > > @@ -1389,7 +1423,7 @@ static int cs_etm__synth_instruction_sample(struct cs_etm_queue *etmq, > struct perf_sample sample = {.ip = 0,}; > > event->sample.header.type = PERF_RECORD_SAMPLE; > - event->sample.header.misc = cs_etm__cpu_mode(etmq, addr); > + event->sample.header.misc = cs_etm__cpu_mode(etmq, addr, tidq->el); > event->sample.header.size = sizeof(struct perf_event_header); > > /* Set time field based on etm auxtrace config. */ > @@ -1448,7 +1482,7 @@ static int cs_etm__synth_branch_sample(struct cs_etm_queue *etmq, > ip = cs_etm__last_executed_instr(tidq->prev_packet); > > event->sample.header.type = PERF_RECORD_SAMPLE; > - event->sample.header.misc = cs_etm__cpu_mode(etmq, ip); > + event->sample.header.misc = cs_etm__cpu_mode(etmq, ip, tidq->prev_el); > event->sample.header.size = sizeof(struct perf_event_header); > > /* Set time field based on etm auxtrace config. */ > diff --git a/tools/perf/util/cs-etm.h b/tools/perf/util/cs-etm.h > index 70cac0375b34..88e9b25a8a9f 100644 > --- a/tools/perf/util/cs-etm.h > +++ b/tools/perf/util/cs-etm.h > @@ -232,10 +232,11 @@ int cs_etm__process_auxtrace_info(union perf_event *event, > struct perf_event_attr *cs_etm_get_default_config(struct perf_pmu *pmu); > > #ifdef HAVE_CSTRACE_SUPPORT > +#include > int cs_etm__get_cpu(u8 trace_chan_id, int *cpu); > int cs_etm__get_pid_fmt(u8 trace_chan_id, u64 *pid_fmt); > -int cs_etm__etmq_set_tid(struct cs_etm_queue *etmq, > - pid_t tid, u8 trace_chan_id); > +int cs_etm__etmq_set_tid_el(struct cs_etm_queue *etmq, pid_t tid, u8 trace_chan_id, > + ocsd_ex_level el); > bool cs_etm__etmq_is_timeless(struct cs_etm_queue *etmq); > void cs_etm__etmq_set_traceid_queue_timestamp(struct cs_etm_queue *etmq, > u8 trace_chan_id); > -- > 2.34.1 >