From patchwork Tue Oct 8 01:56:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingxiang Zeng X-Patchwork-Id: 13825535 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 713CCCED24D for ; Tue, 8 Oct 2024 01:57:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 068F16B007B; Mon, 7 Oct 2024 21:57:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F346D6B0083; Mon, 7 Oct 2024 21:57:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DD55F6B0085; Mon, 7 Oct 2024 21:57:28 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id B84AF6B007B for ; Mon, 7 Oct 2024 21:57:28 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id CB80112195F for ; Tue, 8 Oct 2024 01:57:27 +0000 (UTC) X-FDA: 82648772976.24.2BD65D1 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by imf29.hostedemail.com (Postfix) with ESMTP id A91C2120005 for ; Tue, 8 Oct 2024 01:57:26 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Q3EBXFub; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf29.hostedemail.com: domain of jingxiangzeng.cas@gmail.com designates 209.85.210.170 as permitted sender) smtp.mailfrom=jingxiangzeng.cas@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1728352537; a=rsa-sha256; cv=none; b=q0DnD6MbjAMGvBrz/VTl1eSnQHh3DTiQpRTlSV8OXPide+o/qmVfm9nHEUzNLzAYAWsYvI M4BbsN6Nh6Resd9Inx8eGZRl/sU3xsTgtZwvv7Lip9BnPffdloV7EWN5dh5VV7XReHXC3K UI1/xpshvznq3J1JsaUD9ZmdwhqieBA= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Q3EBXFub; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf29.hostedemail.com: domain of jingxiangzeng.cas@gmail.com designates 209.85.210.170 as permitted sender) smtp.mailfrom=jingxiangzeng.cas@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1728352537; 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=oO+OwRfE1tRLiIYMV3GpC3hAreDH7qc0g4WcBpwzCHk=; b=NxqmONU0j3BVjFlMTKsSi2h3eMZEcaeuG3cmHiml/5smu8T4LFSv5TmMc8iA7YXXb77M0D ZL0KhnxWpU30ReRVSe7F5s0zawLfaIH/hvZbqyn6DRpuWTuu/8GD6dYcmxIjOb8Q5a9RM4 0N35AeVo+h6aUoqffxr6P85mWQTpbtQ= Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-71df8585a42so1786264b3a.3 for ; Mon, 07 Oct 2024 18:57:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728352645; x=1728957445; darn=kvack.org; 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=oO+OwRfE1tRLiIYMV3GpC3hAreDH7qc0g4WcBpwzCHk=; b=Q3EBXFubwUIINP/iGoSLpgv/4+b7TNmDqtYRv+BNd7zZWRli7T9l2YiPGmyEk2WhYd +wc6ctxz2farajulY7+3xljV/r4T1YRuKzBUwx2hZbrEvtbDSoN9br7yEmksSKLfS6Ro G25vZCB47rXcZuRUY/1F8pfIUo8W/Bd5ZDtwn1nkqLARsxFkvFA7sn8pvyAUYGq8W61p UnwfLwYmsCXK9oC2oI48Qvq4thgV2LS8u+PKpq1iQeI+BvTtkfbDtJ1SrMaZ3qX/87iP mjkqDmukyd7+PwdUY6zJ3afSKLpyQ4oPJP2mm9vKRdYlBhTcQpRkOtgoVduHhMrtjaRN DWgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728352645; x=1728957445; 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=oO+OwRfE1tRLiIYMV3GpC3hAreDH7qc0g4WcBpwzCHk=; b=a81yBQs42AODR6RykDOWRxDtPMGaKC/xzN8TF67Ym7CqygL4dZG/NeA/FwDvbwuKIT H+VWxrUwmpBAONwqGZsk0otOtw+w0Q7okhqSrZSOuk6vLDZapAk14y9kYi51ImDdBtIG V1xwjM56wEWVl1E0SIupWlultHRtgkjNmndYpVHSg85anZQWOurL2grPqYUSTj9uJbgQ ItfxxSl82PPQEyU7ydP4CsOmezNfEsFn0bPVTCvyWJaEGsfsUKdb59HiiqvJx3w2uLbn UGnl3NqdhFyKZhGbc6Kr3sYs8aEQWGgaYVSArzMU/8pzZqf7STDmQGMPtttE9i5Ix9qo FMyw== X-Gm-Message-State: AOJu0Yzqp7I1krYFsf3ABnu/flGB/BXLimYMSjEPZPiACxy1Q0+jkUB5 x0QVC4n0Q9vGWcNSKY3jqEeNOYIY+qf55t1holVSY4CtFZgu7C20GJD4IEXp X-Google-Smtp-Source: AGHT+IFppnMppS3FFt97vHNG/ldbRYVpwA4EEMaHJ2/W48eBATJnbTDb9BVew4lWT8hy4GmJ0qCfZg== X-Received: by 2002:a05:6a00:3c81:b0:70d:2a4d:2eeb with SMTP id d2e1a72fcca58-71de23a70a8mr21124857b3a.3.1728352644720; Mon, 07 Oct 2024 18:57:24 -0700 (PDT) Received: from localhost.localdomain ([14.116.239.34]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7e9f6c340f7sm5707902a12.73.2024.10.07.18.57.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2024 18:57:24 -0700 (PDT) From: Jingxiang Zeng To: linux-mm@kvack.org Cc: akpm@linux-foundation.org, kasong@tencent.com, linuszeng@tencent.com, linux-kernel@vger.kernel.org, tjmercier@google.com, weixugc@google.com, yuzhao@google.com, chrisl@kernel.org Subject: [RESEND][PATCH v4] mm/vmscan: wake up flushers conditionally to avoid cgroup OOM Date: Tue, 8 Oct 2024 09:56:35 +0800 Message-ID: <20241008015635.2782751-1-jingxiangzeng.cas@gmail.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: A91C2120005 X-Stat-Signature: ehrx9dqajmbzfifpm7tyrpuchu9fyf5z X-Rspam-User: X-HE-Tag: 1728352646-401069 X-HE-Meta: U2FsdGVkX1/YObfZyygusMDsAp9R01MK+N2WkUdH6q6mMzO7MBspUDDBnDK7/vtioWPgZyM/2+It0W/FUZdzL6FU42CKQ+YnNP4hNDMKDki5JRtBoj/H34Yu7h6Lpx31oPPqlNvI6qxmavGHwSokJQbBFm1Z1/DEQKSlTFola4n9xL3xAGB10mYMkq5z8jrtE+CiEFFdFd5Y8vq0fSc6ZV9f8itXO7iFMoU11ws9A0vz3fFQHjquU5ATFLkzynZtSOleWVfXR+/EsLHRr/nPBrE6ZfiYj3fPuFXyyvsNLVpy/2DoT3UN1gntf5aE/K96h/+VcyucKgBx0zZw1IkOUhZ2xlliJ+JoWwguVfGv3D4Q+fgBi29HHjKJSYxYW7fm0BGmrR1Z5CeZkKq+dgMfIMa/AFafcbXeXUH/1h5k+7J+k4+ln1pNMT7Sdyd8LpH9dUKwP1WM4H6/3BF3Y+XS7y63S8cq20yQrUs+NIV4Ep86RzUxVzFBgX425NqSQlQ9u/BheEli92hb6Cs539srKftRyDEf08fid7sVWoueMfB23p25/6/TjMqEiUQf8NLcMgxxXtYQY02bQPilOnzd6faSOtJ0ky0Vq5PHzfsi5RgyjgtpHEMN7xYW6VrHDTDh6KoBO9YO0Yf8v20/WmESQmIaMf8abkfjyzkfHqi31ENpL70/ZxM2siTQmUzB9UGuIN7sVdNcx42SwIxlLEuy0YX5XUCYuQV1oee6g6ttuZ2bVU0+dKaCYO918EW24PANtto3uquf+MAcD5yHyQ9M28HdOLPsxi9lsFuU5teCtRB0YXXSY/uZGXBSAuf0VflvCUkd+xOr21OQdPvsokNi0lspZFQuPwvYRGUZ+j9xr1jqSUgFWnM8IAn4pr5C/lT//QdGs7Rxhy7av543U5hjYxqy0mq5p7S95ldg/V1BjW6s/FMSKkuI95eaqp+ZiAF1xzGPPbTPnYSLiZzFQtj pIE285MY /aEyktam/fO7nmDBH5FAPvNNvenzIv+LJ6TDStEQe4MQyV6b3lk4dT0BmO5yMA6qhoFugehWQe43mdKT8t5izLlCkNIVGkINqqMuMenACEIotp3GS2PzCTddj+ExnJjlLEe7x7fW1mHfl7K1O2cPcLsTbP5Agwjxqo93D6ORrLEeFj8k9qvjCKNoX/zHWR57TRE8nFpZzpkaThlqsJ3Xu9S+LtWi0mBwTpSyf+goVpQ+M9B8sT2p2QYXgJWszg3qmmdmVAbzHChZZsLSs4cPawhkfvNc1Y6BGoG+ftuUFrWYPMKbjjtGRm5u9mOotRpGKy4kCKOLkkbi0u0GySGwr7e1xKjQbcEklcuxZHUAAgXZw4d4H//hQ5EtPQRSHK5daLl1fOAyWNcIARYzmbZj1xhAmLx671F6yr//yEmNCSQ/iGhaWxvmztMWk/GjZF7yskzLX 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: Jingxiang Zeng Commit 14aa8b2d5c2e ("mm/mglru: don't sync disk for each aging cycle") removed the opportunity to wake up flushers during the MGLRU page reclamation process can lead to an increased likelihood of triggering OOM when encountering many dirty pages during reclamation on MGLRU. This leads to premature OOM if there are too many dirty pages in cgroup: Killed dd invoked oom-killer: gfp_mask=0x101cca(GFP_HIGHUSER_MOVABLE|__GFP_WRITE), order=0, oom_score_adj=0 Call Trace: dump_stack_lvl+0x5f/0x80 dump_stack+0x14/0x20 dump_header+0x46/0x1b0 oom_kill_process+0x104/0x220 out_of_memory+0x112/0x5a0 mem_cgroup_out_of_memory+0x13b/0x150 try_charge_memcg+0x44f/0x5c0 charge_memcg+0x34/0x50 __mem_cgroup_charge+0x31/0x90 filemap_add_folio+0x4b/0xf0 __filemap_get_folio+0x1a4/0x5b0 ? srso_return_thunk+0x5/0x5f ? __block_commit_write+0x82/0xb0 ext4_da_write_begin+0xe5/0x270 generic_perform_write+0x134/0x2b0 ext4_buffered_write_iter+0x57/0xd0 ext4_file_write_iter+0x76/0x7d0 ? selinux_file_permission+0x119/0x150 ? srso_return_thunk+0x5/0x5f ? srso_return_thunk+0x5/0x5f vfs_write+0x30c/0x440 ksys_write+0x65/0xe0 __x64_sys_write+0x1e/0x30 x64_sys_call+0x11c2/0x1d50 do_syscall_64+0x47/0x110 entry_SYSCALL_64_after_hwframe+0x76/0x7e memory: usage 308224kB, limit 308224kB, failcnt 2589 swap: usage 0kB, limit 9007199254740988kB, failcnt 0 ... file_dirty 303247360 file_writeback 0 ... oom-kill:constraint=CONSTRAINT_MEMCG,nodemask=(null),cpuset=test, mems_allowed=0,oom_memcg=/test,task_memcg=/test,task=dd,pid=4404,uid=0 Memory cgroup out of memory: Killed process 4404 (dd) total-vm:10512kB, anon-rss:1152kB, file-rss:1824kB, shmem-rss:0kB, UID:0 pgtables:76kB oom_score_adj:0 The flusher wake up was removed to decrease SSD wearing, but if we are seeing all dirty folios at the tail of an LRU, not waking up the flusher could lead to thrashing easily. So wake it up when a mem cgroups is about to OOM due to dirty caches. --- Changes from v3: - Avoid taking lock and reduce overhead on folio isolation by checking the right flags and rework wake up condition, fixing the performance regression reported by Chris Li. [Chris Li, Kairui Song] - Move the wake up check to try_to_shrink_lruvec to cover kswapd case as well, and update comments. [Kairui Song] - Link to v3: https://lore.kernel.org/all/20240924121358.30685-1-jingxiangzeng.cas@gmail.com/ Changes from v2: - Acquire the lock before calling the folio_check_dirty_writeback function. [Wei Xu, Jingxiang Zeng] - Link to v2: https://lore.kernel.org/all/20240913084506.3606292-1-jingxiangzeng.cas@gmail.com/ Changes from v1: - Add code to count the number of unqueued_dirty in the sort_folio function. [Wei Xu, Jingxiang Zeng] - Link to v1: https://lore.kernel.org/all/20240829102543.189453-1-jingxiangzeng.cas@gmail.com/ --- Fixes: 14aa8b2d5c2e ("mm/mglru: don't sync disk for each aging cycle") Signed-off-by: Zeng Jingxiang Signed-off-by: Kairui Song Cc: T.J. Mercier Cc: Wei Xu Cc: Yu Zhao --- mm/vmscan.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index dc7a285b256b..2a5c2fe81467 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -4291,6 +4291,7 @@ static bool sort_folio(struct lruvec *lruvec, struct folio *folio, struct scan_c int tier_idx) { bool success; + bool dirty, writeback; int gen = folio_lru_gen(folio); int type = folio_is_file_lru(folio); int zone = folio_zonenum(folio); @@ -4336,9 +4337,14 @@ static bool sort_folio(struct lruvec *lruvec, struct folio *folio, struct scan_c return true; } + dirty = folio_test_dirty(folio); + writeback = folio_test_writeback(folio); + if (type == LRU_GEN_FILE && dirty && !writeback) + sc->nr.unqueued_dirty += delta; + /* waiting for writeback */ - if (folio_test_locked(folio) || folio_test_writeback(folio) || - (type == LRU_GEN_FILE && folio_test_dirty(folio))) { + if (folio_test_locked(folio) || writeback || + (type == LRU_GEN_FILE && dirty)) { gen = folio_inc_gen(lruvec, folio, true); list_move(&folio->lru, &lrugen->folios[gen][type][zone]); return true; @@ -4454,7 +4460,7 @@ static int scan_folios(struct lruvec *lruvec, struct scan_control *sc, trace_mm_vmscan_lru_isolate(sc->reclaim_idx, sc->order, MAX_LRU_BATCH, scanned, skipped, isolated, type ? LRU_INACTIVE_FILE : LRU_INACTIVE_ANON); - + sc->nr.taken += scanned; /* * There might not be eligible folios due to reclaim_idx. Check the * remaining to prevent livelock if it's not making progress. @@ -4796,6 +4802,13 @@ static bool try_to_shrink_lruvec(struct lruvec *lruvec, struct scan_control *sc) cond_resched(); } + /* + * If too many file cache in the coldest generation can't be evicted + * due to being dirty, wake up the flusher. + */ + if (sc->nr.unqueued_dirty && sc->nr.unqueued_dirty == sc->nr.taken) + wakeup_flusher_threads(WB_REASON_VMSCAN); + /* whether this lruvec should be rotated */ return nr_to_scan < 0; }