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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id ED5E1C433FE for ; Fri, 14 Jan 2022 22:08:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230235AbiANWIc (ORCPT ); Fri, 14 Jan 2022 17:08:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43026 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230225AbiANWIc (ORCPT ); Fri, 14 Jan 2022 17:08:32 -0500 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 90FC7C061574 for ; Fri, 14 Jan 2022 14:08:31 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id 1136DCE2498 for ; Fri, 14 Jan 2022 22:08:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4AA55C36AEC; Fri, 14 Jan 2022 22:08:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1642198108; bh=sUu9jleLZuzhuolkSsvQLjphRcZDYQ9uRg1a5lDaPQM=; h=Date:From:To:Subject:In-Reply-To:From; b=r6xB0c2Ld8gkn8X004MhHiXFevR5Olg2Lb2r326uQ3ftFuJBy2nO24Rz+2sdDa8VB WNk2ic5TtvhHuGMT4Rc1KXUStJOyZliVar2WqdfcH47g+fbo3Rlbw1dHV0WaX8cssj whF0a8rgcJxH8xj1eb/zU4mLDMs+oeRLYO5tosfs= Date: Fri, 14 Jan 2022 14:08:27 -0800 From: Andrew Morton To: akpm@linux-foundation.org, jannh@google.com, linux-mm@kvack.org, mhocko@suse.com, mm-commits@vger.kernel.org, rientjes@google.com, torvalds@linux-foundation.org Subject: [patch 100/146] mm, oom: OOM sysrq should always kill a process Message-ID: <20220114220827.OSbTBO1rc%akpm@linux-foundation.org> In-Reply-To: <20220114140222.6b14f0061194d3200000c52d@linux-foundation.org> User-Agent: s-nail v14.8.16 Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org From: Jann Horn Subject: mm, oom: OOM sysrq should always kill a process The OOM kill sysrq (alt+sysrq+F) should allow the user to kill the process with the highest OOM badness with a single execution. However, at the moment, the OOM kill can bail out if an OOM notifier (e.g. the i915 one) says that it reclaimed a tiny amount of memory from somewhere. That's probably not what the user wants, so skip the bailout if the OOM was triggered via sysrq. Link: https://lkml.kernel.org/r/20220106102605.635656-1-jannh@google.com Signed-off-by: Jann Horn Acked-by: Michal Hocko Acked-by: David Rientjes Signed-off-by: Andrew Morton --- mm/oom_kill.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/mm/oom_kill.c~mm-oom-oom-sysrq-should-always-kill-a-process +++ a/mm/oom_kill.c @@ -1058,7 +1058,7 @@ bool out_of_memory(struct oom_control *o if (!is_memcg_oom(oc)) { blocking_notifier_call_chain(&oom_notify_list, 0, &freed); - if (freed > 0) + if (freed > 0 && !is_sysrq_oom(oc)) /* Got some memory back in the last second. */ return true; } _