From nobody Mon Apr 6 18:23:10 2026 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (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 40084377553; Wed, 18 Mar 2026 11:34:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773833680; cv=none; b=h/e710LmP2CBlfo/16asP7Iv505K8MPd3rFM65k7G/coHlNlQItgqVM/xLlW8hEAYSCHbtxsQh9Io2SFtWT2QXORYLB/DCIcgBKO0gyKc6tvBrzc/8RP0xLUCE8E5QucX7Z6ZQeHIJA+jK1Y+IJBVBd3F63tK/65lUktW1kaT/Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773833680; c=relaxed/simple; bh=QhJpKRfjPIh6QkF0VEG5UuB6VPtX5UPYQjMK0FZ8z1E=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=FOig1DkPH4k6XU6L5xO352anIFadOAu334KizctMoeaPQNtNSmho3HvzEoyCbtmtVafmCQq/XEd3Xz+yl8Dmp0p6evanhAdmCoFCQAirn6aEKhhT3RomfU89yfkwwINd++7elOPjDQl3Bw7O8Iy2gRaIuvwd8Sfi/DWlEASF3z4= 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=VH4mwz0C; arc=none smtp.client-ip=148.163.156.1 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="VH4mwz0C" Received: from pps.filterd (m0360083.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62I5JdmG972322; Wed, 18 Mar 2026 11:34:35 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:message-id:mime-version :subject:to; s=pp1; bh=c5NAkJOel0CQz9GiraukIpr7jN8BLihcBSWIDAPAt 18=; b=VH4mwz0CHhrsqdF2dXZiPti5BmOx565AgaSW/bElajFIiR1jlTrfny+rD j47oxOnDa3DFvPVdLGpVRHr/Dc58LgLK2zhbdu3LYjNRdbnvG1QyuYE5Wy9zOgDJ 8kqQYmCJ1IReGvrzxDg6/QevVrcp6KCmd6pDcIGLcT73hsuADGK0kl0BjJ7vN67M qEI795sn/g1teTmFPEa3B4xAaLt4SrCJfUG7wb3d9YSJoiNWV4V5LDBLJAY6wIf2 XiLA9p+68gK6TvrpD7IPBQNAFcd2dLKvGNXEDzjuTyOhOb7kWhQzJSF1PQj+TDBC P1QZXpOMG+zG6JPpS/OMtKJ57sTfg== Received: from ppma11.dal12v.mail.ibm.com (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4cvy64sqvy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 18 Mar 2026 11:34:35 +0000 (GMT) Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 62IAsHUO028501; Wed, 18 Mar 2026 11:34:34 GMT Received: from smtprelay03.fra02v.mail.ibm.com ([9.218.2.224]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 4cwmq1dh2m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 18 Mar 2026 11:34:34 +0000 Received: from smtpav02.fra02v.mail.ibm.com (smtpav02.fra02v.mail.ibm.com [10.20.54.101]) by smtprelay03.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 62IBYUZk48234928 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 18 Mar 2026 11:34:30 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id AE6CA20043; Wed, 18 Mar 2026 11:34:30 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7457D20040; Wed, 18 Mar 2026 11:34:30 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav02.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 18 Mar 2026 11:34:30 +0000 (GMT) From: Thomas Richter To: linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, linux-perf-users@vger.kernel.org, acme@kernel.org, namhyung@kernel.org, irogers@google.com, dapeng1.mi@linux.intel.com Cc: agordeev@linux.ibm.com, gor@linux.ibm.com, sumanthk@linux.ibm.com, hca@linux.ibm.com, japo@linux.ibm.com, Thomas Richter Subject: [PATCH v4] perf record: Add support for arch_sdt_arg_parse_op() on s390 Date: Wed, 18 Mar 2026 12:34:16 +0100 Message-ID: <20260318113416.2287472-1-tmricht@linux.ibm.com> X-Mailer: git-send-email 2.51.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-ORIG-GUID: vW3ukWvlYZxzYC-ithtPRGLMS_iXzBB9 X-Proofpoint-GUID: D6L3IAGeUo5dP8b46if4ETcDj0WAATG2 X-Authority-Analysis: v=2.4 cv=KYnfcAYD c=1 sm=1 tr=0 ts=69ba8dcb cx=c_pps a=aDMHemPKRhS1OARIsFnwRA==:117 a=aDMHemPKRhS1OARIsFnwRA==:17 a=Yq5XynenixoA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=iQ6ETzBq9ecOQQE5vZCe:22 a=VnNF1IyMAAAA:8 a=QyXUC8HyAAAA:8 a=1XWaLZrsAAAA:8 a=3tPfgpBZzwENxpOU27sA:9 a=O8hF6Hzn-FEA:10 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzE4MDA5NSBTYWx0ZWRfX8jxrfrkf8OAT yky0BL5UoBjm7rG8B7Jtw3Pj/Eezn3VgIDk0YDFkGEz1Hxrhg8tuvTMU6aOhbrkRA1NMoRUlMM2 sKr24N2d029LLTTv1XKI+wlVoGechAyYZPTKldLE8wWlO01an1hq6pxDytP0sNsqvauC//LaLv2 YFLSqzUQWxm8Zm1j+hYY+JqZp4s0RQtwkUFtEb8wfwEGe0sI+TJYW/yzJnDSWbnvpqRacsUaXre 7eIG+c2VeVFWM05i/PMJ02YVwfPNOS64AjyhzHMomaix6M2ytp1xzSOl83qIcOMV4O0MlaMJZez Ewo7LP1YBcUZtsNh1gLahkxIi2xB+LjqXy0Ni2Kesu21pk32pfJmmKFAZSIZ5tSZXig1X16g2i2 PnSiaCi+zbNWvAN2whQwkQNzchtfFITA4DwNdGwox9/wdSglWPEfwe+oY27Mml71YpenHFzRyS6 1c7cjLTxtOTyg4Bb7EQ== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-18_01,2026-03-17_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 lowpriorityscore=0 priorityscore=1501 suspectscore=0 bulkscore=0 spamscore=0 impostorscore=0 malwarescore=0 adultscore=0 clxscore=1015 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2603050001 definitions=main-2603180095 Content-Type: text/plain; charset="utf-8" V4: Add comments from Ian and Sashiko: Reset variable initialized to zero on error Rework regular expression and reduce to one case. V3: Add comments from Ian Print register expression without leading 'r' (wrong). V2: Add comments from Sumanth Koirkkar commit e5e66adfe45a6 ("perf regs: Remove __weak attributive arch_sdt_arg_pa= rse_op() function") removes arch_sdt_arg_parse_op() functions and reveals missing s390 support. The following warning is printed: Unknown ELF machine 22, standard arguments parse will be skipped. ELF machine 22 is the EM_S390 host. This happens with command # ./perf record -v -- stress-ng -t 1s --matrix 0 on a z/VM system when the event is not specified. Add s390 specific __perf_sdt_arg_parse_op_s390() function to support -architecture calls to arch_sdt_arg_parse_op() for s390. The warning disappears. Signed-off-by: Thomas Richter Cc: Dapeng Mi Cc: Ian Rogers Tested-by: Jan Polensky Reviewed-by: Ian Rogers --- .../perf/util/perf-regs-arch/perf_regs_s390.c | 77 +++++++++++++++++++ tools/perf/util/perf_regs.c | 3 + tools/perf/util/perf_regs.h | 1 + 3 files changed, 81 insertions(+) diff --git a/tools/perf/util/perf-regs-arch/perf_regs_s390.c b/tools/perf/u= til/perf-regs-arch/perf_regs_s390.c index c61df24edf0f..9d34549be477 100644 --- a/tools/perf/util/perf-regs-arch/perf_regs_s390.c +++ b/tools/perf/util/perf-regs-arch/perf_regs_s390.c @@ -1,7 +1,13 @@ // SPDX-License-Identifier: GPL-2.0 =20 +#include +#include #include "../perf_regs.h" #include "../../arch/s390/include/perf_regs.h" +#include "debug.h" + +#include +#include =20 uint64_t __perf_reg_mask_s390(bool intr __maybe_unused) { @@ -95,3 +101,74 @@ uint64_t __perf_reg_sp_s390(void) { return PERF_REG_S390_R15; } + +/* %rXX */ +#define SDT_OP_REGEX1 "^(%r([0-9]|1[0-5]))$" +/* +-###(%rXX) */ +#define SDT_OP_REGEX2 "^([+-]?[0-9]+\\(%r([0-9]|1[0-5])\\))$" +static regex_t sdt_op_regex1, sdt_op_regex2; + +static int sdt_init_op_regex(void) +{ + static int initialized; + int ret =3D 0; + + if (initialized) + return 0; + + ret =3D regcomp(&sdt_op_regex1, SDT_OP_REGEX1, REG_EXTENDED); + if (ret) + goto error; + initialized =3D 1; + + ret =3D regcomp(&sdt_op_regex2, SDT_OP_REGEX2, REG_EXTENDED); + if (ret) + goto free_regex1; + initialized =3D 2; + + return 0; + +free_regex1: + regfree(&sdt_op_regex1); +error: + pr_debug4("Regex compilation error, initialized %d\n", initialized); + initialized =3D 0; + return ret; +} + +/* + * Parse OP and convert it into uprobe format, which is, +/-NUM(%gprREG). + * Possible variants of OP are: + * Format Example + * ------------------------- + * NUM(%rREG) 48(%r1) + * -NUM(%rREG) -48(%r1) + * %rREG %r1 + */ +int __perf_sdt_arg_parse_op_s390(char *old_op, char **new_op) +{ + int ret, new_len; + regmatch_t rm[6]; + + *new_op =3D NULL; + ret =3D sdt_init_op_regex(); + if (ret) + return -EINVAL; + + if (!regexec(&sdt_op_regex1, old_op, ARRAY_SIZE(rm), rm, 0) || + !regexec(&sdt_op_regex2, old_op, ARRAY_SIZE(rm), rm, 0)) { + new_len =3D 1; /* NULL byte */ + new_len +=3D (int)(rm[1].rm_eo - rm[1].rm_so); + *new_op =3D zalloc(new_len); + if (!*new_op) + return -ENOMEM; + + scnprintf(*new_op, new_len, "%.*s", + (int)(rm[1].rm_eo - rm[1].rm_so), old_op + rm[1].rm_so); + } else { + pr_debug4("Skipping unsupported SDT argument: %s\n", old_op); + return SDT_ARG_SKIP; + } + + return SDT_ARG_VALID; +} diff --git a/tools/perf/util/perf_regs.c b/tools/perf/util/perf_regs.c index 5b8f34beb24e..f52b0e1f7fc7 100644 --- a/tools/perf/util/perf_regs.c +++ b/tools/perf/util/perf_regs.c @@ -23,6 +23,9 @@ int perf_sdt_arg_parse_op(uint16_t e_machine, char *old_o= p, char **new_op) case EM_X86_64: ret =3D __perf_sdt_arg_parse_op_x86(old_op, new_op); break; + case EM_S390: + ret =3D __perf_sdt_arg_parse_op_s390(old_op, new_op); + break; default: pr_debug("Unknown ELF machine %d, standard arguments parse will be skipp= ed.\n", e_machine); diff --git a/tools/perf/util/perf_regs.h b/tools/perf/util/perf_regs.h index 7c04700bf837..573f0d1dfe04 100644 --- a/tools/perf/util/perf_regs.h +++ b/tools/perf/util/perf_regs.h @@ -62,6 +62,7 @@ uint64_t __perf_reg_mask_s390(bool intr); const char *__perf_reg_name_s390(int id); uint64_t __perf_reg_ip_s390(void); uint64_t __perf_reg_sp_s390(void); +int __perf_sdt_arg_parse_op_s390(char *old_op, char **new_op); =20 int __perf_sdt_arg_parse_op_x86(char *old_op, char **new_op); uint64_t __perf_reg_mask_x86(bool intr); --=20 2.53.0