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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 33B96C433EF for ; Wed, 20 Oct 2021 12:12:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1ED50611C7 for ; Wed, 20 Oct 2021 12:12:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230260AbhJTMO5 (ORCPT ); Wed, 20 Oct 2021 08:14:57 -0400 Received: from relay.sw.ru ([185.231.240.75]:42218 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230092AbhJTMO4 (ORCPT ); Wed, 20 Oct 2021 08:14:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuozzo.com; s=relay; h=Content-Type:MIME-Version:Date:Message-ID:Subject :From; bh=zCii9TAKFxPwpgbC2GK8kQRHiFyLfuYpBkR6wq1K544=; b=YA4A3B4VF1+nFZ0rGP3 RW6fx/vlidgUELNJqxLSSMjROlO+5ORXrIjobCBiutx+Rzi4Gpj3dIChnj9ANaIk8UuoaQugEQs2H mmO+fyIjeY6wEK2Y8m/P2+a4GbOJnRlVPqjWTPDKKR1Lh5aR54tEKAritk9BQ46GWDnQYzj5ng4=; Received: from [172.29.1.17] by relay.sw.ru with esmtp (Exim 4.94.2) (envelope-from ) id 1mdASW-006b94-0Q; Wed, 20 Oct 2021 15:12:40 +0300 From: Vasily Averin Subject: [PATCH memcg 1/3] mm: do not firce global OOM from inside dying tasks To: Michal Hocko , Johannes Weiner , Vladimir Davydov , Andrew Morton Cc: Roman Gushchin , Uladzislau Rezki , Vlastimil Babka , Shakeel Butt , Mel Gorman , Tetsuo Handa , cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, kernel@openvz.org References: Message-ID: <2c13c739-7282-e6f4-da0a-c0b69e68581e@virtuozzo.com> Date: Wed, 20 Oct 2021 15:12:19 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There is no sense to force global OOM if current task is dying. Signed-off-by: Vasily Averin --- mm/oom_kill.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 831340e7ad8b..1deef8c7a71b 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -1137,6 +1137,9 @@ void pagefault_out_of_memory(void) if (mem_cgroup_oom_synchronize(true)) return; + if (fatal_signal_pending(current)) + return; + if (!mutex_trylock(&oom_lock)) return; out_of_memory(&oc); -- 2.32.0