From nobody Thu Dec 18 10:14:58 2025 Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9150750297; Tue, 18 Jun 2024 15:26:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718724376; cv=none; b=b047FzG2nBV3hlE8MA/AyTaUpaiXO7wFgNOEusOBCtftiMrEqUpptfFlDMxaZLyvEV0BnpzHkhxXNmWKyZ0wr8OYmf8pZ6oiqT7GNDVv60OWCC3xRqmiq9RKVWZN3aF9rkmCx26yKa9wyPDzcV5topnbvp1llzdlkcVp53ztCW8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718724376; c=relaxed/simple; bh=/LZWj7oaqNHKukw2mT2SK+cZhXWIt6cUnNRXQtMon/w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Efs4ayJWvgcWOeizZO06lufzAzZcMkUqidlP5wGsPjPdwybFiWxrrC6W3ltRygNMMCTVSdNK0WOS6xX8DWGM/ReXW3I9Ku0UmxlIuogyyMGP5GQvNOEWiTI9u+oVVdijRKeihOLduwDxZYGb0VSrKwcVfBG5I3J6IBRvG9jLH7U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=grffjhKt; arc=none smtp.client-ip=209.85.210.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="grffjhKt" Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-70601bcfddcso1875577b3a.3; Tue, 18 Jun 2024 08:26:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718724374; x=1719329174; darn=vger.kernel.org; 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=kAYmpGaIlWdxgsMDkaG8zIxFictKgFkTjRCndchDMo8=; b=grffjhKt3K9cWoXwpdB9c4xP0nttWUg1FxUTgLSvUaXG+Vbx1ha/D7V/WWqfqDprVY FMTr3+vdrunJGIWMl8jhg0i/FqXtdMoqzS0FDPBlW8NZ7pI3aaJYqA0DUgwpHBh6Mqji BTj2MaAM63UCMOFwjjHOjzAeAhyT6eMwvBZeTDnCsfDmTG6XgdtoiOROuiHsgRv1rFig UideaO5gJFnw6PBdyxgsIMQXxWxTfYYVExkHxy/JPbUHuWtzrcem0J2k4Hkl/lZGOtUv 8OA5zOYyw2n933CeIlmdd8ShJ2onz7XektvvE8HrNmo5zSYb7iwQcN8ExudQlHkZv91P ompw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718724374; x=1719329174; 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=kAYmpGaIlWdxgsMDkaG8zIxFictKgFkTjRCndchDMo8=; b=QyZV+XqbF0ywqkPM51FpGnqnVUvMBqdobIN4A5tqq0KreXlei5QOq4obUC3dOqFCYI 2ObAgoScU+WvcgfKVY647kBt9O0GKhM36y5YETX24z2MxIgWFI6m72MWfzPztMcHeLK4 4zrrSkPD9tJnlhPZ+XPmCvosNJHlZ1WAe3GNwPTRy9VuvAqX/++Tf9tCcU8CHkosBe74 gd66k/+KH62JM8JM6kl4g3M+q5UcXIleU1+8PR6dXOCz78CKrUEsgkDDU4ONv9wkFpSf EbNYcSZ2ypPIperRSzUpjNZDx/9MMB6h7j/YI84KezRcDd4a0DkBVXuXa/MRKrxThmVu OQHA== X-Forwarded-Encrypted: i=1; AJvYcCULi5SMux30joYaUjReuuk38LnhNwvs0VSBdo2w/VgxuX/TYKKl591pBhsTonibLkpSEBEbBa6OI2Utov+Xzyep79cVNdjJR7fAHJXUMs7dQZrqXrynGLMtnh6j9Cw5Qoj7AbAI8zf3/M6wtOtkGw== X-Gm-Message-State: AOJu0Yw6aa0h6AWhzEWbFkXyuJS6s9ULbrs+yKOCD53qVHSxAH8A4aNC B28xNhiAUwzOzdw9/e4iG13gIVId3QnDqn9FUFcdQwry98n0nEth X-Google-Smtp-Source: AGHT+IGkM7DnndQXgAtODlowuyYwTHvCr4q/l5V2eHDIK7XPTEPbs0PcrlVOUjzAFMcnFjnJDe6HIQ== X-Received: by 2002:aa7:8604:0:b0:704:2362:335b with SMTP id d2e1a72fcca58-705d71e3436mr12403230b3a.26.1718724373799; Tue, 18 Jun 2024 08:26:13 -0700 (PDT) Received: from localhost.localdomain ([120.229.49.95]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-705ccb4265esm9071388b3a.116.2024.06.18.08.26.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jun 2024 08:26:13 -0700 (PDT) From: Howard Chu To: Arnaldo Carvalho de Melo Cc: Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , Kan Liang , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Subject: [PATCH v1 4/5] perf trace: Filter enum arguments with enum names Date: Tue, 18 Jun 2024 23:26:51 +0800 Message-ID: <20240618152652.3446472-5-howardchu95@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240618152652.3446472-1-howardchu95@gmail.com> References: <20240618152652.3446472-1-howardchu95@gmail.com> 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 Content-Type: text/plain; charset="utf-8" Before: perf $ ./perf trace -e timer:hrtimer_start --filter=3D'mode!=3DHRTIMER_MODE= _ABS_PINNED_HARD' --max-events=3D1 No resolver (strtoul) for "mode" in "timer:hrtimer_start", can't set filter= "(mode!=3DHRTIMER_MODE_ABS_PINNED_HARD) && (common_pid !=3D 281988)" After: perf $ ./perf trace -e timer:hrtimer_start --filter=3D'mode!=3DHRTIMER_MODE= _ABS_PINNED_HARD' --max-events=3D1 0.000 :0/0 timer:hrtimer_start(hrtimer: 0xffff9498a6ca5f18, function: = 0xffffffffa77a5be0, expires: 12351248764875, softexpires: 12351248764875, m= ode: HRTIMER_MODE_ABS) && and ||: perf $ ./perf trace -e timer:hrtimer_start --filter=3D'mode !=3D HRTIMER_MO= DE_ABS_PINNED_HARD && mode !=3D HRTIMER_MODE_ABS' --max-events=3D1 0.000 Hyprland/534 timer:hrtimer_start(hrtimer: 0xffff9497801a84d0, fu= nction: 0xffffffffc04cdbe0, expires: 12639434638458, softexpires: 126394336= 38458, mode: HRTIMER_MODE_REL) perf $ ./perf trace -e timer:hrtimer_start --filter=3D'mode =3D=3D HRTIMER_= MODE_REL || mode =3D=3D HRTIMER_MODE_PINNED' --max-events=3D1 0.000 ldlck-test/60639 timer:hrtimer_start(hrtimer: 0xffffb16404ee7bf8= , function: 0xffffffffa7790420, expires: 12772614418016, softexpires: 12772= 614368016, mode: HRTIMER_MODE_REL) Switching it up, using both enum name and integer value(--filter=3D'mode = =3D=3D HRTIMER_MODE_ABS_PINNED_HARD || mode =3D=3D 0'): perf $ ./perf trace -e timer:hrtimer_start --filter=3D'mode =3D=3D HRTIMER_= MODE_ABS_PINNED_HARD || mode =3D=3D 0' --max-events=3D3 0.000 :0/0 timer:hrtimer_start(hrtimer: 0xffff9498a6ca5f18, function: = 0xffffffffa77a5be0, expires: 12601748739825, softexpires: 12601748739825, m= ode: HRTIMER_MODE_ABS_PINNED_HARD) 0.036 :0/0 timer:hrtimer_start(hrtimer: 0xffff9498a6ca5f18, function: = 0xffffffffa77a5be0, expires: 12518758748124, softexpires: 12518758748124, m= ode: HRTIMER_MODE_ABS_PINNED_HARD) 0.172 tmux: server/41881 timer:hrtimer_start(hrtimer: 0xffffb164081e78= 38, function: 0xffffffffa7790420, expires: 12518768255836, softexpires: 125= 18768205836, mode: HRTIMER_MODE_ABS) P.S. perf $ pahole hrtimer_mode enum hrtimer_mode { HRTIMER_MODE_ABS =3D 0, HRTIMER_MODE_REL =3D 1, HRTIMER_MODE_PINNED =3D 2, HRTIMER_MODE_SOFT =3D 4, HRTIMER_MODE_HARD =3D 8, HRTIMER_MODE_ABS_PINNED =3D 2, HRTIMER_MODE_REL_PINNED =3D 3, HRTIMER_MODE_ABS_SOFT =3D 4, HRTIMER_MODE_REL_SOFT =3D 5, HRTIMER_MODE_ABS_PINNED_SOFT =3D 6, HRTIMER_MODE_REL_PINNED_SOFT =3D 7, HRTIMER_MODE_ABS_HARD =3D 8, HRTIMER_MODE_REL_HARD =3D 9, HRTIMER_MODE_ABS_PINNED_HARD =3D 10, HRTIMER_MODE_REL_PINNED_HARD =3D 11, }; Tested-by: Arnaldo Carvalho de Melo Suggested-by: Arnaldo Carvalho de Melo Reviewed-by: Arnaldo Carvalho de Melo Signed-off-by: Howard Chu --- tools/perf/builtin-trace.c | 89 ++++++++++++++++++++++++++++++++------ 1 file changed, 76 insertions(+), 13 deletions(-) diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index bd16679fb4c0..1148c3edee97 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -904,11 +904,36 @@ static size_t syscall_arg__scnprintf_getrandom_flags(= char *bf, size_t size, .strtoul =3D STUL_STRARRAY_FLAGS, \ .parm =3D &strarray__##array, } =20 -static int btf_enum_find_entry(struct btf *btf, char *type, struct syscall= _arg_fmt *arg_fmt) +#define SCA_GETRANDOM_FLAGS syscall_arg__scnprintf_getrandom_flags + +static const struct btf_type *btf_find_type(struct btf *btf, char *type) { const struct btf_type *bt; + int id =3D btf__find_by_name(btf, type); + + if (id < 0) + return NULL; + + bt =3D btf__type_by_id(btf, id); + if (bt =3D=3D NULL) + return NULL; + + return bt; +} + +struct btf_parm { + struct btf *btf; + char *type; +}; + +static bool syscall_arg__strtoul_btf_enum(char *bf, size_t size, struct sy= scall_arg *arg, u64 *val) +{ + struct btf_parm *bparm =3D arg->parm; + struct btf *btf =3D bparm->btf; + char *type =3D bparm->type; char enum_prefix[][16] =3D { "enum", "const enum" }, *ep; - int id; + struct btf_enum *be; + const struct btf_type *bt; size_t i; =20 for (i =3D 0; i < ARRAY_SIZE(enum_prefix); i++) { @@ -917,11 +942,38 @@ static int btf_enum_find_entry(struct btf *btf, char = *type, struct syscall_arg_f type +=3D strlen(ep) + 1; } =20 - id =3D btf__find_by_name(btf, type); - if (id < 0) - return -1; + bt =3D btf_find_type(btf, type); + if (bt =3D=3D NULL) + return false; =20 - bt =3D btf__type_by_id(btf, id); + for (be =3D btf_enum(bt), i =3D 0; i < btf_vlen(bt); ++i, ++be) { + const char *name =3D btf__name_by_offset(btf, be->name_off); + int max_len =3D max(size, strlen(name)); + + if (strncmp(name, bf, max_len) =3D=3D 0) { + *val =3D be->val; + return true; + } + } + + return false; +} + +#define STUL_BTF_ENUM syscall_arg__strtoul_btf_enum + +static int btf_enum_find_entry(struct btf *btf, char *type, struct syscall= _arg_fmt *arg_fmt) +{ + char enum_prefix[][16] =3D { "enum", "const enum" }, *ep; + const struct btf_type *bt; + size_t i; + + for (i =3D 0; i < ARRAY_SIZE(enum_prefix); i++) { + ep =3D enum_prefix[i]; + if (strlen(type) > strlen(ep) + 1 && strstarts(type, ep)) + type +=3D strlen(ep) + 1; + } + + bt =3D btf_find_type(btf, type); if (bt =3D=3D NULL) return -1; =20 @@ -1850,6 +1902,7 @@ syscall_arg_fmt__init_array(struct syscall_arg_fmt *a= rg, struct tep_format_field arg->scnprintf =3D SCA_FD; } else if (strstr(field->type, "enum") && use_btf !=3D NULL) { *use_btf =3D arg->is_enum =3D true; + arg->strtoul =3D STUL_BTF_ENUM; } else { const struct syscall_arg_fmt *fmt =3D syscall_arg_fmt__find_by_name(field->name); @@ -3776,7 +3829,8 @@ static int ordered_events__deliver_event(struct order= ed_events *oe, return __trace__deliver_event(trace, event->event); } =20 -static struct syscall_arg_fmt *evsel__find_syscall_arg_fmt_by_name(struct = evsel *evsel, char *arg) +static struct syscall_arg_fmt *evsel__find_syscall_arg_fmt_by_name(struct = evsel *evsel, char *arg, + char **type) { struct tep_format_field *field; struct syscall_arg_fmt *fmt =3D __evsel__syscall_arg_fmt(evsel); @@ -3785,8 +3839,10 @@ static struct syscall_arg_fmt *evsel__find_syscall_a= rg_fmt_by_name(struct evsel return NULL; =20 for (field =3D evsel->tp_format->format.fields; field; field =3D field->n= ext, ++fmt) - if (strcmp(field->name, arg) =3D=3D 0) + if (strcmp(field->name, arg) =3D=3D 0) { + *type =3D field->type; return fmt; + } =20 return NULL; } @@ -3824,14 +3880,14 @@ static int trace__expand_filter(struct trace *trace= __maybe_unused, struct evsel struct syscall_arg_fmt *fmt; int left_size =3D tok - left, right_size =3D right_end - right; - char arg[128]; + char arg[128], *type; =20 while (isspace(left[left_size - 1])) --left_size; =20 scnprintf(arg, sizeof(arg), "%.*s", left_size, left); =20 - fmt =3D evsel__find_syscall_arg_fmt_by_name(evsel, arg); + fmt =3D evsel__find_syscall_arg_fmt_by_name(evsel, arg, &type); if (fmt =3D=3D NULL) { pr_err("\"%s\" not found in \"%s\", can't set filter \"%s\"\n", arg, evsel->name, evsel->filter); @@ -3843,9 +3899,16 @@ static int trace__expand_filter(struct trace *trace = __maybe_unused, struct evsel =20 if (fmt->strtoul) { u64 val; - struct syscall_arg syscall_arg =3D { - .parm =3D fmt->parm, - }; + struct syscall_arg syscall_arg; + struct btf_parm bparm; + + if (fmt->is_enum) { + bparm.btf =3D trace->btf; + bparm.type =3D type; + syscall_arg.parm =3D &bparm; + } else { + syscall_arg.parm =3D fmt->parm; + } =20 if (fmt->strtoul(right, right_size, &syscall_arg, &val)) { char *n, expansion[19]; --=20 2.45.2