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 76436CDB483 for ; Wed, 18 Oct 2023 11:37:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 179468D0152; Wed, 18 Oct 2023 07:37:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 129E08D0016; Wed, 18 Oct 2023 07:37:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 018DD8D0152; Wed, 18 Oct 2023 07:37:20 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id E6FF78D0016 for ; Wed, 18 Oct 2023 07:37:20 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id AD9471CC118 for ; Wed, 18 Oct 2023 11:37:20 +0000 (UTC) X-FDA: 81358381440.20.4177FDD Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by imf02.hostedemail.com (Postfix) with ESMTP id 9F09780018 for ; Wed, 18 Oct 2023 11:37:18 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=suse.com header.s=susede1 header.b=oy+2Yhqs; spf=pass (imf02.hostedemail.com: domain of mhocko@suse.com designates 195.135.220.29 as permitted sender) smtp.mailfrom=mhocko@suse.com; dmarc=pass (policy=quarantine) header.from=suse.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1697629039; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=fIRiXBPL7Hak/bdjYHHvjv0yyYXIySVMFM3XCbnxNDU=; b=DH9DD1fVhdKCGugJern2/Z86y7JBiWk7YaH1WW1uzb1+svkZlZfE3pokVagwpRRDy15MFT VIUsUdRIW+fmcb5vZWwjVJ9XlrzNaNtsZWiK3JR/xPKd1y2/hLeCzkf+7c6O/ujRIW98d5 2S1btN9JNIZ2xaMoNPkPSofFYho0QCo= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1697629039; a=rsa-sha256; cv=none; b=xU5Wx4v9Lw/FsW4CA3x0u8YhVQyqxI2ZKp8GyU8+Q9SxwHgQSYy1aSYEIL5HjLdDzGCtQQ JZ2UePI6TOmTPjihoCXsAOjnny1dVdGwhb0xq3HlxEP2oMPKNSy7PKwyy2ltwq/UljsMFi a1IbDfwrho9tzLwUZTUUpiNSGPJOoMk= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=suse.com header.s=susede1 header.b=oy+2Yhqs; spf=pass (imf02.hostedemail.com: domain of mhocko@suse.com designates 195.135.220.29 as permitted sender) smtp.mailfrom=mhocko@suse.com; dmarc=pass (policy=quarantine) header.from=suse.com Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 359921FD6F; Wed, 18 Oct 2023 11:37:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1697629036; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=fIRiXBPL7Hak/bdjYHHvjv0yyYXIySVMFM3XCbnxNDU=; b=oy+2Yhqsw+VpnlGmcnaP87XLdexh64fnz9buU1Ckkiaif84HeGj3ahsDJL39+5S/vNpuZp dHzuNmsJiyDADqBNF8YpuYBlBBnj+OzalbRRtx1NZpJDRULQ5KFQuG4C5V3HH27lnpYJS4 CYX1LAJM/fsLXH56OxvsB1666mr/BhY= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 1709A13915; Wed, 18 Oct 2023 11:37:16 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id MGCbAmzDL2UhdQAAMHmgww (envelope-from ); Wed, 18 Oct 2023 11:37:16 +0000 Date: Wed, 18 Oct 2023 13:37:15 +0200 From: Michal Hocko To: Kairui Song Cc: linux-mm@kvack.org, Andrew Morton , Christian Brauner , Suren Baghdasaryan , linux-kernel@vger.kernel.org Subject: Re: [PATCH] mm/oom_killer: simplify OOM killer info dump helper Message-ID: <3hjarpoab5paboraql2ibgqb7hexj2n2fog7rctwgintrvlu24@kwljdjthirws> References: <20231016113103.86477-1-ryncsn@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231016113103.86477-1-ryncsn@gmail.com> X-Rspamd-Queue-Id: 9F09780018 X-Rspam-User: X-Stat-Signature: qjnw5kuz4w5dmfqsbjfdq1qjqdnpoi5y X-Rspamd-Server: rspam03 X-HE-Tag: 1697629038-50640 X-HE-Meta: U2FsdGVkX1/W3lDR9r00ORg8MKQuObWWOXLKt9bvrZiilcWwJJqr2IfTOT77DH9hoPv+UqjyrDWfD3l7hQzztbvjP96ocY0LNuioVktwxSEfjIDrhdS+xw5hoDiYnAiuAEZud6iebSMzC6mS675MuN8c6/M54m/6nV+6NtPfNfvHQ2MvQkSM/BkoyUtjoiR1ZHMh7NNMFd2pxpNaFakWp4z0lBAP9bXD3lE+zSjdwvKSw+mTPXB+fKrp+QPIhkf0jRYY2myL8NSmzAq7EZdB033C7aW7lXh/5RDQxlnStcJmn/NZIlsw3SCvqspoG9X5BODZJA+jugoshBPHLOv1KC3+HVkGuGiIWD014Uf7ZURNwXT0LS/UnA3FsbIWXEOYdX1RLDYwyWzIh8/z+vTuANnjjq3I6GhsTNfAy8KxcrnFtmteipGYTNQF9uugbtxlS3dABBr59e9WpEMKu+1QNwHjhRlEK3a25naruQP/gx9hBMPW4DPLGimtjjLZMPbpZqQbnevuuxpQZPSwZ/mzzdpt0SBrEwsI1K1lEGMTc6HcymTijR67HFnZmcEwBLY2Ed/5F9ppcjij87XPvaj1EA0E256h1jg2T4Goo4996WQKMfuJi119xwqkbBalREEowNjLlk58L9z1k8MUFoiN4Nxw9KwqAlIkuihFKTDfEN8gyivo3Cb1FHeWA8VUrAc/vXFCvqne+0uRg/mXkhh3vVZPsTrqdApY0S5biGzxoG7KNHSWNAH2Rk0RWJToCEd8etY41/bcOptz+gmHv2Pc9lHpwnMd1Z+AYAAy+pwjyayHLn/I1hNXCphUGa8cYWFq1VRQV6Z8bhVjekhQCIUw+/X6mi/tSHSkbPbHpUq8KCvcRVs8yWu7lg3lYeiSP21VKyNQrI3f7j/0ephU3BkMhQcdVOL4yVl0V2VA9CZQRe8ad34m31PYUEhkGs246WRZkxMZ9Jb79fgby/K88D1 XAY+rS+R QJxHhzBEPK1DkQzi+ahvEdYMYuu4mo47aUFunaUuGcqwxQpCZ3IA/Gy7XK+obhE80X8oWEMxMAZLqnHGfmtSvfkL57bR4WKxxDx//yYKW++mwTwfzcVT2j7LaaNmIDiI2Hn5Y6gImVZTRqF37ubwVBVtb2vVjNTlzwjV21KyCdNrazalz6u/wNkVvz2p0JPF9nInOAXieWXf+Nuen0BdRxPQPfRw1fSHGaSSaQSfU3rECZd55Zch5duln5J2IqddueeTMoNHeBvkB8ezu+1PDB4PLovf+sBQqn05QZPPIk5lOoka2U87KWNmeVibCKXYaMkya0xWGEJS9Iz1c3Oh8DyWQKZGf87H2lkW0 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: On Mon 16-10-23 19:31:03, Kairui Song wrote: > From: Kairui Song > > There is only one caller wants to dump the kill victim info, so just let > it call the standalone helper, no need to make the generic info dump > helper take an extra argument for that. > > Result of bloat-o-meter: > ./scripts/bloat-o-meter ./mm/oom_kill.old.o ./mm/oom_kill.o > add/remove: 0/0 grow/shrink: 1/2 up/down: 131/-142 (-11) > Function old new delta > oom_kill_process 412 543 +131 > out_of_memory 1422 1418 -4 > dump_header 562 424 -138 > Total: Before=21514, After=21503, chg -0.05% > > Signed-off-by: Kairui Song Acked-by: Michal Hocko Thanks! > --- > mm/oom_kill.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/mm/oom_kill.c b/mm/oom_kill.c > index 44bde56ecd02..9e6071fde34a 100644 > --- a/mm/oom_kill.c > +++ b/mm/oom_kill.c > @@ -437,7 +437,7 @@ static void dump_tasks(struct oom_control *oc) > } > } > > -static void dump_oom_summary(struct oom_control *oc, struct task_struct *victim) > +static void dump_oom_victim(struct oom_control *oc, struct task_struct *victim) > { > /* one line summary of the oom killer context. */ > pr_info("oom-kill:constraint=%s,nodemask=%*pbl", > @@ -449,7 +449,7 @@ static void dump_oom_summary(struct oom_control *oc, struct task_struct *victim) > from_kuid(&init_user_ns, task_uid(victim))); > } > > -static void dump_header(struct oom_control *oc, struct task_struct *p) > +static void dump_header(struct oom_control *oc) > { > pr_warn("%s invoked oom-killer: gfp_mask=%#x(%pGg), order=%d, oom_score_adj=%hd\n", > current->comm, oc->gfp_mask, &oc->gfp_mask, oc->order, > @@ -467,8 +467,6 @@ static void dump_header(struct oom_control *oc, struct task_struct *p) > } > if (sysctl_oom_dump_tasks) > dump_tasks(oc); > - if (p) > - dump_oom_summary(oc, p); > } > > /* > @@ -1029,8 +1027,10 @@ static void oom_kill_process(struct oom_control *oc, const char *message) > } > task_unlock(victim); > > - if (__ratelimit(&oom_rs)) > - dump_header(oc, victim); > + if (__ratelimit(&oom_rs)) { > + dump_header(oc); > + dump_oom_victim(oc, victim); > + } > > /* > * Do we need to kill the entire memory cgroup? > @@ -1072,7 +1072,7 @@ static void check_panic_on_oom(struct oom_control *oc) > /* Do not panic for oom kills triggered by sysrq */ > if (is_sysrq_oom(oc)) > return; > - dump_header(oc, NULL); > + dump_header(oc); > panic("Out of memory: %s panic_on_oom is enabled\n", > sysctl_panic_on_oom == 2 ? "compulsory" : "system-wide"); > } > @@ -1155,7 +1155,7 @@ bool out_of_memory(struct oom_control *oc) > select_bad_process(oc); > /* Found nothing?!?! */ > if (!oc->chosen) { > - dump_header(oc, NULL); > + dump_header(oc); > pr_warn("Out of memory and no killable processes...\n"); > /* > * If we got here due to an actual allocation at the > -- > 2.42.0 -- Michal Hocko SUSE Labs