From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5026CC4828F for ; Thu, 8 Feb 2024 17:01:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A85CE6B0071; Thu, 8 Feb 2024 12:01:11 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A35276B0074; Thu, 8 Feb 2024 12:01:11 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 924786B0075; Thu, 8 Feb 2024 12:01:11 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 81BB06B0071 for ; Thu, 8 Feb 2024 12:01:11 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 080A91A0DAD for ; Thu, 8 Feb 2024 17:01:10 +0000 (UTC) X-FDA: 81769251942.11.30EE664 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf01.hostedemail.com (Postfix) with ESMTP id CD6EB40021 for ; Thu, 8 Feb 2024 17:01:05 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf01.hostedemail.com: domain of "SRS0=wLiV=JR=goodmis.org=rostedt@kernel.org" designates 139.178.84.217 as permitted sender) smtp.mailfrom="SRS0=wLiV=JR=goodmis.org=rostedt@kernel.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1707411665; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7qIHRYyZoAWJKb4NALNTQbikvNBzyZuAxTbwneAWR1Y=; b=MOZ+FsVPp4KP+WGJ9sGKdW1mTLhNt+9guB+bw+TmUE9UvROCEuqarkgePQSp9CdDimqbxd KUOI0jXVKIESROWKKAURG+C60jKfMLrIHMbMIFDWN7sYZPTgpSqc5fgOBk1RG4rOk0Pen1 HE8M37pGmcF8rvTslI2n8LrI+jK0k64= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf01.hostedemail.com: domain of "SRS0=wLiV=JR=goodmis.org=rostedt@kernel.org" designates 139.178.84.217 as permitted sender) smtp.mailfrom="SRS0=wLiV=JR=goodmis.org=rostedt@kernel.org" ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707411666; a=rsa-sha256; cv=none; b=4X15OI6fIjPhuFWu88yztDeQIgxh1qHcxgbMFK5zKkoU4rO3QBmSXiUzuPlVCrwGZPR+Fx PDJ6KyKxrCV41TfJmQHs22cFvl0HaeFPLMatqAKb+YYtpAWzf51ViPTOPPXmO/gX186qmW 6jAWBi89n1maihHKp52/U/0JRPw8JHM= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 9880361E68; Thu, 8 Feb 2024 17:01:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 01B44C43390; Thu, 8 Feb 2024 17:01:01 +0000 (UTC) Date: Thu, 8 Feb 2024 12:00:57 -0500 From: Steven Rostedt To: Carlos Galo Cc: akpm@linux-foundation.org, surenb@google.com, android-mm@google.com, kernel-team@android.com, Masami Hiramatsu , Mathieu Desnoyers , linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-mm@kvack.org, Roman Gushchin , Michal Hocko Subject: Re: [PATCH v2] mm: Update mark_victim tracepoints fields Message-ID: <20240208120057.01547849@rorschach.local.home> In-Reply-To: <20240111210539.636607-1-carlosgalo@google.com> References: <20240111210539.636607-1-carlosgalo@google.com> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: CD6EB40021 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: 6rf7h4j84rpedanhdt8z3g17zkoid1dc X-HE-Tag: 1707411665-585424 X-HE-Meta: U2FsdGVkX1+xKntk9uUf8CKgm5PCV6nTK0S0+UeiweQDFiMA2iuNYNDjp4zaBpYDTJ3GG2rQ0UjX8BXauGQ43koeLNxO839N3fkaHhiyW03YAiLX+AnsdYHlG3XmMKstHC+h7GO2/VkdmfpKhm8C9FMwroreihKM3hogJ66YA+Tsyon75xg/ljA5bN655uPynOA3qDD1EW9SVUYuxcyxfDZ+KLF/Kvd6BKdYeCqUUvN+zQvpr8V+59L02RPg6ljP3aSx4PlybSZj2SQgiHGFh6dVobesBBqWmIUs+Dy6zpvgcYFiKuOmu5hLVSDndSwF3+nbg3Yfkjy9j0GW7E8tuqEyugh6KKXSVR/p2tO9s66QCDpavm64/SWPAxDqUVPguYvWiayEFyfSCHqKKocx1Th/4C3kObWpRAQ6/Ydq5XFuVnTlPWmIezAJYhSreiYtHNI07QM6QDrUKJ65nKk/4p+S5qTVFVI0Q8/ha5ISA3joEB3S+a7kpN57pCEt24dArb1tT1JO7El1Dk2LhCkf6td+OFRneqifDZ+uaMXCLo4ZIISqEaEs+Ni85TsoZHDM/3lRp8ZAZKPlqTP2jqWxhS/8r4AXvYRWTPk0sAR6FL8djRC56FWDjtomJu1yxsPjiz+f0EokFG+rhsrzqJKGMNteXaFminpw5csMosG68465zymTbFZ+94QH3g6wkS/cIRPWdUZ2dIxpRA/oaE76JfZx7TdyqAUJ/8KC41xK52Y0rwaTYB3mjHG58K4m9zHYEUO+KZrl7d36f2bARYfHeMOKYN0gzZ8BefRrAIRNqC30+eszm4KL7lmgca/st5mqzvNWR7cK4o2HukiJx8HNnvleIGmQ3wcAQ6bcheiMlxcugJwWJmWkePo8y5TU2pGo8uxHeHcQX0k1Uixas9J2x6tDD7qVQjS64BUC5JqlMjevD59jfAFjDFv4Yaq2ZgWTSn10Eqd/FIGExp333W4 OzswqwsE 6FWAdYbGonwMbHtYfXUMlBcG6IzO7s8fLhr6PxYEWv2oopFUZdvsp1p8cheeq0wZ1DkEPkQJeOyO9jimZuVoaM1WbFfux+TrvV/4XTJFB6WBOO+qYY/a21JB+4hz4UMF/0UFFvdQ8HI5kb6X7DkOigc6JOXa9OzEZo5W2CU88ivsluhRrmOPkctTiU0D6CxebyWGwk+vJ3ZcW4FxPhzWuYazUcMEZWrMbcJk2nAuxfz1+ts1kqOvz9AIpu6bm/1f2zwk9U3Jo3Z6/hqooMkHPmeaG0ed1U7J9DC2Fj5Ad+CKSvVBUfgMY1rYzSPoZqRyU7jJbHU2hfKRqOOFyolD1b/dpRClTyfPVNc7Hbl6PrKGoby/2LIhbyckKsDk35kGWpDyAacoML2LjxIix0A1Ay5JNjKN46r7nR8kFMPWojZTYa19VmJVVh7hIvITJZqV61QIWrPVJjvQzcor7RTNASvObgQ== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On Thu, 11 Jan 2024 21:05:30 +0000 Carlos Galo wrote: > The current implementation of the mark_victim tracepoint provides only > the process ID (pid) of the victim process. This limitation poses > challenges for userspace tools that need additional information > about the OOM victim. The association between pid and the additional > data may be lost after the kill, making it difficult for userspace to > correlate the OOM event with the specific process. >=20 > In order to mitigate this limitation, add the following fields: >=20 > - UID > In Android each installed application has a unique UID. Including > the `uid` assists in correlating OOM events with specific apps. >=20 > - Process Name (comm) > Enables identification of the affected process. >=20 > - OOM Score > Allows userspace to get additional insights of the relative kill > priority of the OOM victim. >=20 =46rom a tracing POV this looks fine to me, but it's up to the mm maintainers to decide to take it. > Cc: Steven Rostedt > Cc: Andrew Morton > Cc: Suren Baghdasaryan > Signed-off-by: Carlos Galo > --- > v2: Fixed build error. Added missing comma when printing `__entry->uid`. >=20 > include/trace/events/oom.h | 19 +++++++++++++++---- > mm/oom_kill.c | 6 +++++- > 2 files changed, 20 insertions(+), 5 deletions(-) >=20 > diff --git a/include/trace/events/oom.h b/include/trace/events/oom.h > index 26a11e4a2c36..fb8a5d1b8a0a 100644 > --- a/include/trace/events/oom.h > +++ b/include/trace/events/oom.h > @@ -72,19 +72,30 @@ TRACE_EVENT(reclaim_retry_zone, > ); > =20 > TRACE_EVENT(mark_victim, > - TP_PROTO(int pid), > + TP_PROTO(struct task_struct *task, uid_t uid), > =20 > - TP_ARGS(pid), > + TP_ARGS(task, uid), > =20 > TP_STRUCT__entry( > __field(int, pid) > + __field(uid_t, uid) > + __string(comm, task->comm) > + __field(short, oom_score_adj) > ), > =20 > TP_fast_assign( > - __entry->pid =3D pid; > + __entry->pid =3D task->pid; > + __entry->uid =3D uid; > + __assign_str(comm, task->comm); > + __entry->oom_score_adj =3D task->signal->oom_score_adj; > ), > =20 > - TP_printk("pid=3D%d", __entry->pid) > + TP_printk("pid=3D%d uid=3D%u comm=3D%s oom_score_adj=3D%hd", > + __entry->pid, > + __entry->uid, > + __get_str(comm), > + __entry->oom_score_adj > + ) > ); > =20 > TRACE_EVENT(wake_reaper, > diff --git a/mm/oom_kill.c b/mm/oom_kill.c > index 9e6071fde34a..0698c00c5da6 100644 > --- a/mm/oom_kill.c > +++ b/mm/oom_kill.c > @@ -44,6 +44,7 @@ > #include > #include > #include > +#include > =20 > #include > #include "internal.h" > @@ -753,6 +754,7 @@ static inline void queue_oom_reaper(struct task_struc= t *tsk) > */ > static void mark_oom_victim(struct task_struct *tsk) > { > + const struct cred *cred; > struct mm_struct *mm =3D tsk->mm; > =20 > WARN_ON(oom_killer_disabled); > @@ -772,7 +774,9 @@ static void mark_oom_victim(struct task_struct *tsk) > */ > __thaw_task(tsk); > atomic_inc(&oom_victims); > - trace_mark_victim(tsk->pid); > + cred =3D get_task_cred(tsk); get_task_cred() isn't a trivial function and is used only for tracing. But this isn't a fast path so I guess that is fine. For tracing: Reviewed-by: Steven Rostedt (Google) -- Steve > + trace_mark_victim(tsk, cred->uid.val); > + put_cred(cred); > } > =20 > /** >=20 > base-commit: 0dd3ee31125508cd67f7e7172247f05b7fd1753a