From nobody Tue Dec 2 01:51:20 2025 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 C0C93368E02; Thu, 20 Nov 2025 20:56:37 +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=1763672197; cv=none; b=n1rWe76qn2HcIDg5OnU27F2LAW/ed+jzCvCFFNsOP33TDXsdduzHRUvRhoKqoe/s6OeZRernLR3idqIV/niNlGfzKGYvrHjg4/9qpAl+WqGlB+EUVGYuqt79bzaFopouEhKVyJlF3sTCkaCnGNGk5wORdv/+rJAFPV2+zEKhMOA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763672197; c=relaxed/simple; bh=UQ0Fj894LqN0Ds2iUKog/SfQ2yXKaokcZWHHyVwFHJE=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=It+y2s0bASAnhvU7Pq6gVbpYRrxPbdaraw5NHUNJn0k22Yympu7Aehv8O+mOP6zq2XUcM6oDqcfrVrkosIkVZO6M8hfBwf7/JL7Ls63mjikKTpqzJjkuulgI+lP2yPW7PAjM5xP7IK86bTmuYzT1QiaIeY3IzANS9Ax2JmA8SYs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=PWVA54Ug; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="PWVA54Ug" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 63116C116B1; Thu, 20 Nov 2025 20:56:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1763672197; bh=UQ0Fj894LqN0Ds2iUKog/SfQ2yXKaokcZWHHyVwFHJE=; h=Date:From:To:Cc:Subject:References:From; b=PWVA54UgEIS69m+ngWwxajhW43QeN5YD3oChMDNvXUaUeC3DvS9qQcx5kDeICv7hr j4vif8OHe0gmMQcRj/BUii++liAEg3NZjiyee/mHyg9BzNB8ExTuhVKtk2xMBCPQRu GWx3blMe+Yq0lB9+CsntA30dzwj8+fh/Kk1WSMdPbV+4I9RUQSNzXY2BQC0NbEqsbF GBGx6ZDMeEmO4fBoBWHfFPF9yIxtEYL+hrtDiC1fc04VBojEKFq0BB3BA4yM813NIV twETmdZDldkVj+N1rZy7Gfy64ENxECHiI8+FXJJsmypnCUxT5f41O9mXUrdQKriWng eBbvDaiORPskg== Received: from rostedt by gandalf with local (Exim 4.98.2) (envelope-from ) id 1vMBiI-00000003zBQ-0Xuv; Thu, 20 Nov 2025 15:57:10 -0500 Message-ID: <20251120205709.984522508@kernel.org> User-Agent: quilt/0.68 Date: Thu, 20 Nov 2025 15:56:01 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Tom Zanussi Subject: [PATCH 1/3] tracing: Remove unneeded event_mutex lock in event_trigger_regex_release() References: <20251120205600.570673392@kernel.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 In event_trigger_regex_release(), the only code is: mutex_lock(&event_mutex); if (file->f_mode & FMODE_READ) seq_release(inode, file); mutex_unlock(&event_mutex); return 0; There's nothing special about the file->f_mode or the seq_release() that requires any locking. Remove the unnecessary locks. Signed-off-by: Steven Rostedt (Google) Acked-by: Masami Hiramatsu (Google) --- kernel/trace/trace_events_trigger.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/kernel/trace/trace_events_trigger.c b/kernel/trace/trace_event= s_trigger.c index 7795af600466..e5dcfcbb2cd5 100644 --- a/kernel/trace/trace_events_trigger.c +++ b/kernel/trace/trace_events_trigger.c @@ -314,13 +314,9 @@ static ssize_t event_trigger_regex_write(struct file *= file, =20 static int event_trigger_regex_release(struct inode *inode, struct file *f= ile) { - mutex_lock(&event_mutex); - if (file->f_mode & FMODE_READ) seq_release(inode, file); =20 - mutex_unlock(&event_mutex); - return 0; } =20 --=20 2.51.0 From nobody Tue Dec 2 01:51:20 2025 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 0041B368E15; Thu, 20 Nov 2025 20:56:37 +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=1763672198; cv=none; b=j9XWZcrfIk5fgFzXY+jfqUwNxEp5QmzEH0ENs61tGl3axJ5qqdq54R+3kA8m/XNBWO5pE4Osndidoa4laktNO2B9hJa8iToGc8ldnZa2StJTwaYkmeOOUkDm6YKU2XqtNlwY10Pl7EsdkR3y6Vv0oI+Nn5ZJHjDxEsjN+nLyVGA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763672198; c=relaxed/simple; bh=GVzzXYkl5wHRslHDTIcDpnGGeSvmX5YX+CNNDxLB77c=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=pZqMHESlnECcrCYLwjkdcriGq9rXkB6Mp62Ws7kdy8fei3ZSwsBYCV7ZGys7BkXaVO95yQkNvu4g7Xin2D5hBuv03KA970V04zWaF9dsfsBFvrGewDMf8CyR5F+TkwfQJh8dQFZrctBneg5xVNSYNEtf9Ouub8BWXkUkfyVlW3w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ptgx4EUm; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ptgx4EUm" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 95940C116C6; Thu, 20 Nov 2025 20:56:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1763672197; bh=GVzzXYkl5wHRslHDTIcDpnGGeSvmX5YX+CNNDxLB77c=; h=Date:From:To:Cc:Subject:References:From; b=ptgx4EUmbl9s3QPEolP8Fu/2glAVCzhchz4L3avHetcPWzrYs+icLmCJEXJrSi4Y6 6PQTZ85PobejfpxfhDN4XjlaqXSuL/4zKYfbVvRccV5UXF1kkLy72LsZwoVYiQGRrC Cm+8+JgufcNpmrTKQAQsxO+kyUg0qgMJo0Yu9L3O3OpLjR/nIwBFfkdlVx1I5fDmLe QMd3SdjlHc6l8UiuIENJQO1wp/WItcMXfb6cdoM86x21/nGc9nzQYO+I/6unR1Ntxr 4bPfOM1txW8GjX0ZpDStWBSb/odFcs3Uk0ZZGIydKmM2CZtDyLrSMxrhr+FiXPh4IQ XTq10TtFGBXkA== Received: from rostedt by gandalf with local (Exim 4.98.2) (envelope-from ) id 1vMBiI-00000003zBu-1Egz; Thu, 20 Nov 2025 15:57:10 -0500 Message-ID: <20251120205710.151041470@kernel.org> User-Agent: quilt/0.68 Date: Thu, 20 Nov 2025 15:56:02 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Tom Zanussi Subject: [PATCH 2/3] tracing: Add bulk garbage collection of freeing event_trigger_data References: <20251120205600.570673392@kernel.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 The event trigger data requires a full tracepoint_synchronize_unregister() call before freeing. That call can take 100s of milliseconds to complete. In order to allow for bulk freeing of the trigger data, it can not call the tracepoint_synchronize_unregister() for every individual trigger data being free. Create a kthread that gets created the first time a trigger data is freed, and have it use the lockless llist to get the list of data to free, run the tracepoint_synchronize_unregister() then free everything in the list. By freeing hundreds of event_trigger_data elements together, it only requires two runs of the synchronization function, and not hundreds of runs. This speeds up the operation by orders of magnitude (milliseconds instead of several seconds). Signed-off-by: Steven Rostedt (Google) Acked-by: Masami Hiramatsu (Google) --- kernel/trace/trace.h | 1 + kernel/trace/trace_events_trigger.c | 56 +++++++++++++++++++++++++++-- 2 files changed, 54 insertions(+), 3 deletions(-) diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index 5863800b1ab3..fd5a6daa6c25 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -1808,6 +1808,7 @@ struct event_trigger_data { char *name; struct list_head named_list; struct event_trigger_data *named_data; + struct llist_node llist; }; =20 /* Avoid typos */ diff --git a/kernel/trace/trace_events_trigger.c b/kernel/trace/trace_event= s_trigger.c index e5dcfcbb2cd5..16e3449f3cfe 100644 --- a/kernel/trace/trace_events_trigger.c +++ b/kernel/trace/trace_events_trigger.c @@ -6,26 +6,76 @@ */ =20 #include +#include #include #include #include #include #include +#include =20 #include "trace.h" =20 static LIST_HEAD(trigger_commands); static DEFINE_MUTEX(trigger_cmd_mutex); =20 +static struct task_struct *trigger_kthread; +static struct llist_head trigger_data_free_list; +static DEFINE_MUTEX(trigger_data_kthread_mutex); + +/* Bulk garbage collection of event_trigger_data elements */ +static int trigger_kthread_fn(void *ignore) +{ + struct event_trigger_data *data, *tmp; + struct llist_node *llnodes; + + /* Once this task starts, it lives forever */ + for (;;) { + set_current_state(TASK_INTERRUPTIBLE); + if (llist_empty(&trigger_data_free_list)) + schedule(); + + __set_current_state(TASK_RUNNING); + + llnodes =3D llist_del_all(&trigger_data_free_list); + + /* make sure current triggers exit before free */ + tracepoint_synchronize_unregister(); + + llist_for_each_entry_safe(data, tmp, llnodes, llist) + kfree(data); + } + + return 0; +} + void trigger_data_free(struct event_trigger_data *data) { if (data->cmd_ops->set_filter) data->cmd_ops->set_filter(NULL, data, NULL); =20 - /* make sure current triggers exit before free */ - tracepoint_synchronize_unregister(); + if (unlikely(!trigger_kthread)) { + guard(mutex)(&trigger_data_kthread_mutex); + /* Check again after taking mutex */ + if (!trigger_kthread) { + struct task_struct *kthread; + + kthread =3D kthread_create(trigger_kthread_fn, NULL, + "trigger_data_free"); + if (!IS_ERR(kthread)) + WRITE_ONCE(trigger_kthread, kthread); + } + } + + if (!trigger_kthread) { + /* Do it the slow way */ + tracepoint_synchronize_unregister(); + kfree(data); + return; + } =20 - kfree(data); + llist_add(&data->llist, &trigger_data_free_list); + wake_up_process(trigger_kthread); } =20 static inline void data_ops_trigger(struct event_trigger_data *data, --=20 2.51.0 From nobody Tue Dec 2 01:51:20 2025 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 004F8368E17; Thu, 20 Nov 2025 20:56:37 +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=1763672198; cv=none; b=QUBoP8/c59FyRxU1nLteIZXolPVQEyqRoSg6ZFoteKC6d4ZuljnJBN1K/Qlybdkuc1FV1aHwh+XV73rNpt7cnRegfUkAHrHvoZyB/o3iFSbL0XHyRaSNn8sCgDu9Saw7+1d9zT2T4YtYBpwEJSRgcuN/2KfaHuGPh90SCoX4U20= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763672198; c=relaxed/simple; bh=8C5Q1w4EPe0MTRU5lmtulPwfzR7CqMI3MLyK+6S7Wk4=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=fSAIfHGpFlmkeYaMsvToDA7WiyAm/Uuf9ya17fQWcRldm4GvBmSQyXV0r+4lcnH36xb3dEsJY6HeTMq+J1wisBjZbK8BrtxcD0ajmAo3Jt+8m8LSxYwK4dLVxduh1ruyncx0Zxcbk67S0Wmo0vURWFY3JqSPGKFM/UYdGOh0d/U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BNco/rZ/; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="BNco/rZ/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9AB9DC19423; Thu, 20 Nov 2025 20:56:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1763672197; bh=8C5Q1w4EPe0MTRU5lmtulPwfzR7CqMI3MLyK+6S7Wk4=; h=Date:From:To:Cc:Subject:References:From; b=BNco/rZ/hU49q0cYoAOOiI6Zi7ZRK3+w9OEPKFf7An88yFHc5WCCeXNrUDN8gFp3/ G6PZWIuBT7YqLVb7NQFRbVXM50GkkenmH7nMoG7WnvrTr2Zht04WzKmt6VKVmmcp0e I419D3QwUiEK3POK70LkD5TxOcWIvPz8RH1N+j4H3Cse/4LAD7EsrgVGBayPEcH+AX pWSfyOFTR+bsLQKsYcwxNVzsQ4sB3qIV30hJIe6Y/DxuTfEoilKg95yQv6OoQ6SMp+ BMCzCA8A/89gxpopDMZXtng10FJi9RocGPDH0jI4nhZ60h1U/mq01tZhCKgzw8I5Z1 Pb5/M5SPIOudg== Received: from rostedt by gandalf with local (Exim 4.98.2) (envelope-from ) id 1vMBiI-00000003zCO-1vTj; Thu, 20 Nov 2025 15:57:10 -0500 Message-ID: <20251120205710.314839538@kernel.org> User-Agent: quilt/0.68 Date: Thu, 20 Nov 2025 15:56:03 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Tom Zanussi Subject: [PATCH 3/3] tracing: Use strim() in trigger_process_regex() instead of skip_spaces() References: <20251120205600.570673392@kernel.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 The function trigger_process_regex() is called by a few functions, where only one calls strim() on the buffer passed to it. That leaves the other functions not trimming the end of the buffer passed in and making it a little inconsistent. Remove the strim() from event_trigger_regex_write() and have trigger_process_regex() use strim() instead of skip_spaces(). The buff variable is not passed in as const, so it can be modified. Signed-off-by: Steven Rostedt (Google) Acked-by: Masami Hiramatsu (Google) --- kernel/trace/trace_events_trigger.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/kernel/trace/trace_events_trigger.c b/kernel/trace/trace_event= s_trigger.c index 16e3449f3cfe..1dfe69146a81 100644 --- a/kernel/trace/trace_events_trigger.c +++ b/kernel/trace/trace_events_trigger.c @@ -309,7 +309,8 @@ int trigger_process_regex(struct trace_event_file *file= , char *buff) char *command, *next; struct event_command *p; =20 - next =3D buff =3D skip_spaces(buff); + next =3D buff =3D strim(buff); + command =3D strsep(&next, ": \t"); if (next) { next =3D skip_spaces(next); @@ -346,8 +347,6 @@ static ssize_t event_trigger_regex_write(struct file *f= ile, if (IS_ERR(buf)) return PTR_ERR(buf); =20 - strim(buf); - guard(mutex)(&event_mutex); =20 event_file =3D event_file_file(file); --=20 2.51.0