From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4C19EC43217 for ; Mon, 21 Nov 2022 07:53:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229964AbiKUHxB (ORCPT ); Mon, 21 Nov 2022 02:53:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59114 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229892AbiKUHwv (ORCPT ); Mon, 21 Nov 2022 02:52:51 -0500 Received: from mail-pg1-x530.google.com (mail-pg1-x530.google.com [IPv6:2607:f8b0:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6F1EF13F9F for ; Sun, 20 Nov 2022 23:52:50 -0800 (PST) Received: by mail-pg1-x530.google.com with SMTP id q1so10411478pgl.11 for ; Sun, 20 Nov 2022 23:52:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GrdNyxmUm7/OayqjPE/oVvrwFtOOqyIl/5p9OFU6Fr0=; b=wBPQtACIGMRQsLzX5Ws93cxwnKmhVj2dH6vEvL+TNjBZDoDwssZA7uu1BLzXIx6eYP RTaocauylMpuPsr4c3/sA3yQZrEucPI16eXN3jlWPzI4BIALq12/mQzJKdPs1cbTVkig 7kNh8Fms7yQu1xYBkPuDNatC/92hoz+IIiFILeRWbxSGWeJgR1v/zwNi2WfJ3Khs3Ym5 +cpK8IIzUD4tiK1xNAaZq7tCw7GGXfUsZwTToIuVEI6CjRJJfhz1fmKXcAyLYA9fi8fK 2L3/yXsmz8mTx+vx/IaZbuU2owjVBi3A0L3McfcGzPQsv8uEgFGWH0DSQpPE2SMJ3kwf Yl0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GrdNyxmUm7/OayqjPE/oVvrwFtOOqyIl/5p9OFU6Fr0=; b=U5wIwQWWgy8m7amE2waYhl8RR9MhPGLqCMh1WYcfK3nzR2d98IS29u7BfvQ6dHqFXh FUROsSrsOriiiFjQSUOL2MtZ9g6AoVg/XLYKJCxYgT5hiFadBF+x24i4d1xD8Q53k8cU UTtoKfDp96Pny59koLT8Ubf1AjTrZ9kLFV2jViIS4cIsgatNxjKI6nBeuklNH6Vjrx0g UUOHyiGkcpsjiYDvCLoiv+OI7+bDgQ6B5oKAU9oizF+HHhN3dTecD/041vwNLJvUABTV UmOtqLbKI+g0J1CO0h0LgkVVthG/2Ge+9ICbybACSBRElkoUqCh7rqk2gR9t3v0cb9Ar roLQ== X-Gm-Message-State: ANoB5pn3s2QvVhhxbIs1ZOI5FK+0/6U/5hrgxJFgJ0dLjNbk/Cgla1FV 9dxeddKIyQa6Aw9dGTuwWcl140ZvDwVYhkSG X-Google-Smtp-Source: AA0mqf7ssZ3/XYk4nyVkHfrpaMxtbI8X4/OIUEO94ZfPqyrSioHxfy8AcjHOdcE8IV1JZC+7khrzcg== X-Received: by 2002:a63:f808:0:b0:426:9c23:97da with SMTP id n8-20020a63f808000000b004269c2397damr17469280pgh.2.1669017169852; Sun, 20 Nov 2022 23:52:49 -0800 (PST) Received: from leoy-huangpu.lan (211-75-219-204.hinet-ip.hinet.net. [211.75.219.204]) by smtp.gmail.com with ESMTPSA id h31-20020a63575f000000b0047696938911sm7006277pgm.74.2022.11.20.23.52.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 23:52:49 -0800 (PST) From: Leo Yan To: Arnaldo Carvalho de Melo , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , linux-perf-users@vger.kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Leo Yan Subject: [PATCH v1 1/5] perf trace: Use macro RAW_SYSCALL_ARGS_NUM to replace number Date: Mon, 21 Nov 2022 07:52:33 +0000 Message-Id: <20221121075237.127706-2-leo.yan@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221121075237.127706-1-leo.yan@linaro.org> References: <20221121075237.127706-1-leo.yan@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org This patch defines a macro RAW_SYSCALL_ARGS_NUM to replace the open coded number '6'. Signed-off-by: Leo Yan --- tools/perf/builtin-trace.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index 3257da5cad23..22008a31684b 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -88,6 +88,8 @@ # define F_LINUX_SPECIFIC_BASE 1024 #endif +#define RAW_SYSCALL_ARGS_NUM 6 + /* * strtoul: Go from a string to a value, i.e. for msr: MSR_FS_BASE to 0xc0000100 */ @@ -108,7 +110,7 @@ struct syscall_fmt { const char *sys_enter, *sys_exit; } bpf_prog_name; - struct syscall_arg_fmt arg[6]; + struct syscall_arg_fmt arg[RAW_SYSCALL_ARGS_NUM]; u8 nr_args; bool errpid; bool timeout; @@ -1229,7 +1231,7 @@ struct syscall { */ struct bpf_map_syscall_entry { bool enabled; - u16 string_args_len[6]; + u16 string_args_len[RAW_SYSCALL_ARGS_NUM]; }; /* @@ -1661,7 +1663,7 @@ static int syscall__alloc_arg_fmts(struct syscall *sc, int nr_args) { int idx; - if (nr_args == 6 && sc->fmt && sc->fmt->nr_args != 0) + if (nr_args == RAW_SYSCALL_ARGS_NUM && sc->fmt && sc->fmt->nr_args != 0) nr_args = sc->fmt->nr_args; sc->arg_fmt = calloc(nr_args, sizeof(*sc->arg_fmt)); @@ -1812,7 +1814,8 @@ static int trace__read_syscall_info(struct trace *trace, int id) sc->tp_format = trace_event__tp_format("syscalls", tp_name); } - if (syscall__alloc_arg_fmts(sc, IS_ERR(sc->tp_format) ? 6 : sc->tp_format->format.nr_fields)) + if (syscall__alloc_arg_fmts(sc, IS_ERR(sc->tp_format) ? + RAW_SYSCALL_ARGS_NUM : sc->tp_format->format.nr_fields)) return -ENOMEM; if (IS_ERR(sc->tp_format)) -- 2.34.1