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 40E17C5478C for ; Fri, 23 Feb 2024 17:33:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B31BC6B007D; Fri, 23 Feb 2024 12:33:34 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id AE1906B007E; Fri, 23 Feb 2024 12:33:34 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9DB306B0082; Fri, 23 Feb 2024 12:33:34 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 8EC526B007D for ; Fri, 23 Feb 2024 12:33:34 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id D79911A1153 for ; Fri, 23 Feb 2024 17:33:33 +0000 (UTC) X-FDA: 81823765506.03.98856DF Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) by imf04.hostedemail.com (Postfix) with ESMTP id 197C54001E for ; Fri, 23 Feb 2024 17:33:31 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=kPMOvwO8; spf=pass (imf04.hostedemail.com: domain of 369bYZQoKCDIQOfZcgUOZcUccUZS.QcaZWbil-aaYjOQY.cfU@flex--carlosgalo.bounces.google.com designates 209.85.219.201 as permitted sender) smtp.mailfrom=369bYZQoKCDIQOfZcgUOZcUccUZS.QcaZWbil-aaYjOQY.cfU@flex--carlosgalo.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1708709612; 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: references:dkim-signature; bh=uB4sepnqluOGCQzWosSupcXtilnk0cI5dxVNZLd+dk0=; b=iNp9+XI8laKh5DAB22xO+h+DyS3BreoODBGCnY54Tt0pln9TLUURCOSlB2uIABBgyd+LsT xdFn6Ln56GnDcHTCB2di501WDGm5319gxoZRRDo2BR/gtIFBubqColv5Jnmv/ITdWg9b4z PZrMiO20PxAIC7CwJxhF7YKCjYwooMo= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=kPMOvwO8; spf=pass (imf04.hostedemail.com: domain of 369bYZQoKCDIQOfZcgUOZcUccUZS.QcaZWbil-aaYjOQY.cfU@flex--carlosgalo.bounces.google.com designates 209.85.219.201 as permitted sender) smtp.mailfrom=369bYZQoKCDIQOfZcgUOZcUccUZS.QcaZWbil-aaYjOQY.cfU@flex--carlosgalo.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1708709612; a=rsa-sha256; cv=none; b=hIXlr1tqoTrlRe6C77795Y8SoTeOAzvPWXIKo8OBFFTj8R1r5uI7Y8tfSRZAr1Eo5RLbk1 oWmvavdjYLdGw4uO4PRw9uu7sd4QpxfKXOs1z5Za/WbeZYtXSC4vHhxPBNK1+z4yHweuJM zrDzoclhQxt0ycurmerm/z2Ae1inM5k= Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-dc64e0fc7c8so1505764276.2 for ; Fri, 23 Feb 2024 09:33:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1708709611; x=1709314411; darn=kvack.org; h=content-transfer-encoding:cc:to:from:subject:message-id :mime-version:date:from:to:cc:subject:date:message-id:reply-to; bh=uB4sepnqluOGCQzWosSupcXtilnk0cI5dxVNZLd+dk0=; b=kPMOvwO8xLg0WZZzVCedtTGgtDroXrK6k5WktAIX6X+3dQyHABIdLsYj+8hFN6H5Ff vlwEjYoMYrjYYPYEb+v9c0y1Xp6dTgephNc+tEp3paqR7KKS+EVmI4tt00Jn+ete1D3e zZXIXkRzxGHYnrYsA48/6/cEgtyVPeE1yhzjW0a8RRWeHY09aAKgRKzqbt9cUwHhNexQ 0ue7H/vL6bszkWvgWdj+UWoXUjO6oB1yhZ4c9wy421HFWxPeJ6IbgtqWtSHToDs4Z7qM hJn9gfLcSqXzBlfUMZ1J+5cpSq1mUP0rp6Jdyz+qZGGgXLlpLG2CmAXLoGH0RVY8x2es heQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708709611; x=1709314411; h=content-transfer-encoding:cc:to:from:subject:message-id :mime-version:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=uB4sepnqluOGCQzWosSupcXtilnk0cI5dxVNZLd+dk0=; b=etQSNAmddKs9OyZ2PQEMRAH3EKFQHKlYkAkkt1d+ePZvxCb/ymlksG4Ou/SwL+hDd/ /5tJ8tx7r9nte2qSzC9vUhxdoLE6Qq2qOGwTUpKwbgB4yxC9b3rhKz64kj02Vmdn59R1 LKknsDKk+aiyU3qIOQYkN0zAuc/wD67dkGV+8vWRycN5kWqspfz0W5ywoes3tkl8QV/U AodUrb5D+6tVoWp/HQznnMeZVEBzeB07+MykR1r4tW8U7kGzPbRt3UWDknUqhQmxAhz0 rGZnX2Gk6wjb+nRUd8DDHtV1Ao3oTGtNSB/8kU9ZS5MxPumXC8O6ppjGmbulglLSW7aq OV4A== X-Forwarded-Encrypted: i=1; AJvYcCWIyCoQCzHLK1j8bSaRlgjckpRNgy6snzAfR3gUX7bRW2a7o/EvVHsoiPhedPpbRfxbhRxn06jL6X2bSNwWonoj3AU= X-Gm-Message-State: AOJu0YwmkJnB/JkZXv8+O9Hsly4dhnKe6B+tUj7KS52eoavLcDot/ts0 MeFb9SBwLO1beq5pmX4ILBNHPG5zTUqeytxPQOaM3JkjorJjpnpwE2Es5uxwZSKqfOANrsSQiiL QOiE5NobkOFA+weYTyg== X-Google-Smtp-Source: AGHT+IHVRK3LPQO5y/JakeL60p382oMqTXfrOuVmR62hgfxoKp6aQ2jEjXhQkVkn+lJufBcDrmjuFkr7l+uc036t X-Received: from cgalo-android-cuttlefish.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:24f8]) (user=carlosgalo job=sendgmr) by 2002:a05:6902:1501:b0:dc7:66ec:9038 with SMTP id q1-20020a056902150100b00dc766ec9038mr31443ybu.1.1708709611093; Fri, 23 Feb 2024 09:33:31 -0800 (PST) Date: Fri, 23 Feb 2024 17:32:49 +0000 Mime-Version: 1.0 X-Mailer: git-send-email 2.44.0.rc0.258.g7320e95886-goog Message-ID: <20240223173258.174828-1-carlosgalo@google.com> Subject: [PATCH v3] mm: Update mark_victim tracepoints fields From: Carlos Galo To: rostedt@goodmis.org, akpm@linux-foundation.org, surenb@google.com, mhocko@suse.com Cc: android-mm@google.com, kernel-team@android.com, Carlos Galo , Masami Hiramatsu , Mathieu Desnoyers , linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-mm@kvack.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 197C54001E X-Rspam-User: X-Stat-Signature: ydbmpxd83r8krazg9j33djts3oiriz8f X-Rspamd-Server: rspam01 X-HE-Tag: 1708709611-80014 X-HE-Meta: U2FsdGVkX1/MUO3Tdcb7yby1pdN8hxexU06HTTrRn8LpfdV0ulBcvKj7v/dr1mBmK55j0taMm6IezP/TX+eASnVVDjXdf3kFPxQnU3P9UbyovhDRNaIgsYIOOWWnOBuNoCeD3atxB3a1k8rry6dmBOf5eA5uGB+rBiyiQYyRleTNLlCVWWyosuEoNfEry8sgwxeex4MJ8YNER+Z9aKMo4SkSM1leqPGQWwKwlFA92bGLTgqbQFcgzY8QARNtkgpv4npblrgwMVatOEhE9qF7+8BQOP/drFQP5HjFKte+QxnQqIsXDM6Xth20doSeSOt15zDxz5u1OWkjJhHtBvREJpi9TecYMb7FyEpJH4h4SZp4d+iH0FuWSDhiiUa39/pIPvvJlhipJ9SQlSaAKzM7o0LnFVyzdk6/AlsjMtVhcQ7uoNg3kY4QJW4kgPwVjM9RcHvuAy8WnmusLDtVZo6bWJiW/YrpDNADd90iTptOBVzQgU/H91w28/eKNl8hdM/KtRZ3KThvXKaD4gD931LvWhvhcyTWWR5Hy4g8RaQNx+nwGbO+BQ9CV1O/h8qM3dMRLXI6gtgwJsZDMIKawZ9iBrstsOdjvnkIMNhgJnI8eq9tpBccMf4DHEP2PmBj3d+UJ9fvsweTeKMlJ0JtbpApnbWDWuQ+QGzmu5JHaLC5SYi20U2fPUNBbOs6odCq4ELrpVXKoFg1t2s+nlSmFLeh4lMjzwKXAGGfOObV5JX4pgD3S9tBF3fzaeFIE1zFi06zEAkxtlZA3vHI9tXw/xklBZBQmxPCYpiNJErDvMFDlH9E+t4V6cCQJgHVtNqckNiBXB8XwyyF/upH5cdqh5dl1HkpcLH4xqTMHA4BtBuubyfiANW35IzWM27K4f8+dj2b8DAV8y8ddNaJK8tzsDJwZnYFBqnRtCV5ID4r+lMFCJ2gQKC7JMKpBj3IXIEFIVfj1DFkzctzHLVsRpZLWNJ 2nvL1rDk di+fedMqXRJBVscShEBMS2g+PeINuAN37zeoeoN7YRDkxKpD5yH7lJUX1hADJecpj3nzjiPX8kHVzIqgfiF39rqtiuZZklIli7I3jE6m5qSrdXlMzFvv3kfcnTQiE65Rm8NriJYqB9K59ZbQbDEhLRheTCr7A6kVkvCL5y/97tSHNimh5kLIjlz/ThaPp9G+S9Z6LOCBzyLPk99H4AYYQyDoqkSSabkNKG3CCrHcYxqfmhqdot0sAYDj+sZGYYtIQtf/r20dt96xKArNv5eBsCvBqHrPTMqqPGabceB+BdN5ldWWmRns7zPBLwFQe+YOMH0pjA1aJ57fhfEX4bPciVnKfrSe8dhgc7tXBchqsCY0OKXKFVpPqj2EuORwU6n99YcN1XUjscb1aIH07dkUD4kRpvbMSAp39hf7rNoZ0a88k5SPxqkLZaJlcTXJDdBhg5Kh8NnpmkXG/pFIjYT39Y+u9l6wHgM7fLTtlBkyzZ2/qS86luXBJ+VAVLEX1ydVe7UgUiMppKs96WSl9ZhQHQFRDNQRrANcf96VB8FRxtCL9eruo5YekXf/FZmMYhEJeifd2IeLwSa1Sc7GLd/CDa12Hge39yxf8/zIk4e0DKaMPYTSYtLrvbujwKNbQI8L3A1MFERfVGqfRSZEVgp0GUl1s1xT0k+1regzSR5Z3ha/Xfhk+dQE3+YGd0b3W71uz84l1+YGSmKHV2t425sJo9lfhf+KtOp0cuwccttdAVRJhvQ9M9ADHKge32ce/kvuiewOMcBITJok8TqLW1tPmupKXFPWjcru0l2gSXyKEurRjJDpr9rnRkWiMf0m+AmNANNLD4yT7Xpevd/N8rKB3GDBSTSJsGcn3Hk0qRGJmKfKFKsBwJm4Ncrdb5oyoQTFEIyIlMFhoInzBegE= X-Bogosity: Ham, tests=bogofilter, spamicity=0.001725, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: 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 requiring real-time OOM analysis and intervention. Although this information is available from the kernel logs, it=E2=80=99s not the appropriate format to provide OOM notifications.= In Android, BPF programs are used with the mark_victim trace events to notify userspace of an OOM kill. For consistency, update the trace event to include the same information about the OOMed victim as the kernel logs. - UID In Android each installed application has a unique UID. Including the `uid` assists in correlating OOM events with specific apps. - Process Name (comm) Enables identification of the affected process. - OOM Score Will allow userspace to get additional insight of the relative kill priority of the OOM victim. In Android, the oom_score_adj is used to categorize app state (foreground, background, etc.), which aids in analyzing user-perceptible impacts of OOM events [1]. - Total VM, RSS Stats, and pgtables Amount of memory used by the victim that will, potentially, be freed up by killing it. [1] https://cs.android.com/android/platform/superproject/main/+/246dc8fc95b= 6d93afcba5c6d6c133307abb3ac2e:frameworks/base/services/core/java/com/androi= d/server/am/ProcessList.java;l=3D188-283 Cc: Steven Rostedt Cc: Andrew Morton Cc: Suren Baghdasaryan Cc: Michal Hocko Reviewed-by: Steven Rostedt Signed-off-by: Carlos Galo --- v3: - Added total_vm, rss fields, and pgtables per Michal Hocko. - Added Steven Rostedt reviewed by - Updated commit description to include android usecase v2: Fixed build error. Added missing comma when printing `__entry->uid`. include/trace/events/oom.h | 36 ++++++++++++++++++++++++++++++++---- mm/oom_kill.c | 6 +++++- 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/include/trace/events/oom.h b/include/trace/events/oom.h index 26a11e4a2c36..b799f3bcba82 100644 --- a/include/trace/events/oom.h +++ b/include/trace/events/oom.h @@ -7,6 +7,8 @@ #include #include =20 +#define PG_COUNT_TO_KB(x) ((x) << (PAGE_SHIFT - 10)) + TRACE_EVENT(oom_score_adj_update, =20 TP_PROTO(struct task_struct *task), @@ -72,19 +74,45 @@ 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) + __string(comm, task->comm) + __field(unsigned long, total_vm) + __field(unsigned long, anon_rss) + __field(unsigned long, file_rss) + __field(unsigned long, shmem_rss) + __field(uid_t, uid) + __field(unsigned long, pgtables) + __field(short, oom_score_adj) ), =20 TP_fast_assign( - __entry->pid =3D pid; + __entry->pid =3D task->pid; + __assign_str(comm, task->comm); + __entry->total_vm =3D PG_COUNT_TO_KB(task->mm->total_vm); + __entry->anon_rss =3D PG_COUNT_TO_KB(get_mm_counter(task->mm, MM_ANONPAG= ES)); + __entry->file_rss =3D PG_COUNT_TO_KB(get_mm_counter(task->mm, MM_FILEPAG= ES)); + __entry->shmem_rss =3D PG_COUNT_TO_KB(get_mm_counter(task->mm, MM_SHMEMP= AGES)); + __entry->uid =3D uid; + __entry->pgtables =3D mm_pgtables_bytes(task->mm) >> 10; + __entry->oom_score_adj =3D task->signal->oom_score_adj; ), =20 - TP_printk("pid=3D%d", __entry->pid) + TP_printk("pid=3D%d comm=3D%s total-vm=3D%lukB anon-rss=3D%lukB file-rss:= %lukB shmem-rss:%lukB uid=3D%u pgtables=3D%lukB oom_score_adj=3D%hd", + __entry->pid, + __get_str(comm), + __entry->total_vm, + __entry->anon_rss, + __entry->file_rss, + __entry->shmem_rss, + __entry->uid, + __entry->pgtables, + __entry->oom_score_adj + ) ); =20 TRACE_EVENT(wake_reaper, diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 91ccd82097c2..8d6a207c3c59 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -44,6 +44,7 @@ #include #include #include +#include =20 #include #include "internal.h" @@ -754,6 +755,7 @@ static inline void queue_oom_reaper(struct task_struct = *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); @@ -773,7 +775,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); + trace_mark_victim(tsk, cred->uid.val); + put_cred(cred); } =20 /** --=20 2.44.0.rc0.258.g7320e95886-goog