Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "tracing: Have saved_cmdlines arrays all in one allocation"

Browse source 
This reverts commit 6154d7268a.
This commit is contained in:
Ksawlii 2024-11-24 00:22:59 +01:00
parent cd14a4325d
commit bc40c2aebd
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
kernel/trace/trace.c
View file

@ -2245,10 +2245,6 @@ struct saved_cmdlines_buffer {
}; };
static struct saved_cmdlines_buffer *savedcmd; static struct saved_cmdlines_buffer *savedcmd;
/* Holds the size of a cmdline and pid element */
#define SAVED_CMDLINE_MAP_ELEMENT_SIZE(s) \
(TASK_COMM_LEN + sizeof((s)->map_cmdline_to_pid[0]))
static inline char *get_saved_cmdlines(int idx) static inline char *get_saved_cmdlines(int idx)
{ {
return &savedcmd->saved_cmdlines[idx * TASK_COMM_LEN]; return &savedcmd->saved_cmdlines[idx * TASK_COMM_LEN];
@ -2263,6 +2259,7 @@ static void free_saved_cmdlines_buffer(struct saved_cmdlines_buffer *s)
{ {
int order = get_order(sizeof(*s) + s->cmdline_num * TASK_COMM_LEN); int order = get_order(sizeof(*s) + s->cmdline_num * TASK_COMM_LEN);
kfree(s->map_cmdline_to_pid);
kmemleak_free(s); kmemleak_free(s);
free_pages((unsigned long)s, order); free_pages((unsigned long)s, order);
} }
@ -2275,7 +2272,7 @@ static struct saved_cmdlines_buffer *allocate_cmdlines_buffer(unsigned int val)
int order; int order;
/* Figure out how much is needed to hold the given number of cmdlines */ /* Figure out how much is needed to hold the given number of cmdlines */
orig_size = sizeof(*s) + val * SAVED_CMDLINE_MAP_ELEMENT_SIZE(s); orig_size = sizeof(*s) + val * TASK_COMM_LEN;
order = get_order(orig_size); order = get_order(orig_size);
size = 1 << (order + PAGE_SHIFT); size = 1 << (order + PAGE_SHIFT);
page = alloc_pages(GFP_KERNEL, order); page = alloc_pages(GFP_KERNEL, order);
@ -2287,11 +2284,16 @@ static struct saved_cmdlines_buffer *allocate_cmdlines_buffer(unsigned int val)
memset(s, 0, sizeof(*s)); memset(s, 0, sizeof(*s));
/* Round up to actual allocation */ /* Round up to actual allocation */
val = (size - sizeof(*s)) / SAVED_CMDLINE_MAP_ELEMENT_SIZE(s); val = (size - sizeof(*s)) / TASK_COMM_LEN;
s->cmdline_num = val; s->cmdline_num = val;
/* Place map_cmdline_to_pid array right after saved_cmdlines */ s->map_cmdline_to_pid = kmalloc_array(val,
s->map_cmdline_to_pid = (unsigned *)&s->saved_cmdlines[val * TASK_COMM_LEN]; sizeof(*s->map_cmdline_to_pid),
GFP_KERNEL);
if (!s->map_cmdline_to_pid) {
free_saved_cmdlines_buffer(s);
return NULL;
}
s->cmdline_idx = 0; s->cmdline_idx = 0;
memset(&s->map_pid_to_cmdline, NO_CMDLINE_MAP, memset(&s->map_pid_to_cmdline, NO_CMDLINE_MAP,