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 D48BFD10BF6 for ; Sat, 26 Oct 2024 11:57:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4E2466B0082; Sat, 26 Oct 2024 07:57:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 491CC6B0083; Sat, 26 Oct 2024 07:57:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 359B36B0085; Sat, 26 Oct 2024 07:57:29 -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 181C96B0082 for ; Sat, 26 Oct 2024 07:57:29 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 1AA37415EA for ; Sat, 26 Oct 2024 11:57:17 +0000 (UTC) X-FDA: 82715602746.30.9B71AA9 Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by imf05.hostedemail.com (Postfix) with ESMTP id CE306100002 for ; Sat, 26 Oct 2024 11:56:46 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Wasmbqph; spf=pass (imf05.hostedemail.com: domain of jingxiangzeng.cas@gmail.com designates 209.85.215.175 as permitted sender) smtp.mailfrom=jingxiangzeng.cas@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1729943767; a=rsa-sha256; cv=none; b=yZAa2io8ne+zf3TFRg7cu1y8FzRLgUqV/HTbvT4YN0W9ROstxjHcVjB3TfQL8iFsQqw5TG /bTiP6ubBvDhmsPg5pUcPrdKNjZON3ReOMSBISYEnr+nAVwaroFJPg61/Pq1rE3kZtUTc6 IUEumMItkI9tQQHjnc8FpgMOGx2bf7o= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Wasmbqph; spf=pass (imf05.hostedemail.com: domain of jingxiangzeng.cas@gmail.com designates 209.85.215.175 as permitted sender) smtp.mailfrom=jingxiangzeng.cas@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1729943767; h=from:from:sender:reply-to: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=4mojazzZY9EJEZiK2gI73vbSFoW3i9QXTOwDHwlfVGg=; b=BtvvgMTUhuFlwtjMX5OCbL2j9fO7U7sRv1Be+H9Ar2RStAhf8jdiZeeVveBG3jbf697F8i roULhnYVg69H6ODUBq722twDvmC5V5km2bKtEQSM3KigWAZV+Vifqf+nbby2iNYZnI2MzF /4Vc0dPeQztlyxX6awBCw9484+o8UDU= Received: by mail-pg1-f175.google.com with SMTP id 41be03b00d2f7-7eae96e6624so1974261a12.2 for ; Sat, 26 Oct 2024 04:57:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729943845; x=1730548645; darn=kvack.org; h=content-transfer-encoding:mime-version:reply-to:message-id:date :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=4mojazzZY9EJEZiK2gI73vbSFoW3i9QXTOwDHwlfVGg=; b=Wasmbqphd0Z1pQj9P1mJ3X2kqAfGSdZlOlOwWCsIN32GJ+nV1Af1Him+yBBPjjgjTU 5V1QWgE9K8z8aU1gv+oVwfM9qLBVOXNPiPFOcf0TbYEmBvblpLH+eJfe9SsLrx1I5jf1 nTgiZfnF3rPG1CU5P1n+EArnSadO4Mj3U8arxhQHHJ5vQZuECQIrmYoz/kzSGvKyOnuS vyI7+Fu9bpUVjf40m+h0numBrNTPEgZUFiss43rXpS1wW3Bjj3we50Xv5f6tGia5+e0+ R5L3uHDz/ctE4JB2RBTYr7bSWw1MFzxGFU34yPEqr0GHkRvGvOTxku4pnvnR7h9Rc8iQ IbaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729943845; x=1730548645; h=content-transfer-encoding:mime-version:reply-to:message-id:date :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=4mojazzZY9EJEZiK2gI73vbSFoW3i9QXTOwDHwlfVGg=; b=uDcUeRNrJIHEoDeqcCILJnKw+VdEAOKimgIlRHBWCXMH/L47tQyEpxb9QaFGpWCwJv UqghRfhA63ZurHg00go0EkdRKmCUlCaqLl10xMeHLZLlpMJZ9v9ZEkuNukeIHifUJdfp ElDIGBAXlvViVith9MPOQTFXIRmRR7E40ynq6cJw3DLzVDBS0UDeaGr3naJ0zFoIYEgK jovC7GVKBUioppQaIp3D+yYUKNMw56KeNQ2VYHb9GDbEQREgAkZe4/gNuAsSBV/2Y1P+ pej/Rn5OKXW7Tb4H3ec7zVIDNvlqtSwvWyxyo06ObVxOVFa/do7TCzCK3O/p8Ih9JIR7 4NXw== X-Gm-Message-State: AOJu0YxC3YD2LuuZeQZyO0jGf8lQxP8fclUGhR5Y41+egmxqCQa3zlUP 71IoPHRhHQP84DKbRaL/A95G32foEZZT2sMR2of2xXGb/72nkxj/0stHl8qR X-Google-Smtp-Source: AGHT+IFSfrbwdJph2pUQUgML3x4x4NmbUTpWB+vHFd1v/uBCN/Xo7vsJ97j04tG9/8BaG1QIbgXEqw== X-Received: by 2002:a17:90a:c70e:b0:2e5:5ab5:ba4b with SMTP id 98e67ed59e1d1-2e8f107b5b4mr3098886a91.22.1729943844742; Sat, 26 Oct 2024 04:57:24 -0700 (PDT) Received: from localhost.localdomain ([14.116.239.35]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2e8e374998fsm3294023a91.45.2024.10.26.04.57.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Oct 2024 04: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: [PATCH v6] mm/vmscan: wake up flushers conditionally to avoid cgroup OOM Date: Sat, 26 Oct 2024 19:57:14 +0800 Message-ID: <20241026115714.1437435-1-jingxiangzeng.cas@gmail.com> X-Mailer: git-send-email 2.43.5 Reply-To: Jingxiang Zeng MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: f556fnw996au5we7wi5iz1k6kh557dmx X-Rspamd-Queue-Id: CE306100002 X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1729943806-121403 X-HE-Meta: U2FsdGVkX1+8ACIjtNmfbQBM5ewUglJePRLTvRl48d1zZjov6SKKQpx+bbA7+RGaSCwDyU63aQmTO8pdfTOC2u/+efwgsFEISDP1d9TL0mN/1uiD70H1ArYmS9kQwf0rWEOG/HMOudKWCc3iMNG3oy8Y2UTxWv9fYiVF3/XhlpPr+fonp7NDzQM+RnIcj4mlZjDmXJpgQv/Ro2FtHZ/9XPd+fNgD8KVrXatuoz/SKL/cn4WlXV1F1jsRdlnlyKOnezJdG3mPsFPdpJz0qVXlLqLRB6C7OZOiy5WK6Sa8HnEPqddcOmjgsGMe3+qJcxcUUnJ2ho648ZKGr+YVXstOvLS6iThPIgWQoo8d9DqaQHG5L0PlPV0+ngncuSCI1K4ANiSsS6QbjbF+Rriumq1f0u8If3okvYTYYcI/vxLJChkW03/ozW1RToKjXQvjCPRSKJgONllwtqWU3tkiRxwOIky0s76hmy/5pClnyKlLzJGywGtQEaxxk6+RvLD+3nxwq9lcicie2ZGsrhXtkmd9bYIipLIBqs4l9Zmvpvd3qsasnHFRZ9Y7lJjYkHOAAQ3AP+xltcQyayz4she3HG/zyZ71YfihMykGSBKJ3rXBb2ttP0f94WIE3DwGJg040thhcwQ8cM00B0grH8tpn+j2YcUW95wxoa8lqotItuFu68WLVvSxhNb/FUa6G0QA4djNpp/J5bn+GxHAzAHmcwqmtr3STUfmAyOINqfnvVW/aZwr7Bzeu5PEB54uZs2tfV2eStcxaTUf45Io3NwGoJtkG+1oglFqTbZmpWbXB4kRr5GF5yLFRLan2mnn2me2mxo6+PvAlDwJWDstWaG2tzjD/cltpW3vcqFG9WkzLhLy2JbKc6vM5AadH/hef/y49twFd+hQ5MH/o/O4lo0vOMntJDSNZFqFWBR90qVgeO18XovQxsaGQ4virBC1hfzjTNhx5XOMQVAs/G27AdcEttb LKe6QO2w UwTbLvIZ3/XQAhiDnFyoImsaSLsd5LnHbQF8YH11SBnStw3GMzkzu3Jsvq0ztsA8VzIh9ErpR5aYZEaSDNLMCU+ZeYlb34x0IixoEKwISzf0DOVBmNumIRVmaoby7E5g1NO5cGnnq7H+nRnvGOfrhiiTsQ7N0iApbBLC0V0WbLOGqMPrYEGAv0l7bu62MnNaLCe9Gvgvj/PWQtEY8cBXEoUqHGN2EejRLV0DYwJGYTtWUmAQrqclBvJmgQWteNf4cUiBKymjRDr6Dqfje56XRWQL33LFaSJvAUQeenIwqebndF9eHNqv/bmfvCNtsYyz2OViSrtexIp6e/wuEyboDuh+p6zMszCF2QmpWODfz7H3T/99/Ib4/QXamhyWUudI8IbXa0dQQhqW1qaJDQsvttSYnZGXzpXxAwDZxkznCc08mUhP/UUANi4Z1ZrnF4R6oHXUVXqpWuQflvTBmKQsvi50CCA2BtsNh0JG+YhmugbYoMMDDRr80EEGEzqi3VWIdduP2dXM474k3bF8QZWMXv5pTEMRdXMxVl5dsNKlSVRM/K9VZUrAmj/nI1ucsTVP0o5RisCpK/nJoSW2wiJ/aKPl7SQ== 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: Zeng Jingxiang 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. I did run the build kernel test[1] on V6, with -j16 1G memcg on my local branch: Without the patch(10 times): user 1449.394 system 368.78 372.58 363.03 362.31 360.84 372.70 368.72 364.94 373.51 366.58 (avg 367.399) real 164.883 With the V6 patch(10 times): user 1447.525 system 360.87 360.63 372.39 364.09 368.49 365.15 359.93 362.04 359.72 354.60 (avg 362.79) real 164.514 Test results show that this patch has about 1% performance improvement, which should be caused by noise. --- Changes from v5: - Make wake-up conditions stricter. [Wei Xu, Jingxiang Zeng] - Use sc->nr.file_taken to count. [Wei Xu, Jingxiang Zeng] - Link to v5: https://lore.kernel.org/all/20241018052942.3810740-1-jingxiangzeng.cas@gmail.com/ Changes from v4: - Add the number of unqueued dirty pages in the shrink_folio_list function to sc->nr.unqueued_dirty. [Wei Xu, Jingxiang Zeng] - Reset sc->nr before calling lru_gen_shrink_node function. [Wei Xu, Jingxiang Zeng] - Modified the conditions for waking up the flusher thread to avoid interference from unevictable and anonymous pages. [Wei Xu, Jingxiang Zeng] - Link to v4: https://lore.kernel.org/all/20240929113050.76079-1-jingxiangzeng.cas@gmail.com/ 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/ --- Link: https://lore.kernel.org/all/CACePvbV4L-gRN9UKKuUnksfVJjOTq_5Sti2-e=pb_w51kucLKQ@mail.gmail.com/ [1] Fixes: 14aa8b2d5c2e ("mm/mglru: don't sync disk for each aging cycle") Suggested-by: Wei Xu Signed-off-by: Zeng Jingxiang Signed-off-by: Kairui Song Cc: T.J. Mercier Cc: Wei Xu Cc: Yu Zhao --- mm/vmscan.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index 084de0efe59b..794730c8c1de 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -4282,6 +4282,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); @@ -4327,9 +4328,17 @@ 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) { + sc->nr.file_taken += delta; + if (!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; @@ -4445,7 +4454,8 @@ 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); - + if (type == LRU_GEN_FILE) + sc->nr.file_taken += isolated; /* * There might not be eligible folios due to reclaim_idx. Check the * remaining to prevent livelock if it's not making progress. @@ -4579,6 +4589,7 @@ static int evict_folios(struct lruvec *lruvec, struct scan_control *sc, int swap return scanned; retry: reclaimed = shrink_folio_list(&list, pgdat, sc, &stat, false); + sc->nr.unqueued_dirty += stat.nr_unqueued_dirty; sc->nr_reclaimed += reclaimed; trace_mm_vmscan_lru_shrink_inactive(pgdat->node_id, scanned, reclaimed, &stat, sc->priority, @@ -4787,6 +4798,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.file_taken) + wakeup_flusher_threads(WB_REASON_VMSCAN); + /* whether this lruvec should be rotated */ return nr_to_scan < 0; } @@ -5932,6 +5950,7 @@ static void shrink_node(pg_data_t *pgdat, struct scan_control *sc) bool reclaimable = false; if (lru_gen_enabled() && root_reclaim(sc)) { + memset(&sc->nr, 0, sizeof(sc->nr)); lru_gen_shrink_node(pgdat, sc); return; } -- 2.43.5