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 1F9CDC19F2C for ; Tue, 16 Aug 2022 06:00:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 90EB58D0001; Tue, 16 Aug 2022 02:00:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8BE7B6B0075; Tue, 16 Aug 2022 02:00:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 786988D0001; Tue, 16 Aug 2022 02:00:35 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 67B4F6B0073 for ; Tue, 16 Aug 2022 02:00:35 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 396DD1C5FB0 for ; Tue, 16 Aug 2022 06:00:35 +0000 (UTC) X-FDA: 79804406430.01.6C49D17 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by imf01.hostedemail.com (Postfix) with ESMTP id 351C740053 for ; Tue, 16 Aug 2022 06:00:26 +0000 (UTC) Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 27G4m8cF030863; Tue, 16 Aug 2022 06:00:26 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h=from : to : cc : subject : date : message-id; s=qcppdkim1; bh=17A5XgzIslLl1w0X8XOBzNYOt3ViA7v3u3+KeLKY6NU=; b=np6p2dpNnUfqpExDsaGH0Bn7FLucHdyOSd78KeApQsPxZu3TYLMFTPN/MELVZGcb8xOn c+QUzOos015kywVNQRkRSPLZccY4EsElCTYwVpAGhz7Zgwr6lo27Pmgfzi6YVR7Apagy 6mBhv8Z4glkDNHzuDk5tqMugZ7iutLhQarCi/DtD0e86l60nH9em4UDAueQSRd7CjyX7 cu4x+rXkCc81Qia+gCM0nIHLNpnOEURKyWP0R+ThXeP5GTsbSVjajTrwmh73ETNetnoZ jVX46VEVwwB2TYpUpHW5qNg40V4i3g+VC69KPcyW0mh+G+Vk6nQQ4DisxOqYXEg+StmJ uQ== Received: from apblrppmta01.qualcomm.com (blr-bdr-fw-01_GlobalNAT_AllZones-Outside.qualcomm.com [103.229.18.19]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3j0445rafg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 16 Aug 2022 06:00:25 +0000 Received: from pps.filterd (APBLRPPMTA01.qualcomm.com [127.0.0.1]) by APBLRPPMTA01.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTP id 27G60Mwi030772; Tue, 16 Aug 2022 06:00:22 GMT Received: from pps.reinject (localhost [127.0.0.1]) by APBLRPPMTA01.qualcomm.com (PPS) with ESMTPS id 3hxnep8jfu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 16 Aug 2022 06:00:22 +0000 Received: from APBLRPPMTA01.qualcomm.com (APBLRPPMTA01.qualcomm.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 27G60Ldr030766; Tue, 16 Aug 2022 06:00:21 GMT Received: from hu-maiyas-hyd.qualcomm.com (hu-pbrahma-hyd.qualcomm.com [10.213.107.125]) by APBLRPPMTA01.qualcomm.com (PPS) with ESMTP id 27G60LgP030762; Tue, 16 Aug 2022 06:00:21 +0000 Received: by hu-maiyas-hyd.qualcomm.com (Postfix, from userid 2370061) id B9C875001D9; Tue, 16 Aug 2022 11:30:20 +0530 (+0530) From: Pratyush Brahma To: akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, quic_charante@quicinc.com, Pratyush Brahma Subject: [PATCH v2] mm: oom_kill: add trace logs in process_mrelease() system call Date: Tue, 16 Aug 2022 11:30:17 +0530 Message-Id: <20220816060017.17996-1-pbrahma@qti.qualcomm.com> X-Mailer: git-send-email 2.17.1 X-QCInternal: smtphost X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: PmydXDOiBMMuIpx-8SEodg6JjntJ-xgb X-Proofpoint-GUID: PmydXDOiBMMuIpx-8SEodg6JjntJ-xgb X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1 definitions=2022-08-16_04,2022-08-16_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 mlxlogscore=999 clxscore=1011 adultscore=0 spamscore=0 bulkscore=0 malwarescore=0 mlxscore=0 phishscore=0 suspectscore=0 priorityscore=1501 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2207270000 definitions=main-2208160022 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1660629630; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references:dkim-signature; bh=17A5XgzIslLl1w0X8XOBzNYOt3ViA7v3u3+KeLKY6NU=; b=74wil6vjJ3JhU5Me7/1f7gLB9UGQ+Fx5j+mrnUgV3Oo4Ifa60q0wem6mXdRfaQAqW1uxbD t8rIw1tmAoSdjltoz+YxC5z+VivQX41cdhMkptl7XuOpKLKUkUhbNKXqxQOSRrvXvdwO9g vhMyAb86D5r5GmEpgU5ZGlFm9zfipB4= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=qualcomm.com header.s=qcppdkim1 header.b=np6p2dpN; dmarc=pass (policy=none) header.from=qti.qualcomm.com; spf=pass (imf01.hostedemail.com: domain of pbrahma@qualcomm.com designates 205.220.168.131 as permitted sender) smtp.mailfrom=pbrahma@qualcomm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1660629630; a=rsa-sha256; cv=none; b=yHR4JA+qygi/NTEotMgfJkblxL4ztvnd3zS02wVMh4rZAPxlaADuo6WSNeiSn34Y7R9Pmj P7wAEpUvjsbmsiBXinL+QM0ExTPcx/Abz+xT+pywDnwB8aiyjKhz+pNt7klAkQpneJmlvk TmhdAjMYl6gi4+h6dHnK9LorvQwrYI0= Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=qualcomm.com header.s=qcppdkim1 header.b=np6p2dpN; dmarc=pass (policy=none) header.from=qti.qualcomm.com; spf=pass (imf01.hostedemail.com: domain of pbrahma@qualcomm.com designates 205.220.168.131 as permitted sender) smtp.mailfrom=pbrahma@qualcomm.com X-Rspam-User: X-Stat-Signature: 7tisomnbq5ayg8acnqaix7tqire6gme4 X-Rspamd-Queue-Id: 351C740053 X-Rspamd-Server: rspam11 X-HE-Tag: 1660629626-351105 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: From: Charan Teja Kalla The process_mrelease() system call[1] is used to release the memory of a dying process from the context of the caller, which is similar to and uses the functions of the oom reaper logic. There exists trace logs for a process when reaped by the oom reaper. Just extend the same to when done by the process_mrelease() system call. [1] https://lore.kernel.org/linux-mm/20210809185259.405936-1-surenb@google.com/ Signed-off-by: Charan Teja Kalla Signed-off-by: Pratyush Brahma --- Changes in v2: - Added trace_skip_task_reaping() to cover more cases where we skip reaping. - Print debug information in pr_debug instead of pr_info - The original author email domain has changed. Update the new email address. [v1] https://patchwork.kernel.org/project/linux-mm/patch/1629106756-20874-1-git-send-email-charante@codeaurora.org/ mm/oom_kill.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 3c6cf9e3cd66..51ad5f0b612e 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -995,7 +995,6 @@ static void __oom_kill_process(struct task_struct *victim, const char *message) mmdrop(mm); put_task_struct(victim); } -#undef K /* * Kill provided task unless it's secured by setting @@ -1241,17 +1240,33 @@ SYSCALL_DEFINE2(process_mrelease, int, pidfd, unsigned int, flags) goto drop_mm; if (mmap_read_lock_killable(mm)) { + trace_skip_task_reaping(task->pid); ret = -EINTR; - goto drop_mm; + goto read_unlock; } /* * Check MMF_OOM_SKIP again under mmap_read_lock protection to ensure * possible change in exit_mmap is seen */ - if (!test_bit(MMF_OOM_SKIP, &mm->flags) && !__oom_reap_task_mm(mm)) + if (test_bit(MMF_OOM_SKIP, &mm->flags)) { + trace_skip_task_reaping(task->pid); + goto read_unlock; + } + + trace_start_task_reaping(task->pid); + + if (!__oom_reap_task_mm(mm)) ret = -EAGAIN; - mmap_read_unlock(mm); + pr_debug("process_mrelease: reaped process %d (%s), now anon-rss:%lukB, file-rss:%lukB, shmem-rss:%lukB\n", + task_pid_nr(task), task->comm, + K(get_mm_counter(mm, MM_ANONPAGES)), + K(get_mm_counter(mm, MM_FILEPAGES)), + K(get_mm_counter(mm, MM_SHMEMPAGES))); + trace_finish_task_reaping(task->pid); + +read_unlock: + mmap_read_unlock(mm); drop_mm: mmdrop(mm); put_task: @@ -1261,3 +1276,4 @@ SYSCALL_DEFINE2(process_mrelease, int, pidfd, unsigned int, flags) return -ENOSYS; #endif /* CONFIG_MMU */ } +#undef K -- 2.17.1