evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "tracing: Revert commits improving handling of saved_tgids"

Browse source
This commit is contained in:
Linux Build Service Account 2017-08-22 04:11:33 -07:00 • committed by Gerrit - the friendly Code Review server
commit a39227b922
1 changed files with 5 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
kernel/trace/trace.c
View file

@ -1358,11 +1358,11 @@ void tracing_reset_all_online_cpus(void)
#define SAVED_CMDLINES_DEFAULT 128 #define SAVED_CMDLINES_DEFAULT 128
#define NO_CMDLINE_MAP UINT_MAX #define NO_CMDLINE_MAP UINT_MAX
static unsigned saved_tgids[SAVED_CMDLINES_DEFAULT];
static arch_spinlock_t trace_cmdline_lock = __ARCH_SPIN_LOCK_UNLOCKED; static arch_spinlock_t trace_cmdline_lock = __ARCH_SPIN_LOCK_UNLOCKED;
struct saved_cmdlines_buffer { struct saved_cmdlines_buffer {
unsigned map_pid_to_cmdline[PID_MAX_DEFAULT+1]; unsigned map_pid_to_cmdline[PID_MAX_DEFAULT+1];
unsigned *map_cmdline_to_pid; unsigned *map_cmdline_to_pid;
unsigned *saved_tgids;
unsigned cmdline_num; unsigned cmdline_num;
int cmdline_idx; int cmdline_idx;
char *saved_cmdlines; char *saved_cmdlines;
@ -1396,22 +1396,12 @@ static int allocate_cmdlines_buffer(unsigned int val,
return -ENOMEM; return -ENOMEM;
} }
s->saved_tgids = kmalloc_array(val, sizeof(*s->saved_tgids),
GFP_KERNEL);
if (!s->saved_tgids) {
kfree(s->map_cmdline_to_pid);
kfree(s->saved_cmdlines);
return -ENOMEM;
}
s->cmdline_idx = 0; s->cmdline_idx = 0;
s->cmdline_num = val; s->cmdline_num = val;
memset(&s->map_pid_to_cmdline, NO_CMDLINE_MAP, memset(&s->map_pid_to_cmdline, NO_CMDLINE_MAP,
sizeof(s->map_pid_to_cmdline)); sizeof(s->map_pid_to_cmdline));
memset(s->map_cmdline_to_pid, NO_CMDLINE_MAP, memset(s->map_cmdline_to_pid, NO_CMDLINE_MAP,
val * sizeof(*s->map_cmdline_to_pid)); val * sizeof(*s->map_cmdline_to_pid));
memset(s->saved_tgids, 0,
val * sizeof(*s->saved_tgids));
return 0; return 0;
} }
@ -1607,7 +1597,7 @@ static int trace_save_cmdline(struct task_struct *tsk)
} }
set_cmdline(idx, tsk->comm); set_cmdline(idx, tsk->comm);
savedcmd->saved_tgids[idx] = tsk->tgid; saved_tgids[idx] = tsk->tgid;
arch_spin_unlock(&trace_cmdline_lock); arch_spin_unlock(&trace_cmdline_lock);
return 1; return 1;
@ -1659,7 +1649,7 @@ int trace_find_tgid(int pid)
arch_spin_lock(&trace_cmdline_lock); arch_spin_lock(&trace_cmdline_lock);
map = savedcmd->map_pid_to_cmdline[pid]; map = savedcmd->map_pid_to_cmdline[pid];
if (map != NO_CMDLINE_MAP) if (map != NO_CMDLINE_MAP)
tgid = savedcmd->saved_tgids[map]; tgid = saved_tgids[map];
else else
tgid = -1; tgid = -1;
@ -3991,7 +3981,6 @@ static void free_saved_cmdlines_buffer(struct saved_cmdlines_buffer *s)
{ {
kfree(s->saved_cmdlines); kfree(s->saved_cmdlines);
kfree(s->map_cmdline_to_pid); kfree(s->map_cmdline_to_pid);
kfree(s->saved_tgids);
kfree(s); kfree(s);
} }
@ -4233,13 +4222,13 @@ tracing_saved_tgids_read(struct file *file, char __user *ubuf,
int pid; int pid;
int i; int i;
file_buf = kmalloc(savedcmd->cmdline_num*(16+1+16), GFP_KERNEL); file_buf = kmalloc(SAVED_CMDLINES_DEFAULT*(16+1+16), GFP_KERNEL);
if (!file_buf) if (!file_buf)
return -ENOMEM; return -ENOMEM;
buf = file_buf; buf = file_buf;
for (i = 0; i < savedcmd->cmdline_num; i++) { for (i = 0; i < SAVED_CMDLINES_DEFAULT; i++) {
int tgid; int tgid;
int r; int r;