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 45F5FC6FD18 for ; Wed, 19 Apr 2023 03:08:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B40538E0002; Tue, 18 Apr 2023 23:08:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AEFDC8E0001; Tue, 18 Apr 2023 23:08:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9B7578E0002; Tue, 18 Apr 2023 23:08:07 -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 8AB888E0001 for ; Tue, 18 Apr 2023 23:08:07 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 5D8E91C6586 for ; Wed, 19 Apr 2023 03:08:07 +0000 (UTC) X-FDA: 80696656614.16.DA0D4BC Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by imf23.hostedemail.com (Postfix) with ESMTP id 6E43B140011 for ; Wed, 19 Apr 2023 03:08:05 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=shopee.com header.s=shopee.com header.b=BdWMlTLA; dmarc=pass (policy=reject) header.from=shopee.com; spf=pass (imf23.hostedemail.com: domain of haifeng.xu@shopee.com designates 209.85.216.52 as permitted sender) smtp.mailfrom=haifeng.xu@shopee.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1681873685; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=nviNXZ8MpNGnswY2Ey+JPiFyvr7UX/7DG9RC/8jr/gg=; b=ze++nhVDDy5Ot0iJkCxck66nf10ovMr1JmQzppMKpdtrjJOpG8jX5bghuYtbmbnyO5WYXK 2v8YvCi7WxB9rNtcsooZ/KBeEUybmIrBFiDhjNWuEAwA8YFkOY8YoyL353m9paKY/mSaCs SOdzo5KJpIC3Xp/8fq0k6jYURNveRAI= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=shopee.com header.s=shopee.com header.b=BdWMlTLA; dmarc=pass (policy=reject) header.from=shopee.com; spf=pass (imf23.hostedemail.com: domain of haifeng.xu@shopee.com designates 209.85.216.52 as permitted sender) smtp.mailfrom=haifeng.xu@shopee.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1681873685; a=rsa-sha256; cv=none; b=yyVXKpS16TwEGrXw4YM6S/616pSXO4tX1b/ljA559C8asguJU/PX3qWt0NNqAlkk8Vv+Xl knvLsyjIxH8EcJbb88ZplxF8BT0esGu5iEm6aLikIIJvbi3dh1ny7u9nV8VCPrUVlPuCd+ iti2IiCGnAD6mTUryn2v2zb7ZjrfytA= Received: by mail-pj1-f52.google.com with SMTP id v21-20020a17090a459500b0024776162815so299185pjg.2 for ; Tue, 18 Apr 2023 20:08:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shopee.com; s=shopee.com; t=1681873684; x=1684465684; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nviNXZ8MpNGnswY2Ey+JPiFyvr7UX/7DG9RC/8jr/gg=; b=BdWMlTLAc9ygx2qd6sNmSkvG3hOuewMi1A6ltCqDBjeKwTiYoAjw31KLUXL4Um80zZ mMQpqvccs60Ix14cht+Y1dTzSmescFdlLdpVm5DtqpGGFf4WdMUjHT2/mYgvWVk2g/Ru xj+Uucw7XaIqG4bigweo2Fg1e76nUm/46kIEfQeIISYCI2pm5Ce1Q8RslNpStIE3S9FC kcONJwqS5ngxQMH+UCa84o2maXLDoBW3O3QiscYsUmr1+JLTTyfsPVTMS2+vvlzRIeWt R0tp3yOdznk0dSCAN5Pxl8T6Pf86sHJdaCDBb2dT9BNZMoQNhNQEOnOqEtp71GjkdLgU AW/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681873684; x=1684465684; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nviNXZ8MpNGnswY2Ey+JPiFyvr7UX/7DG9RC/8jr/gg=; b=WZ+URW/MkuXNrOz+ijpKwDQ4Oo16+NAgCKIdM/YtsMej+vy6I8JQH9R24rah6juFtF VFFxlC7+wxqNh5TvULwxjv3JvoqwUOve5d3QnEl2b/qECTTy3tBo4Jc3kQDSeYCNwb/2 ndbdpiWMMW1N0lTIMY8xmEhVm10ZfEai4FROf2MVRXxK9YaPnRjHtTLyeDavNCPi61Wt yVRO7FCbAUEhU1FWlyRJSDmB+miSccXq2uAl0ekbJp19JN53WGA1AAt9eotyDMSvMA55 1/3dgmo+hqCotN8XctCOaTX4qnapRbvAQK3LoA3W6o94Ra8oRAdZLdIjamYCzSyU2+8X SjRQ== X-Gm-Message-State: AAQBX9fEpp4Wo1gVZztS+E13D23fkLJwOrLNG0ENWrIslmhK+QVdY9jp Xg7flnrAkO05WxnOtXRy8Y5mEioBiGUO9c6jlIywFg== X-Google-Smtp-Source: AKy350Y2AdbxTU4zuLNCibYIhpdwwFFwY4wE2TtYLiPTSPRgHOnSOsrrF+WPVMeIC8YSjbxC++Brhw== X-Received: by 2002:a05:6a20:1612:b0:f0:f4cf:fcf0 with SMTP id l18-20020a056a20161200b000f0f4cffcf0mr2158017pzj.11.1681873683959; Tue, 18 Apr 2023 20:08:03 -0700 (PDT) Received: from ubuntu-haifeng.default.svc.cluster.local ([101.127.248.173]) by smtp.gmail.com with ESMTPSA id n13-20020aa7904d000000b00639a1f7b54fsm9900150pfo.60.2023.04.18.20.08.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Apr 2023 20:08:03 -0700 (PDT) From: Haifeng Xu To: mhocko@suse.com Cc: hannes@cmpxchg.org, roman.gushchin@linux.dev, shakeelb@google.com, akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Haifeng Xu Subject: [PATCH v2 1/2] memcg, oom: remove unnecessary check in mem_cgroup_oom_synchronize() Date: Wed, 19 Apr 2023 03:07:38 +0000 Message-Id: <20230419030739.115845-1-haifeng.xu@shopee.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 6E43B140011 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: ocsg4tmpz5z8ca8axoypsujahp1hbtyh X-HE-Tag: 1681873685-914711 X-HE-Meta: U2FsdGVkX1935Woin65fmYqWAQ8FkYLvyHtUHLNnuGJSxJO2j9OGCyE8bsIHxeklEGN8uuMLZSMEXXkbs73j5mfROduiQrj0dodWAIAxHWey3G8esY3hZQPPTQxr0p6LUpHEhALOi4MHb5zkcwip7DUhoVPsoaeFtic2WZaLtuH8KC4TXLtiGQ5l6z7O48rb7br15WXd+hfAEipRyn8bHs0pjDNZ1ZxiM6YuxQ6RAWKajkAY1t8o58fvlTsmPvOQmch+X9n3W1oF77buGAp3gXHyQpFBNDn3k+ko5rgKSepfh2E13jWgBKBtEz+ygdeqbCYiCSY+YRLUeVGHgwf7JrPN6UGCHKQDv2nXnomQ3iRBEywYCLrIr/EutIR0YNkP3AyUvBoEk/CuENB6zE0DJYfc9ztAswokqawz/lcF8PgcBAaBQRBsGQycQAm7L25OId4/3868XXJPjLWjnWjT3aSj5iSu0nJBiRHw1VD3o8Qpo/T1eu9meaue1jUYVa3hpKtx/2RxdPBwhSoEvpq59F+PUyVP12m4H/oO7QTA+Rb656NA3avgCpGMMBYqllTXj6NS1wuIxs6SNwN83XoYrpqHCHeDFqKfQySs/7ofJrKLGncaoLImaUqMihRjCyC5+I6KeMlFW74BW8jkuSXzl/uzdb5hci3rQ2jmLdDyl5A+O/synGSMDL2tl2f0eff392fDfes1DsEbw260PfCBamKDh935kMANxi2Ja7MGWTNoeX6gkkcrs/nx6JjFHA+fJikzevB+jEEEQa8qF3lEW23bc05wyWX4CQz7GI7qYjbJltUJdx4NAM4C/8PqfdtURpkuNdIH6CC6H2xqWRlVUi8u804345uz72yYGkWs3IyjaFVcknsBeaSJyNyrrTfyE+xqqL7zFlwTjWmJRF382guITQ9G66dxh8XowrIG2fbHo30TVUvbNAGqpCRvK9/IPsn1CZ8lJRESniie/ZG M9eo5wvy G4r+/KN5xf0Z7j1BlnNkfCJVwL1njKDE2dLIpuCs8VuR2jf0XQEpVqSr3bsrZATudXZtcGwV4hHHBaovXg5kzlEywQiiOGVK+SeqvywxiyiMqNjdQOqhAcnqptFApebvjBQ9k36m2yqHS0Zv4jMx6ORYwB40ryMrDeo1CV0bnIODqwDNEYsgsQGwGQCCkWgd3ocSE8d5ZaiWEAe5lvFTw+GekKo2UfR7McXZtS6ME8ErL6CqyRolscZaGdwQY4Q0045p1mfbSQQ0gZotIGQPUCt2+kFqU0Mbwehk6yptP1DgteKwYp5QCYP9NZ3IFdEPLqJWSOotJH9S/uVk23Ajg3Grc1+Fy82O5RBhsmcRIG5R1R/zBxy1Hfr2ONAXXuKpGa6PQg4Nsl2QzlfBNLCaGlrRtZKdYZ70GvUU5grLRjpY75eSSPQdt4DlIntXvfK7JJAqVg899TQrX1oRsSdNZgl37dyJFIVGKwDNQrpiMlP877nyT0WxOCPcdn0W9Q7A638Tn7elOb6vdaLOKuqvG2q5nAA== 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: 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 --- 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