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 BED78CE7A89 for ; Sat, 23 Sep 2023 08:19:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 40E866B0280; Sat, 23 Sep 2023 04:19:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3BD526B0281; Sat, 23 Sep 2023 04:19:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 284F06B0284; Sat, 23 Sep 2023 04:19:11 -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 171256B0280 for ; Sat, 23 Sep 2023 04:19:11 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id D6025120B79 for ; Sat, 23 Sep 2023 08:19:10 +0000 (UTC) X-FDA: 81267162060.03.F1BAE32 Received: from mail-il1-f176.google.com (mail-il1-f176.google.com [209.85.166.176]) by imf07.hostedemail.com (Postfix) with ESMTP id 2636640017 for ; Sat, 23 Sep 2023 08:19:07 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=shopee.com header.s=shopee.com header.b=JIsEzVZy; dmarc=pass (policy=reject) header.from=shopee.com; spf=pass (imf07.hostedemail.com: domain of haifeng.xu@shopee.com designates 209.85.166.176 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=1695457148; 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:references:dkim-signature; bh=53y+MSASX7iIoRiw0N0MaPINtyDxfHQ2/xhc/ZQOZdc=; b=6kgME/S9bZxANvcd8k2AP74VwGGzvOHt+JwkNVJFcPR0NaT6oAm9DEmotgT29STezr1FZ4 K+iFKiNqwyt0M7KFYROqGxuIgdgZTlrS9+eJ0xe9+tAXb0d6MgBoco1I49FYVUQrQLXgjb 3+lP9VjilCPfD5MTPb/QxzoF+GAiZq8= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=shopee.com header.s=shopee.com header.b=JIsEzVZy; dmarc=pass (policy=reject) header.from=shopee.com; spf=pass (imf07.hostedemail.com: domain of haifeng.xu@shopee.com designates 209.85.166.176 as permitted sender) smtp.mailfrom=haifeng.xu@shopee.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695457148; a=rsa-sha256; cv=none; b=ADwO7eBjcmbh2yuhUqZg9CzrFdjKOkVYLzi6SFqPZv2Mj8BuT5RwdLvAtgQr3imA7lsUo/ d/ndAwZ1HVXWepBUfdOAu7xzxxvB2AvImq1M3OyfHsCQsmQb+FfXDy491zPsKxqxdEZB6Y tGiys7h8DNqKnO9c+fd7KAXlqmCh3Aw= Received: by mail-il1-f176.google.com with SMTP id e9e14a558f8ab-351232a46b3so4228905ab.1 for ; Sat, 23 Sep 2023 01:19:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shopee.com; s=shopee.com; t=1695457147; x=1696061947; darn=kvack.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=53y+MSASX7iIoRiw0N0MaPINtyDxfHQ2/xhc/ZQOZdc=; b=JIsEzVZy5CetVcXVeVedYTOpcc5ciT2Loo2tgnTpPXrKcJvMcq88kpQZPqENN9Ipz1 d6SEWY2Dx6ojJbt/2s9zgl52Z9qzqkyhON8m6R4pA8R704c0tczHljDyOfTFodnY2+uk jqxkScdxe1o9vlq4ELpuADcmKMaRp58UbzeJJ4BuumejdTDY5M1iSmm/6KpE6TOj5dtI +6xA7auPfsGEuFHDq7T5d2L+ZU/fgwcmL/OS9u60v+yyw9Pt0kl6xxoMWQlfGauWoYyJ Pq6kj2hG4CUZqq/VyjN1XAEia25ZWBfAukiaum6JOPS2zhk63/IyJfF8EYPd3Hq/tScw +tZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695457147; x=1696061947; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=53y+MSASX7iIoRiw0N0MaPINtyDxfHQ2/xhc/ZQOZdc=; b=Oy+NiYK0j2pwuGONJRXA1yUnfY/ia5aJthcT8ieHLWszzQj7/tCz2K3aLTzUtYh+S8 hr4nrO65M5SJ8n0HYT8HjgChzgQZzm/6OGtmEYO52j3xVeVOFrvRKN9MzMwuvBccR4HS lx3EG30rghMnqHX/HnWfRlPFSJn32fZ3B86qcOLJofasWKLfJWODgNoehznEWKM2BeWf jed91aIHTNywegdJI7EqtlC6XhNO5rZa+uZ27M0eKoa5V3CymwS/SsyJOEQIJdCfOfsI HZTMHxqMkneGUzxnUI8Kd2iiz7axtZJGtDF4yh3vINbn/jrEaDypDNiiV8wjitm1lFwI cMLg== X-Gm-Message-State: AOJu0YxkMOnW28WCD0faWcncmBmoqD7OVdg2x2FxivCGZwIb8dlECM+K sXpjnk8Fr6z9GKAHrYzTLHSObQ== X-Google-Smtp-Source: AGHT+IHBNbl6IYAGI8nr8YQtW/FP5fMEN/o90a3CpDDMTaYSF6PS3d98V+TNXLqc0Tu5l1jKXPiM4w== X-Received: by 2002:a05:6e02:1c82:b0:34f:7e36:5f8b with SMTP id w2-20020a056e021c8200b0034f7e365f8bmr2693146ill.25.1695457147258; Sat, 23 Sep 2023 01:19:07 -0700 (PDT) Received: from ubuntu-hf2.default.svc.cluster.local ([101.127.248.173]) by smtp.gmail.com with ESMTPSA id u74-20020a63794d000000b00565e2ad12e5sm4219928pgc.91.2023.09.23.01.19.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Sep 2023 01:19:06 -0700 (PDT) From: Haifeng Xu To: roman.gushchin@linux.dev Cc: mhocko@kernel.org, hannes@cmpxchg.org, shakeelb@google.com, akpm@linux-foundation.org, cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Haifeng Xu Subject: [PATCH RESEND] memcg, oom: unmark under_oom after the oom killer is done Date: Sat, 23 Sep 2023 08:17:39 +0000 Message-Id: <20230923081739.398912-1-haifeng.xu@shopee.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 2636640017 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: tkknxbjyy37f4mj5igzqu4jyubi84rm7 X-HE-Tag: 1695457147-144627 X-HE-Meta: U2FsdGVkX19so2x2VSx8G02gcyDm4V+KTXbr7C+hsMMg0Aob1MG54Qw2St0nr3YUzlAgMaYCVF4olpnO6IwXiF7qqPd7bUcDQugvKI2563Itr/q+Vma2V8fgBvnmazyYx46mdM+8sP5QgJwvKyOWxdqzE1akZUHL6yTj2soGc6BRpUT1JUNDg21k5xidnsm7sqpALreuTV/2rW/CQNLbeG8JiQaOEkiI5uA/gbU9/t8KBjq6/n6JgoXqkNFTip64MajI+P16e5+wWJJ18a3Kmr1bwOl1DJranqw6mkxF/3N/5LPRQxcUcK5hCcuNaj8SnJ+J0yAQLEStp/dkXPQL2kz06k9gZV4xGIvtv5K68xG2DpDqs2Wgx0Ibp4YhEWtbxCWKmgnCORIkoaIN9BCpsMEz6nFlPO1UWDx4HPtAZwDLtQ7ZtejJ1Oy+eaoOJc/zhhCqVkd+bVAWHsgoARg16gNAHawF+7iW6vU3kAKHVwR7CmdBNchzxj85FcqLxqgWGAUjGMBQWRkY41UcnPbRz7fT2JiH09qLEMCG4MuJCy3JRCU9v/Pxoycb2clZypGLERvJ3lU6aO52ZSHA2+YQ9U7ECdjGlc2vuOB4OIW5Mdf95YWMxRvf8ymeHjuWwGCQIdKwEKPdRLWv0tC9sy9KqdBQaBurmbzdLTwmV6rP3VtG2Y49OVxv3OHOUBOcS98nXVdVBu5lQXoAtwUfP+QpEeK36eWHzuWyjfXGP/4ygtNgeYLv+OeiLkqpnMFR9N8g0qwokZTyJkyhlJ7cphzmdBDI0uwsZoCCvVk9wEVSyZR96kOM52JGwXSX3MoSe6O7V4DiKYGtYrJqdqfqpcCsT8yq4iaKdOE5e9dfvuuFg8xAFzEkECUp3jYGua/iXN4YH53BbqnRl+UqEjaFZj0694yOPpDSecvaDOIcyDY5S7kEVb4JCnA1FqIQQVz2fsIfoa4Yxpkqqk//2z0s0h2 b6GZGZoo Zdr1WYv/FIeOTUWPbmwrKkq0RL2jsYTshAvOfbHYVXLeeQjRg/N+AdqxHP3UoMXS230C4gTlQ98JPgx/yx0c2jIApOwyzJKrEchaRJObrJh3WYodcrjSAjMWbsLJ5espDSz6dkwSDUQQ1cT+iuVUaH7mNCZpjfivgxIRsMwFhFeKkifgd2jPWN1fMRsBobQi3Z1qr2bqWUA9qgTRdzTugLN6ykVnBjlwcKifizHdcJpLv2xVfoGPl62T0/+CvNmTlNwCdMFYIKp9QTZ99uRvCIZOp2xhCpKSp1CDZIiWZNiQJ50nBxGrgedQH9PikW/H3F7Gym6OKptIut8NeGsu5ipJJiNnUGPBa2qqWSCs6N+KYa/ueWFcBNKFV3z02P7fRH07z8Csyw7Hj8Jh5tmf+JO923HKkTc4Tpzh9ehGgN1z7mhrPVZMKVNe/LjL33Prnq0VAcmysebMjVTBA28LYN1FXyiZAvTEAaWPT X-Bogosity: Ham, tests=bogofilter, spamicity=0.000001, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: When application in userland receives oom notification from kernel and reads the oom_control file, it's confusing that under_oom is 0 though the omm killer hasn't finished. The reason is that under_oom is cleared before invoking mem_cgroup_out_of_memory(), so move the action that unmark under_oom after completing oom handler. Therefore the value of under_oom won't mislead users. Signed-off-by: Haifeng Xu --- mm/memcontrol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index e8ca4bdcb03c..0b6ed63504ca 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1970,8 +1970,8 @@ static bool mem_cgroup_oom(struct mem_cgroup *memcg, gfp_t mask, int order) if (locked) mem_cgroup_oom_notify(memcg); - mem_cgroup_unmark_under_oom(memcg); ret = mem_cgroup_out_of_memory(memcg, mask, order); + mem_cgroup_unmark_under_oom(memcg); if (locked) mem_cgroup_oom_unlock(memcg); -- 2.25.1