From patchwork Wed Feb 12 02:57:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Ridong X-Patchwork-Id: 13971016 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 2D104C0219E for ; Wed, 12 Feb 2025 03:08:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 985FF6B0082; Tue, 11 Feb 2025 22:08:04 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 936556B0083; Tue, 11 Feb 2025 22:08:04 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7FE1B6B0085; Tue, 11 Feb 2025 22:08:04 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 65A776B0082 for ; Tue, 11 Feb 2025 22:08:04 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 17E9714154E for ; Wed, 12 Feb 2025 03:08:04 +0000 (UTC) X-FDA: 83109808488.28.54843ED Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by imf17.hostedemail.com (Postfix) with ESMTP id 8A5D14000B for ; Wed, 12 Feb 2025 03:07:59 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=none; spf=pass (imf17.hostedemail.com: domain of chenridong@huaweicloud.com designates 45.249.212.56 as permitted sender) smtp.mailfrom=chenridong@huaweicloud.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739329682; 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; bh=628EQhm1GLfFwdBk9RsfdFUSk/Pu/iy4LCBYq93ayik=; b=Y0/oeCJYKqwlAV0IOzthzhki4eqnGPEjYgarlvaL/j8ovYerPEY2BvNjSP7kPEwPXKSD1D /pvwETnT+GE4Z5ClUmyJfab3hVSiSjZj4GKTOr+DGRMDr4lSZadBUmWr4Swb1V9LM5wi2B KfPoXswWRtgaAU/ZGwr/lWbUBhSipuU= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=none; spf=pass (imf17.hostedemail.com: domain of chenridong@huaweicloud.com designates 45.249.212.56 as permitted sender) smtp.mailfrom=chenridong@huaweicloud.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739329682; a=rsa-sha256; cv=none; b=blGlHdoGCBkZcEHXuaEI7tjpWo67LrSBlX5fqE9Hw0FQ9wtnrolHxbbloiTR7FQJJ/bUIx QUFaPgSi/eNITloZkmbJEFTgVue+BGcs79GvWoXRAoghDEzI/1Aaphz5ZAfpb7rFpcwlK7 JOo1K9uiF5bqRlhCG5/0g5x2TSyLJpw= Received: from mail.maildlp.com (unknown [172.19.163.235]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4Yt3C83CJfz4f3js6 for ; Wed, 12 Feb 2025 11:07:32 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.252]) by mail.maildlp.com (Postfix) with ESMTP id C1DF31A0B96 for ; Wed, 12 Feb 2025 11:07:53 +0800 (CST) Received: from hulk-vt.huawei.com (unknown [10.67.174.121]) by APP3 (Coremail) with SMTP id _Ch0CgDXKcSBEKxnbyc1Dg--.7428S2; Wed, 12 Feb 2025 11:07:53 +0800 (CST) From: Chen Ridong To: akpm@linux-foundation.org, mhocko@kernel.org, hannes@cmpxchg.org, yosryahmed@google.com, roman.gushchin@linux.dev, shakeel.butt@linux.dev, muchun.song@linux.dev, davidf@vimeo.com, vbabka@suse.cz, mkoutny@suse.com, paulmck@kernel.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, chenridong@huawei.com, wangweiyang2@huawei.com Subject: [PATCH] mm/oom_kill: revert watchdog reset in global OOM process Date: Wed, 12 Feb 2025 02:57:07 +0000 Message-Id: <20250212025707.67009-1-chenridong@huaweicloud.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-CM-TRANSID: _Ch0CgDXKcSBEKxnbyc1Dg--.7428S2 X-Coremail-Antispam: 1UD129KBjvJXoW7KFy8Kry3Ww48GryrJw1fWFg_yoW8XF48pa 98ua4UK398J3Z8ZF47Aa4IvF17J395ZFW8JF9rK34FvwsxtFn2yrWIyr1aqryrAFWS9a4Y vFs8Kr1xJrWavw7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUv2b4IE77IF4wAFF20E14v26r4j6ryUM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rwA2F7IY1VAKz4 vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6xIIjxv20xvEc7Cj xVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x 0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG 6I80ewAv7VC0I7IYx2IY67AKxVWUGVWUXwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFV Cjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4IIrI8v6xkF7I0E8cxan2IY04v7MxkF7I0E n4kS14v26r1q6r43MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I 0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVW8 ZVWrXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcV CY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAF wI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa 7IUbmii3UUUUU== X-CM-SenderInfo: hfkh02xlgr0w46kxt4xhlfz01xgou0bp/ X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 8A5D14000B X-Stat-Signature: ww6ay4xc1a7xiakfywa31gof3s5se336 X-HE-Tag: 1739329679-210585 X-HE-Meta: U2FsdGVkX1/1gnDyhKEV3xRe8nWqQdzkuFzeyYxJ2Toh8vUWe7o71GlCTdG/q1HUwRD59tsKJ77WmKg9KOuMN0WOuOTedCEXJRaQQA5ajEALf1N40YnrK8ewROVIBaLkbMQPF/cdZRhvmKuL28xk8UReDIFxOxG6UZfNf8ZB8WIzJWBCieOzAgPRtvLrzCRoppkL4zhOmIErhS1HQWQ1vhiiRabZ6tBseQcY+4orwO2k+QSFe78uBn/ZTIud/Miojny1mOYGlg+oGGeCwDUuXR/ZxR00b+uSIGN92TivuA//xYZjylovsXjjYzQrzzbR91/YaSzZp/SV816wdtWSGlHagMabGp4sld1fRknSkZPlA1/Ww6f0ErpYyfMiqbZTOYPE9D/v5uKd7nOWrR0z5r5LTUpOf8INvfI6Hc+gfFhRCJRJemDdRv/HBhNBcCU2hx48IWgQS307kypPYMzTxOMvwQwuW4VQXq2SBP3GvoQo5Q0WtradXtD59yyIK9m+WDPWn9gK4WcKEPNfY2Pu4Jb+8O1ElZsjFapxhWCbH+pfMT/QhHj7V1L5lf6fb51g27ufGv0scrMoVvX+PlF0okwRXFI+5r6ParYQnN8OGVYv+7lwW/KLLZRiXddyHXhVyoVQn6Vz0Vv+U4pCZFxjR/DmyNRIvP6KyB02PxPBZqKX/37Iw9x8ilejc/lvEP0HFBtnrH5HZ4YxrC+keTIzMZW3pQlV3GaHAgQiNRgfFEtKViMpXZlpuAkT1nO5MnPqRoWI4MXSHpx7rMSkl3cIdqbzk7SigCabNHi9Z0EklhKtnAxeOlL2b0ptGsWRwRPcqO/jtSeruFHOU9E8UfBapCiojWZ2wku7y3xYUSuCltOMxbYJzO00g70PGmdFozn+6ezI3hXPKzcIiUEMpwyPizG0rJrxp8EFNVZur7owzXwIpY1fV9Z8k8sMH93mNYEy4HKpaV7p6h318j/tQpQ D3yjqdY/ MkmKABK2k4K5g8DFdroWpkNj3I1DRlac6xXBxcnymO4UQ6Aai+nAc/emzDiECLPJXwOQDH4Nv81NOKvAaZng81P7vViJzLERS7u0mVrsmMxXwOhZKILBKSnabhyv1wdH45Ttv4pOA+LuW+qj4sQHZhlC2OjYveBNsvr6V4bVqOMiHWR3VhfXgZu+n3MzyI2zRA2NDHmzk0LYSUxkjK11xKLpSMw== 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: List-Subscribe: List-Unsubscribe: From: Chen Ridong Unlike memcg OOM, which is relatively common, global OOM events are rare and typically indicate that the entire system is under severe memory pressure. The commit ade81479c7dd ("memcg: fix soft lockup in the OOM process") added the touch_softlockup_watchdog in the global OOM handler to suppess the soft lockup issues. However, while this change can suppress soft lockup warnings, it does not address RCU stalls, which can still be detected and may cause unnecessary disturbances. Simply remove the modification from the global OOM handler. Fixes: ade81479c7dd ("memcg: fix soft lockup in the OOM process") Signed-off-by: Chen Ridong --- mm/oom_kill.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 25923cfec9c6..2d8b27604ef8 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -44,7 +44,6 @@ #include #include #include -#include #include #include "internal.h" @@ -431,15 +430,10 @@ static void dump_tasks(struct oom_control *oc) mem_cgroup_scan_tasks(oc->memcg, dump_task, oc); else { struct task_struct *p; - int i = 0; rcu_read_lock(); - for_each_process(p) { - /* Avoid potential softlockup warning */ - if ((++i & 1023) == 0) - touch_softlockup_watchdog(); + for_each_process(p) dump_task(p, oc); - } rcu_read_unlock(); } }