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 A2699C77B73 for ; Wed, 19 Apr 2023 07:35:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 426F0900003; Wed, 19 Apr 2023 03:35:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3D69B8E0001; Wed, 19 Apr 2023 03:35:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2C523900003; Wed, 19 Apr 2023 03:35:18 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 1CE668E0001 for ; Wed, 19 Apr 2023 03:35:18 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id D560280149 for ; Wed, 19 Apr 2023 07:35:17 +0000 (UTC) X-FDA: 80697329874.29.53C2766 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by imf02.hostedemail.com (Postfix) with ESMTP id EBDAD8001A for ; Wed, 19 Apr 2023 07:35:15 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=suse.com header.s=susede1 header.b=TMg4G2d6; spf=pass (imf02.hostedemail.com: domain of mhocko@suse.com designates 195.135.220.28 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=1681889716; 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=YyB/75+jiUPM1QbAHiRPjsAvKjjCWrsA4ssFHkqLNwg=; b=PdW93IcR0Bza+7ZQ0eIUOhXwRguAds+GqoglKUbzhYdflflBVn1l9gg3IEvgtsiqWDWHRq Blf+aq/P20LoQDck6hTHztIxBtZrvu1rr79FMwYW9sEJyoqvzMIjY0yI3t2V1n8ykxByFq nV5HZ3qBEVzQls7feGI+InQ396HMZJI= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=suse.com header.s=susede1 header.b=TMg4G2d6; spf=pass (imf02.hostedemail.com: domain of mhocko@suse.com designates 195.135.220.28 as permitted sender) smtp.mailfrom=mhocko@suse.com; dmarc=pass (policy=quarantine) header.from=suse.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1681889716; a=rsa-sha256; cv=none; b=2IIpKhsWXMn/PVQ/xbMJake1yUZ3ww1avV+cIpGH88dQufOxP+6fj+Ys+RnfmvAerSg6Rz VNWvsv+OCF9NqeZcJOw41yuhAhzsaTmPhwR0uBYniI0TRJLTtbyvL7g2d2XN1C72m+7jMp okLGy5QrVpt8EIWtQPNLB9nIVUOD2oA= 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-out1.suse.de (Postfix) with ESMTPS id 5438921905; Wed, 19 Apr 2023 07:35:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1681889714; 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=YyB/75+jiUPM1QbAHiRPjsAvKjjCWrsA4ssFHkqLNwg=; b=TMg4G2d65HjVAIwxzRQu9OhxitpicLJzY8btsIHMJCIOh89/dx6yaEOgOLMEzWTwUSIEI4 wRbkUDjOHdqaKYUmw3JYnu0nhLISwxDy/WYBYW/Prik4ad/n7jDCAxaZMvDT+gI9KrUD0S iTbEnNvz5azS24fykLbj+LP1gg2r3AA= 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 2D20213580; Wed, 19 Apr 2023 07:35:14 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id DamWCLKZP2Q5SAAAMHmgww (envelope-from ); Wed, 19 Apr 2023 07:35:14 +0000 Date: Wed, 19 Apr 2023 09:35:13 +0200 From: Michal Hocko To: Haifeng Xu Cc: hannes@cmpxchg.org, roman.gushchin@linux.dev, shakeelb@google.com, akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 1/2] memcg, oom: remove unnecessary check in mem_cgroup_oom_synchronize() Message-ID: References: <20230419030739.115845-1-haifeng.xu@shopee.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230419030739.115845-1-haifeng.xu@shopee.com> X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: EBDAD8001A X-Stat-Signature: 39yac1owsr8f71z3frbo1a67x8etuegm X-Rspam-User: X-HE-Tag: 1681889715-790679 X-HE-Meta: U2FsdGVkX1+092co91QnS/uGDI4lj/e+6iFNR9WwRG2cSow40OcLB1SB9E8uFKYLEyawUsIePHT4pRHxOdk52L48wY2Ritl19ftg/dfm7xsLvU6BC/W9uKgQ8r+Odre1YrnNc1a/ZMIqmfkc8RqStN253iJwHQnT46mggg8HEgb7UGFw5ukHymaZjLNtkQHaSfX65msvxhkvo6RKZqnr/6sns9/ENqXgv+lXR/uS3iaYePw7TxykQxD2Yd3QIeZ6ZypOJGJ0Sn2AbhEA7DABSPdarcFFfnqfjau5tjInrbo8HFlnBpiuS6kHSCLH/z1uV+AKcK5ECQbmhTTkoSdwWzF1Cl2F+NZjjF3Csai1p+oEhuJnmcgfW3GpvDIOSsahnaSJcoABSuwzLqYUiLbYoLITUm0DwV9VPg5mrh7TAE3itPziabrKImjmDeDCP27AoqREyBu2DR2xaTNa4lMaqjztwFBX7X2CMlQY6bgqMlluyfZ+AKyUnJuswkC/HpxMtQgx1S9ogp0Ugt0mb28SIY7VrfjoyKGZdyUuFzQws6zZ9nF5HLyK6T7P1V7pUek01FMg1+i1LkzVZqdFryyx32agiugHF7bJBP6Up7OgOD/JT+BE3pYBuIRlTOrJA7qSKAeuY9IElQ92QN6yjujHi38A7BnxqW+NvNhiUHEOI9JHPsKfaOZniuj8uV1zN0dlIY86gsE+jKGQC3UcaOBDqcX4EVUg1NOQ5ObpW7N1QYX3EWmyV/pfkLtCDkMyskAVh/xsEM8OuiF8NEjXLbDmQI6d7zQUTESzOxoJObdPQ8Dk6Vky4b2k8o8jU7aJMnIop2nCXvT5iftHFj72RiI/70fN1X9FElPAoqbbPM9JtF1CJgaZ1PnRwbvURlK8dO3P9SmuPnsRF+ZdFf4Hi1CuWpXzUbFJ7C6ZnJlMVY9OlXLHtFMgAPoNdgECUcdfx6PQg/KaxAeQgZBbdjW6sEN LlTXVE45 hwOb5KqJ6dLZ7hOOGm60qyH37Tb71ZLzW+UPLDuGuylmTmI73W48W+YSxUnBIEWF3BpxYlGZpuJd5aw7vd2+9oqvye7Fzg1qI/PBDMF1Sq3xpmqLYwZNa9fnLSZTETyVXgTGcm7uF/QL3P2a1mGAvH5+SC3TR/h2ZEaMV9yTUdbWrkhv8kNGSl74+n+uobgtrLMc37SKPI/lvPSHUU1dP4KehZF7P8DJAI8nVS1ZWpmuuZGDzWfylDOCQJI3aNy2LezmJiZcq5zWi5Pa5sD+DZykb34lC85h/Ch3Yo922oW0qUK1ws0hzGXbEYyidhzcUD4f4tvHiNcobNNY= 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 Wed 19-04-23 03:07:38, Haifeng Xu wrote: > mem_cgroup_oom_synchronize() is only used when the memcg oom handling is > handed over to the edge of the #PF path. Since commit 29ef680ae7c2 ("memcg, > oom: move out_of_memory back to the charge path") this is the case only > when the kernel memcg oom killer is disabled (current->memcg_in_oom is > only set if memcg->oom_kill_disable). Therefore a check for > oom_kill_disable in mem_cgroup_oom_synchronize() is not required. > > Signed-off-by: Haifeng Xu > Suggested-by: Michal Hocko Acked-by: Michal Hocko > --- > v2: split original into two and improve patch description > --- > mm/memcontrol.c | 13 +++---------- > 1 file changed, 3 insertions(+), 10 deletions(-) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 5abffe6f8389..fbf4d2bb1003 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -1999,16 +1999,9 @@ bool mem_cgroup_oom_synchronize(bool handle) > if (locked) > mem_cgroup_oom_notify(memcg); > > - if (locked && !memcg->oom_kill_disable) { > - mem_cgroup_unmark_under_oom(memcg); > - finish_wait(&memcg_oom_waitq, &owait.wait); > - mem_cgroup_out_of_memory(memcg, current->memcg_oom_gfp_mask, > - current->memcg_oom_order); > - } else { > - schedule(); > - mem_cgroup_unmark_under_oom(memcg); > - finish_wait(&memcg_oom_waitq, &owait.wait); > - } > + schedule(); > + mem_cgroup_unmark_under_oom(memcg); > + finish_wait(&memcg_oom_waitq, &owait.wait); > > if (locked) { > mem_cgroup_oom_unlock(memcg); > -- > 2.25.1 -- Michal Hocko SUSE Labs