FAILED: patch "[PATCH] tracing/fprobe: Avoid kcalloc() in rcu_read_lock section" failed to apply to 6.18-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 6.18-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.18.y
git checkout FETCH_HEAD
git cherry-pick -x aa72812b49104bb5a38272fc9541feb62ca6fd32
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026051559-bucket-granny-664d@gregkh' --subject-prefix 'PATCH 6.18.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From aa72812b49104bb5a38272fc9541feb62ca6fd32 Mon Sep 17 00:00:00 2001
From: "Masami Hiramatsu (Google)" <[email protected]>
Date: Mon, 20 Apr 2026 23:01:12 +0900
Subject: [PATCH] tracing/fprobe: Avoid kcalloc() in rcu_read_lock section
fprobe_remove_node_in_module() is called under RCU read locked, but this invokes kcalloc() if there are more than 8 fprobes installed on the module. Sashiko warns it because kcalloc() can sleep [1].
To fix this issue, expand the batch size to 128 and do not expand the fprobe_addr_list, but just cancel walking on fprobe_ip_table, update fgraph/ftrace_ops and retry the loop again.
kernel/trace/fprobe.c +46 -48
@@ -344,11 +344,10 @@ static bool fprobe_is_ftrace(struct fprobe *fp) }#ifdef CONFIG_MODULES -static void fprobe_set_ips (unsigned long *ips,unsigned int cnt,int remove, -int reset) +static void fprobe_remove_ips (unsigned long *ips,unsigned int cnt) { -ftrace_set_filter_ips (&fprobe_graph_ops.ops, ips, cnt, remove, reset); -ftrace_set_filter_ips (&fprobe_ftrace_ops, ips, cnt, remove, reset); +ftrace_set_filter_ips (&fprobe_graph_ops.ops, ips, cnt,1 ,0 ); +ftrace_set_filter_ips (&fprobe_ftrace_ops, ips, cnt,1 ,0 ); }#endif #else
@@ -367,10 +366,9 @@ static bool fprobe_is_ftrace(struct fprobe *fp) }#ifdef CONFIG_MODULES -static void fprobe_set_ips (unsigned long *ips,unsigned int cnt,int remove, -int reset) +static void fprobe_remove_ips (unsigned long *ips,unsigned int cnt) { -ftrace_set_filter_ips (&fprobe_graph_ops.ops, ips, cnt, remove, reset); +ftrace_set_filter_ips (&fprobe_graph_ops.ops, ips, cnt,1 ,0 ); }#endif #endif /* !CONFIG_DYNAMIC_FTRACE_WITH_ARGS && !CONFIG_DYNAMIC_FTRACE_WITH_REGS */
@@ -542,7 +540,7 @@ static void fprobe_graph_remove_ips(unsigned long *addrs, int num) #ifdef CONFIG_MODULES -#define FPROBE_IPS_BATCH_INIT 8 +#define FPROBE_IPS_BATCH_INIT 128 /* instruction pointer address list */ struct fprobe_addr_list { int index;
@@ -550,43 +548,22 @@ struct fprobe_addr_list {unsigned long *addrs; }; -static int fprobe_addr_list_add (struct fprobe_addr_list *alist,unsigned long addr) -{ -unsigned long *addrs; - -/* Previously we failed to expand the list. */ -if (alist->index == alist->size) -return -ENOSPC ; - - alist->addrs[alist->index++] = addr; -if (alist->index < alist->size) -return 0 ; - -/* Expand the address list */ - addrs =kcalloc (alist->size *2 ,sizeof (*addrs),GFP_KERNEL ); -if (!addrs) -return -ENOMEM ; - -memcpy (addrs, alist->addrs, alist->size *sizeof (*addrs)); - alist->size *=2 ; -kfree (alist->addrs); - alist->addrs = addrs; - -return 0 ; -} - -static void fprobe_remove_node_in_module (struct module *mod,struct fprobe_hlist_node *node, +static int fprobe_remove_node_in_module (struct module *mod,struct fprobe_hlist_node *node,struct fprobe_addr_list *alist) {if (!within_module (node->addr, mod)) -return ; +return 0 ; +if (delete_fprobe_node (node)) -return ; -/* -* If failed to update alist, just continue to update hlist. -* Therefore, at list user handler will not hit anymore. -*/ -fprobe_addr_list_add (alist, node->addr); +return 0 ; +/* If no address list is available, we can't track this address. */ +if (!alist->addrs) +return 0 ; + + alist->addrs[alist->index++] = node->addr; +if (alist->index == alist->size) +return -ENOSPC ; +return 0 ; }/* Handle module unloading to manage fprobe_ip_table. */
@@ -597,29 +574,50 @@ static int fprobe_module_callback(struct notifier_block *nb,struct fprobe_hlist_node *node;struct rhashtable_iter iter;struct module *mod = data; +bool retry;if (val !=MODULE_STATE_GOING )return NOTIFY_DONE ; alist.addrs =kcalloc (alist.size,sizeof (*alist.addrs),GFP_KERNEL ); -/* If failed to alloc memory, we can not remove ips from hash. */ -if (!alist.addrs) -return NOTIFY_DONE ; +/* +* If failed to alloc memory, ftrace_ops will not be able to remove ips from +* hash, but we can still remove nodes from fprobe_ip_table, so we can avoid +* the potential wrong callback. So just print a warning here and try to +* continue without address list. +*/ +WARN_ONCE (!alist.addrs, +"Failed to allocate memory for fprobe_addr_list, ftrace_ops will not be updated" );mutex_lock (&fprobe_mutex); +again: + retry = false; + alist.index =0 ;rhltable_walk_enter (&fprobe_ip_table, &iter);do {rhashtable_walk_start (&iter);while ((node =rhashtable_walk_next (&iter)) && !IS_ERR (node)) -fprobe_remove_node_in_module (mod, node, &alist); +if (fprobe_remove_node_in_module (mod, node, &alist) <0 ) { + retry = true; +break ; + }rhashtable_walk_stop (&iter); - }while (node ==ERR_PTR (-EAGAIN )); + }while (node ==ERR_PTR (-EAGAIN ) && !retry);rhashtable_walk_exit (&iter); +/* Remove any ips from hash table(s) */ +if (alist.index >0 ) { +fprobe_remove_ips (alist.addrs, alist.index); +/* +* If we break rhashtable walk loop except for -EAGAIN, we need +* to restart looping from start for safety. Anyway, this is +* not a hotpath. +*/ +if (retry) + goto again; + } -if (alist.index >0 ) -fprobe_set_ips (alist.addrs, alist.index,1 ,0 );mutex_unlock (&fprobe_mutex);kfree (alist.addrs);
Sasha Levin
maintainerPATCH 1/3 tracing: fprobe: Remove unused local variable
From: "Masami Hiramatsu (Google)" <[email protected]>
[ Upstream commit 90e69d291d195d35215b578d210fd3ce0e5a3f42 ]
The 'ret' local variable in fprobe_remove_node_in_module() was used for checking the error state in the loop, but commit dfe0d675df82 ("tracing: fprobe: use rhltable for fprobe_ip_table") removed the loop. So we don't need it anymore.
Stable-dep-of: aa72812b4910 ("tracing/fprobe: Avoid kcalloc() in rcu_read_lock section")
--- kernel/trace/fprobe.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
kernel/trace/fprobe.c +1 -4
@@ -561,8 +561,6 @@ static int fprobe_addr_list_add(struct fprobe_addr_list *alist, unsigned long adstatic void fprobe_remove_node_in_module (struct module *mod,struct fprobe_hlist_node *node,struct fprobe_addr_list *alist) { -int ret =0 ; -if (!within_module (node->addr, mod))return ;if (delete_fprobe_node (node))
@@ -571,8 +569,7 @@ static void fprobe_remove_node_in_module(struct module *mod, struct fprobe_hlist* If failed to update alist, just continue to update hlist. * Therefore, at list user handler will not hit anymore. */ -if (!ret) - ret =fprobe_addr_list_add (alist, node->addr); +fprobe_addr_list_add (alist, node->addr); }/* Handle module unloading to manage fprobe_ip_table. */
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/3 tracing: fprobe: use ftrace if CONFIG_DYNAMIC_FTRACE_WITH_ARGS
From: Menglong Dong <[email protected]>
[ Upstream commit cd06078a38aaedfebbf8fa0c009da0f99f4473fb ]
For now, we will use ftrace for the fprobe if fp->exit_handler not exists and CONFIG_DYNAMIC_FTRACE_WITH_REGS is enabled.
However, CONFIG_DYNAMIC_FTRACE_WITH_REGS is not supported by some arch, such as arm. What we need in the fprobe is the function arguments, so we can use ftrace for fprobe if CONFIG_DYNAMIC_FTRACE_WITH_ARGS is enabled.
Therefore, use ftrace if CONFIG_DYNAMIC_FTRACE_WITH_REGS or CONFIG_DYNAMIC_FTRACE_WITH_ARGS enabled.
Stable-dep-of: aa72812b4910 ("tracing/fprobe: Avoid kcalloc() in rcu_read_lock section")
--- kernel/trace/fprobe.c | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-)
kernel/trace/fprobe.c +22 -10
@@ -45,6 +45,7 @@static struct hlist_head fprobe_table[FPROBE_TABLE_SIZE ];static struct rhltable fprobe_ip_table;static DEFINE_MUTEX (fprobe_mutex); +static struct fgraph_ops fprobe_graph_ops;static u32 fprobe_node_hashfn (const void *data,u32 len,u32 seed) {
@@ -259,7 +260,7 @@ static inline int __fprobe_kprobe_handler(unsigned long ip, unsigned long parentreturn ret; } -#ifdef CONFIG_DYNAMIC_FTRACE_WITH_REGS +#if defined(CONFIG_DYNAMIC_FTRACE_WITH_ARGS ) || defined(CONFIG_DYNAMIC_FTRACE_WITH_REGS )/* ftrace_ops callback, this processes fprobes which have only entry_handler. */ static void fprobe_ftrace_entry (unsigned long ip,unsigned long parent_ip,struct ftrace_ops *ops,struct ftrace_regs *fregs)
@@ -300,7 +301,7 @@ NOKPROBE_SYMBOL(fprobe_ftrace_entry);static struct ftrace_ops fprobe_ftrace_ops = { .func = fprobe_ftrace_entry, - .flags =FTRACE_OPS_FL_SAVE_REGS , + .flags =FTRACE_OPS_FL_SAVE_ARGS , };static int fprobe_ftrace_active;
@@ -341,6 +342,15 @@ static bool fprobe_is_ftrace(struct fprobe *fp) {return !fp->exit_handler; } + +#ifdef CONFIG_MODULES +static void fprobe_set_ips (unsigned long *ips,unsigned int cnt,int remove, +int reset) +{ +ftrace_set_filter_ips (&fprobe_graph_ops.ops, ips, cnt, remove, reset); +ftrace_set_filter_ips (&fprobe_ftrace_ops, ips, cnt, remove, reset); +} +#endif #else static int fprobe_ftrace_add_ips (unsigned long *addrs,int num) {
@@ -355,7 +365,15 @@ static bool fprobe_is_ftrace(struct fprobe *fp) {return false; } + +#ifdef CONFIG_MODULES +static void fprobe_set_ips (unsigned long *ips,unsigned int cnt,int remove, +int reset) +{ +ftrace_set_filter_ips (&fprobe_graph_ops.ops, ips, cnt, remove, reset); +}#endif +#endif /* !CONFIG_DYNAMIC_FTRACE_WITH_ARGS && !CONFIG_DYNAMIC_FTRACE_WITH_REGS */ /* fgraph_ops callback, this processes fprobes which have exit_handler. */ static int fprobe_fgraph_entry(struct ftrace_graph_ent *trace, struct fgraph_ops *gops,
@@ -601,14 +619,8 @@ static int fprobe_module_callback(struct notifier_block *nb, }while (node ==ERR_PTR (-EAGAIN ));rhashtable_walk_exit (&iter); -if (alist.index >0 ) { -ftrace_set_filter_ips (&fprobe_graph_ops.ops, - alist.addrs, alist.index,1 ,0 ); -#ifdef CONFIG_DYNAMIC_FTRACE_WITH_REGS -ftrace_set_filter_ips (&fprobe_ftrace_ops, - alist.addrs, alist.index,1 ,0 ); -#endif - } +if (alist.index >0 ) +fprobe_set_ips (alist.addrs, alist.index,1 ,0 );mutex_unlock (&fprobe_mutex);kfree (alist.addrs);
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 3/3 tracing/fprobe: Avoid kcalloc() in rcu_read_lock section
In reply to Sasha LevinFrom: "Masami Hiramatsu (Google)" <[email protected]>
[ Upstream commit aa72812b49104bb5a38272fc9541feb62ca6fd32 ]
fprobe_remove_node_in_module() is called under RCU read locked, but this invokes kcalloc() if there are more than 8 fprobes installed on the module. Sashiko warns it because kcalloc() can sleep [1].
To fix this issue, expand the batch size to 128 and do not expand the fprobe_addr_list, but just cancel walking on fprobe_ip_table, update fgraph/ftrace_ops and retry the loop again.
--- kernel/trace/fprobe.c | 92 +++++++++++++++++++++---------------------- 1 file changed, 45 insertions(+), 47 deletions(-)
kernel/trace/fprobe.c +45 -47
@@ -344,11 +344,10 @@ static bool fprobe_is_ftrace(struct fprobe *fp) }#ifdef CONFIG_MODULES -static void fprobe_set_ips (unsigned long *ips,unsigned int cnt,int remove, -int reset) +static void fprobe_remove_ips (unsigned long *ips,unsigned int cnt) { -ftrace_set_filter_ips (&fprobe_graph_ops.ops, ips, cnt, remove, reset); -ftrace_set_filter_ips (&fprobe_ftrace_ops, ips, cnt, remove, reset); +ftrace_set_filter_ips (&fprobe_graph_ops.ops, ips, cnt,1 ,0 ); +ftrace_set_filter_ips (&fprobe_ftrace_ops, ips, cnt,1 ,0 ); }#endif #else
@@ -367,10 +366,9 @@ static bool fprobe_is_ftrace(struct fprobe *fp) }#ifdef CONFIG_MODULES -static void fprobe_set_ips (unsigned long *ips,unsigned int cnt,int remove, -int reset) +static void fprobe_remove_ips (unsigned long *ips,unsigned int cnt) { -ftrace_set_filter_ips (&fprobe_graph_ops.ops, ips, cnt, remove, reset); +ftrace_set_filter_ips (&fprobe_graph_ops.ops, ips, cnt,1 ,0 ); }#endif #endif /* !CONFIG_DYNAMIC_FTRACE_WITH_ARGS && !CONFIG_DYNAMIC_FTRACE_WITH_REGS */
@@ -543,7 +541,7 @@ static void fprobe_graph_remove_ips(unsigned long *addrs, int num) #ifdef CONFIG_MODULES -#define FPROBE_IPS_BATCH_INIT 8 +#define FPROBE_IPS_BATCH_INIT 128 /* instruction pointer address list */ struct fprobe_addr_list { int index;
@@ -551,45 +549,24 @@ struct fprobe_addr_list {unsigned long *addrs; }; -static int fprobe_addr_list_add (struct fprobe_addr_list *alist,unsigned long addr) +static int fprobe_remove_node_in_module (struct module *mod,struct fprobe_hlist_node *node, +struct fprobe_addr_list *alist) { -unsigned long *addrs; - -/* Previously we failed to expand the list. */ -if (alist->index == alist->size) -return -ENOSPC ; - - alist->addrs[alist->index++] = addr; -if (alist->index < alist->size) +if (!within_module (node->addr, mod))return 0 ; -/* Expand the address list */ - addrs =kcalloc (alist->size *2 ,sizeof (*addrs),GFP_KERNEL ); -if (!addrs) -return -ENOMEM ; - -memcpy (addrs, alist->addrs, alist->size *sizeof (*addrs)); - alist->size *=2 ; -kfree (alist->addrs); - alist->addrs = addrs; +if (delete_fprobe_node (node)) +return 0 ; +/* If no address list is available, we can't track this address. */ +if (!alist->addrs) +return 0 ; + alist->addrs[alist->index++] = node->addr; +if (alist->index == alist->size) +return -ENOSPC ;return 0 ; } -static void fprobe_remove_node_in_module (struct module *mod,struct fprobe_hlist_node *node, -struct fprobe_addr_list *alist) -{ -if (!within_module (node->addr, mod)) -return ; -if (delete_fprobe_node (node)) -return ; -/* -* If failed to update alist, just continue to update hlist. -* Therefore, at list user handler will not hit anymore. -*/ -fprobe_addr_list_add (alist, node->addr); -} -/* Handle module unloading to manage fprobe_ip_table. */ static int fprobe_module_callback (struct notifier_block *nb,unsigned long val,void *data)
@@ -598,29 +575,50 @@ static int fprobe_module_callback(struct notifier_block *nb,struct fprobe_hlist_node *node;struct rhashtable_iter iter;struct module *mod = data; +bool retry;if (val !=MODULE_STATE_GOING )return NOTIFY_DONE ; alist.addrs =kcalloc (alist.size,sizeof (*alist.addrs),GFP_KERNEL ); -/* If failed to alloc memory, we can not remove ips from hash. */ -if (!alist.addrs) -return NOTIFY_DONE ; +/* +* If failed to alloc memory, ftrace_ops will not be able to remove ips from +* hash, but we can still remove nodes from fprobe_ip_table, so we can avoid +* the potential wrong callback. So just print a warning here and try to +* continue without address list. +*/ +WARN_ONCE (!alist.addrs, +"Failed to allocate memory for fprobe_addr_list, ftrace_ops will not be updated" );mutex_lock (&fprobe_mutex); +again: + retry = false; + alist.index =0 ;rhltable_walk_enter (&fprobe_ip_table, &iter);do {rhashtable_walk_start (&iter);while ((node =rhashtable_walk_next (&iter)) && !IS_ERR (node)) -fprobe_remove_node_in_module (mod, node, &alist); +if (fprobe_remove_node_in_module (mod, node, &alist) <0 ) { + retry = true; +break ; + }rhashtable_walk_stop (&iter); - }while (node ==ERR_PTR (-EAGAIN )); + }while (node ==ERR_PTR (-EAGAIN ) && !retry);rhashtable_walk_exit (&iter); +/* Remove any ips from hash table(s) */ +if (alist.index >0 ) { +fprobe_remove_ips (alist.addrs, alist.index); +/* +* If we break rhashtable walk loop except for -EAGAIN, we need +* to restart looping from start for safety. Anyway, this is +* not a hotpath. +*/ +if (retry) + goto again; + } -if (alist.index >0 ) -fprobe_set_ips (alist.addrs, alist.index,1 ,0 );mutex_unlock (&fprobe_mutex);kfree (alist.addrs);
Signature · 1 line
2.53.0