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 6ADC23195FC; Tue, 17 Mar 2026 11:07:02 +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=1773745623; cv=none; b=I614HMgRHyyRHg1MZybv+VSiFvfUuZ/hkfMGOZMo+Pgwc5Yc1FBI/j3gCUTeiIw5vFV0/QRZHF5IkEHmMQnrfbKV/znFXmOFvBUjVm97GFkcLAGqn9okWqe7Rbh8iDkac/VzjIeEZRuma0PwWCrEWbW4afxg6m1DVjRDpCNkwH0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773745623; c=relaxed/simple; bh=I76HU+oxLBYmviFr73dxuXs5JTIVDH0ff9gP7TpRSg0=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=l6LElHuXR2107fTflxKVkQNafBjVeyR/hXRTox4w/mPj4BctwaBTaqHXIvoHlAGeMHq7QlHeWfC5gi4eoeRn4LGXOyP/EuCI+eBbWla9+3WFXuVtTb5QP4FVOX4uVHo51AmoPI4C8PNfQypPLKHJ1YBJOlAKAWlAx7TxUvBu/3s= 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=ckZpT3Ye; 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="ckZpT3Ye" Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62H7rmUb578436; Tue, 17 Mar 2026 11:06:57 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=FrSHcVs1FrsJyQaJTSRWHPtVY6nhFMU0AL8TwOU13 Wo=; b=ckZpT3YeSneqkHMKVx94Ia5ayXMpbsIiQgQjr6GEEvf4RuD+wO0sOs+GY 4Sw+3D0l+QX2rHVt8W31GdbDB8xeM9WiIq1DZdXBKWf5HQsAXRx6EgIATsL0/tq+ hhU0uF9ZzGUVXkwf+yB3xTUk83yUGRck6A8IUeW6e60HUAHCHfzRik18/64Iat1W grOsUq1s0zWAQwsBIpzasuO5uhOGqx71RRVNAsRp1nnnpt0PA0DCfGVRWbowpzIP e0ePd08u/5mEFweMwvXfz/bDUFX34HatI9kqmkntjr2ZZDGS40le9atYwlbgfxnJ jqs+sGE9xG0C0WxWjrH5UnRDoTfSA== Received: from ppma12.dal12v.mail.ibm.com (dc.9e.1632.ip4.static.sl-reverse.com [50.22.158.220]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4cvw3hv0a3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 17 Mar 2026 11:06:57 +0000 (GMT) Received: from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 62HAw1XY004559; Tue, 17 Mar 2026 11:06:56 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 4cwj0s8wrp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 17 Mar 2026 11:06:56 +0000 Received: from smtpav07.fra02v.mail.ibm.com (smtpav07.fra02v.mail.ibm.com [10.20.54.106]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 62HB6q8I27984166 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 17 Mar 2026 11:06:52 GMT Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id BC2B72004B; Tue, 17 Mar 2026 11:06:52 +0000 (GMT) Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 92FB420043; Tue, 17 Mar 2026 11:06:52 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav07.fra02v.mail.ibm.com (Postfix) with ESMTP; Tue, 17 Mar 2026 11:06:52 +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 v3] perf record: Add support for arch_sdt_arg_parse_op() on s390 Date: Tue, 17 Mar 2026 12:06:41 +0100 Message-ID: <20260317110641.39975-1-tmricht@linux.ibm.com> X-Mailer: git-send-email 2.51.0 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-GUID: 8pIsgrBhhanGy1vG0emibv2ZV5tmmiE5 X-Proofpoint-ORIG-GUID: 5G02-VFyStHpxCYew-1IspnPftyO3WrO X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzE3MDA5NCBTYWx0ZWRfXyqGkvNL0pOY2 PdX5xFSbq4JdB7gAu87a2lUwiyoqk7MkT7CJapfVZA0XCSe32j7G0fGH6GGa8tV58bBVRt3nM7x 9z93/ISgJuJUcTuq6vKeCfNOqTWqpSxQQQrS8UHpASdvSqnwB8l94p7cZWJgLvt01iYJDO+hR6k zhjiVLtXZJlIp+XqyxiA0S9eR4af7USbYtrWsoyz6OsqqzObHcVKVM9Usmgu1WTzYaEExGR1Sqv whSIkAoFu+xqE6L2FBOtjKH2Lr8fzjsGo6Je/GTb1pzsFgWNSdaqtU3sMFm4bAoIYsgeO0s5HTJ uLPTm0YTbvs+NqA3RkuzpUFIGbAy0edXKUVBF0yiq8bnNaEttzzN/4NkUH0JZR8rS4pQZBlGPgx 6Mthje5C+55efbSrP54NuXFnhN1ajpAlc2/6ROhE7QtBeR7iOejw+i2c6pfox8EXrmt5ZryMJKC lPSf5VZSoGFzNn0o4CQ== X-Authority-Analysis: v=2.4 cv=Hf8ZjyE8 c=1 sm=1 tr=0 ts=69b935d1 cx=c_pps a=bLidbwmWQ0KltjZqbj+ezA==:117 a=bLidbwmWQ0KltjZqbj+ezA==:17 a=Yq5XynenixoA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=Y2IxJ9c9Rs8Kov3niI8_:22 a=VnNF1IyMAAAA:8 a=QyXUC8HyAAAA:8 a=1XWaLZrsAAAA:8 a=9_JGaw_69MBna2B2lCEA:9 a=O8hF6Hzn-FEA:10 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-17_01,2026-03-16_06,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 malwarescore=0 lowpriorityscore=0 impostorscore=0 bulkscore=0 suspectscore=0 priorityscore=1501 spamscore=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-2603170094 commit e5e66adfe45a6 ("perf regs: Remove __weak attributive arch_sdt_arg_parse_op() function") removes arch_sdt_arg_parse_op() functions and s390 support is lost. 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 --- .../perf/util/perf-regs-arch/perf_regs_s390.c | 89 +++++++++++++++++++ tools/perf/util/perf_regs.c | 3 + tools/perf/util/perf_regs.h | 1 + 3 files changed, 93 insertions(+) diff --git a/tools/perf/util/perf-regs-arch/perf_regs_s390.c b/tools/perf/util/perf-regs-arch/perf_regs_s390.c index c61df24edf0f..2aa70eb23311 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 +#include +#include #include "../perf_regs.h" #include "../../arch/s390/include/perf_regs.h" +#include "debug.h" + +#include +#include uint64_t __perf_reg_mask_s390(bool intr __maybe_unused) { @@ -95,3 +101,86 @@ 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]|r1[0-5])\\)$" +static regex_t sdt_op_regex1, sdt_op_regex2; + +static int sdt_init_op_regex(void) +{ + static int initialized; + int ret = 0; + + if (initialized) + return 0; + + ret = regcomp(&sdt_op_regex1, SDT_OP_REGEX1, REG_EXTENDED); + if (ret) + goto error; + initialized = 1; + + ret = regcomp(&sdt_op_regex2, SDT_OP_REGEX2, REG_EXTENDED); + if (ret) + goto free_regex1; + initialized = 2; + + return 0; + +free_regex1: + regfree(&sdt_op_regex1); +error: + pr_debug4("Regex compilation error, initialized %d\n", initialized); + 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]; + unsigned long i; + + *new_op = NULL; + ret = sdt_init_op_regex(); + if (ret) + return -EINVAL; + + if (!regexec(&sdt_op_regex1, old_op, 3, rm, 0)) { + /* Extract %rX */ + new_len = 2; /* % NULL */ + new_len += (int)(rm[1].rm_eo - rm[1].rm_so); + *new_op = 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 if (!regexec(&sdt_op_regex2, old_op, ARRAY_SIZE(rm), rm, 0)) { + /* Extract #(%rX) */ + new_len = 4; /* (%)NULL */ + for (i = 1; i < ARRAY_SIZE(rm) && rm[i].rm_so != -1; ++i) + new_len += (int)(rm[i].rm_eo - rm[i].rm_so); + *new_op = zalloc(new_len); + if (!*new_op) + return -ENOMEM; + + scnprintf(*new_op, new_len, "%.*s(%.*s)", + (int)(rm[1].rm_eo - rm[1].rm_so), old_op + rm[1].rm_so, + (int)(rm[2].rm_eo - rm[2].rm_so), old_op + rm[2].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_op, char **new_op) case EM_X86_64: ret = __perf_sdt_arg_parse_op_x86(old_op, new_op); break; + case EM_S390: + ret = __perf_sdt_arg_parse_op_s390(old_op, new_op); + break; default: pr_debug("Unknown ELF machine %d, standard arguments parse will be skipped.\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); int __perf_sdt_arg_parse_op_x86(char *old_op, char **new_op); uint64_t __perf_reg_mask_x86(bool intr); -- 2.53.0