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 987F2C25B4F for ; Tue, 7 May 2024 09:58:06 +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-Transfer-Encoding:Content-Type: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=Qx8o1jdVgIRLbLTznuYdNok49ypRUHOAAkvm/3/nFT0=; b=k6KUCi/mgOsgsf B60DTq5I/rqu3kb1zlJx1Y5I9CIoQfPMl5Gn1XyCROQ2OFscwa49glOf8DH643ZRDy1yznnbDllrd oLb7WddkvN6tdltaGaZ5JIq2U2nO9esvpgqFHIz5crUAnRFECGhZr2jpUj2QMgwhgZ5/8icgEHEDR xa1pkCjGoXoMe/U4Xfk5W6NS9I4pTvS7SNGrk5X7Dm59PdXDcUVpzDpe9G9hLd3Lgs9U+WsZFEntu +MVYChxwmTtw8934tVNcQbzGOicUWOy+Td0kJcGN8bVssqVwKz1KhVMm+0bay3zBrp6TZWZ7I5mwC FK5U9C20WAFaI0yPChEQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s4Ha8-0000000AQgD-0xYO; Tue, 07 May 2024 09:57:56 +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 1s4Ha5-0000000AQee-47wf for linux-arm-kernel@lists.infradead.org; Tue, 07 May 2024 09:57:55 +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 6E9251063; Tue, 7 May 2024 02:58:17 -0700 (PDT) Received: from [192.168.1.100] (usa-sjc-mx-foss1.foss.arm.com [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 46E393F587; Tue, 7 May 2024 02:57:48 -0700 (PDT) Message-ID: <07e869aa-6c4d-46f1-bce1-fe37aa72ce87@arm.com> Date: Tue, 7 May 2024 10:57:46 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 12/17] coresight: Make CPU id map a property of a trace ID map To: Anshuman Khandual 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, linux-perf-users@vger.kernel.org, gankulkarni@os.amperecomputing.com, scclevenger@os.amperecomputing.com, coresight@lists.linaro.org, suzuki.poulose@arm.com, mike.leach@linaro.org References: <20240429152207.479221-1-james.clark@arm.com> <20240429152207.479221-14-james.clark@arm.com> <8080ae06-7014-4afe-8620-ffaca6e3c597@arm.com> Content-Language: en-US From: James Clark In-Reply-To: <8080ae06-7014-4afe-8620-ffaca6e3c597@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240507_025754_166305_C35904FD X-CRM114-Status: GOOD ( 19.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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 07/05/2024 07:22, Anshuman Khandual wrote: > > > On 4/29/24 20:51, James Clark wrote: >> The global CPU ID mappings won't work for per-sink ID maps so move it to >> the ID map struct. coresight_trace_id_release_all_pending() is hard >> coded to operate on the default map, but once Perf sessions use their >> own maps the pending release mechanism will be deleted. So it doesn't >> need to be extended to accept a trace ID map argument at this point. >> >> Signed-off-by: James Clark >> --- >> .../hwtracing/coresight/coresight-etm-perf.c | 3 +- >> .../coresight/coresight-etm3x-core.c | 3 +- >> .../coresight/coresight-etm4x-core.c | 3 +- >> .../hwtracing/coresight/coresight-trace-id.c | 28 ++++++++----------- >> .../hwtracing/coresight/coresight-trace-id.h | 2 +- >> include/linux/coresight.h | 1 + >> 6 files changed, 20 insertions(+), 20 deletions(-) >> >> diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.c b/drivers/hwtracing/coresight/coresight-etm-perf.c >> index 4afb9d29f355..25f1f87c90d1 100644 >> --- a/drivers/hwtracing/coresight/coresight-etm-perf.c >> +++ b/drivers/hwtracing/coresight/coresight-etm-perf.c >> @@ -508,7 +508,8 @@ static void etm_event_start(struct perf_event *event, int flags) >> hw_id = FIELD_PREP(CS_AUX_HW_ID_VERSION_MASK, >> CS_AUX_HW_ID_CURR_VERSION); >> hw_id |= FIELD_PREP(CS_AUX_HW_ID_TRACE_ID_MASK, >> - coresight_trace_id_read_cpu_id(cpu)); >> + coresight_trace_id_read_cpu_id(cpu, >> + coresight_trace_id_map_default())); >> perf_report_aux_output_id(event, hw_id); >> } >> >> diff --git a/drivers/hwtracing/coresight/coresight-etm3x-core.c b/drivers/hwtracing/coresight/coresight-etm3x-core.c >> index 4149e7675ceb..b21f5ad94e63 100644 >> --- a/drivers/hwtracing/coresight/coresight-etm3x-core.c >> +++ b/drivers/hwtracing/coresight/coresight-etm3x-core.c >> @@ -501,7 +501,8 @@ 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); >> + trace_id = coresight_trace_id_read_cpu_id(drvdata->cpu, >> + coresight_trace_id_map_default()); >> 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); >> diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c >> index f32c8cd7742d..d16d6efb26fa 100644 >> --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c >> +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c >> @@ -776,7 +776,8 @@ 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); >> + trace_id = coresight_trace_id_read_cpu_id(drvdata->cpu, >> + coresight_trace_id_map_default()); >> 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); >> diff --git a/drivers/hwtracing/coresight/coresight-trace-id.c b/drivers/hwtracing/coresight/coresight-trace-id.c >> index 45ddd50d09a6..b393603dd713 100644 >> --- a/drivers/hwtracing/coresight/coresight-trace-id.c >> +++ b/drivers/hwtracing/coresight/coresight-trace-id.c >> @@ -13,10 +13,12 @@ >> #include "coresight-trace-id.h" >> >> /* Default trace ID map. Used in sysfs mode and for system sources */ >> -static struct coresight_trace_id_map id_map_default; >> +static DEFINE_PER_CPU(atomic_t, id_map_default_cpu_ids) = ATOMIC_INIT(0); >> +static struct coresight_trace_id_map id_map_default = { >> + .cpu_map = &id_map_default_cpu_ids >> +}; >> >> -/* maintain a record of the mapping of IDs and pending releases per cpu */ >> -static DEFINE_PER_CPU(atomic_t, cpu_id) = ATOMIC_INIT(0); >> +/* maintain a record of the pending releases per cpu */ >> static cpumask_t cpu_id_release_pending; >> >> /* perf session active counter */ >> @@ -46,12 +48,6 @@ static void coresight_trace_id_dump_table(struct coresight_trace_id_map *id_map, >> #define PERF_SESSION(n) >> #endif >> >> -/* unlocked read of current trace ID value for given CPU */ >> -static int _coresight_trace_id_read_cpu_id(int cpu) >> -{ >> - return atomic_read(&per_cpu(cpu_id, cpu)); >> -} > > Just wondering where this per cpu cpu_id ^^ is being dropped off as well > OR is it still getting used ? > No it's still needed. It's not dropped in this set. I just moved the implementation into coresight_trace_id_read_cpu_id() rather than add a new argument to _coresight_trace_id_read_cpu_id(). Although I might change that because of Mike's comment about keeping both the map and non map versions of the functions to reduce some of the churn changing the callers. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel