diff options
| author | Carlos Galo <carlosgalo@google.com> | 2024-04-08 18:37:57 +0000 |
|---|---|---|
| committer | Carlos Galo <carlosgalo@google.com> | 2024-04-08 18:38:42 +0000 |
| commit | 4571e647cc3ca967ac2edffb992f330aec8119c8 (patch) | |
| tree | 0dc90d486e785db75366a7d1d1b1c02a8dfa4398 | |
| parent | beecd97e3a92f28e06b319ecd702fc287f3b1940 (diff) | |
| download | hikey-linaro-4571e647cc3ca967ac2edffb992f330aec8119c8.tar.gz | |
Revert "FROMGIT: BACKPORT: mm: update mark_victim tracepoints fields"
This reverts commit 050c668fefb2a9724ad4f3efd58bd04c6fd308c5.
Reason for revert: b/331214192
Signed-off-by: Carlos Galo <carlosgalo@google.com>
Change-Id: I64e551ef5114f602c3300ed576de61ab3332ffc2
| -rw-r--r-- | include/trace/events/oom.h | 19 | ||||
| -rw-r--r-- | mm/oom_kill.c | 7 |
2 files changed, 5 insertions, 21 deletions
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 f335ffb793e5..e722c6877faf 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -44,7 +44,6 @@ #include <linux/kthread.h> #include <linux/init.h> #include <linux/mmu_notifier.h> -#include <linux/cred.h> #include <asm/tlb.h> #include "internal.h" @@ -752,8 +751,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)) @@ -770,9 +767,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); } /** |