From patchwork Fri Aug 9 12:14:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Yan X-Patchwork-Id: 13758735 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 D3F34C3DA4A for ; Fri, 9 Aug 2024 12:17:36 +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=LkUcmh/tK+j+0RwYvZVqDhJ3mEYPJH90XTFrqkmNkLA=; b=gZ1/UnFj/FMSqO8GBNLsFkhtzY FNQUKM4tBFyon0geyfCMl3eNkNJyKJmEWYmQyRxkneNzrVbGHjoueSAXZRKf4KQne4uLPx+0/L51L C3UArD/DhRzUBE/qMaTinCLTPfiaCo0Tnge31uhmImOPly+grnGO13SfiyPmH4QoTWJ1NeaFin0jJ KevFS4pmGalX7hlQX0hrb9dG6M1VKfrZ3JeLAoMHxtxIjj3yz8Wz6b4ayekEMBp7/OW59SA5RLPRs dYFoNEzH8Ze8Xcd/tPYNe//CcvIwfhR+cFaGh7AKGgRmd6unVUgB6vAySmYN0JUbiMFB3W+L/kzrg SE1pIf8Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1scOYZ-0000000BAOQ-2Uai; Fri, 09 Aug 2024 12:17:19 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1scOWg-0000000BAC4-0lVS for linux-arm-kernel@bombadil.infradead.org; Fri, 09 Aug 2024 12:15:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=LkUcmh/tK+j+0RwYvZVqDhJ3mEYPJH90XTFrqkmNkLA=; b=R+/NzZoPzPv0X1fxIKpvQGfnw3 xMpAChR4qptVvVYb7j06RpN0qhNK068fLroQXysc1TUyle3dm2Aad77cUivpC27aE3s5wDV4sdeRj Y+7XGhFpqu/5ZnF5yhtQ1imajInghiqBp6Bu1x+oystWYLC5thbN6bMVMiAxcAz5q9GjjJW3TNB91 ClHfDigDxZzDJAjU7nTlWtl6B9Kxt+t4Lt4W1s0qh33UQs6gxT6lXBY1PPPBJqqpLxpfA9VxV+GcT OifA59f4hE+qI/YsmH/Ac7H8sSfzWHJTNi4DrOg7oVi1B0cgpME95cv5nlH9t+7Cx5gjKXcBkQ86K B4dQ7rYA==; Received: from foss.arm.com ([217.140.110.172]) by desiato.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1scOWb-000000070b7-3LeJ for linux-arm-kernel@lists.infradead.org; Fri, 09 Aug 2024 12:15:20 +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 8AD7B1756; Fri, 9 Aug 2024 05:15:39 -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 EB2743F6A8; Fri, 9 Aug 2024 05:15:11 -0700 (PDT) From: Leo Yan To: Peter Zijlstra , Arnaldo Carvalho de Melo , Ingo Molnar , Namhyung Kim , Ian Rogers , Adrian Hunter , "Liang, Kan" , Suzuki K Poulose , Mike Leach , James Clark , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org Cc: Leo Yan Subject: [PATCH v4 8/8] perf arm-spe: Support multiple events in arm_spe_evsel_is_auxtrace() Date: Fri, 9 Aug 2024 13:14:47 +0100 Message-Id: <20240809121447.2078084-9-leo.yan@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240809121447.2078084-1-leo.yan@arm.com> References: <20240809121447.2078084-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-20240809_131518_197051_2CF214ED X-CRM114-Status: GOOD ( 13.68 ) 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 The 'pmu_type' field is an unique value and cannot support multiple PMU events. The arm_spe_evsel_is_auxtrace() function changes to compare PMU name to decide if it is a Arm SPE event. This leads to the 'pmu_type' field is no longer used, remove it. Signed-off-by: Leo Yan --- tools/perf/util/arm-spe.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/tools/perf/util/arm-spe.c b/tools/perf/util/arm-spe.c index afbd5869f6bf..7c27d5179470 100644 --- a/tools/perf/util/arm-spe.c +++ b/tools/perf/util/arm-spe.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -45,7 +46,6 @@ struct arm_spe { u32 auxtrace_type; struct perf_session *session; struct machine *machine; - u32 pmu_type; u64 midr; struct perf_tsc_conversion tc; @@ -1053,12 +1053,10 @@ static void arm_spe_free(struct perf_session *session) free(spe); } -static bool arm_spe_evsel_is_auxtrace(struct perf_session *session, +static bool arm_spe_evsel_is_auxtrace(struct perf_session *session __maybe_unused, struct evsel *evsel) { - struct arm_spe *spe = container_of(session->auxtrace, struct arm_spe, auxtrace); - - return evsel->core.attr.type == spe->pmu_type; + return strstarts(evsel->pmu_name, ARM_SPE_PMU_NAME); } static const char * const arm_spe_info_fmts[] = { @@ -1128,7 +1126,7 @@ arm_spe_synth_events(struct arm_spe *spe, struct perf_session *session) int err; evlist__for_each_entry(evlist, evsel) { - if (evsel->core.attr.type == spe->pmu_type) { + if (arm_spe_evsel_is_auxtrace(session, evsel)) { found = true; break; } @@ -1313,7 +1311,6 @@ int arm_spe_process_auxtrace_info(union perf_event *event, spe->session = session; spe->machine = &session->machines.host; /* No kvm support */ spe->auxtrace_type = auxtrace_info->type; - spe->pmu_type = auxtrace_info->priv[ARM_SPE_PMU_TYPE]; spe->midr = midr; spe->timeless_decoding = arm_spe__is_timeless_decoding(spe);