Received: by 2002:a05:6500:1b41:b0:1fb:d597:ff75 with SMTP id cz1csp158662lqb; Tue, 4 Jun 2024 07:53:06 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUbxy7JdcgLIgtT19WsrvNzmBpMrik01AygbRdKvm6ICtOrqUI51O3QdDKQWm2PDOOvp8j5Y3TNNHvuS5oLa852fS+KMUl8u/Lc8OzeAQ== X-Google-Smtp-Source: AGHT+IFI2bHk3BPwUBEdtW7toMx+LrnL/6PWDx2vtPDDbEZNmMrs/dTTZz0+grHthh2hjGRWYOnb X-Received: by 2002:a05:6358:528e:b0:18a:6074:90d1 with SMTP id e5c5f4694b2df-19b48e92bfcmr1610316155d.19.1717512785814; Tue, 04 Jun 2024 07:53:05 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1717512785; cv=pass; d=google.com; s=arc-20160816; b=T6LPWEbCKy9baG45GAJ/SwKTlTTkNHFg5xv6UYlu9bjRmbYOFn5yS53aUsRSSOrsZr cU1AxAfFGvJMziqA5MnhVZtihgX7iFJSFHFXNKhQXff0D71hNyOpTC0Z06o5yQHGyz39 x+RlNeul8ESmFK+UEmIz54uD91mSIF5NZStzLG6Sv3kOFUW29IoNB66BxF7vA4icBdKJ AYv0iSL92cy2hhtQK3s427/094OxbMpsZNlm1xOc3y75vQqE2WSLyi4Nu6ItgK5cMTed LcrQAjRbcZuKosbfM0OIiwknArk1DCGIOdxtCeEZuKucqTRDvq5v/CqsyQSsngqPrRL/ LaIg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from; bh=IyxDq468q1dy1ROHPnW6v6HhIf+2W2KV7DiGvvRT160=; fh=PS2xZ37x6i1et2MxEVJy4TSpqrJZGNwd6DyYCR5/2fw=; b=pTmtedvLq1h7++NMcEq73lvAFZacDMFRD070QOAVx9nJd7xzVop7xt8ss7BDarwaSw aV72apXw2ARMh1EPVu0xTm6NVz88eu6qrXseMK7exPF3FJDvrFGArQjeN/EDyIdH7QAL xFj5H6FRMmD+Z6DQ26L4TQj8a8EKuFe8Pv8y0r53P5edSQYKgZvxk0lkwW82bdFJrTIQ ACOW+uBij5oa8fNG9v3ezyG2tMi45wnW3yzZ/Dr/FTftETyeXGi2jHqSoLK6RSZkqHx1 hJ8iaL8b5uy+v2O9prhJfsy0uac9onUDnr5udG6p06OVWXZ9yxqvy0bYIyixrRksv/sx 6a/A==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=arm.com dmarc=pass fromdomain=arm.com); spf=pass (google.com: domain of linux-kernel+bounces-200818-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-200818-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id 41be03b00d2f7-6cd1a7c41c5si4018167a12.384.2024.06.04.07.53.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jun 2024 07:53:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-200818-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=arm.com dmarc=pass fromdomain=arm.com); spf=pass (google.com: domain of linux-kernel+bounces-200818-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-200818-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id C06C3B26B40 for ; Tue, 4 Jun 2024 14:31:38 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8FCAB13CFA2; Tue, 4 Jun 2024 14:31:21 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 132ABC8C7; Tue, 4 Jun 2024 14:31:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717511481; cv=none; b=qvyMD9aNtBgupLWb4eEa5uTsuclbbaqqqk21TG8xl0ZRfCqmyDG/h2Cb6zbeOYHs7ABEKT1Mc857SOP2a/EruDZAjaqNahtNX4xX7yHRONv2ntSMG+Rcvm51DINSRuvkKAsydcEsMf9ED1gpu805tCWbMXxlciU6Y4IKvuWn1qY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717511481; c=relaxed/simple; bh=Dq1zejYHK9mzk5cTnEpZHT/3srVpAlt4/nXwvEtc2ak=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=jr/Nvaju7ZrA6q4I1r+4oEW78kQia8h2W/2Pj4fzWVF435ADGzAzIni2AET6a+ayhgrdV6h4MC+GyEzCYTmgwAqVpe4TO5GgJgwR+F7lbHpneWgaIKfhYaICK0YgA/B5ts8SeKAW0EwpYyxCWr6KhQn1CIrg2Tkw5kKp6dnBhDI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com 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 905391042; Tue, 4 Jun 2024 07:31:42 -0700 (PDT) Received: from e127643.broadband (usa-sjc-mx-foss1.foss.arm.com [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 1D1C33F64C; Tue, 4 Jun 2024 07:31:15 -0700 (PDT) From: James Clark To: coresight@lists.linaro.org, suzuki.poulose@arm.com, gankulkarni@os.amperecomputing.com, mike.leach@linaro.org, leo.yan@linux.dev, anshuman.khandual@arm.com Cc: James Clark , 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 , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-perf-users@vger.kernel.org Subject: [PATCH v2 00/16] coresight: Use per-sink trace ID maps for Perf sessions Date: Tue, 4 Jun 2024 15:30:09 +0100 Message-Id: <20240604143030.519906-1-james.clark@arm.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit This will allow sessions with more than CORESIGHT_TRACE_IDS_MAX ETMs as long as there are fewer than that many ETMs connected to each sink. Each sink owns its own trace ID map, and any Perf session connecting to that sink will allocate from it, even if the sink is currently in use by other users. This is similar to the existing behavior where the dynamic trace IDs are constant as long as there is any concurrent Perf session active. It's not completely optimal because slightly more IDs will be used than necessary, but the optimal solution involves tracking the PIDs of each session and allocating ID maps based on the session owner. This is difficult to do with the combination of per-thread and per-cpu modes and some scheduling issues. The complexity of this isn't likely to worth it because even with multiple users they'd just see a difference in the ordering of ID allocations rather than hitting any limits (unless the hardware does have too many ETMs connected to one sink). Per-thread mode works but only until there are any overlapping IDs, at which point Perf will error out. Both per-thread mode and sysfs mode are left to future changes, but both can be added on top of this initial implementation and only sysfs mode requires further driver changes. The HW_ID version field hasn't been bumped in order to not break Perf which already has an error condition for other values of that field. Instead a new minor version has been added which signifies that there are new fields but the old fields are backwards compatible. Changes since V1: * Rename coresight_device.perf_id_map to perf_sink_id_map. * Instead of outputting a HW_ID for each reachable ETM, output the sink ID and continue to output only the HW_ID once for each mapping. * Keep the first two Perf patches so that it applies cleanly on coresight-next, although they have been applied on perf-tools-next * Add new *_map() functions to the trace ID public API instead of modifying existing ones. * Collapse "coresight: Pass trace ID map into source enable" into "coresight: Use per-sink trace ID maps for Perf sessions" because the first commit relied on the default map being accessible which is no longer necessary due to the previous bullet point. James Clark (16): perf cs-etm: Print error for new PERF_RECORD_AUX_OUTPUT_HW_ID versions perf auxtrace: Allow number of queues to be specified perf: cs-etm: Create decoders after both AUX and HW_ID search passes perf: cs-etm: Allocate queues for all CPUs perf: cs-etm: Move traceid_list to each queue perf: cs-etm: Create decoders based on the trace ID mappings perf: cs-etm: Support version 0.1 of HW_ID packets coresight: Remove unused ETM Perf stubs coresight: Clarify comments around the PID of the sink owner coresight: Move struct coresight_trace_id_map to common header coresight: Expose map arguments in trace ID API coresight: Make CPU id map a property of a trace ID map coresight: Use per-sink trace ID maps for Perf sessions coresight: Remove pending trace ID release mechanism coresight: Re-emit trace IDs when the sink changes in per-thread mode coresight: Emit sink ID in the HW_ID packets drivers/hwtracing/coresight/coresight-core.c | 36 +- drivers/hwtracing/coresight/coresight-dummy.c | 3 +- .../hwtracing/coresight/coresight-etm-perf.c | 50 +- .../hwtracing/coresight/coresight-etm-perf.h | 20 +- .../coresight/coresight-etm3x-core.c | 9 +- .../coresight/coresight-etm4x-core.c | 9 +- drivers/hwtracing/coresight/coresight-priv.h | 1 + drivers/hwtracing/coresight/coresight-stm.c | 3 +- drivers/hwtracing/coresight/coresight-sysfs.c | 3 +- .../hwtracing/coresight/coresight-tmc-etr.c | 5 +- drivers/hwtracing/coresight/coresight-tmc.h | 5 +- drivers/hwtracing/coresight/coresight-tpdm.c | 3 +- .../hwtracing/coresight/coresight-trace-id.c | 109 ++-- .../hwtracing/coresight/coresight-trace-id.h | 70 +- include/linux/coresight-pmu.h | 17 +- include/linux/coresight.h | 20 +- tools/include/linux/coresight-pmu.h | 17 +- tools/perf/util/auxtrace.c | 9 +- tools/perf/util/auxtrace.h | 1 + .../perf/util/cs-etm-decoder/cs-etm-decoder.c | 28 +- tools/perf/util/cs-etm.c | 603 ++++++++++++------ tools/perf/util/cs-etm.h | 2 +- 22 files changed, 628 insertions(+), 395 deletions(-) -- 2.34.1