From patchwork Tue Aug 27 16:44:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Yan X-Patchwork-Id: 13779814 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 6F3AEC54731 for ; Tue, 27 Aug 2024 16:48:59 +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:References:In-Reply-To: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:List-Owner; bh=WMNH0fwNgsKSCRKwczzysH+5hJeLp7AMDN4V/EbRjxI=; b=ee6h3eO+9U05ealH4EMFy1PUhr M1aQ7wzR1VTcJ7c+ftg1F7FTNMNKA1fZ+rWRAVdoRhp6cBjT/VAxKSi05pdI04J3omddiMCwV2OVs IBuWDN2KGtdphk6uJ2XFTOGaKwv9BfhRMAD+7QpQBpLPSwh6S8WtACItxPulyrcfw1MjjhSq8mr6e rzTYAErEZh+TSRQbl1eK5JaOnz/HMjxHcSmkyiQ7hS+3wTdx1KqS9V8IDE7dCr/bcWGe5WYqNkkoQ 5wHqDnlRVC+v5W2lkbOd94PkQa2ILPiZG1rIypwT8qLFU+hkIPLo/df2V18+eNrtwwpA0zGxZnsy0 B31vMAzw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sizN9-0000000C8dn-3Mn9; Tue, 27 Aug 2024 16:48:47 +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 1sizJD-0000000C7Xo-28Qs for linux-arm-kernel@lists.infradead.org; Tue, 27 Aug 2024 16:44:44 +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 E56EDDA7; Tue, 27 Aug 2024 09:45:08 -0700 (PDT) Received: from e132581.cambridge.arm.com (e132581.arm.com [10.2.76.71]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 979E03F762; Tue, 27 Aug 2024 09:44:40 -0700 (PDT) From: Leo Yan To: Arnaldo Carvalho de Melo , Will Deacon , Mark Rutland , Suzuki K Poulose , Mike Leach , James Clark , John Garry , Namhyung Kim , Ian Rogers , Adrian Hunter , "Liang, Kan" , Jonathan Cameron , Yicong Yang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, coresight@lists.linaro.org, linux-perf-users@vger.kernel.org Cc: Leo Yan Subject: [PATCH v1 4/9] perf: arm-spe: Record multiple PMUs Date: Tue, 27 Aug 2024 17:44:12 +0100 Message-Id: <20240827164417.3309560-5-leo.yan@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240827164417.3309560-1-leo.yan@arm.com> References: <20240827164417.3309560-1-leo.yan@arm.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240827_094443_656569_6415A7A0 X-CRM114-Status: GOOD ( 14.91 ) 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 Currently, the arm_spe_recording structure only saves the first Arm SPE PMU pointer and it cannot cover all PMU events for the multiple Arm SPE event case. Save the all Arm SPE PMU pointers into the arm_spe_recording structure, later changes will use these pointers to retrieve meta data. Signed-off-by: Leo Yan --- tools/perf/arch/arm/util/auxtrace.c | 2 +- tools/perf/arch/arm64/util/arm-spe.c | 19 +++++++++++++++---- tools/perf/util/arm-spe.h | 3 ++- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/tools/perf/arch/arm/util/auxtrace.c b/tools/perf/arch/arm/util/auxtrace.c index 2fca16659858..55877418b6c4 100644 --- a/tools/perf/arch/arm/util/auxtrace.c +++ b/tools/perf/arch/arm/util/auxtrace.c @@ -100,7 +100,7 @@ struct auxtrace_record #if defined(__aarch64__) if (arm_spe_pmus) - itr = arm_spe_recording_init(err, arm_spe_pmus[0]); + itr = arm_spe_recording_init(err, arm_spe_pmus, nr_spe); if (hisi_ptt_pmus) itr = hisi_ptt_recording_init(err, hisi_ptt_pmus[0]); diff --git a/tools/perf/arch/arm64/util/arm-spe.c b/tools/perf/arch/arm64/util/arm-spe.c index 2be99fdf997d..7880190c3dd6 100644 --- a/tools/perf/arch/arm64/util/arm-spe.c +++ b/tools/perf/arch/arm64/util/arm-spe.c @@ -31,7 +31,8 @@ struct arm_spe_recording { struct auxtrace_record itr; - struct perf_pmu *arm_spe_pmu; + struct perf_pmu **pmu; + int nr_pmu; struct evlist *evlist; int wrapped_cnt; bool *wrapped; @@ -51,7 +52,7 @@ static int arm_spe_info_fill(struct auxtrace_record *itr, { struct arm_spe_recording *sper = container_of(itr, struct arm_spe_recording, itr); - struct perf_pmu *arm_spe_pmu = sper->arm_spe_pmu; + struct perf_pmu *arm_spe_pmu = sper->pmu[0]; if (priv_size != ARM_SPE_AUXTRACE_PRIV_SIZE) return -EINVAL; @@ -494,11 +495,13 @@ static void arm_spe_recording_free(struct auxtrace_record *itr) container_of(itr, struct arm_spe_recording, itr); zfree(&sper->wrapped); + zfree(&sper->pmu); free(sper); } struct auxtrace_record *arm_spe_recording_init(int *err, - struct perf_pmu *arm_spe_pmu) + struct perf_pmu **arm_spe_pmu, + int nr_pmu) { struct arm_spe_recording *sper; @@ -513,7 +516,15 @@ struct auxtrace_record *arm_spe_recording_init(int *err, return NULL; } - sper->arm_spe_pmu = arm_spe_pmu; + sper->pmu = zalloc(sizeof(struct perf_pmu *) * nr_pmu); + if (!sper->pmu) { + free(sper); + *err = -ENOMEM; + return NULL; + } + memcpy(sper->pmu, arm_spe_pmu, sizeof(struct perf_pmu *) * nr_pmu); + sper->nr_pmu = nr_pmu; + sper->itr.snapshot_start = arm_spe_snapshot_start; sper->itr.snapshot_finish = arm_spe_snapshot_finish; sper->itr.find_snapshot = arm_spe_find_snapshot; diff --git a/tools/perf/util/arm-spe.h b/tools/perf/util/arm-spe.h index 4f4900c18f3e..e1327e1b3fec 100644 --- a/tools/perf/util/arm-spe.h +++ b/tools/perf/util/arm-spe.h @@ -22,7 +22,8 @@ struct perf_session; struct perf_pmu; struct auxtrace_record *arm_spe_recording_init(int *err, - struct perf_pmu *arm_spe_pmu); + struct perf_pmu **arm_spe_pmu, + int nr_pmu); int arm_spe_process_auxtrace_info(union perf_event *event, struct perf_session *session);