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 519CAC10F1A for ; Tue, 7 May 2024 10:49:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:From:References:Cc:To:Subject: MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=4LPJczhrwT/RQSP+Zu5N/rqn6OMgQoHTUCkJ+mLRWvo=; b=mx59cblY6kzKc7 2fNQwpuTkqkyDnvkoxN1mPFokbIbyy9H5uvg6i6W6+xTKjTUXVuIezmh9Ppy1AQLfcDXvNY3nrDdo tR1q3vyQGwRmjuLEGAmXYBmY1KSC1FdeLn2iONDzoUjKc7LYwUfN1o4dr1Y7PJX6NzInSxaZ6QkyG nHTVkwHrIpCVBmBuu+/sW+TxipndK1MK5LhGKa8CdRbLS2CaEjbijItWMXigyM9sWayt4wMh/EZmw 9PRFnjOERQ1ldu9ULoR+a6OfcxlFNlzVyWQrIcQ1GeMfWbLNyVKVQMvua2y1QBsL6mefpq8Bgvbkg DQuKWSIgqSBxz1LAErVg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s4IOF-0000000AbNi-2MWF; Tue, 07 May 2024 10:49:43 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s4IOB-0000000AbLb-1Gbr for linux-arm-kernel@lists.infradead.org; Tue, 07 May 2024 10:49:41 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id CB93E1063; Tue, 7 May 2024 03:50:01 -0700 (PDT) Received: from [10.1.197.1] (ewhatever.cambridge.arm.com [10.1.197.1]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id DC5D93F587; Tue, 7 May 2024 03:49:32 -0700 (PDT) Message-ID: <6d426e77-8d74-40d5-88c9-e590de07141c@arm.com> Date: Tue, 7 May 2024 11:49:31 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 13/17] coresight: Pass trace ID map into source enable To: James Clark , linux-perf-users@vger.kernel.org, gankulkarni@os.amperecomputing.com, scclevenger@os.amperecomputing.com, coresight@lists.linaro.org, mike.leach@linaro.org Cc: Alexander Shishkin , Maxime Coquelin , Alexandre Torgue , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Jiri Olsa , Ian Rogers , Adrian Hunter , John Garry , Will Deacon , Leo Yan , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com References: <20240429152207.479221-1-james.clark@arm.com> <20240429152207.479221-15-james.clark@arm.com> Content-Language: en-US From: Suzuki K Poulose In-Reply-To: <20240429152207.479221-15-james.clark@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240507_034939_472783_4A2BBC5A X-CRM114-Status: GOOD ( 26.35 ) 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: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi James On 29/04/2024 16:21, James Clark wrote: > This will allow Perf mode to pass in per-sink maps. System sources > allocate IDs on probe so they don't use this and it's __maybe_unused. I am wondering if we need this change ? We have event_data associated with each event and we allocate the traceid from the sink map at setup_aux. So, why not set the traceid or even link the id_map in the event_data ? something like: struct etm_event_data { struct work_struct work; cpumask_t mask; cpumask_t aux_hwid_done; void *snk_config; u32 cfg_hash; struct list_head * __percpu *path; + u8 __percpu *traceid; }; See my comment in the other patch. Suzuki > > Sysfs mode also has the global map hard coded in various places, so pass > in NULL when enabling for sysfs. We could bubble the global map all the > way down to where it's used, but it wouldn't have any functional > difference, so it's probably not worth the code churn. > > Signed-off-by: James Clark > --- > drivers/hwtracing/coresight/coresight-dummy.c | 3 ++- > drivers/hwtracing/coresight/coresight-etm-perf.c | 3 ++- > drivers/hwtracing/coresight/coresight-etm3x-core.c | 10 +++++----- > drivers/hwtracing/coresight/coresight-etm4x-core.c | 10 +++++----- > drivers/hwtracing/coresight/coresight-stm.c | 3 ++- > drivers/hwtracing/coresight/coresight-sysfs.c | 3 ++- > drivers/hwtracing/coresight/coresight-tpdm.c | 3 ++- > include/linux/coresight.h | 2 +- > 8 files changed, 21 insertions(+), 16 deletions(-) > > diff --git a/drivers/hwtracing/coresight/coresight-dummy.c b/drivers/hwtracing/coresight/coresight-dummy.c > index ac70c0b491be..1f1b9ad160f6 100644 > --- a/drivers/hwtracing/coresight/coresight-dummy.c > +++ b/drivers/hwtracing/coresight/coresight-dummy.c > @@ -21,7 +21,8 @@ DEFINE_CORESIGHT_DEVLIST(source_devs, "dummy_source"); > DEFINE_CORESIGHT_DEVLIST(sink_devs, "dummy_sink"); > > static int dummy_source_enable(struct coresight_device *csdev, > - struct perf_event *event, enum cs_mode mode) > + struct perf_event *event, enum cs_mode mode, > + __maybe_unused struct coresight_trace_id_map *id_map) > { > dev_dbg(csdev->dev.parent, "Dummy source enabled\n"); > > diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.c b/drivers/hwtracing/coresight/coresight-etm-perf.c > index 25f1f87c90d1..177cecae38d9 100644 > --- a/drivers/hwtracing/coresight/coresight-etm-perf.c > +++ b/drivers/hwtracing/coresight/coresight-etm-perf.c > @@ -496,7 +496,8 @@ static void etm_event_start(struct perf_event *event, int flags) > goto fail_end_stop; > > /* Finally enable the tracer */ > - if (source_ops(csdev)->enable(csdev, event, CS_MODE_PERF)) > + if (source_ops(csdev)->enable(csdev, event, CS_MODE_PERF, > + coresight_trace_id_map_default())) > goto fail_disable_path; > > /* > diff --git a/drivers/hwtracing/coresight/coresight-etm3x-core.c b/drivers/hwtracing/coresight/coresight-etm3x-core.c > index b21f5ad94e63..b310bdf19038 100644 > --- a/drivers/hwtracing/coresight/coresight-etm3x-core.c > +++ b/drivers/hwtracing/coresight/coresight-etm3x-core.c > @@ -482,7 +482,8 @@ void etm_release_trace_id(struct etm_drvdata *drvdata) > } > > static int etm_enable_perf(struct coresight_device *csdev, > - struct perf_event *event) > + struct perf_event *event, > + struct coresight_trace_id_map *id_map) > { > struct etm_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); > int trace_id; > @@ -501,8 +502,7 @@ static int etm_enable_perf(struct coresight_device *csdev, > * with perf locks - we know the ID cannot change until perf shuts down > * the session > */ > - trace_id = coresight_trace_id_read_cpu_id(drvdata->cpu, > - coresight_trace_id_map_default()); > + trace_id = coresight_trace_id_read_cpu_id(drvdata->cpu, id_map); > if (!IS_VALID_CS_TRACE_ID(trace_id)) { > dev_err(&drvdata->csdev->dev, "Failed to set trace ID for %s on CPU%d\n", > dev_name(&drvdata->csdev->dev), drvdata->cpu); > @@ -555,7 +555,7 @@ static int etm_enable_sysfs(struct coresight_device *csdev) > } > > static int etm_enable(struct coresight_device *csdev, struct perf_event *event, > - enum cs_mode mode) > + enum cs_mode mode, struct coresight_trace_id_map *id_map) > { > int ret; > struct etm_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); > @@ -570,7 +570,7 @@ static int etm_enable(struct coresight_device *csdev, struct perf_event *event, > ret = etm_enable_sysfs(csdev); > break; > case CS_MODE_PERF: > - ret = etm_enable_perf(csdev, event); > + ret = etm_enable_perf(csdev, event, id_map); > break; > default: > ret = -EINVAL; > diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c > index d16d6efb26fa..02dbb6c4daf5 100644 > --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c > +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c > @@ -753,7 +753,8 @@ static int etm4_parse_event_config(struct coresight_device *csdev, > } > > static int etm4_enable_perf(struct coresight_device *csdev, > - struct perf_event *event) > + struct perf_event *event, > + struct coresight_trace_id_map *id_map) > { > int ret = 0, trace_id; > struct etmv4_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); > @@ -776,8 +777,7 @@ static int etm4_enable_perf(struct coresight_device *csdev, > * with perf locks - we know the ID cannot change until perf shuts down > * the session > */ > - trace_id = coresight_trace_id_read_cpu_id(drvdata->cpu, > - coresight_trace_id_map_default()); > + trace_id = coresight_trace_id_read_cpu_id(drvdata->cpu, id_map); > if (!IS_VALID_CS_TRACE_ID(trace_id)) { > dev_err(&drvdata->csdev->dev, "Failed to set trace ID for %s on CPU%d\n", > dev_name(&drvdata->csdev->dev), drvdata->cpu); > @@ -839,7 +839,7 @@ static int etm4_enable_sysfs(struct coresight_device *csdev) > } > > static int etm4_enable(struct coresight_device *csdev, struct perf_event *event, > - enum cs_mode mode) > + enum cs_mode mode, struct coresight_trace_id_map *id_map) > { > int ret; > > @@ -853,7 +853,7 @@ static int etm4_enable(struct coresight_device *csdev, struct perf_event *event, > ret = etm4_enable_sysfs(csdev); > break; > case CS_MODE_PERF: > - ret = etm4_enable_perf(csdev, event); > + ret = etm4_enable_perf(csdev, event, id_map); > break; > default: > ret = -EINVAL; > diff --git a/drivers/hwtracing/coresight/coresight-stm.c b/drivers/hwtracing/coresight/coresight-stm.c > index e1c62820dfda..a80ad1de4c23 100644 > --- a/drivers/hwtracing/coresight/coresight-stm.c > +++ b/drivers/hwtracing/coresight/coresight-stm.c > @@ -194,7 +194,8 @@ static void stm_enable_hw(struct stm_drvdata *drvdata) > } > > static int stm_enable(struct coresight_device *csdev, struct perf_event *event, > - enum cs_mode mode) > + enum cs_mode mode, > + __maybe_unused struct coresight_trace_id_map *trace_id) > { > struct stm_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); > > diff --git a/drivers/hwtracing/coresight/coresight-sysfs.c b/drivers/hwtracing/coresight/coresight-sysfs.c > index 1e67cc7758d7..a01c9e54e2ed 100644 > --- a/drivers/hwtracing/coresight/coresight-sysfs.c > +++ b/drivers/hwtracing/coresight/coresight-sysfs.c > @@ -9,6 +9,7 @@ > #include > > #include "coresight-priv.h" > +#include "coresight-trace-id.h" > > /* > * Use IDR to map the hash of the source's device name > @@ -63,7 +64,7 @@ static int coresight_enable_source_sysfs(struct coresight_device *csdev, > */ > lockdep_assert_held(&coresight_mutex); > if (coresight_get_mode(csdev) != CS_MODE_SYSFS) { > - ret = source_ops(csdev)->enable(csdev, data, mode); > + ret = source_ops(csdev)->enable(csdev, data, mode, NULL); > if (ret) > return ret; > } > diff --git a/drivers/hwtracing/coresight/coresight-tpdm.c b/drivers/hwtracing/coresight/coresight-tpdm.c > index a9708ab0d488..0376ad326a2f 100644 > --- a/drivers/hwtracing/coresight/coresight-tpdm.c > +++ b/drivers/hwtracing/coresight/coresight-tpdm.c > @@ -439,7 +439,8 @@ static void __tpdm_enable(struct tpdm_drvdata *drvdata) > } > > static int tpdm_enable(struct coresight_device *csdev, struct perf_event *event, > - enum cs_mode mode) > + enum cs_mode mode, > + __maybe_unused struct coresight_trace_id_map *id_map) > { > struct tpdm_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); > > diff --git a/include/linux/coresight.h b/include/linux/coresight.h > index 7d62b88bfb5c..3a678e5425dc 100644 > --- a/include/linux/coresight.h > +++ b/include/linux/coresight.h > @@ -384,7 +384,7 @@ struct coresight_ops_link { > struct coresight_ops_source { > int (*cpu_id)(struct coresight_device *csdev); > int (*enable)(struct coresight_device *csdev, struct perf_event *event, > - enum cs_mode mode); > + enum cs_mode mode, struct coresight_trace_id_map *id_map); > void (*disable)(struct coresight_device *csdev, > struct perf_event *event); > }; _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel