Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp3963106pxb; Tue, 10 Nov 2020 04:51:04 -0800 (PST) X-Google-Smtp-Source: ABdhPJzwQBRTwPb17J8hFi9UFrdpouy3hpyAs9iTJKGWNa3HhD1qGJbFh7ujw+xgtMGuLR9A+cjI X-Received: by 2002:a17:906:f247:: with SMTP id gy7mr19732738ejb.48.1605012664313; Tue, 10 Nov 2020 04:51:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605012664; cv=none; d=google.com; s=arc-20160816; b=AorvPHwueEVQ3dNtDKXC4cwmUs1NPwuZOeUTi3EEtWHd2prceTu9qhvg1MWc/bYDXz dB0E9a6+UR3VVVnft3Q9EJ7z/eqieGcKAJ0AUULp9uf5vxPHNpwy+hU0gvvJ0HLdkjW8 JGLpkJkJMS0ABC72yVDvU0r/Pq2O+lNbsmgcun+DvwXvI/3Qqi70bJ3zeE5qnouZ/Jxs 2s9HDoOhfSFB3iu1Guo/61PXytinvkT7sL6zPyOZTtG4KdHzIFI9jNlZp9VZVrfgN+CU aL2hNJS+6LO5xWuWxMRjDo1KE+L+wiPkRlMhdrW6J0VC3VBG0p2OwNpqUVIhv8uoivda sUWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from; bh=Pa6c1qOprVH3IZeMLDoB0szck1d/2u3DtHCbnwaUz5I=; b=ZkIT3Shny72hMc+u/ISFijRqaBOioZQFNz4d0xxortiIAscRebDsSy9rWwwWlRIvtS G7fNGTVapuoQkWDQEst8yT+N3m4rP7r2Fy0AdZnrEhy3tlMNCfHRJ2+peAUwI+lqDr90 tdD2VgumpnRkLaWkbzm0tKu15nyUNvc7usuUeW/b9tPZMutJs/w0qSQ74/sFW8MrcAf5 E4mh9DC7JXKf12mkdV+pxvCES3ZMUPWq02bJvUdbVYzLCSkbDMa+6R8VaEFZ+29kU4KV tBPffkYxS5deM82ycj7sYo84iG/qIcwO82Uj1XciD4O2kBoZWXM8mPbSYPx9v6OSIqas wq2w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a3si7866527ejx.273.2020.11.10.04.50.41; Tue, 10 Nov 2020 04:51:04 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732130AbgKJMqB (ORCPT + 99 others); Tue, 10 Nov 2020 07:46:01 -0500 Received: from foss.arm.com ([217.140.110.172]:55088 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731929AbgKJMp7 (ORCPT ); Tue, 10 Nov 2020 07:45:59 -0500 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 A17BA1396; Tue, 10 Nov 2020 04:45:58 -0800 (PST) Received: from p8cg001049571a15.blr.arm.com (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 5D7A03F6CF; Tue, 10 Nov 2020 04:45:56 -0800 (PST) From: Anshuman Khandual To: linux-arm-kernel@lists.infradead.org, coresight@lists.linaro.org Cc: linux-kernel@vger.kernel.org, suzuki.poulose@arm.com, mathieu.poirier@linaro.org, mike.leach@linaro.org, Anshuman Khandual Subject: [RFC 02/11] coresight: etm-perf: Allow an event to use different sinks Date: Tue, 10 Nov 2020 18:15:00 +0530 Message-Id: <1605012309-24812-3-git-send-email-anshuman.khandual@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1605012309-24812-1-git-send-email-anshuman.khandual@arm.com> References: <1605012309-24812-1-git-send-email-anshuman.khandual@arm.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Suzuki K Poulose When there are multiple sinks on the system, in the absence of a specified sink, it is quite possible that a default sink for an ETM could be different from that of another ETM. However we do not support having multiple sinks for an event yet. This patch allows the event to use the default sinks on the ETMs where they are scheduled as long as the sinks are of the same type. e.g, if we have 1x1 topology with per-CPU ETRs, the event can use the per-CPU ETR for the session. However, if the sinks are of different type, e.g TMC-ETR on one and a custom sink on another, the event will only trace on the first detected sink. Signed-off-by: Suzuki K Poulose Signed-off-by: Anshuman Khandual --- drivers/hwtracing/coresight/coresight-etm-perf.c | 50 ++++++++++++++++++------ 1 file changed, 39 insertions(+), 11 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.c b/drivers/hwtracing/coresight/coresight-etm-perf.c index c2c9b12..ea73cfa 100644 --- a/drivers/hwtracing/coresight/coresight-etm-perf.c +++ b/drivers/hwtracing/coresight/coresight-etm-perf.c @@ -204,14 +204,22 @@ static void etm_free_aux(void *data) schedule_work(&event_data->work); } +static bool sinks_match(struct coresight_device *a, struct coresight_device *b) +{ + if (!a || !b) + return false; + return (sink_ops(a) == sink_ops(b)); +} + static void *etm_setup_aux(struct perf_event *event, void **pages, int nr_pages, bool overwrite) { u32 id; int cpu = event->cpu; cpumask_t *mask; - struct coresight_device *sink; + struct coresight_device *sink = NULL; struct etm_event_data *event_data = NULL; + bool sink_forced = false; event_data = alloc_event_data(cpu); if (!event_data) @@ -222,6 +230,7 @@ static void *etm_setup_aux(struct perf_event *event, void **pages, if (event->attr.config2) { id = (u32)event->attr.config2; sink = coresight_get_sink_by_id(id); + sink_forced = true; } mask = &event_data->mask; @@ -235,7 +244,7 @@ static void *etm_setup_aux(struct perf_event *event, void **pages, */ for_each_cpu(cpu, mask) { struct list_head *path; - struct coresight_device *csdev; + struct coresight_device *csdev, *new_sink; csdev = per_cpu(csdev_src, cpu); /* @@ -249,21 +258,35 @@ static void *etm_setup_aux(struct perf_event *event, void **pages, } /* - * No sink provided - look for a default sink for one of the - * devices. At present we only support topology where all CPUs - * use the same sink [N:1], so only need to find one sink. The - * coresight_build_path later will remove any CPU that does not - * attach to the sink, or if we have not found a sink. + * No sink provided - look for a default sink for all the devices. + * We only support multiple sinks, only if all the default sinks + * are of the same type, so that the sink buffer can be shared + * as the event moves around. We don't trace on a CPU if it can't + * */ - if (!sink) - sink = coresight_find_default_sink(csdev); + if (!sink_forced) { + new_sink = coresight_find_default_sink(csdev); + if (!new_sink) { + cpumask_clear_cpu(cpu, mask); + continue; + } + /* Skip checks for the first sink */ + if (!sink) { + sink = new_sink; + } else if (!sinks_match(new_sink, sink)) { + cpumask_clear_cpu(cpu, mask); + continue; + } + } else { + new_sink = sink; + } /* * Building a path doesn't enable it, it simply builds a * list of devices from source to sink that can be * referenced later when the path is actually needed. */ - path = coresight_build_path(csdev, sink); + path = coresight_build_path(csdev, new_sink); if (IS_ERR(path)) { cpumask_clear_cpu(cpu, mask); continue; @@ -284,7 +307,12 @@ static void *etm_setup_aux(struct perf_event *event, void **pages, if (!sink_ops(sink)->alloc_buffer || !sink_ops(sink)->free_buffer) goto err; - /* Allocate the sink buffer for this session */ + /* + * Allocate the sink buffer for this session. All the sinks + * where this event can be scheduled are ensured to be of the + * same type. Thus the same sink configuration is used by the + * sinks. + */ event_data->snk_config = sink_ops(sink)->alloc_buffer(sink, event, pages, nr_pages, overwrite); -- 2.7.4