Skip to content

Commit

Permalink
fprobe: Add nr_maxactive to specify rethook_node pool size
Browse files Browse the repository at this point in the history
Add nr_maxactive to specify rethook_node pool size. This means
the maximum number of actively running target functions concurrently
for probing by exit_handler. Note that if the running function is
preempted or sleep, it is still counted as 'active'.

Link: https://lkml.kernel.org/r/167526697917.433354.17779774988245113106.stgit@mhiramat.roam.corp.google.com

Cc: Florent Revest <revest@chromium.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
  • Loading branch information
Masami Hiramatsu (Google) authored and Steven Rostedt (Google) committed Mar 28, 2023
1 parent 34cabf8 commit 59a7a29
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
2 changes: 2 additions & 0 deletions include/linux/fprobe.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
* @flags: The status flag.
* @rethook: The rethook data structure. (internal data)
* @entry_data_size: The private data storage size.
* @nr_maxactive: The max number of active functions.
* @entry_handler: The callback function for function entry.
* @exit_handler: The callback function for function exit.
*/
Expand All @@ -31,6 +32,7 @@ struct fprobe {
unsigned int flags;
struct rethook *rethook;
size_t entry_data_size;
int nr_maxactive;

void (*entry_handler)(struct fprobe *fp, unsigned long entry_ip,
struct pt_regs *regs, void *entry_data);
Expand Down
5 changes: 4 additions & 1 deletion kernel/trace/fprobe.c
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,10 @@ static int fprobe_init_rethook(struct fprobe *fp, int num)
}

/* Initialize rethook if needed */
size = num * num_possible_cpus() * 2;
if (fp->nr_maxactive)
size = fp->nr_maxactive;
else
size = num * num_possible_cpus() * 2;
if (size < 0)
return -E2BIG;

Expand Down

0 comments on commit 59a7a29

Please sign in to comment.