From patchwork Mon Jul 22 10:11:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Clark X-Patchwork-Id: 13738631 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 6645FC3DA59 for ; Mon, 22 Jul 2024 10:13:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=tvIqnYuZYV2/+xYtsXtoYvUIcyIYgJiQLbfJZw43cls=; b=K2nd9NSh++0eudtqR6Gn1Ub3iG JAyl+xdgUJgukhU/3q+IHMWMNoa06eTquqx5L9JRjUYBcAESm14KkUUl6vDsn91Tfy3sYnqbHLguj fAhIuuBL4ZM0EK9DzwjOwv8wI03K3H0Z3J4H3otwt+cm25SsZki8d/oMSg/366HQWktXGcyp+TCtk jc/A3PtuOHOAb2aTi7QYlHTYEtLkCtlPXvCT5RvW2NXCj0sPNrWMB8GzRn/k26SDujoOILQz86S8y o+BHkUASqLMSpGfJTwKYjpH5aAT6UVWo/z33q1876G/gIec2Fm9bJOcUhdXJgv+bkWLCrxVBfCsZV 7vtq6iSA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sVq2I-00000009CFW-31q4; Mon, 22 Jul 2024 10:12:55 +0000 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sVq1v-00000009C8r-0N37 for linux-arm-kernel@lists.infradead.org; Mon, 22 Jul 2024 10:12:32 +0000 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-42795086628so29122435e9.3 for ; Mon, 22 Jul 2024 03:12:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1721643149; x=1722247949; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=tvIqnYuZYV2/+xYtsXtoYvUIcyIYgJiQLbfJZw43cls=; b=PNPlfnWQH4YKMVl8tRqKkAKs9zniSthd3IT94Ausu0uOPBtJYe5LagxXfTm6ZZSONc q9e45eo2KXhPUNqh4Y0LW8NWD2CACAlp601IZDoiKBojimCj/kPVqA9vsohMDyVToWq6 6USHGp/KpEn4v8UqPycHuLzmMeea5lwLN6wLKOWNPqw1qtPKjIgsBKO79Ffuu8aRvS3y pex3zFcnfp6pQxtRQHC9Vjl4rbFNv/AUOLbiiwdQohMIQ1iKsKughka0FxaEKyY0TW/r aFQ+O7gA+rjSqAUYMesf7Tl7YM1LnarogIdkexte/n34/C8mFfoyJOJaDvz+Ii54SbhM 3ddQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721643149; x=1722247949; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=tvIqnYuZYV2/+xYtsXtoYvUIcyIYgJiQLbfJZw43cls=; b=FNlim/r0s17XWC7Q87Z/ovlKe9U7dIfg8hMOGM9oYc5/5r2fzgaFSHk5Nr+1cBwZ4x +Mzjcz7DCEOmkK8f3PyMIepx/kPVUg/IlF4M62pTvuBh0Xaac2pe1t4P0EzTIYtXcGj6 FsWFcOj/P+BihNcrWX3OSzEXnoWMhpjqbzhB78eASxj4pFRHoEtCWMBqXMv7HqtRWQeM 6blhzcIgbvRJGVqpumpXSHnbd2bPL1jxs8gX0MHUCFo0YxpV4cbZrGJnzRAAs9LXX84u AZFQJFXEao1T03kOM0rcXvdx1KPIgjHWXxHAY3gIcC+QOFnmEWXZEhC4AeTuXWnu5lzE Rszw== X-Forwarded-Encrypted: i=1; AJvYcCVE1gjYA5XcEEs8yG2lMIESiUB8bdYCrlKFOmkDIJeU664oK23AbYXDyh4o04tcm75u8QkHYxn84IKNWr0aysDerlTwyJFM14O6JvKA+Fzpit3p2Kw= X-Gm-Message-State: AOJu0Yw1aTW0VivwyqtnkFzHb2aOFL/sGI1Xa7+6Pfgr5qCJvAhZBZy+ TXrJ/c2fhZHeOOP4ba+zU+xuLEAiglcbg8fyjg9ZH/ujQ+g1DT/ZcBhV3teP5QU= X-Google-Smtp-Source: AGHT+IEuuQIrmzIO0zM11jr+yM94YwQ2ufkKLq0ZEfsaM9EANBUdXgXQ01+M4sPvdg9zpdfL46GD+g== X-Received: by 2002:a05:600c:5103:b0:426:63b8:2cce with SMTP id 5b1f17b1804b1-427dc52063amr39592745e9.7.1721643148703; Mon, 22 Jul 2024 03:12:28 -0700 (PDT) Received: from localhost.localdomain ([89.47.253.130]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-427d2a8e436sm147993865e9.33.2024.07.22.03.12.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jul 2024 03:12:28 -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 , James Clark , Alexander Shishkin , Maxime Coquelin , Alexandre Torgue , John Garry , Will Deacon , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Jiri Olsa , Ian Rogers , Adrian Hunter , "Liang, Kan" , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, linux-perf-users@vger.kernel.org Subject: [PATCH v6 00/17] coresight: Use per-sink trace ID maps for Perf sessions Date: Mon, 22 Jul 2024 11:11:42 +0100 Message-Id: <20240722101202.26915-1-james.clark@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240722_031231_156747_0EE79596 X-CRM114-Status: GOOD ( 26.79 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 v5: * Hide queue number printout behind -v option * Style change in cs_etm__process_aux_output_hw_id() * Move new format enum to an earlier commit to reduce churn Changes since v4: * Fix compilation failure when TRACE_ID_DEBUG is set * Expand comment about not freeing individual trace IDs in free_event_data() Changes since v3: * Fix issue where trace IDs were overwritten by possibly invalid ones by Perf in unformatted mode. Now the HW_IDs are also used for unformatted mode unless the kernel didn't emit any. * Add a commit to check the OpenCSD version. * Add a commit to not save invalid IDs in the Perf header. * Replace cs_etm_queue's formatted and formatted_set members with a single enum which is easier to use. * Drop CORESIGHT_TRACE_ID_UNUSED_FLAG as it's no longer needed. * Add a commit to print the queue number in the raw dump. * Don't assert on the number of unformatted decoders if decoders == 0. Changes since v2: * Rebase on coresight-next 6.10-rc2 (b9b25c8496). * Fix double free of csdev if device registration fails. * Fix leak of coresight_trace_id_perf_start() if trace ID allocation fails. * Don't resend HW_ID for sink changes in per-thread mode. The existing CPU field on AUX records can be used to track this instead. * Tidy function doc for coresight_trace_id_release_all() * Drop first two commits now that they are in coresight-next * Add a commit to make the trace ID spinlock local to the map 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 (17): 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: Only save valid trace IDs into files perf: cs-etm: Support version 0.1 of HW_ID packets perf: cs-etm: Print queue number in raw trace dump perf: cs-etm: Add runtime version check for OpenCSD 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: Emit sink ID in the HW_ID packets coresight: Make trace ID map spinlock local to the map drivers/hwtracing/coresight/coresight-core.c | 37 +- drivers/hwtracing/coresight/coresight-dummy.c | 3 +- .../hwtracing/coresight/coresight-etm-perf.c | 43 +- .../hwtracing/coresight/coresight-etm-perf.h | 18 - .../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 | 138 ++-- .../hwtracing/coresight/coresight-trace-id.h | 70 +- include/linux/coresight-pmu.h | 17 +- include/linux/coresight.h | 21 +- tools/build/feature/test-libopencsd.c | 4 +- tools/include/linux/coresight-pmu.h | 17 +- tools/perf/Makefile.config | 2 +- tools/perf/arch/arm/util/cs-etm.c | 11 +- .../perf/util/cs-etm-decoder/cs-etm-decoder.c | 49 +- .../perf/util/cs-etm-decoder/cs-etm-decoder.h | 3 +- .../util/cs-etm-decoder/cs-etm-min-version.h | 13 + tools/perf/util/cs-etm.c | 629 +++++++++++------- tools/perf/util/cs-etm.h | 12 +- 25 files changed, 650 insertions(+), 475 deletions(-) create mode 100644 tools/perf/util/cs-etm-decoder/cs-etm-min-version.h Acked-by: Suzuki K Poulose