shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 10:31:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "FROMGIT: BACKPORT: mm: update mark_victim tracepoints fields"

Browse Source 
This reverts commit 6b4c816d17.

Reason for revert: b/331214192

Change-Id: I9f4f56de7d65cee19c7015b0cb1bda339d82a5f5
Signed-off-by: Carlos Galo <carlosgalo@google.com>
This commit is contained in:
Carlos Galo
2024-04-04 23:39:13 +00:00
parent dfd2c809b9
commit 97808981ed
2 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/trace/events/oom.h
View File

@@ -72,30 +72,19 @@ TRACE_EVENT(reclaim_retry_zone,
); );
TRACE_EVENT(mark_victim, 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( TP_STRUCT__entry(
__field(int, pid) __field(int, pid)
__field(uid_t, uid)
__string(comm, task->comm)
__field(short, oom_score_adj)
), ),
TP_fast_assign( TP_fast_assign(
__entry->pid = task->pid; __entry->pid = pid;
__entry->uid = uid;
__assign_str(comm, task->comm);
__entry->oom_score_adj = task->signal->oom_score_adj;
), ),
TP_printk("pid=%d uid=%u comm=%s oom_score_adj=%hd", TP_printk("pid=%d", __entry->pid)
__entry->pid,
__entry->uid,
__get_str(comm),
__entry->oom_score_adj
)
); );
TRACE_EVENT(wake_reaper, TRACE_EVENT(wake_reaper,

7
mm/oom_kill.c
View File

@@ -44,7 +44,6 @@
#include <linux/kthread.h> #include <linux/kthread.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/mmu_notifier.h> #include <linux/mmu_notifier.h>
#include <linux/cred.h>
#include <asm/tlb.h> #include <asm/tlb.h>
#include "internal.h" #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) static void mark_oom_victim(struct task_struct *tsk)
{ {
const struct cred *cred;
WARN_ON(oom_killer_disabled); WARN_ON(oom_killer_disabled);
/* OOM killer might race with memcg OOM */ /* OOM killer might race with memcg OOM */
if (test_and_set_tsk_thread_flag(tsk, TIF_MEMDIE)) 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); __thaw_task(tsk);
atomic_inc(&oom_victims); atomic_inc(&oom_victims);
cred = get_task_cred(tsk); trace_mark_victim(tsk->pid);
trace_mark_victim(tsk, cred->uid.val);
put_cred(cred);
} }
/** /**