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 108F1E7D0D2 for ; Fri, 22 Sep 2023 07:05:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4CC7E6B025C; Fri, 22 Sep 2023 03:05:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 42E456B025F; Fri, 22 Sep 2023 03:05:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2F6096B0285; Fri, 22 Sep 2023 03:05:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 1B4A76B025C for ; Fri, 22 Sep 2023 03:05:49 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id C95CFA021D for ; Fri, 22 Sep 2023 07:05:48 +0000 (UTC) X-FDA: 81263348376.08.20CDAB8 Received: from mail-oi1-f175.google.com (mail-oi1-f175.google.com [209.85.167.175]) by imf30.hostedemail.com (Postfix) with ESMTP id 0E65C80011 for ; Fri, 22 Sep 2023 07:05:46 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=shopee.com header.s=shopee.com header.b=ZJOLk2NP; spf=pass (imf30.hostedemail.com: domain of haifeng.xu@shopee.com designates 209.85.167.175 as permitted sender) smtp.mailfrom=haifeng.xu@shopee.com; dmarc=pass (policy=reject) header.from=shopee.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1695366347; 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=XVblwGEZgzzMamuC2lPhj14gVXLYTQn0EwcGLXw/zVI=; b=JP6x8wG/n/ckg5UmgVufI7fFRVhViaQweGc4ykaOWPY4O9fxTik9cl8ze2AJm2JMfWodwD 4qo6tpkk2lWKempQrLo3w0Xzr3FUwmMsfyIdieXybyK74zxV90MHpZDGktiRyqcDQC6+1h kXsgHTe/Gmq/PELb+Pe2LIG6qEROccA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695366347; a=rsa-sha256; cv=none; b=1P/FXpSh2d3p5xD6Zsicbpa7B/PIfl/h1G4RQVTR2Aoug3688A23FP/3vnMPBX/zjwnYi9 pfOb/Vl1Sd3NYciCol29teq2FS3Uoylm9Yp4AW4kqCslv2ehY5TyiXaJf/hQrpDBTLtDQl JJ38FJL/oujOGeCF3LPEpISL74jMKSU= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=shopee.com header.s=shopee.com header.b=ZJOLk2NP; spf=pass (imf30.hostedemail.com: domain of haifeng.xu@shopee.com designates 209.85.167.175 as permitted sender) smtp.mailfrom=haifeng.xu@shopee.com; dmarc=pass (policy=reject) header.from=shopee.com Received: by mail-oi1-f175.google.com with SMTP id 5614622812f47-3addaf54b5dso1176929b6e.1 for ; Fri, 22 Sep 2023 00:05:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shopee.com; s=shopee.com; t=1695366346; x=1695971146; 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=XVblwGEZgzzMamuC2lPhj14gVXLYTQn0EwcGLXw/zVI=; b=ZJOLk2NPcbMp+P8zNotlsJv5t8My2ZV4VUHSjoZt+TvYPQHxcVWKO3AadakDWPsSSD wPYs0wcLq6QnK/I1GcxeLM1RcSO8iiCX2yZeXcP3/Vb6V6M6oDvAzhZ7x7V2khgnOqIC pfVsXTaDmJKIxYGbyk33o+zEqsy71YO2vbmK0Zx88EQl+VwTLPm1EY8MZuyJTeES9MdT N18N0UoCk0CDS3oN0IRSGrbIkeVTP3G7w1rjFm4Sg69AEB/WjMOObhrIitBZ5mAGE45n gundYt08SdooV/ScSnw55Z/U48UrVe8JZW+96tuWAMTkr87Ur7hcXF3LcTm+sbvEc/h1 JVPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695366346; x=1695971146; 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=XVblwGEZgzzMamuC2lPhj14gVXLYTQn0EwcGLXw/zVI=; b=aTOjc37ITArjxiSFEInzP1oPXD0gVE7ivrkanxPPlo9C0adzlIyFNstb69Y1E118oE nxYnmS9pGmzYFBzDRhVZ01vmuYjDTQPjnNbici18JRd3JMYm4rRY/P3bCs+wOgVYS6Nq X5KsYNhwZE5+43oRgTd6SzVJ+YCnxNKKtrxM/EOrUKlkCYsgrr3NO+ZFrVyZDC+FVl1W RAx3b6GOXAWCerl1ulSaS6zJSP+eCYaxbv3XWakrri1kstvTfvjzAR7latdGQEHRMx+3 QesF3dWcec5gzEUPtVPYon0b122GtMdrQAGbhW27UlAop+OZA8i69DCnFZEcL0yFG5GN gGiw== X-Gm-Message-State: AOJu0YwUqFGnWHFc2yekyTq2ffFgWlzDmdNW0ONiuDq68IydFRNl1YEm veKyeusems9rENWoZpJPJhS+Zw== X-Google-Smtp-Source: AGHT+IH9MSQlxPTmkRds3kblO6QJzbPrCLMsYiY6pIkK+VRtBVthOwW96tHki/2mFPqvo3VMINXFNQ== X-Received: by 2002:a05:6808:1b23:b0:3a7:73e0:d18f with SMTP id bx35-20020a0568081b2300b003a773e0d18fmr9552660oib.14.1695366346098; Fri, 22 Sep 2023 00:05:46 -0700 (PDT) Received: from ubuntu-hf2.default.svc.cluster.local ([101.127.248.173]) by smtp.gmail.com with ESMTPSA id k17-20020a637b51000000b0056b27af8715sm2443723pgn.43.2023.09.22.00.05.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 00:05:45 -0700 (PDT) From: Haifeng Xu To: mhocko@kernel.org Cc: hannes@cmpxchg.org, roman.gushchin@linux.dev, shakeelb@google.com, cgroups@vger.kernel.org, linux-mm@kvack.org, Haifeng Xu Subject: [PATCH 2/2] memcg, oom: do not wake up memcg_oom_waitq if waitqueue is empty Date: Fri, 22 Sep 2023 07:05:29 +0000 Message-Id: <20230922070529.362202-2-haifeng.xu@shopee.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: zizonufgpc3emmrbcnbkujzq4g67mfej X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 0E65C80011 X-Rspam-User: X-HE-Tag: 1695366346-226626 X-HE-Meta: U2FsdGVkX1/6yqnMp4RzHv1mQgpZ+xVKo4GctoBjp7noID5hbpyYKA4s3J2zOrhGAvNjtqBn/+PHQKiMjig2F6hx6axLanMrLlA/ulndivr96UadnkyQOPGKLJzVBXeLmXfO2JwRQuLqdEzTrhQPjRfY2GHCJh6qdubXZtg6uwYU7Sy5GIRLIos4QK/Ihy1RnsleZabCuXEIwPloO1U2zDDSeTub5JCdxDzZ7lxjEp+DWAQ/6Q186US6KNqNzkcgEd9ZPPjniPi2gTAm/1ZgFfs/uhu1lZ+D0Nx1cElXO2ckSP5tDYkPu86af8coxVssOClPvXXxYmD2jlE9BaZBIGaCP2DO5JZ78s8lvs8eUltF6MJuM0F2CZfS9C8xhSoaiYsZedlUTm1ANJ6i6u7TbRbiavYFkn3WQnZo1pyg7EkETagaLc91zDlyY6WO+tmNzUjwV9T7sKUJ4V+yiTtBa3qiV1ht0FJoWa+eMJElPjVS7MEAAjT5CqzrNjlYueV9YmwRR3bcWtc6sOFdd16mVYOLtqM4nUYliq5i+UZ57FEs7e+0cElJWV/RxhzKQ1rTLM/U33V+uUFS08/AQ3D3uOIMNkAuf1Id6ZPmumVoqq4SUlxOjdFPrC8f44M6vmeS4/8E14WB8LI9vTbk6rJsXUQIiEb/cJ4u2soaUC1k/xnSXaJeO7Bs7wgqJH5l3+BfMxzXC/Eht8Xcg2AZWlG0mJ4vMSNRrSfHXwwllM+G3Pnd3/w2tLdnBdusqwI9b7jxUMHF+01YJMK02rYCe+Vc8PWRKPsgkbE9jbVF/0Zhq1vSr7O5gSSJ/u4Obn03JGaNvsO4kZy5V5ghRuEGIfU8YNNmxbr+Xv0IuPSmUVyrJJ1DpcDX8I2D6Wh09vBHNseckHY1QogamMfP60tzZxHd179ky1BaZxu3RqiPWXCL7vNLwYx4KAi3rN4X/0OQ5ktKZhNihLXjTLqOBeaDFUN M4yP7Nex O5IwFqRP7bM3CpmRbixpi47HNm2f/Os0h6KOLGuPiBkcjEsN5PtJB7M78/vmt3SBu/HTKelm3CstOM7bnOZrMiN4TI2gu08pT0/mMagmW5zT1ROPCzmS161u5J8kUrCgstBEM6vBz4AngvAKK37gdAp05QTdowmkg2T/HyDSfLU13YoudwLkUJin/mSN/Cy9fmMCukU1HWq/kazjQyH/FIQmtynfmATyaIjvn3zJdfAA2lVwzzaOkR/L3YRp59rAvNvaFeBDYs4r0+B4qkSCJhVnFC8YgLp6AKCzf6y0OEyyCoo5E2ufDdiP4/zNwz5cm1chitQIqBI9j3DpG6gvaQ9Bx7lW+Uh/gwNi7pLTe1SK/wNbaIySe5UwKhtghrDAdND6qOHE1VacXEwKt+FTrhR3wWtmo8bcLXyZ4AsFe7SX6Q0PLo+kMdu69XyhOIsxS3i7K X-Bogosity: Ham, tests=bogofilter, spamicity=0.012374, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Only when memcg oom killer is disabled, the task which triggers memecg oom handling will sleep on a waitqueue. Except this case, the waitqueue is empty though under_oom is true. There is no need to step into wake up path when resolve the oom situation. So add a check that whether the waitqueue is empty. 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 0b6ed63504ca..2bb98ff5be3d 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1918,7 +1918,7 @@ static void memcg_oom_recover(struct mem_cgroup *memcg) * achieved by invoking mem_cgroup_mark_under_oom() before * triggering notification. */ - if (memcg && memcg->under_oom) + if (memcg && memcg->under_oom && !list_empty(&memcg_oom_waitq.head)) __wake_up(&memcg_oom_waitq, TASK_NORMAL, 0, memcg); } -- 2.25.1