diff --git a/include/trace/events/oom.h b/include/trace/events/oom.h index 3c5941da8075..26a11e4a2c36 100644 --- a/include/trace/events/oom.h +++ b/include/trace/events/oom.h @@ -72,30 +72,19 @@ TRACE_EVENT(reclaim_retry_zone, ); TRACE_EVENT(mark_victim, - TP_PROTO(struct task_struct *task, uid_t uid), + TP_PROTO(int pid), - TP_ARGS(task, uid), + TP_ARGS(pid), TP_STRUCT__entry( __field(int, pid) - __field(uid_t, uid) - __string(comm, task->comm) - __field(short, oom_score_adj) ), TP_fast_assign( - __entry->pid = task->pid; - __entry->uid = uid; - __assign_str(comm, task->comm); - __entry->oom_score_adj = task->signal->oom_score_adj; + __entry->pid = pid; ), - TP_printk("pid=%d uid=%u comm=%s oom_score_adj=%hd", - __entry->pid, - __entry->uid, - __get_str(comm), - __entry->oom_score_adj - ) + TP_printk("pid=%d", __entry->pid) ); TRACE_EVENT(wake_reaper, diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 7a9e1c7f636c..eb6a24072c3f 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -44,7 +44,6 @@ #include #include #include -#include #include #include "internal.h" @@ -773,8 +772,6 @@ static void __mark_oom_victim(struct task_struct *tsk) */ static void mark_oom_victim(struct task_struct *tsk) { - const struct cred *cred; - WARN_ON(oom_killer_disabled); /* OOM killer might race with memcg OOM */ if (test_and_set_tsk_thread_flag(tsk, TIF_MEMDIE)) @@ -791,9 +788,7 @@ static void mark_oom_victim(struct task_struct *tsk) */ __thaw_task(tsk); atomic_inc(&oom_victims); - cred = get_task_cred(tsk); - trace_mark_victim(tsk, cred->uid.val); - put_cred(cred); + trace_mark_victim(tsk->pid); } /**