From nobody Sun Feb 8 20:32:44 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 2E82F7F7D0 for ; Fri, 23 Feb 2024 14:17:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708697829; cv=none; b=m/MxUbH6kQk22Lfjad/FBjIn4iVX3PDuEJb9p/j4Imq7y8cKe6JRNcMD5PGjgreMjkiKhpoYrr0KuQ4VDiRuEZ4HUaRu4nV7qy/sjl+Tran3mU4idsQtDmxRHjeqDmKM+YVCEsdU98XlG1RrpF0dsTzw5GhAkpaveEUi+ajU4J0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708697829; c=relaxed/simple; bh=7sp6LKfmVAODTBRGZ6mT00DB66BAm8reYLZmF3tLaL0=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=XkkANpFP2Rj/ER4qKke60Ek8eIDtWOYNgCcM//ibUG9T33O8FQZevZwoV9t4vf7Zc1IdhFy56VgmatrNyYGp6BdMLk6O19JcwuDxq1GR7BpcEkELw6m+Ki1s5TRvH38gbn1GCJsGgFzRIYQ8pENcpKR0yLniWaTOlwfeMsLuxm8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id D77C7C43390; Fri, 23 Feb 2024 14:17:08 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.97) (envelope-from ) id 1rdWOD-000000077LG-34wV; Fri, 23 Feb 2024 09:19:01 -0500 Message-ID: <20240223141901.595795628@goodmis.org> User-Agent: quilt/0.67 Date: Fri, 23 Feb 2024 09:18:39 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Beau Belgrave Subject: [for-next][PATCH 01/13] tracing/user_events: Prepare find/delete for same name events References: <20240223141838.985298316@goodmis.org> 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" From: Beau Belgrave The current code for finding and deleting events assumes that there will never be cases when user_events are registered with the same name, but different formats. Scenarios exist where programs want to use the same name but have different formats. An example is multiple versions of a program running side-by-side using the same event name, but with updated formats in each version. This change does not yet allow for multi-format events. If user_events are registered with the same name but different arguments the programs see the same return values as before. This change simply makes it possible to easily accommodate for this. Update find_user_event() to take in argument parameters and register flags to accommodate future multi-format event scenarios. Have find validate argument matching and return error pointers to cover when an existing event has the same name but different format. Update callers to handle error pointer logic. Move delete_user_event() to use hash walking directly now that find_user_event() has changed. Delete all events found that match the register name, stop if an error occurs and report back to the user. Update user_fields_match() to cover list_empty() scenarios now that find_user_event() uses it directly. This makes the logic consistent across several callsites. Link: https://lore.kernel.org/linux-trace-kernel/20240222001807.1463-2-beau= b@linux.microsoft.com Signed-off-by: Beau Belgrave Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_events_user.c | 107 +++++++++++++++++-------------- 1 file changed, 59 insertions(+), 48 deletions(-) diff --git a/kernel/trace/trace_events_user.c b/kernel/trace/trace_events_u= ser.c index e76f5e1efdf2..fce5ed5fec50 100644 --- a/kernel/trace/trace_events_user.c +++ b/kernel/trace/trace_events_user.c @@ -202,6 +202,8 @@ static struct user_event_mm *user_event_mm_get(struct u= ser_event_mm *mm); static struct user_event_mm *user_event_mm_get_all(struct user_event *user= ); static void user_event_mm_put(struct user_event_mm *mm); static int destroy_user_event(struct user_event *user); +static bool user_fields_match(struct user_event *user, int argc, + const char **argv); =20 static u32 user_event_key(char *name) { @@ -1493,17 +1495,24 @@ static int destroy_user_event(struct user_event *us= er) } =20 static struct user_event *find_user_event(struct user_event_group *group, - char *name, u32 *outkey) + char *name, int argc, const char **argv, + u32 flags, u32 *outkey) { struct user_event *user; u32 key =3D user_event_key(name); =20 *outkey =3D key; =20 - hash_for_each_possible(group->register_table, user, node, key) - if (!strcmp(EVENT_NAME(user), name)) + hash_for_each_possible(group->register_table, user, node, key) { + if (strcmp(EVENT_NAME(user), name)) + continue; + + if (user_fields_match(user, argc, argv)) return user_event_get(user); =20 + return ERR_PTR(-EADDRINUSE); + } + return NULL; } =20 @@ -1860,6 +1869,9 @@ static bool user_fields_match(struct user_event *user= , int argc, struct list_head *head =3D &user->fields; int i =3D 0; =20 + if (argc =3D=3D 0) + return list_empty(head); + list_for_each_entry_reverse(field, head, link) { if (!user_field_match(field, argc, argv, &i)) return false; @@ -1880,10 +1892,8 @@ static bool user_event_match(const char *system, con= st char *event, match =3D strcmp(EVENT_NAME(user), event) =3D=3D 0 && (!system || strcmp(system, USER_EVENTS_SYSTEM) =3D=3D 0); =20 - if (match && argc > 0) + if (match) match =3D user_fields_match(user, argc, argv); - else if (match && argc =3D=3D 0) - match =3D list_empty(&user->fields); =20 return match; } @@ -1922,11 +1932,11 @@ static int user_event_parse(struct user_event_group= *group, char *name, char *args, char *flags, struct user_event **newuser, int reg_flags) { - int ret; - u32 key; struct user_event *user; + char **argv =3D NULL; int argc =3D 0; - char **argv; + int ret; + u32 key; =20 /* Currently don't support any text based flags */ if (flags !=3D NULL) @@ -1935,41 +1945,34 @@ static int user_event_parse(struct user_event_group= *group, char *name, if (!user_event_capable(reg_flags)) return -EPERM; =20 + if (args) { + argv =3D argv_split(GFP_KERNEL, args, &argc); + + if (!argv) + return -ENOMEM; + } + /* Prevent dyn_event from racing */ mutex_lock(&event_mutex); - user =3D find_user_event(group, name, &key); + user =3D find_user_event(group, name, argc, (const char **)argv, + reg_flags, &key); mutex_unlock(&event_mutex); =20 - if (user) { - if (args) { - argv =3D argv_split(GFP_KERNEL, args, &argc); - if (!argv) { - ret =3D -ENOMEM; - goto error; - } + if (argv) + argv_free(argv); =20 - ret =3D user_fields_match(user, argc, (const char **)argv); - argv_free(argv); - - } else - ret =3D list_empty(&user->fields); - - if (ret) { - *newuser =3D user; - /* - * Name is allocated by caller, free it since it already exists. - * Caller only worries about failure cases for freeing. - */ - kfree(name); - } else { - ret =3D -EADDRINUSE; - goto error; - } + if (IS_ERR(user)) + return PTR_ERR(user); + + if (user) { + *newuser =3D user; + /* + * Name is allocated by caller, free it since it already exists. + * Caller only worries about failure cases for freeing. + */ + kfree(name); =20 return 0; -error: - user_event_put(user, false); - return ret; } =20 user =3D kzalloc(sizeof(*user), GFP_KERNEL_ACCOUNT); @@ -2052,25 +2055,33 @@ static int user_event_parse(struct user_event_group= *group, char *name, } =20 /* - * Deletes a previously created event if it is no longer being used. + * Deletes previously created events if they are no longer being used. */ static int delete_user_event(struct user_event_group *group, char *name) { - u32 key; - struct user_event *user =3D find_user_event(group, name, &key); + struct user_event *user; + struct hlist_node *tmp; + u32 key =3D user_event_key(name); + int ret =3D -ENOENT; =20 - if (!user) - return -ENOENT; + /* Attempt to delete all event(s) with the name passed in */ + hash_for_each_possible_safe(group->register_table, user, tmp, node, key) { + if (strcmp(EVENT_NAME(user), name)) + continue; =20 - user_event_put(user, true); + if (!user_event_last_ref(user)) + return -EBUSY; =20 - if (!user_event_last_ref(user)) - return -EBUSY; + if (!user_event_capable(user->reg_flags)) + return -EPERM; =20 - if (!user_event_capable(user->reg_flags)) - return -EPERM; + ret =3D destroy_user_event(user); =20 - return destroy_user_event(user); + if (ret) + goto out; + } +out: + return ret; } =20 /* --=20 2.43.0 From nobody Sun Feb 8 20:32:44 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 7803980629 for ; Fri, 23 Feb 2024 14:17:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708697829; cv=none; b=Khibupd50Wfx5tnQclMsE7r1+/H8h4icIFaxFHm12h/36eotlZcdDmJ+QVaOhEMAchEr4huXcMBP+Cc+rGVe0HNBBryQ0ksHvLVE/LC6fg+Gv1PsZXTo303/tCgnaHN0/9LqKtkZ6pcVFiA5mKpoe/kiHJqcXcWgXy5A6zfpH8U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708697829; c=relaxed/simple; bh=Up9eFZpr8dIJaujb9WoqM/K2VjYXnomqdkuQX/lsnUg=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=lrq7HYeTTLNx0yLUvqE6/SDFNpLcAIXz4K+6IGjOhvDgLk/H9ceKxFGx+plhPfcgoKtOkVW6MJd6rmRqvpiDloHYtRsOCGtJLS5pLxnWOs+dtaDaa7UUQpXDXUZ4svMJk1S74QCfYr+n4PZfsJWmO9LK4LkTcf0GkQzJ0l1JUCE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id EA51FC433C7; Fri, 23 Feb 2024 14:17:08 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.97) (envelope-from ) id 1rdWOD-000000077Lk-3kWI; Fri, 23 Feb 2024 09:19:01 -0500 Message-ID: <20240223141901.755071412@goodmis.org> User-Agent: quilt/0.67 Date: Fri, 23 Feb 2024 09:18:40 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Beau Belgrave Subject: [for-next][PATCH 02/13] tracing/user_events: Introduce multi-format events References: <20240223141838.985298316@goodmis.org> 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" From: Beau Belgrave Currently user_events supports 1 event with the same name and must have the exact same format when referenced by multiple programs. This opens an opportunity for malicious or poorly thought through programs to create events that others use with different formats. Another scenario is user programs wishing to use the same event name but add more fields later when the software updates. Various versions of a program may be running side-by-side, which is prevented by the current single format requirement. Add a new register flag (USER_EVENT_REG_MULTI_FORMAT) which indicates the user program wishes to use the same user_event name, but may have several different formats of the event. When this flag is used, create the underlying tracepoint backing the user_event with a unique name per-version of the format. It's important that existing ABI users do not get this logic automatically, even if one of the multi format events matches the format. This ensures existing programs that create events and assume the tracepoint name will match exactly continue to work as expected. Add logic to only check multi-format events with other multi-format events and single-format events to only check single-format events during find. Change system name of the multi-format event tracepoint to ensure that multi-format events are isolated completely from single-format events. This prevents single-format names from conflicting with multi-format events if they end with the same suffix as the multi-format events. Add a register_name (reg_name) to the user_event struct which allows for split naming of events. We now have the name that was used to register within user_events as well as the unique name for the tracepoint. Upon registering events ensure matches based on first the reg_name, followed by the fields and format of the event. This allows for multiple events with the same registered name to have different formats. The underlying tracepoint will have a unique name in the format of {reg_name}.{unique_id}. For example, if both "test u32 value" and "test u64 value" are used with the USER_EVENT_REG_MULTI_FORMAT the system would have 2 unique tracepoints. The dynamic_events file would then show the following: u:test u64 count u:test u32 count The actual tracepoint names look like this: test.0 test.1 Both would be under the new user_events_multi system name to prevent the older ABI from being used to squat on multi-formatted events and block their use. Deleting events via "!u:test u64 count" would only delete the first tracepoint that matched that format. When the delete ABI is used all events with the same name will be attempted to be deleted. If per-version deletion is required, user programs should either not use persistent events or delete them via dynamic_events. Link: https://lore.kernel.org/linux-trace-kernel/20240222001807.1463-3-beau= b@linux.microsoft.com Signed-off-by: Beau Belgrave Signed-off-by: Steven Rostedt (Google) --- include/uapi/linux/user_events.h | 6 +- kernel/trace/trace_events_user.c | 102 +++++++++++++++++++++++++++---- 2 files changed, 95 insertions(+), 13 deletions(-) diff --git a/include/uapi/linux/user_events.h b/include/uapi/linux/user_eve= nts.h index f74f3aedd49c..a03de03dccbc 100644 --- a/include/uapi/linux/user_events.h +++ b/include/uapi/linux/user_events.h @@ -12,6 +12,7 @@ #include =20 #define USER_EVENTS_SYSTEM "user_events" +#define USER_EVENTS_MULTI_SYSTEM "user_events_multi" #define USER_EVENTS_PREFIX "u:" =20 /* Create dynamic location entry within a 32-bit value */ @@ -22,8 +23,11 @@ enum user_reg_flag { /* Event will not delete upon last reference closing */ USER_EVENT_REG_PERSIST =3D 1U << 0, =20 + /* Event will be allowed to have multiple formats */ + USER_EVENT_REG_MULTI_FORMAT =3D 1U << 1, + /* This value or above is currently non-ABI */ - USER_EVENT_REG_MAX =3D 1U << 1, + USER_EVENT_REG_MAX =3D 1U << 2, }; =20 /* diff --git a/kernel/trace/trace_events_user.c b/kernel/trace/trace_events_u= ser.c index fce5ed5fec50..70d428c394b6 100644 --- a/kernel/trace/trace_events_user.c +++ b/kernel/trace/trace_events_user.c @@ -34,7 +34,8 @@ =20 /* Limit how long of an event name plus args within the subsystem. */ #define MAX_EVENT_DESC 512 -#define EVENT_NAME(user_event) ((user_event)->tracepoint.name) +#define EVENT_NAME(user_event) ((user_event)->reg_name) +#define EVENT_TP_NAME(user_event) ((user_event)->tracepoint.name) #define MAX_FIELD_ARRAY_SIZE 1024 =20 /* @@ -54,10 +55,13 @@ * allows isolation for events by various means. */ struct user_event_group { - char *system_name; - struct hlist_node node; - struct mutex reg_mutex; + char *system_name; + char *system_multi_name; + struct hlist_node node; + struct mutex reg_mutex; DECLARE_HASHTABLE(register_table, 8); + /* ID that moves forward within the group for multi-event names */ + u64 multi_id; }; =20 /* Group for init_user_ns mapping, top-most group */ @@ -78,6 +82,7 @@ static unsigned int current_user_events; */ struct user_event { struct user_event_group *group; + char *reg_name; struct tracepoint tracepoint; struct trace_event_call call; struct trace_event_class class; @@ -127,6 +132,8 @@ struct user_event_enabler { =20 #define ENABLE_BIT(e) ((int)((e)->values & ENABLE_VAL_BIT_MASK)) =20 +#define EVENT_MULTI_FORMAT(f) ((f) & USER_EVENT_REG_MULTI_FORMAT) + /* Used for asynchronous faulting in of pages */ struct user_event_enabler_fault { struct work_struct work; @@ -330,6 +337,7 @@ static void user_event_put(struct user_event *user, boo= l locked) static void user_event_group_destroy(struct user_event_group *group) { kfree(group->system_name); + kfree(group->system_multi_name); kfree(group); } =20 @@ -348,6 +356,11 @@ static char *user_event_group_system_name(void) return system_name; } =20 +static char *user_event_group_system_multi_name(void) +{ + return kstrdup(USER_EVENTS_MULTI_SYSTEM, GFP_KERNEL); +} + static struct user_event_group *current_user_event_group(void) { return init_group; @@ -367,6 +380,11 @@ static struct user_event_group *user_event_group_creat= e(void) if (!group->system_name) goto error; =20 + group->system_multi_name =3D user_event_group_system_multi_name(); + + if (!group->system_multi_name) + goto error; + mutex_init(&group->reg_mutex); hash_init(group->register_table); =20 @@ -1482,6 +1500,11 @@ static int destroy_user_event(struct user_event *use= r) hash_del(&user->node); =20 user_event_destroy_validators(user); + + /* If we have different names, both must be freed */ + if (EVENT_NAME(user) !=3D EVENT_TP_NAME(user)) + kfree(EVENT_TP_NAME(user)); + kfree(user->call.print_fmt); kfree(EVENT_NAME(user)); kfree(user); @@ -1504,12 +1527,24 @@ static struct user_event *find_user_event(struct us= er_event_group *group, *outkey =3D key; =20 hash_for_each_possible(group->register_table, user, node, key) { + /* + * Single-format events shouldn't return multi-format + * events. Callers expect the underlying tracepoint to match + * the name exactly in these cases. Only check like-formats. + */ + if (EVENT_MULTI_FORMAT(flags) !=3D EVENT_MULTI_FORMAT(user->reg_flags)) + continue; + if (strcmp(EVENT_NAME(user), name)) continue; =20 if (user_fields_match(user, argc, argv)) return user_event_get(user); =20 + /* Scan others if this is a multi-format event */ + if (EVENT_MULTI_FORMAT(flags)) + continue; + return ERR_PTR(-EADDRINUSE); } =20 @@ -1889,8 +1924,12 @@ static bool user_event_match(const char *system, con= st char *event, struct user_event *user =3D container_of(ev, struct user_event, devent); bool match; =20 - match =3D strcmp(EVENT_NAME(user), event) =3D=3D 0 && - (!system || strcmp(system, USER_EVENTS_SYSTEM) =3D=3D 0); + match =3D strcmp(EVENT_NAME(user), event) =3D=3D 0; + + if (match && system) { + match =3D strcmp(system, user->group->system_name) =3D=3D 0 || + strcmp(system, user->group->system_multi_name) =3D=3D 0; + } =20 if (match) match =3D user_fields_match(user, argc, argv); @@ -1923,6 +1962,33 @@ static int user_event_trace_register(struct user_eve= nt *user) return ret; } =20 +static int user_event_set_tp_name(struct user_event *user) +{ + lockdep_assert_held(&user->group->reg_mutex); + + if (EVENT_MULTI_FORMAT(user->reg_flags)) { + char *multi_name; + + multi_name =3D kasprintf(GFP_KERNEL_ACCOUNT, "%s.%llx", + user->reg_name, user->group->multi_id); + + if (!multi_name) + return -ENOMEM; + + user->call.name =3D multi_name; + user->tracepoint.name =3D multi_name; + + /* Inc to ensure unique multi-event name next time */ + user->group->multi_id++; + } else { + /* Non Multi-format uses register name */ + user->call.name =3D user->reg_name; + user->tracepoint.name =3D user->reg_name; + } + + return 0; +} + /* * Parses the event name, arguments and flags then registers if successful. * The name buffer lifetime is owned by this method for success cases only. @@ -1985,7 +2051,13 @@ static int user_event_parse(struct user_event_group = *group, char *name, INIT_LIST_HEAD(&user->validators); =20 user->group =3D group; - user->tracepoint.name =3D name; + user->reg_name =3D name; + user->reg_flags =3D reg_flags; + + ret =3D user_event_set_tp_name(user); + + if (ret) + goto put_user; =20 ret =3D user_event_parse_fields(user, args); =20 @@ -1999,11 +2071,14 @@ static int user_event_parse(struct user_event_group= *group, char *name, =20 user->call.data =3D user; user->call.class =3D &user->class; - user->call.name =3D name; user->call.flags =3D TRACE_EVENT_FL_TRACEPOINT; user->call.tp =3D &user->tracepoint; user->call.event.funcs =3D &user_event_funcs; - user->class.system =3D group->system_name; + + if (EVENT_MULTI_FORMAT(user->reg_flags)) + user->class.system =3D group->system_multi_name; + else + user->class.system =3D group->system_name; =20 user->class.fields_array =3D user_event_fields_array; user->class.get_fields =3D user_event_get_fields; @@ -2025,8 +2100,6 @@ static int user_event_parse(struct user_event_group *= group, char *name, if (ret) goto put_user_lock; =20 - user->reg_flags =3D reg_flags; - if (user->reg_flags & USER_EVENT_REG_PERSIST) { /* Ensure we track self ref and caller ref (2) */ refcount_set(&user->refcnt, 2); @@ -2050,6 +2123,11 @@ static int user_event_parse(struct user_event_group = *group, char *name, user_event_destroy_fields(user); user_event_destroy_validators(user); kfree(user->call.print_fmt); + + /* Caller frees reg_name on error, but not multi-name */ + if (EVENT_NAME(user) !=3D EVENT_TP_NAME(user)) + kfree(EVENT_TP_NAME(user)); + kfree(user); return ret; } @@ -2639,7 +2717,7 @@ static int user_seq_show(struct seq_file *m, void *p) hash_for_each(group->register_table, i, user, node) { status =3D user->status; =20 - seq_printf(m, "%s", EVENT_NAME(user)); + seq_printf(m, "%s", EVENT_TP_NAME(user)); =20 if (status !=3D 0) seq_puts(m, " #"); --=20 2.43.0 From nobody Sun Feb 8 20:32:44 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 8C08780BE4 for ; Fri, 23 Feb 2024 14:17:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708697829; cv=none; b=bgVXDzuq/bn5Vlqv4nhwfe8Z+DhczZDs6jye5TXTfn5spokfLJXAlkTnrvnri4LgLV+xRH0UwTs+ASotOXPec70KT6IR3bm4ZlucCyLOKoCEpxIr3B81CdKpfW8JNn62Qds4/QFBX7PQoWn+Iw9lU8yasKKRYNxuhmH0vf7PIe4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708697829; c=relaxed/simple; bh=UDxACU48a6ODn38IN/prkOxVlk0VavU6n+0bJ/Ta2QQ=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=kI4BenmqArMo4B95MXCsVLymdFQM+J3kNvHwr/2ot8MOh1EG84VnGp/Odo5dzyWCpx1l4+P+6g6J8QnMW7ZTvArhu8JOZfri3n44zhHBqs0FWo5Gxua9mWpVFrtG/b4nEdPFv5Zf1tz78xsWqV56xq7GRnc7lnC1TaS2FMcgEGM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2CFFDC433B1; Fri, 23 Feb 2024 14:17:09 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.97) (envelope-from ) id 1rdWOE-000000077ME-0DHa; Fri, 23 Feb 2024 09:19:02 -0500 Message-ID: <20240223141901.913156672@goodmis.org> User-Agent: quilt/0.67 Date: Fri, 23 Feb 2024 09:18:41 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Beau Belgrave Subject: [for-next][PATCH 03/13] selftests/user_events: Test multi-format events References: <20240223141838.985298316@goodmis.org> 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" From: Beau Belgrave User_events now has multi-format events which allow for the same register name, but with different formats. When this occurs, different tracepoints are created with unique names. Add a new test that ensures the same name can be used for two different formats. Ensure they are isolated from each other and that name and arg matching still works if yet another register comes in with the same format as one of the two. Link: https://lore.kernel.org/linux-trace-kernel/20240222001807.1463-4-beau= b@linux.microsoft.com Signed-off-by: Beau Belgrave Signed-off-by: Steven Rostedt (Google) --- .../testing/selftests/user_events/abi_test.c | 134 ++++++++++++++++++ 1 file changed, 134 insertions(+) diff --git a/tools/testing/selftests/user_events/abi_test.c b/tools/testing= /selftests/user_events/abi_test.c index cef1ff1af223..7288a05136ba 100644 --- a/tools/testing/selftests/user_events/abi_test.c +++ b/tools/testing/selftests/user_events/abi_test.c @@ -16,6 +16,8 @@ #include #include #include +#include +#include #include =20 #include "../kselftest_harness.h" @@ -23,6 +25,62 @@ =20 const char *data_file =3D "/sys/kernel/tracing/user_events_data"; const char *enable_file =3D "/sys/kernel/tracing/events/user_events/__abi_= event/enable"; +const char *multi_dir_glob =3D "/sys/kernel/tracing/events/user_events_mul= ti/__abi_event.*"; + +static int wait_for_delete(char *dir) +{ + struct stat buf; + int i; + + for (i =3D 0; i < 10000; ++i) { + if (stat(dir, &buf) =3D=3D -1 && errno =3D=3D ENOENT) + return 0; + + usleep(1000); + } + + return -1; +} + +static int find_multi_event_dir(char *unique_field, char *out_dir, int dir= _len) +{ + char path[256]; + glob_t buf; + int i, ret; + + ret =3D glob(multi_dir_glob, GLOB_ONLYDIR, NULL, &buf); + + if (ret) + return -1; + + ret =3D -1; + + for (i =3D 0; i < buf.gl_pathc; ++i) { + FILE *fp; + + snprintf(path, sizeof(path), "%s/format", buf.gl_pathv[i]); + fp =3D fopen(path, "r"); + + if (!fp) + continue; + + while (fgets(path, sizeof(path), fp) !=3D NULL) { + if (strstr(path, unique_field)) { + fclose(fp); + /* strscpy is not available, use snprintf */ + snprintf(out_dir, dir_len, "%s", buf.gl_pathv[i]); + ret =3D 0; + goto out; + } + } + + fclose(fp); + } +out: + globfree(&buf); + + return ret; +} =20 static bool event_exists(void) { @@ -74,6 +132,39 @@ static int event_delete(void) return ret; } =20 +static int reg_enable_multi(void *enable, int size, int bit, int flags, + char *args) +{ + struct user_reg reg =3D {0}; + char full_args[512] =3D {0}; + int fd =3D open(data_file, O_RDWR); + int len; + int ret; + + if (fd < 0) + return -1; + + len =3D snprintf(full_args, sizeof(full_args), "__abi_event %s", args); + + if (len > sizeof(full_args)) { + ret =3D -E2BIG; + goto out; + } + + reg.size =3D sizeof(reg); + reg.name_args =3D (__u64)full_args; + reg.flags =3D USER_EVENT_REG_MULTI_FORMAT | flags; + reg.enable_bit =3D bit; + reg.enable_addr =3D (__u64)enable; + reg.enable_size =3D size; + + ret =3D ioctl(fd, DIAG_IOCSREG, ®); +out: + close(fd); + + return ret; +} + static int reg_enable_flags(void *enable, int size, int bit, int flags) { struct user_reg reg =3D {0}; @@ -207,6 +298,49 @@ TEST_F(user, bit_sizes) { ASSERT_NE(0, reg_enable(&self->check, 128, 0)); } =20 +TEST_F(user, multi_format) { + char first_dir[256]; + char second_dir[256]; + struct stat buf; + + /* Multiple formats for the same name should work */ + ASSERT_EQ(0, reg_enable_multi(&self->check, sizeof(int), 0, + 0, "u32 multi_first")); + + ASSERT_EQ(0, reg_enable_multi(&self->check, sizeof(int), 1, + 0, "u64 multi_second")); + + /* Same name with same format should also work */ + ASSERT_EQ(0, reg_enable_multi(&self->check, sizeof(int), 2, + 0, "u64 multi_second")); + + ASSERT_EQ(0, find_multi_event_dir("multi_first", + first_dir, sizeof(first_dir))); + + ASSERT_EQ(0, find_multi_event_dir("multi_second", + second_dir, sizeof(second_dir))); + + /* Should not be found in the same dir */ + ASSERT_NE(0, strcmp(first_dir, second_dir)); + + /* First dir should still exist */ + ASSERT_EQ(0, stat(first_dir, &buf)); + + /* Disabling first register should remove first dir */ + ASSERT_EQ(0, reg_disable(&self->check, 0)); + ASSERT_EQ(0, wait_for_delete(first_dir)); + + /* Second dir should still exist */ + ASSERT_EQ(0, stat(second_dir, &buf)); + + /* Disabling second register should remove second dir */ + ASSERT_EQ(0, reg_disable(&self->check, 1)); + /* Ensure bit 1 and 2 are tied together, should not delete yet */ + ASSERT_EQ(0, stat(second_dir, &buf)); + ASSERT_EQ(0, reg_disable(&self->check, 2)); + ASSERT_EQ(0, wait_for_delete(second_dir)); +} + TEST_F(user, forks) { int i; =20 --=20 2.43.0 From nobody Sun Feb 8 20:32:44 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 8BE2180BE3 for ; Fri, 23 Feb 2024 14:17:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708697829; cv=none; b=OCrSnxER5Aai7PvPmlnHKPeOGoDPkRUs/2dTszJ+WSnz42hjj6FmPn7IY3bs0PI/t4lnwTb8a6NU0WEN4f3t54rbOdngnVWzWZv0F6qNKbwCXVQkf/98Js4x2Ycne3Ihjrc/j15pcbSMOpfRwCHlJFY3QMoATXDtpoAY8q6T8xI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708697829; c=relaxed/simple; bh=nKcWAWVRnB8xYWN/oRCb/6ODPrdVBFq4pB5n9Mp0FBY=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=cZDCSNvcI0DrMUbxldcgcyKfzhULlPsmnTHOxmc0+ccTWnkoiHjw7D0env7jmKAeJjl7lMmr1Op6Z4W6OFoVFqsWFk7g33xJJPXc6VNba1crGedmYA/2FXXBPUEkCFg1PYlxQO20BXPfQQCZ5BzT16vTzT8+MCwRxgGFzf4hys0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4B0AEC43390; Fri, 23 Feb 2024 14:17:09 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.97) (envelope-from ) id 1rdWOE-000000077Mi-0sLR; Fri, 23 Feb 2024 09:19:02 -0500 Message-ID: <20240223141902.070244243@goodmis.org> User-Agent: quilt/0.67 Date: Fri, 23 Feb 2024 09:18:42 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Beau Belgrave Subject: [for-next][PATCH 04/13] tracing/user_events: Document multi-format flag References: <20240223141838.985298316@goodmis.org> 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" From: Beau Belgrave User programs can now ask user_events to handle the synchronization of multiple different formats for an event with the same name via the new USER_EVENT_REG_MULTI_FORMAT flag. Add a section for USER_EVENT_REG_MULTI_FORMAT that explains the intended purpose and caveats of using it. Explain how deletion works in these cases and how to use /sys/kernel/tracing/dynamic_events for per-version deletion. Link: https://lore.kernel.org/linux-trace-kernel/20240222001807.1463-5-beau= b@linux.microsoft.com Signed-off-by: Beau Belgrave Signed-off-by: Steven Rostedt (Google) --- Documentation/trace/user_events.rst | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/Documentation/trace/user_events.rst b/Documentation/trace/user= _events.rst index d8f12442aaa6..1d5a7626e6a6 100644 --- a/Documentation/trace/user_events.rst +++ b/Documentation/trace/user_events.rst @@ -92,6 +92,24 @@ The following flags are currently supported. process closes or unregisters the event. Requires CAP_PERFMON otherwise -EPERM is returned. =20 ++ USER_EVENT_REG_MULTI_FORMAT: The event can contain multiple formats. This + allows programs to prevent themselves from being blocked when their event + format changes and they wish to use the same name. When this flag is use= d the + tracepoint name will be in the new format of "name.unique_id" vs the old= er + format of "name". A tracepoint will be created for each unique pair of n= ame + and format. This means if several processes use the same name and format, + they will use the same tracepoint. If yet another process uses the same = name, + but a different format than the other processes, it will use a different + tracepoint with a new unique id. Recording programs need to scan tracefs= for + the various different formats of the event name they are interested in + recording. The system name of the tracepoint will also use "user_events_= multi" + instead of "user_events". This prevents single-format event names confli= cting + with any multi-format event names within tracefs. The unique_id is outpu= t as + a hex string. Recording programs should ensure the tracepoint name start= s with + the event name they registered and has a suffix that starts with . and o= nly + has hex characters. For example to find all versions of the event "test"= you + can use the regex "^test\.[0-9a-fA-F]+$". + Upon successful registration the following is set. =20 + write_index: The index to use for this file descriptor that represents t= his @@ -106,6 +124,9 @@ or perf record -e user_events:[name] when attaching/rec= ording. **NOTE:** The event subsystem name by default is "user_events". Callers sh= ould not assume it will always be "user_events". Operators reserve the right in= the future to change the subsystem name per-process to accommodate event isola= tion. +In addition if the USER_EVENT_REG_MULTI_FORMAT flag is used the tracepoint= name +will have a unique id appended to it and the system name will be +"user_events_multi" as described above. =20 Command Format ^^^^^^^^^^^^^^ @@ -156,7 +177,11 @@ to request deletes than the one used for registration = due to this. to the event. If programs do not want auto-delete, they must use the USER_EVENT_REG_PERSIST flag when registering the event. Once that flag is = used the event exists until DIAG_IOCSDEL is invoked. Both register and delete o= f an -event that persists requires CAP_PERFMON, otherwise -EPERM is returned. +event that persists requires CAP_PERFMON, otherwise -EPERM is returned. Wh= en +there are multiple formats of the same event name, all events with the same +name will be attempted to be deleted. If only a specific version is wanted= to +be deleted then the /sys/kernel/tracing/dynamic_events file should be used= for +that specific format of the event. =20 Unregistering ------------- --=20 2.43.0 From nobody Sun Feb 8 20:32:44 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 BE60C81AAD for ; Fri, 23 Feb 2024 14:17:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708697829; cv=none; b=SXCWr/5YIhaJDgPxC3J8fcVPjgLdgdGR1tNmL+/CrC2ygPXtSbF7yc+h/sXQ/U2vGHVKFb/oRi+VX0QTqqAkGmd/XSKsg37oT5XpLJqaQjvwEsy+Rj/sbPm9uJj4NPByoP2xY6RvaaxjJLDuIvkCEGN90CZWCeGdC+NTxYFuyek= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708697829; c=relaxed/simple; bh=9g5M/uPrmYOSZQw75hsZotn5/TImjS5Rj6S+jNoXasQ=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=oE/LOKi3rX/Z54CZ1Jm201r+ifv1w55+1rEWsYDM2zxv78o+217jXdg5Dsj9+xxf5loHVu4CKDLZq+459F6nGmb2n8mSBeDyXupUbYWYaMtd+kCW8cjsY9zGHbGmCZnTXVR4YaLlZzvOoqQnYQGyFzHJZo4+kP7Oc+uRVp6mzq8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7096BC43330; Fri, 23 Feb 2024 14:17:09 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.97) (envelope-from ) id 1rdWOE-000000077NC-1ZH5; Fri, 23 Feb 2024 09:19:02 -0500 Message-ID: <20240223141902.230675644@goodmis.org> User-Agent: quilt/0.67 Date: Fri, 23 Feb 2024 09:18:43 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , John Garry Subject: [for-next][PATCH 05/13] tracing: Use init_utsname()->release References: <20240223141838.985298316@goodmis.org> 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" From: John Garry Instead of using UTS_RELEASE, use init_utsname()->release, which means that we don't need to rebuild the code just for the git head commit changing. Link: https://lore.kernel.org/linux-trace-kernel/20240222124639.65629-1-joh= n.g.garry@oracle.com Signed-off-by: John Garry Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 8fdd68dbcf6d..f56b3275c676 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -13,7 +13,7 @@ * Copyright (C) 2004 Nadia Yvette Chambers */ #include -#include +#include #include #include #include @@ -4133,7 +4133,7 @@ print_trace_header(struct seq_file *m, struct trace_i= terator *iter) get_total_entries(buf, &total, &entries); =20 seq_printf(m, "# %s latency trace v1.1.5 on %s\n", - name, UTS_RELEASE); + name, init_utsname()->release); seq_puts(m, "# -----------------------------------" "---------------------------------\n"); seq_printf(m, "# latency: %lu us, #%lu/%lu, CPU#%d |" --=20 2.43.0 From nobody Sun Feb 8 20:32:44 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 D9A6781ACA for ; Fri, 23 Feb 2024 14:17:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708697829; cv=none; b=LTThyjxGmJlH3zv3ETEALeeVDGhd36XPtVk9PDHSSq79GckRQkN+mpZPsF3GCmvlmXqW2UogN16o7qyHHOqyEqsdFSv+54uyRyA4GJdGRueF+aqMJSF3G2lMOfiTP8woYW15TXEre8cPebOMTZrV6WRTg0HwZsT5Wza1Aw8qaig= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708697829; c=relaxed/simple; bh=3xrOW9URhoOAn6cXs/5dE696kcxcVdjb+ohYIPRoMYs=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=VDNtnAgtwBEs3xlawjKTx7cQ3miDTG8I3cQ5eC8EHpKydnfyBsbLNb++QRz8TL6yaZXVTZxF9O8BHzqaksW4fkbQLW6P60yo0Yw2Mx9+y1A1k3yJ8MNo1S6jpj9Ni1Orron/4FOTRrZ6Tc+oc6ibbYE9kZZSUzLdoqsJhasxB7c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9D546C4166B; Fri, 23 Feb 2024 14:17:09 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.97) (envelope-from ) id 1rdWOE-000000077Ng-2Ezo; Fri, 23 Feb 2024 09:19:02 -0500 Message-ID: <20240223141902.394601874@goodmis.org> User-Agent: quilt/0.67 Date: Fri, 23 Feb 2024 09:18:44 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Jeff Layton , Neil Brown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Chuck Lever Subject: [for-next][PATCH 06/13] NFSD: Fix nfsd_clid_class use of __string_len() macro References: <20240223141838.985298316@goodmis.org> 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" From: "Steven Rostedt (Google)" I'm working on restructuring the __string* macros so that it doesn't need to recalculate the string twice. That is, it will save it off when processing __string() and the __assign_str() will not need to do the work again as it currently does. Currently __string_len(item, src, len) doesn't actually use "src", but my changes will require src to be correct as that is where the __assign_str() will get its value from. The event class nfsd_clid_class has: __string_len(name, name, clp->cl_name.len) But the second "name" does not exist and causes my changes to fail to build. That second parameter should be: clp->cl_name.data. Link: https://lore.kernel.org/linux-trace-kernel/20240222122828.3d8d213c@ga= ndalf.local.home Cc: Jeff Layton Cc: Neil Brown Cc: Olga Kornievskaia Cc: Dai Ngo Cc: Tom Talpey Fixes: d27b74a8675ca ("NFSD: Use new __string_len C macros for nfsd_clid_cl= ass") Acked-by: Chuck Lever Signed-off-by: Steven Rostedt (Google) Acked-by: Jeff Layton --- fs/nfsd/trace.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h index d1e8cf079b0f..2cd57033791f 100644 --- a/fs/nfsd/trace.h +++ b/fs/nfsd/trace.h @@ -843,7 +843,7 @@ DECLARE_EVENT_CLASS(nfsd_clid_class, __array(unsigned char, addr, sizeof(struct sockaddr_in6)) __field(unsigned long, flavor) __array(unsigned char, verifier, NFS4_VERIFIER_SIZE) - __string_len(name, name, clp->cl_name.len) + __string_len(name, clp->cl_name.data, clp->cl_name.len) ), TP_fast_assign( __entry->cl_boot =3D clp->cl_clientid.cl_boot; --=20 2.43.0 From nobody Sun Feb 8 20:32:44 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 B1972811F9 for ; Fri, 23 Feb 2024 14:17:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708697829; cv=none; b=O6ODy7Ix6tYAXKSRbkxoO+8c/4lbYY1sfsXOo6ZyM2+5QeUxUbSzIkuFORLzsA2GNwh0NGNfV6G/hFG7xTF04wIuhIUiao5L8Gah/SYiE8wlb9VYor2S6JWxuJgU54WIOyI2YMYFIriJ1rwCQCSaALluYNWgxB/Tl1s0wyqvtGc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708697829; c=relaxed/simple; bh=uBv+s4SGLMdbgolqp2QWNEru5imW1UxdLM5GyLNVTUw=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=Ki2iKe/GKlgOakXDzEzOAqrpicCG8lSMCKffSSThB4ypeJhTz17X+dVXyJHPhhYhNm0f1IuZKLTMFKiOF37MrZcedfClQ8xUVNqiFIjdm4Om/pk9JuJ3fGCAb6sNGZV8X4kE91JQrw2K4w3YNLilXGvhClT5WhIu8wirOr7s57g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9D369C43142; Fri, 23 Feb 2024 14:17:09 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.97) (envelope-from ) id 1rdWOE-000000077OA-2tYX; Fri, 23 Feb 2024 09:19:02 -0500 Message-ID: <20240223141902.554087446@goodmis.org> User-Agent: quilt/0.67 Date: Fri, 23 Feb 2024 09:18:45 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Daniel Vetter , David Airlie , =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , Rodrigo Vivi Subject: [for-next][PATCH 07/13] drm/i915: Add missing ; to __assign_str() macros in tracepoint code References: <20240223141838.985298316@goodmis.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: "Steven Rostedt (Google)" I'm working on improving the __assign_str() and __string() macros to be more efficient, and removed some unneeded semicolons. This triggered a bug in the build as some of the __assign_str() macros in intel_display_trace was missing a terminating semicolon. Link: https://lore.kernel.org/linux-trace-kernel/20240222133057.2af72a19@ga= ndalf.local.home Cc: Daniel Vetter Cc: David Airlie Fixes: 2ceea5d88048b ("drm/i915: Print plane name in fbc tracepoints") Reviewed-by: Ville Syrj=C3=A4l=C3=A4 Acked-by: Rodrigo Vivi Signed-off-by: Steven Rostedt (Google) --- drivers/gpu/drm/i915/display/intel_display_trace.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display_trace.h b/drivers/g= pu/drm/i915/display/intel_display_trace.h index 99bdb833591c..7862e7cefe02 100644 --- a/drivers/gpu/drm/i915/display/intel_display_trace.h +++ b/drivers/gpu/drm/i915/display/intel_display_trace.h @@ -411,7 +411,7 @@ TRACE_EVENT(intel_fbc_activate, struct intel_crtc *crtc =3D intel_crtc_for_pipe(to_i915(plane->base.= dev), plane->pipe); __assign_str(dev, __dev_name_kms(plane)); - __assign_str(name, plane->base.name) + __assign_str(name, plane->base.name); __entry->pipe =3D crtc->pipe; __entry->frame =3D intel_crtc_get_vblank_counter(crtc); __entry->scanline =3D intel_get_crtc_scanline(crtc); @@ -438,7 +438,7 @@ TRACE_EVENT(intel_fbc_deactivate, struct intel_crtc *crtc =3D intel_crtc_for_pipe(to_i915(plane->base.= dev), plane->pipe); __assign_str(dev, __dev_name_kms(plane)); - __assign_str(name, plane->base.name) + __assign_str(name, plane->base.name); __entry->pipe =3D crtc->pipe; __entry->frame =3D intel_crtc_get_vblank_counter(crtc); __entry->scanline =3D intel_get_crtc_scanline(crtc); @@ -465,7 +465,7 @@ TRACE_EVENT(intel_fbc_nuke, struct intel_crtc *crtc =3D intel_crtc_for_pipe(to_i915(plane->base.= dev), plane->pipe); __assign_str(dev, __dev_name_kms(plane)); - __assign_str(name, plane->base.name) + __assign_str(name, plane->base.name); __entry->pipe =3D crtc->pipe; __entry->frame =3D intel_crtc_get_vblank_counter(crtc); __entry->scanline =3D intel_get_crtc_scanline(crtc); --=20 2.43.0 From nobody Sun Feb 8 20:32:44 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 F23B581AD2 for ; Fri, 23 Feb 2024 14:17:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708697830; cv=none; b=gwV8djxby603qdyZzbgh09cEYnVLv2sMJNGNYq6axk/95CfTdsnQn1bVKGIlTEpW+/lLQeQWcuRNjMFJ9uTubVx55+Ucd3M2QcIvu38BeHQbpkyGk+7/SfSc2/lgchlHpgEq95lGwxCLqfVTM1SkvJ8ddKOM9CYJcjNA+nBMiWc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708697830; c=relaxed/simple; bh=FCyX2FSgboFtCipl3b/75W1aXP+CFhFjDvr72f87SeE=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=PuLnae3AWI8zEO1/t9N/IU2INnWz9V74Sm5CaAtfAg3xQHJakYNhf6TODN7eOmFlIE1KFBuo6BLCDa73JzWvP78/zMStBfnFew71cMMW36VoG4FJ21aQzcyWtR/SDoREeM1bsSAWqDFfrqduuCaFhmLLpEBe7DSRBsH2OnbSazc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id D6E99C43330; Fri, 23 Feb 2024 14:17:09 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.97) (envelope-from ) id 1rdWOE-000000077Oe-3Yxh; Fri, 23 Feb 2024 09:19:02 -0500 Message-ID: <20240223141902.711938025@goodmis.org> User-Agent: quilt/0.67 Date: Fri, 23 Feb 2024 09:18:46 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , =?utf-8?b?VmlsbGUgU3lyasOkbMOk?= , Rodrigo Vivi , Chuck Lever Subject: [for-next][PATCH 08/13] tracing: Rework __assign_str() and __string() to not duplicate getting the string References: <20240223141838.985298316@goodmis.org> 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" From: "Steven Rostedt (Google)" The TRACE_EVENT() macro handles dynamic strings by having: TP_PROTO(struct some_struct *s), TP_ARGS(s), TP_STRUCT__entry( __string(my_string, s->string) ), TP_fast_assign( __assign_str(my_string, s->string); ) TP_printk("%s", __get_str(my_string)) There's even some code that may call a function helper to find the s->string value. The problem with the above is that the work to get the s->string is done twice. Once at the __string() and again in the __assign_str(). But the __string() uses dynamic_array() which has a helper structure that is created holding the offsets and length of the string fields. Instead of finding the string twice, just save it off in another field from that helper structure, and have __assign_str() use that instead. Note, this also means that the second parameter of __assign_str() isn't even used anymore, and may be removed in the future. Link: https://lore.kernel.org/linux-trace-kernel/20240222211442.634192653@g= oodmis.org Cc: Masami Hiramatsu Cc: Mark Rutland Cc: Mathieu Desnoyers Cc: Andrew Morton Cc: =3D?utf-8?b?VmlsbGUgU3lyasOkbMOk?=3D Cc: Rodrigo Vivi Cc: Chuck Lever Signed-off-by: Steven Rostedt (Google) --- include/trace/stages/stage2_data_offsets.h | 4 ++-- include/trace/stages/stage5_get_offsets.h | 15 ++++++++++----- include/trace/stages/stage6_event_callback.h | 12 ++++++++---- 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/include/trace/stages/stage2_data_offsets.h b/include/trace/sta= ges/stage2_data_offsets.h index 469b6a64293d..8b0cff06d346 100644 --- a/include/trace/stages/stage2_data_offsets.h +++ b/include/trace/stages/stage2_data_offsets.h @@ -24,7 +24,7 @@ #define __array(type, item, len) =20 #undef __dynamic_array -#define __dynamic_array(type, item, len) u32 item; +#define __dynamic_array(type, item, len) u32 item; const void *item##_ptr_; =20 #undef __string #define __string(item, src) __dynamic_array(char, item, -1) @@ -45,7 +45,7 @@ #define __sockaddr(field, len) __dynamic_array(u8, field, len) =20 #undef __rel_dynamic_array -#define __rel_dynamic_array(type, item, len) u32 item; +#define __rel_dynamic_array(type, item, len) u32 item; const void *item##_= ptr_; =20 #undef __rel_string #define __rel_string(item, src) __rel_dynamic_array(char, item, -1) diff --git a/include/trace/stages/stage5_get_offsets.h b/include/trace/stag= es/stage5_get_offsets.h index e30a13be46ba..45f8151cf622 100644 --- a/include/trace/stages/stage5_get_offsets.h +++ b/include/trace/stages/stage5_get_offsets.h @@ -47,10 +47,12 @@ =20 #undef __string #define __string(item, src) __dynamic_array(char, item, \ - strlen((src) ? (const char *)(src) : "(null)") + 1) + strlen((src) ? (const char *)(src) : "(null)") + 1) \ + __data_offsets->item##_ptr_ =3D src; =20 #undef __string_len -#define __string_len(item, src, len) __dynamic_array(char, item, (len) + 1) +#define __string_len(item, src, len) __dynamic_array(char, item, (len) + 1= )\ + __data_offsets->item##_ptr_ =3D src; =20 #undef __vstring #define __vstring(item, fmt, ap) __dynamic_array(char, item, \ @@ -67,11 +69,14 @@ __data_size +=3D __item_length; =20 #undef __rel_string -#define __rel_string(item, src) __rel_dynamic_array(char, item, \ - strlen((src) ? (const char *)(src) : "(null)") + 1) +#define __rel_string(item, src) __rel_dynamic_array(char, item, \ + strlen((src) ? (const char *)(src) : "(null)") + 1) \ + __data_offsets->item##_ptr_ =3D src; =20 #undef __rel_string_len -#define __rel_string_len(item, src, len) __rel_dynamic_array(char, item, (= len) + 1) +#define __rel_string_len(item, src, len) __rel_dynamic_array(char, item, (= len) + 1)\ + __data_offsets->item##_ptr_ =3D src; + /* * __bitmask_size_in_bytes_raw is the number of bytes needed to hold * num_possible_cpus(). diff --git a/include/trace/stages/stage6_event_callback.h b/include/trace/s= tages/stage6_event_callback.h index 919b1a4da980..b3e2f321e787 100644 --- a/include/trace/stages/stage6_event_callback.h +++ b/include/trace/stages/stage6_event_callback.h @@ -32,12 +32,14 @@ =20 #undef __assign_str #define __assign_str(dst, src) \ - strcpy(__get_str(dst), (src) ? (const char *)(src) : "(null)"); + strcpy(__get_str(dst), __data_offsets.dst##_ptr_ ? \ + __data_offsets.dst##_ptr_ : "(null)") =20 #undef __assign_str_len #define __assign_str_len(dst, src, len) \ do { \ - memcpy(__get_str(dst), (src), (len)); \ + memcpy(__get_str(dst), __data_offsets.dst##_ptr_ ? \ + __data_offsets.dst##_ptr_ : "(null)", len); \ __get_str(dst)[len] =3D '\0'; \ } while(0) =20 @@ -92,12 +94,14 @@ =20 #undef __assign_rel_str #define __assign_rel_str(dst, src) \ - strcpy(__get_rel_str(dst), (src) ? (const char *)(src) : "(null)"); + strcpy(__get_rel_str(dst), __data_offsets.dst##_ptr_ ? \ + __data_offsets.dst##_ptr_ : "(null)") =20 #undef __assign_rel_str_len #define __assign_rel_str_len(dst, src, len) \ do { \ - memcpy(__get_rel_str(dst), (src), (len)); \ + memcpy(__get_rel_str(dst), __data_offsets.dst##_ptr_ ? \ + __data_offsets.dst##_ptr_ : "(null)", len); \ __get_rel_str(dst)[len] =3D '\0'; \ } while (0) =20 --=20 2.43.0 From nobody Sun Feb 8 20:32:44 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 8C2CD823CD for ; Fri, 23 Feb 2024 14:17:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708697830; cv=none; b=fKt284zUtIsGd4ZzCPB4cCv3tZwGy5tkdCVuCCW4pVdisREr55yPCxKVRXO8YnGbuQzSndBPFZHE1bGauIkeaO+X+PJghuSD6nC5VagW2Lk/VjrRWqNoKtGqGHkemjHiHP89HuRZ1C6t1V2a8B0wfENiR4gelGxGTzL+IW1HqQQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708697830; c=relaxed/simple; bh=TRTlBeIWlLJicEJm6c+SDXQxnX8BueJpz4S9NWvpEnU=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=Xp6O3B8SNT3o2JWIkVf3+tFGHIxNCfUELQ9SMsng5iXmBEd9bFFtL+xeAbBFSSpPKZh91FKJkGMiFDrQ8dRSpUf3yJzArkdTvgRnaFs6jiCTGmm3zZTytJOgVYWDp7nzvlyjTuovZ2aJ2gAvxx6qMBWVVr6O4clrLA9/RGl3Fes= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 079ADC433C7; Fri, 23 Feb 2024 14:17:10 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.97) (envelope-from ) id 1rdWOF-000000077PA-03aA; Fri, 23 Feb 2024 09:19:03 -0500 Message-ID: <20240223141902.873290088@goodmis.org> User-Agent: quilt/0.67 Date: Fri, 23 Feb 2024 09:18:47 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , =?utf-8?b?VmlsbGUgU3lyasOkbMOk?= , Rodrigo Vivi , Chuck Lever Subject: [for-next][PATCH 09/13] tracing: Do not calculate strlen() twice for __string() fields References: <20240223141838.985298316@goodmis.org> 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" From: "Steven Rostedt (Google)" The TRACE_EVENT() macro handles dynamic strings by having: TP_PROTO(struct some_struct *s), TP_ARGS(s), TP_STRUCT__entry( __string(my_string, s->string) ), TP_fast_assign( __assign_str(my_string, s->string); ) TP_printk("%s", __get_str(my_string)) There's even some code that may call a function helper to find the s->string value. The problem with the above is that the work to get the s->string is done twice. Once at the __string() and again in the __assign_str(). The length of the string is calculated via a strlen(), not once, but twice. Once during the __string() macro and again in __assign_str(). But the length is actually already recorded in the data location and here's no reason to call strlen() again. Just use the saved length that was saved in the __string() code for the __assign_str() code. Link: https://lore.kernel.org/linux-trace-kernel/20240222211442.793074999@g= oodmis.org Cc: Masami Hiramatsu Cc: Mark Rutland Cc: Mathieu Desnoyers Cc: Andrew Morton Cc: =3D?utf-8?b?VmlsbGUgU3lyasOkbMOk?=3D Cc: Rodrigo Vivi Cc: Chuck Lever Signed-off-by: Steven Rostedt (Google) --- include/trace/stages/stage6_event_callback.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/include/trace/stages/stage6_event_callback.h b/include/trace/s= tages/stage6_event_callback.h index b3e2f321e787..c0e5d097324e 100644 --- a/include/trace/stages/stage6_event_callback.h +++ b/include/trace/stages/stage6_event_callback.h @@ -32,8 +32,9 @@ =20 #undef __assign_str #define __assign_str(dst, src) \ - strcpy(__get_str(dst), __data_offsets.dst##_ptr_ ? \ - __data_offsets.dst##_ptr_ : "(null)") + memcpy(__get_str(dst), __data_offsets.dst##_ptr_ ? \ + __data_offsets.dst##_ptr_ : "(null)", \ + __get_dynamic_array_len(dst)) =20 #undef __assign_str_len #define __assign_str_len(dst, src, len) \ @@ -94,8 +95,9 @@ =20 #undef __assign_rel_str #define __assign_rel_str(dst, src) \ - strcpy(__get_rel_str(dst), __data_offsets.dst##_ptr_ ? \ - __data_offsets.dst##_ptr_ : "(null)") + memcpy(__get_rel_str(dst), __data_offsets.dst##_ptr_ ? \ + __data_offsets.dst##_ptr_ : "(null)", \ + __get_rel_dynamic_array_len(dst)) =20 #undef __assign_rel_str_len #define __assign_rel_str_len(dst, src, len) \ --=20 2.43.0 From nobody Sun Feb 8 20:32:44 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 8C314823D0 for ; Fri, 23 Feb 2024 14:17:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708697830; cv=none; b=l7TbqePHpYTDb3sn6WbBQJzUjLUjErnsP7MOnjyax78CI+JB76k9ZaWcb36vs/S2udbpm0qS06+0uKXeIIV420nSEwy5xNkc9IxQgGt9TY6dYgmMFTkCtkSct/vSS7Jug9A452LC9uotdjvO9u7uXgRSpARxLzRypjsrTHkEZ1o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708697830; c=relaxed/simple; bh=CRDwQm02YMBZgJ/K9iwkHdDrBNbu7OUJpyW+gq/qcQg=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=mh+2TsIFWGaL11mMwnysddxQjIZUHEPTNTtm0NowmBRQDhODt6kLZ6tZZDJLtQ8OdA+HFhVNnIZDMYJ8Dr4dweF6mgWRXiZOJQxwy/tMvLHa5KQUY2obSmbAE0vFVyVRQlsFXXlP86mpXnFCkEEoAk95OAfBPZqGQVG6TJ+Y9j8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 387C6C4166B; Fri, 23 Feb 2024 14:17:10 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.97) (envelope-from ) id 1rdWOF-000000077Pf-0hlO; Fri, 23 Feb 2024 09:19:03 -0500 Message-ID: <20240223141903.033285779@goodmis.org> User-Agent: quilt/0.67 Date: Fri, 23 Feb 2024 09:18:48 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , =?utf-8?b?VmlsbGUgU3lyasOkbMOk?= , Rodrigo Vivi , Chuck Lever Subject: [for-next][PATCH 10/13] tracing: Use ? : shortcut in trace macros References: <20240223141838.985298316@goodmis.org> 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" From: "Steven Rostedt (Google)" Instead of having: #define __assign_str(dst, src) \ memcpy(__get_str(dst), __data_offsets.dst##_ptr_ ? \ __data_offsets.dst##_ptr_ : "(null)", \ __get_dynamic_array_len(dst)) Use the ? : shortcut and compact it down to: #define __assign_str(dst, src) \ memcpy(__get_str(dst), __data_offsets.dst##_ptr_ ? : "(null)", \ __get_dynamic_array_len(dst)) Link: https://lore.kernel.org/linux-trace-kernel/20240222211442.949327725@g= oodmis.org Cc: Masami Hiramatsu Cc: Mark Rutland Cc: Andrew Morton Cc: =3D?utf-8?b?VmlsbGUgU3lyasOkbMOk?=3D Cc: Rodrigo Vivi Cc: Chuck Lever Suggested-by: Mathieu Desnoyers Signed-off-by: Steven Rostedt (Google) --- include/trace/stages/stage5_get_offsets.h | 4 ++-- include/trace/stages/stage6_event_callback.h | 14 ++++++-------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/include/trace/stages/stage5_get_offsets.h b/include/trace/stag= es/stage5_get_offsets.h index 45f8151cf622..20b801ed3fd4 100644 --- a/include/trace/stages/stage5_get_offsets.h +++ b/include/trace/stages/stage5_get_offsets.h @@ -47,7 +47,7 @@ =20 #undef __string #define __string(item, src) __dynamic_array(char, item, \ - strlen((src) ? (const char *)(src) : "(null)") + 1) \ + strlen((const char *)(src) ? : "(null)") + 1) \ __data_offsets->item##_ptr_ =3D src; =20 #undef __string_len @@ -70,7 +70,7 @@ =20 #undef __rel_string #define __rel_string(item, src) __rel_dynamic_array(char, item, \ - strlen((src) ? (const char *)(src) : "(null)") + 1) \ + strlen((const char *)(src) ? : "(null)") + 1) \ __data_offsets->item##_ptr_ =3D src; =20 #undef __rel_string_len diff --git a/include/trace/stages/stage6_event_callback.h b/include/trace/s= tages/stage6_event_callback.h index c0e5d097324e..38732855eadb 100644 --- a/include/trace/stages/stage6_event_callback.h +++ b/include/trace/stages/stage6_event_callback.h @@ -32,15 +32,14 @@ =20 #undef __assign_str #define __assign_str(dst, src) \ - memcpy(__get_str(dst), __data_offsets.dst##_ptr_ ? \ - __data_offsets.dst##_ptr_ : "(null)", \ + memcpy(__get_str(dst), __data_offsets.dst##_ptr_ ? : "(null)", \ __get_dynamic_array_len(dst)) =20 #undef __assign_str_len #define __assign_str_len(dst, src, len) \ do { \ - memcpy(__get_str(dst), __data_offsets.dst##_ptr_ ? \ - __data_offsets.dst##_ptr_ : "(null)", len); \ + memcpy(__get_str(dst), \ + __data_offsets.dst##_ptr_ ? : "(null)", len); \ __get_str(dst)[len] =3D '\0'; \ } while(0) =20 @@ -95,15 +94,14 @@ =20 #undef __assign_rel_str #define __assign_rel_str(dst, src) \ - memcpy(__get_rel_str(dst), __data_offsets.dst##_ptr_ ? \ - __data_offsets.dst##_ptr_ : "(null)", \ + memcpy(__get_rel_str(dst), __data_offsets.dst##_ptr_ ? : "(null)", \ __get_rel_dynamic_array_len(dst)) =20 #undef __assign_rel_str_len #define __assign_rel_str_len(dst, src, len) \ do { \ - memcpy(__get_rel_str(dst), __data_offsets.dst##_ptr_ ? \ - __data_offsets.dst##_ptr_ : "(null)", len); \ + memcpy(__get_rel_str(dst), \ + __data_offsets.dst##_ptr_ ? : "(null)", len); \ __get_rel_str(dst)[len] =3D '\0'; \ } while (0) =20 --=20 2.43.0 From nobody Sun Feb 8 20:32:44 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 BFE348286A for ; Fri, 23 Feb 2024 14:17:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708697830; cv=none; b=e9+jgZcwEVKx3XAEEy/Stk/B2oOoUF2oNVaxjo4Z6a8dgVgjJOOQFStGiP3NzMwBxe6NCIJrRH45I8Atv6TcBedtoooYucL3JOG1CtxUk3FMkOhcqZnNYP2uBwaxdECXbtaMGuAhCXQOXf3JNR1uiXZagOEqWI9tcg1roqKTtko= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708697830; c=relaxed/simple; bh=v6a9/CaOaJ6aIHABwtc4/WIX+ftSavTtwVoqgQOfoq4=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=UgMyoTT+R7lzynBqA2WzdcLWUzU6AOLdaRBj3XxZXPyA5DM5cAPGSKASwYzC8SJZq2CbkjQvgesu7xPY6DXoS3X0e4WeFUgWrfbG5/7Gc9Dgh+w0NdjvcoLtxQptCqCB/jjMgsi6rutDslVVG3aRxCgVSAZNIV75fXgs9XfpJnM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5C808C41613; Fri, 23 Feb 2024 14:17:10 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.97) (envelope-from ) id 1rdWOF-000000077QA-1NLU; Fri, 23 Feb 2024 09:19:03 -0500 Message-ID: <20240223141903.188175670@goodmis.org> User-Agent: quilt/0.67 Date: Fri, 23 Feb 2024 09:18:49 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , =?utf-8?b?VmlsbGUgU3lyasOkbMOk?= , Rodrigo Vivi , Chuck Lever Subject: [for-next][PATCH 11/13] tracing: Use EVENT_NULL_STR macro instead of open coding "(null)" References: <20240223141838.985298316@goodmis.org> 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" From: "Steven Rostedt (Google)" The TRACE_EVENT macros has some dependency if a __string() field is NULL, where it will save "(null)" as the string. This string is also used by __assign_str(). It's better to create a single macro instead of having something that will not be caught by the compiler if there is an unfortunate typo. Link: https://lore.kernel.org/linux-trace-kernel/20240222211443.106216915@g= oodmis.org Cc: Masami Hiramatsu Cc: Mark Rutland Cc: Andrew Morton Cc: =3D?utf-8?b?VmlsbGUgU3lyasOkbMOk?=3D Cc: Rodrigo Vivi Cc: Chuck Lever Suggested-by: Mathieu Desnoyers Signed-off-by: Steven Rostedt (Google) --- include/linux/trace_events.h | 3 +++ include/trace/events/sunrpc.h | 12 ++++++------ include/trace/stages/stage5_get_offsets.h | 4 ++-- include/trace/stages/stage6_event_callback.h | 8 ++++---- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h index d68ff9b1247f..b9d88aced7e1 100644 --- a/include/linux/trace_events.h +++ b/include/linux/trace_events.h @@ -17,6 +17,9 @@ struct dentry; struct bpf_prog; union bpf_attr; =20 +/* Used for event string fields when they are NULL */ +#define EVENT_NULL_STR "(null)" + const char *trace_print_flags_seq(struct trace_seq *p, const char *delim, unsigned long flags, const struct trace_print_flags *flag_array); diff --git a/include/trace/events/sunrpc.h b/include/trace/events/sunrpc.h index cdd3a45e6003..ce6a85b82afa 100644 --- a/include/trace/events/sunrpc.h +++ b/include/trace/events/sunrpc.h @@ -1327,18 +1327,18 @@ TRACE_EVENT(xs_stream_read_data, __field(ssize_t, err) __field(size_t, total) __string(addr, xprt ? xprt->address_strings[RPC_DISPLAY_ADDR] : - "(null)") + EVENT_NULL_STR) __string(port, xprt ? xprt->address_strings[RPC_DISPLAY_PORT] : - "(null)") + EVENT_NULL_STR) ), =20 TP_fast_assign( __entry->err =3D err; __entry->total =3D total; __assign_str(addr, xprt ? - xprt->address_strings[RPC_DISPLAY_ADDR] : "(null)"); + xprt->address_strings[RPC_DISPLAY_ADDR] : EVENT_NULL_STR); __assign_str(port, xprt ? - xprt->address_strings[RPC_DISPLAY_PORT] : "(null)"); + xprt->address_strings[RPC_DISPLAY_PORT] : EVENT_NULL_STR); ), =20 TP_printk("peer=3D[%s]:%s err=3D%zd total=3D%zu", __get_str(addr), @@ -1783,7 +1783,7 @@ TRACE_EVENT(svc_process, __string(service, name) __string(procedure, svc_proc_name(rqst)) __string(addr, rqst->rq_xprt ? - rqst->rq_xprt->xpt_remotebuf : "(null)") + rqst->rq_xprt->xpt_remotebuf : EVENT_NULL_STR) ), =20 TP_fast_assign( @@ -1793,7 +1793,7 @@ TRACE_EVENT(svc_process, __assign_str(service, name); __assign_str(procedure, svc_proc_name(rqst)); __assign_str(addr, rqst->rq_xprt ? - rqst->rq_xprt->xpt_remotebuf : "(null)"); + rqst->rq_xprt->xpt_remotebuf : EVENT_NULL_STR); ), =20 TP_printk("addr=3D%s xid=3D0x%08x service=3D%s vers=3D%u proc=3D%s", diff --git a/include/trace/stages/stage5_get_offsets.h b/include/trace/stag= es/stage5_get_offsets.h index 20b801ed3fd4..e6b96608f452 100644 --- a/include/trace/stages/stage5_get_offsets.h +++ b/include/trace/stages/stage5_get_offsets.h @@ -47,7 +47,7 @@ =20 #undef __string #define __string(item, src) __dynamic_array(char, item, \ - strlen((const char *)(src) ? : "(null)") + 1) \ + strlen((const char *)(src) ? : EVENT_NULL_STR) + 1) \ __data_offsets->item##_ptr_ =3D src; =20 #undef __string_len @@ -70,7 +70,7 @@ =20 #undef __rel_string #define __rel_string(item, src) __rel_dynamic_array(char, item, \ - strlen((const char *)(src) ? : "(null)") + 1) \ + strlen((const char *)(src) ? : EVENT_NULL_STR) + 1) \ __data_offsets->item##_ptr_ =3D src; =20 #undef __rel_string_len diff --git a/include/trace/stages/stage6_event_callback.h b/include/trace/s= tages/stage6_event_callback.h index 38732855eadb..2bfd49713b42 100644 --- a/include/trace/stages/stage6_event_callback.h +++ b/include/trace/stages/stage6_event_callback.h @@ -32,14 +32,14 @@ =20 #undef __assign_str #define __assign_str(dst, src) \ - memcpy(__get_str(dst), __data_offsets.dst##_ptr_ ? : "(null)", \ + memcpy(__get_str(dst), __data_offsets.dst##_ptr_ ? : EVENT_NULL_STR, \ __get_dynamic_array_len(dst)) =20 #undef __assign_str_len #define __assign_str_len(dst, src, len) \ do { \ memcpy(__get_str(dst), \ - __data_offsets.dst##_ptr_ ? : "(null)", len); \ + __data_offsets.dst##_ptr_ ? : EVENT_NULL_STR, len); \ __get_str(dst)[len] =3D '\0'; \ } while(0) =20 @@ -94,14 +94,14 @@ =20 #undef __assign_rel_str #define __assign_rel_str(dst, src) \ - memcpy(__get_rel_str(dst), __data_offsets.dst##_ptr_ ? : "(null)", \ + memcpy(__get_rel_str(dst), __data_offsets.dst##_ptr_ ? : EVENT_NULL_STR, \ __get_rel_dynamic_array_len(dst)) =20 #undef __assign_rel_str_len #define __assign_rel_str_len(dst, src, len) \ do { \ memcpy(__get_rel_str(dst), \ - __data_offsets.dst##_ptr_ ? : "(null)", len); \ + __data_offsets.dst##_ptr_ ? : EVENT_NULL_STR, len); \ __get_rel_str(dst)[len] =3D '\0'; \ } while (0) =20 --=20 2.43.0 From nobody Sun Feb 8 20:32:44 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 9FC3B823D9 for ; Fri, 23 Feb 2024 14:17:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708697830; cv=none; b=PkyqrRVIRGLfQqMOmEhw8l/8bVL7/PrhzfZ2c7hkUiQuXZbSgMpgy6MAWeuBuw7MwwjtDE7mCtmNWU2VDpoqsXeM6OROOuNQy2thyjdL4p2GAeX40DOSfFqzcQQyBcQzob73/tJfoApaI5/jnMjMyrUCTlzGN37PPwxX20bRuhI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708697830; c=relaxed/simple; bh=SSAkBsKZDXS3J7H5zDJ3fM4StROONFq7WOqxGyruuNk=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=JlqaSG1tA/xd47yOlaOmX2UFbXGjNm92lgBga0dgbp8WFFNVrSLccWhZfZhaKL38tVJ9efe0YsPgn68Q1HImqUiY7j0X3H7Sz1fYc4VdYtEx+VzZVHqMm1/goLW+yhYUCfgR/4CQGwthXahSBt0AARjPdXXPODzp1jA9xT0c4OI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 80E06C43142; Fri, 23 Feb 2024 14:17:10 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.97) (envelope-from ) id 1rdWOF-000000077Qf-23xN; Fri, 23 Feb 2024 09:19:03 -0500 Message-ID: <20240223141903.347912102@goodmis.org> User-Agent: quilt/0.67 Date: Fri, 23 Feb 2024 09:18:50 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Vincent Donnefort Subject: [for-next][PATCH 12/13] tracing: Fix snapshot counter going between two tracers that use it References: <20240223141838.985298316@goodmis.org> 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" From: "Steven Rostedt (Google)" Running the ftrace selftests caused the ring buffer mapping test to fail. Investigating, I found that the snapshot counter would be incremented every time a tracer that uses the snapshot is enabled even if the snapshot was used by the previous tracer. That is: # cd /sys/kernel/tracing # echo wakeup_rt > current_tracer # echo wakeup_dl > current_tracer # echo nop > current_tracer would leave the snapshot counter at 1 and not zero. That's because the enabling of wakeup_dl would increment the counter again but the setting the tracer to nop would only decrement it once. Do not arm the snapshot for a tracer if the previous tracer already had it armed. Link: https://lore.kernel.org/linux-trace-kernel/20240223013344.570525723@g= oodmis.org Cc: Masami Hiramatsu Cc: Mark Rutland Cc: Mathieu Desnoyers Cc: Andrew Morton Cc: Vincent Donnefort Fixes: 16f7e48ffc53a ("tracing: Add snapshot refcount") Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index f56b3275c676..1bcfbc21fb3e 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -6148,7 +6148,7 @@ int tracing_set_tracer(struct trace_array *tr, const = char *buf) tracing_disarm_snapshot(tr); } =20 - if (t->use_max_tr) { + if (!had_max_tr && t->use_max_tr) { ret =3D tracing_arm_snapshot_locked(tr); if (ret) goto out; --=20 2.43.0 From nobody Sun Feb 8 20:32:44 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 BB59482868 for ; Fri, 23 Feb 2024 14:17:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708697830; cv=none; b=DJR9dZsa2lDZT1wLEcfyYY4yTjELp0mgF4FUxiZTfCPUWtFRV+ndr9/Uzw+opFa1US3OU5zwGtVsImOcw2imt4vwY+JfsQSa1+V7Ufeq31eNZ/W9g1ZPkiukEAIbHsVN85CJliDANw7I5sVwwIxVgiw2bVWb/P175gZilM80Btg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708697830; c=relaxed/simple; bh=ZgqLTdRoUVgbCvGQljZzqd+I5mUdqZPv5Wp0Z7wOMSk=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=j8JK/MMNZsoItuD/rdXWUCWL5FSyKo0hqV9mEgaOXXpfDxRm1cEeDPfhUcesPjXPVeKwKdhyUHwGk/7rj0z5w06p6DWvGEg4ulgwtqldZUKad2MIjWddL07khjvVPPgXHyJi9bW7LcjRl9JQ6DehQ1htYtT+CAQc0cCX6RNAyrQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id A65B5C43390; Fri, 23 Feb 2024 14:17:10 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.97) (envelope-from ) id 1rdWOF-000000077RA-2jRW; Fri, 23 Feb 2024 09:19:03 -0500 Message-ID: <20240223141903.512514224@goodmis.org> User-Agent: quilt/0.67 Date: Fri, 23 Feb 2024 09:18:51 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Vincent Donnefort Subject: [for-next][PATCH 13/13] tracing: Decrement the snapshot if the snapshot trigger fails to register References: <20240223141838.985298316@goodmis.org> 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" From: "Steven Rostedt (Google)" Running the ftrace selftests caused the ring buffer mapping test to fail. Investigating, I found that the snapshot counter would be incremented every time a snapshot trigger was added, even if that snapshot trigger failed. # cd /sys/kernel/tracing # echo "snapshot" > events/sched/sched_process_fork/trigger # echo "snapshot" > events/sched/sched_process_fork/trigger -bash: echo: write error: File exists That second one that fails increments the snapshot counter but doesn't decrement it. It needs to be decremented when the snapshot fails. Link: https://lore.kernel.org/linux-trace-kernel/20240223013344.729055907@g= oodmis.org Cc: Masami Hiramatsu Cc: Mark Rutland Cc: Mathieu Desnoyers Cc: Andrew Morton Cc: Vincent Donnefort Fixes: 16f7e48ffc53a ("tracing: Add snapshot refcount") Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_events_trigger.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kernel/trace/trace_events_trigger.c b/kernel/trace/trace_event= s_trigger.c index 62e4f58b8671..4bec043c8690 100644 --- a/kernel/trace/trace_events_trigger.c +++ b/kernel/trace/trace_events_trigger.c @@ -1491,7 +1491,10 @@ register_snapshot_trigger(char *glob, if (ret < 0) return ret; =20 - return register_trigger(glob, data, file); + ret =3D register_trigger(glob, data, file); + if (ret < 0) + tracing_disarm_snapshot(file->tr); + return ret; } =20 static void unregister_snapshot_trigger(char *glob, --=20 2.43.0