From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2645F47FB0F for ; Wed, 29 Jul 2026 12:44:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785329072; cv=none; b=SSBjxOK44NywGlkX17PZhldAKugF52RSyWfELdFDXHw+bfjlC4Q2ObUUF60dm61FHs69wEvnutF1by1Ls+ZfWV6yufFoFbQQyc3XDFPuNnvQCZIvD9vDrzmsEs/ltw9F/9ohZM+c0T9MKxKrSwMA8n608e8AqR6wDrLHC3ut/6U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785329072; c=relaxed/simple; bh=8DxF0uOna7k7XfLYYLJt5HMK31K0mfHqaacLHNWZ6lM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=fxTdkSwczLZtOWRSADCatRD2RNZfESw3GXw81qzcWMHVeuyqVNRUCPl6nahMZaSMRSNAtnQ3a8MRDVKcDq2Oh3ZjgSKIlZivpTZlo004dO28Q8CfduWVJXxxwGDZ7+HPVJhDscZDQQvMGMsd1YiMSbiU4ZY1NX15hNujV2V4tJ0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=PrN4K3F2; arc=none smtp.client-ip=148.163.158.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="PrN4K3F2" Received: from pps.filterd (m0360072.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66TBHgGC4075760; Wed, 29 Jul 2026 12:44:14 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=5+kSeWecuTSp21vGw SLTPaews8/pjDr+Aa9QZwkkkBI=; b=PrN4K3F22EZEO38jOx+fMGd9otTLd3YJR o9HoYENNB1r5W1kcVObl8QK1iLv7CG9F6cRKXkEnx9iFPKR/RzdaA7Yqp0VyY/Ug mFcfzUl7LXpTe4q4lcp3E12Ftm4+GugbhSbAolIobsCZDDDVeYS28KkDTjUIDtkB x2M1BxuG5UzFL+iMjWjyOS6Jt4uQaVfvMi0ja9Ichxyrxh0jAfXhWtFVPAhWteKD kuYr2V1UUehSYakICtBYOuBOmNXNSYYwFfDQbcch098KKihanIxgDBVpBoMTGAog 1+xRhNGHjCHYqgnIDhTKcfE7LzZhQ3n9GS85V3xFvDBpAHWF1OKaA== Received: from ppma21.wdc07v.mail.ibm.com (5b.69.3da9.ip4.static.sl-reverse.com [169.61.105.91]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fmuwd1x5u-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 29 Jul 2026 12:44:14 +0000 (GMT) Received: from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1]) by ppma21.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 66TCfFU9017880; Wed, 29 Jul 2026 12:44:13 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4fn8fk6qpj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 29 Jul 2026 12:44:13 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 66TCi9Mx38601048 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 29 Jul 2026 12:44:09 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 660A620043; Wed, 29 Jul 2026 12:44:09 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D926020040; Wed, 29 Jul 2026 12:44:05 +0000 (GMT) Received: from localhost.localdomain (unknown [9.39.22.136]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 29 Jul 2026 12:44:05 +0000 (GMT) From: Athira Rajeev To: acme@kernel.org, jolsa@kernel.org, adrian.hunter@intel.com, maddy@linux.ibm.com, irogers@google.com, namhyung@kernel.org Cc: linux-perf-users@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, atrajeev@linux.ibm.com, hbathini@linux.vnet.ibm.com, tejas05@linux.ibm.com, tshah@linux.ibm.com, venkat88@linux.ibm.com, usha.r2@ibm.com Subject: [PATCH V4 1/6] tools/perf: Move powerpc VPA-DTL auxtrace init into a separate file Date: Wed, 29 Jul 2026 18:13:55 +0530 Message-Id: <20260729124400.65009-2-atrajeev@linux.ibm.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20260729124400.65009-1-atrajeev@linux.ibm.com> References: <20260729124400.65009-1-atrajeev@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-ORIG-GUID: deGR75OkV6CgckQDhnerE9PLkurcGV_c X-Proofpoint-Spam-Info: AW1haW4tMjYwNzI5MDEwMiBTYWx0ZWRfX6NtEx7blLefr /rq5ryXefd8XoLWK5GMitgd76sx3zdv2RyjHzkS70AjiM4pcb205oi57ev0+lnH3UeaPTn2IL6w G1VxC8HahIt9lr+7MqLjreYkBo8n+r4= X-Authority-Analysis: v=2.4 cv=E/z9Y6dl c=1 sm=1 tr=0 ts=6a69f59e cx=c_pps a=GFwsV6G8L6GxiO2Y/PsHdQ==:117 a=GFwsV6G8L6GxiO2Y/PsHdQ==:17 a=RAioF0-LDSMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=RzCfie-kr_QcCd8fBx8p:22 a=VnNF1IyMAAAA:8 a=fb_F93YjGL9XOfOOxY0A:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzI5MDEwMiBTYWx0ZWRfX4FZYpc7m2CVt /qN+b7GJDY5/DgY0qlVP6ooM28fH/M2OXVVI1GZIqQJpXGVIsrX+oZn/Iw8F00o5sylF9hIA9OT q0jmLQzgkMep5Dm95j4nF07+G2gzETy6ZgwEomWrs5YRiybqiUmmxthwJ945XG7xsqnwrk+/Rnq alhrmsfr/C/CFPW/TrEYwLL0p9xrWj4EnqkKQIr1jY+F3nYqqtQhCd4cFBUR7IX1nKHDhLUQYBb 2dF3CTpqMo6cEq0atR+e2jfXuOFmwSjHihrHoq6o9v8q2o1/XAgaKaDt87DsUzSU8HbHy1Q2YJl 6savsLuS3faUchXaE52WX/IC6kUOSWU2FkZmCKSWE2WpuhbZAOJGSE03es3e5VCLlSft6fHG04x BPJStTivg4QWpq2t87zXFeKlePxv1IcMcrNgpTK0gOkiOY6YUGO4NPlWFsXn3AicqdseS/XWvuW 51mMS39nELnYQEGHgFA== X-Proofpoint-GUID: wQlWq2s-VGnF2ZwF66G_v7TwKa73ZbR4 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-29_04,2026-07-28_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 priorityscore=1501 spamscore=0 clxscore=1015 phishscore=0 lowpriorityscore=0 bulkscore=0 malwarescore=0 impostorscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607290102 The powerpc auxtrace dispatch lives entirely in arch/powerpc/util/auxtrace.c. As new PMUs such as HTM are added, this file would grow to contain the recording logic for all of them. Factor out the VPA-DTL recording initializer into its own file, arch/powerpc/util/vpa-dtl.c, and reduce auxtrace.c to a thin dispatch layer. auxtrace_record__init() now detects the PMU by name and calls the appropriate per-PMU init function: - vpa_dtl_recording_init() for VPA-DTL events (unchanged behaviour) - Further PMU entries will follow in subsequent patches This makes room in auxtrace_record__init() for the HTM recording path added in the next patch without growing a single monolithic file. Signed-off-by: Athira Rajeev --- Changes in V4: - No changes from V3. Changes in V3: Add #include to vpa-dtl.c; without it the compiler treats zalloc() as implicitly returning int, truncating the upper 32 bits of the returned pointer on 64-bit PowerPC. Changes in V2: - Renamed the destination file from arch/powerpc/util/vpa-dtl.c (same name, unchanged) but the subject and commit message are reworded to clearly state that the goal is to make auxtrace_record__init() a thin per-PMU dispatcher, not merely to "allow multiple PMUs to use auxtrace". - Handle failure from memory allocation - Included stdlib and limits.h - No functional change to the VPA-DTL path itself. - Patch is now 1/6 instead of 1/9. tools/perf/arch/powerpc/util/Build | 1 + tools/perf/arch/powerpc/util/auxtrace.c | 84 +++------------------- tools/perf/arch/powerpc/util/vpa-dtl.c | 96 +++++++++++++++++++++++++ tools/perf/util/powerpc-vpadtl.h | 1 + 4 files changed, 106 insertions(+), 76 deletions(-) create mode 100644 tools/perf/arch/powerpc/util/vpa-dtl.c diff --git a/tools/perf/arch/powerpc/util/Build b/tools/perf/arch/powerpc/util/Build index ae928050e07a..7819c8f5af2d 100644 --- a/tools/perf/arch/powerpc/util/Build +++ b/tools/perf/arch/powerpc/util/Build @@ -7,3 +7,4 @@ perf-util-y += evsel.o perf-util-$(CONFIG_LIBDW) += skip-callchain-idx.o perf-util-y += auxtrace.o +perf-util-y += vpa-dtl.o diff --git a/tools/perf/arch/powerpc/util/auxtrace.c b/tools/perf/arch/powerpc/util/auxtrace.c index 4600a1661b4f..e04a0bd61755 100644 --- a/tools/perf/arch/powerpc/util/auxtrace.c +++ b/tools/perf/arch/powerpc/util/auxtrace.c @@ -13,63 +13,12 @@ #include "../../util/auxtrace.h" #include "../../util/powerpc-vpadtl.h" #include "../../util/record.h" -#include // page_size - -#define KiB(x) ((x) * 1024) - -static int -powerpc_vpadtl_recording_options(struct auxtrace_record *ar __maybe_unused, - struct evlist *evlist __maybe_unused, - struct record_opts *opts) -{ - opts->full_auxtrace = true; - - /* - * Set auxtrace_mmap_pages to minimum - * two pages - */ - if (!opts->auxtrace_mmap_pages) { - opts->auxtrace_mmap_pages = KiB(128) / page_size; - if (opts->mmap_pages == UINT_MAX) - opts->mmap_pages = KiB(256) / page_size; - } - - return 0; -} - -static size_t powerpc_vpadtl_info_priv_size(struct auxtrace_record *itr __maybe_unused, - struct evlist *evlist __maybe_unused) -{ - return VPADTL_AUXTRACE_PRIV_SIZE; -} - -static int -powerpc_vpadtl_info_fill(struct auxtrace_record *itr __maybe_unused, - struct perf_session *session __maybe_unused, - struct perf_record_auxtrace_info *auxtrace_info, - size_t priv_size __maybe_unused) -{ - auxtrace_info->type = PERF_AUXTRACE_VPA_DTL; - - return 0; -} - -static void powerpc_vpadtl_free(struct auxtrace_record *itr) -{ - free(itr); -} - -static u64 powerpc_vpadtl_reference(struct auxtrace_record *itr __maybe_unused) -{ - return 0; -} struct auxtrace_record *auxtrace_record__init(struct evlist *evlist, int *err) { - struct auxtrace_record *aux; struct evsel *pos; - int found = 0; + struct evsel *vpa_dtl_evsel = NULL; /* * Set err value to zero here. Any fail later @@ -78,33 +27,16 @@ struct auxtrace_record *auxtrace_record__init(struct evlist *evlist, *err = 0; evlist__for_each_entry(evlist, pos) { - if (strstarts(pos->name, "vpa_dtl")) { - found = 1; + if (pos->name && strstarts(pos->name, "vpa_dtl")) { pos->needs_auxtrace_mmap = true; - break; + /* Remember the first matching VPA DTL event */ + if (!vpa_dtl_evsel) + vpa_dtl_evsel = pos; } } - if (!found) - return NULL; - - /* - * To obtain the auxtrace buffer file descriptor, the auxtrace event - * must come first. - */ - evlist__to_front(pos->evlist, pos); - - aux = zalloc(sizeof(*aux)); - if (aux == NULL) { - pr_debug("aux record is NULL\n"); - *err = -ENOMEM; - return NULL; - } + if (vpa_dtl_evsel) + return vpa_dtl_recording_init(vpa_dtl_evsel, err); - aux->recording_options = powerpc_vpadtl_recording_options; - aux->info_priv_size = powerpc_vpadtl_info_priv_size; - aux->info_fill = powerpc_vpadtl_info_fill; - aux->free = powerpc_vpadtl_free; - aux->reference = powerpc_vpadtl_reference; - return aux; + return NULL; } diff --git a/tools/perf/arch/powerpc/util/vpa-dtl.c b/tools/perf/arch/powerpc/util/vpa-dtl.c new file mode 100644 index 000000000000..2609b88f61d8 --- /dev/null +++ b/tools/perf/arch/powerpc/util/vpa-dtl.c @@ -0,0 +1,96 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * VPA DTL AUX tracing support + */ + +#include +#include +#include +#include +#include +#include +#include +#include "../../util/cpumap.h" +#include "../../util/evsel.h" +#include "../../util/evlist.h" +#include "../../util/session.h" +#include "../../util/util.h" +#include "../../util/debug.h" +#include "../../util/auxtrace.h" +#include "../../util/powerpc-vpadtl.h" +#include "../../util/record.h" +#include // page_size + +#define KiB(x) ((x) * 1024) + +static int +powerpc_vpadtl_recording_options(struct auxtrace_record *ar __maybe_unused, + struct evlist *evlist __maybe_unused, + struct record_opts *opts) +{ + opts->full_auxtrace = true; + + /* + * Set auxtrace_mmap_pages to minimum + * two pages + */ + if (!opts->auxtrace_mmap_pages) { + opts->auxtrace_mmap_pages = KiB(128) / page_size; + if (opts->mmap_pages == UINT_MAX) + opts->mmap_pages = KiB(256) / page_size; + } + + return 0; +} + +static size_t powerpc_vpadtl_info_priv_size(struct auxtrace_record *itr __maybe_unused, + struct evlist *evlist __maybe_unused) +{ + return VPADTL_AUXTRACE_PRIV_SIZE; +} + +static int +powerpc_vpadtl_info_fill(struct auxtrace_record *itr __maybe_unused, + struct perf_session *session __maybe_unused, + struct perf_record_auxtrace_info *auxtrace_info, + size_t priv_size __maybe_unused) +{ + auxtrace_info->type = PERF_AUXTRACE_VPA_DTL; + + return 0; +} + +static void powerpc_vpadtl_free(struct auxtrace_record *itr) +{ + free(itr); +} + +static u64 powerpc_vpadtl_reference(struct auxtrace_record *itr __maybe_unused) +{ + return 0; +} + +struct auxtrace_record *vpa_dtl_recording_init(struct evsel *pos, int *err) +{ + struct auxtrace_record *aux; + + /* + * To obtain the auxtrace buffer file descriptor, the auxtrace event + * must come first. + */ + evlist__to_front(pos->evlist, pos); + + aux = zalloc(sizeof(*aux)); + if (aux == NULL) { + pr_debug("aux record allocation failed (-ENOMEM)\n"); + *err = -ENOMEM; + return NULL; + } + + aux->recording_options = powerpc_vpadtl_recording_options; + aux->info_priv_size = powerpc_vpadtl_info_priv_size; + aux->info_fill = powerpc_vpadtl_info_fill; + aux->free = powerpc_vpadtl_free; + aux->reference = powerpc_vpadtl_reference; + return aux; +} diff --git a/tools/perf/util/powerpc-vpadtl.h b/tools/perf/util/powerpc-vpadtl.h index ca809660b9bb..41e09b17a353 100644 --- a/tools/perf/util/powerpc-vpadtl.h +++ b/tools/perf/util/powerpc-vpadtl.h @@ -20,4 +20,5 @@ struct perf_pmu; int powerpc_vpadtl_process_auxtrace_info(union perf_event *event, struct perf_session *session); +struct auxtrace_record *vpa_dtl_recording_init(struct evsel *pos, int *err); #endif -- 2.43.0