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 B8436C4332F for ; Wed, 30 Mar 2022 12:17:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347190AbiC3MTC (ORCPT ); Wed, 30 Mar 2022 08:19:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38034 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344509AbiC3L4N (ORCPT ); Wed, 30 Mar 2022 07:56:13 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 277592B24A; Wed, 30 Mar 2022 04:54:06 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 55ADBB81C37; Wed, 30 Mar 2022 11:54:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6C5D0C34116; Wed, 30 Mar 2022 11:54:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648641244; bh=fbafnmH+HMXr9Vfi2LqmWZ6ZH9LpSsOiiv5763Uqj3Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FX42o8Hb1V+jKmyTZPIDGtzin0jcMKVUeoxH2lNoOTBor0Fu5pRKRBJKXl2bUXS01 1qgk3Vx8KL+C9nSeNPqfdF8Kx5qbmrHJQRvZLrPQNfV4tewv9U28MJssS/z8DzWlpg X/ZBoa1IgSNUl+QiTlj5ebvAWsQfpUD5fTUEnzpOWSTl+SDnoDxPg569TFSI+oPveN L7hQsYiKW/vshKM+QKmWGTGkwPH2zYF57vnK7tgiy2Qg/x+O/9JI40jCAKl4lCBIKO UZwdPXgvEEdQSbamEf1VVg/jJtlWgQz7ttk18PILn3ZfMdSU4dZSNe6B2mP72fQlW3 DpTEkBXDbjm6A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Steven Rostedt (Google)" , Ritesh Harjani , Sasha Levin , mingo@redhat.com Subject: [PATCH AUTOSEL 4.14 18/20] tracing: Have TRACE_DEFINE_ENUM affect trace event types as well Date: Wed, 30 Mar 2022 07:53:34 -0400 Message-Id: <20220330115336.1672930-18-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220330115336.1672930-1-sashal@kernel.org> References: <20220330115336.1672930-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Steven Rostedt (Google)" [ Upstream commit b3bc8547d3be60898818885f5bf22d0a62e2eb48 ] The macro TRACE_DEFINE_ENUM is used to convert enums in the kernel to their actual value when they are exported to user space via the trace event format file. Currently only the enums in the "print fmt" (TP_printk in the TRACE_EVENT macro) have the enums converted. But the enums can be used to denote array size: field:unsigned int fc_ineligible_rc[EXT4_FC_REASON_MAX]; offset:12; size:36; signed:0; The EXT4_FC_REASON_MAX has no meaning to userspace but it needs to know that information to know how to parse the array. Have the array indexes also be parsed as well. Link: https://lore.kernel.org/all/cover.1646922487.git.riteshh@linux.ibm.com/ Reported-by: Ritesh Harjani Tested-by: Ritesh Harjani Signed-off-by: Steven Rostedt (Google) Signed-off-by: Sasha Levin --- kernel/trace/trace_events.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index 1285ef6e2d14..7c2d4ff7a51f 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@ -2209,6 +2209,33 @@ static void update_event_printk(struct trace_event_call *call, } } +static void update_event_fields(struct trace_event_call *call, + struct trace_eval_map *map) +{ + struct ftrace_event_field *field; + struct list_head *head; + char *ptr; + int len = strlen(map->eval_string); + + head = trace_get_fields(call); + list_for_each_entry(field, head, link) { + ptr = strchr(field->type, '['); + if (!ptr) + continue; + ptr++; + + if (!isalpha(*ptr) && *ptr != '_') + continue; + + if (strncmp(map->eval_string, ptr, len) != 0) + continue; + + ptr = eval_replace(ptr, map, len); + /* enum/sizeof string smaller than value */ + WARN_ON_ONCE(!ptr); + } +} + void trace_event_eval_update(struct trace_eval_map **map, int len) { struct trace_event_call *call, *p; @@ -2244,6 +2271,7 @@ void trace_event_eval_update(struct trace_eval_map **map, int len) first = false; } update_event_printk(call, map[i]); + update_event_fields(call, map[i]); } } } -- 2.34.1