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 3F9A9C5B552 for ; Mon, 9 Jun 2025 17:18:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CD4336B0089; Mon, 9 Jun 2025 13:18:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CAC1A6B008A; Mon, 9 Jun 2025 13:18:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BC1396B0092; Mon, 9 Jun 2025 13:18:07 -0400 (EDT) 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 A14856B0089 for ; Mon, 9 Jun 2025 13:18:07 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 234DE1006F8 for ; Mon, 9 Jun 2025 17:18:07 +0000 (UTC) X-FDA: 83536520214.09.08D9CF4 Received: from mail-qk1-f171.google.com (mail-qk1-f171.google.com [209.85.222.171]) by imf05.hostedemail.com (Postfix) with ESMTP id 4C31C100005 for ; Mon, 9 Jun 2025 17:18:05 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=GRqA++qC; spf=pass (imf05.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.222.171 as permitted sender) smtp.mailfrom=ryncsn@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=1749489485; 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-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references:dkim-signature; bh=TuBH0kW1mGv5AvaA37P6jbIihS1u1hg1W3AQWK2Hcgg=; b=TmGArv48D95Bh6MpmV8tR4c5jDSnhnjYTd/+tPa61oNAtVxlYyerNCBNnj6Xz/1pvqrHLI R67zGQYeFAdMSKezGTvv07ukQHmOzGa4SivjV6ad2lln89E65xT5wflGTGbHzGBI/qNRn6 1ekkuj4U/93r9tApH8qqrMRwknd5gVQ= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=GRqA++qC; spf=pass (imf05.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.222.171 as permitted sender) smtp.mailfrom=ryncsn@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749489485; a=rsa-sha256; cv=none; b=qJHomcmscx2qv6DfBuVseLwGn7mYP8mBNFx5cv+I+082fXqnQiaiiIM3+tAA3iQZj91f06 iqF6vn0e1g0XeEsKTiHs6rkH8oPg+HMKcjXsJB1bO2+U523EgLL09NXrD8HqmcMAV0YW+6 DS4eBRYXyimbl/nBQDyzdx0+Tio8T9g= Received: by mail-qk1-f171.google.com with SMTP id af79cd13be357-7cadd46eb07so490016585a.3 for ; Mon, 09 Jun 2025 10:18:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749489484; x=1750094284; 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=TuBH0kW1mGv5AvaA37P6jbIihS1u1hg1W3AQWK2Hcgg=; b=GRqA++qCCT1APxuQgswCpZNBxA0H55lhQi08xHgWSCTCFZYw+8/9v3VhFR/mj7hMRA C04EQ4fjaVXGns+1zko7jtldOAv2S3/27uB10t0Fi5bCTWLzNOzjfx0AJADeHXMXufx6 IcBdiJ9eGaKOBs9SZEE/pEOJHpYRVwuckPrG4oy501Rl2zw17PHhDa9f1W90ScG0Ji7P /pu+enR0hvmo/k/g5k+/mZKuwXh55MWYNAgGdSJZfU2n0FVK7Zr/pW2nuWS8Q1aeCAh6 XaPgpvkE67h49H5LkURxuFPVijuZr+eNEF768maWKe08CRdOjPBNpX2OXFM3Xm8+H2lw ikfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749489484; x=1750094284; 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=TuBH0kW1mGv5AvaA37P6jbIihS1u1hg1W3AQWK2Hcgg=; b=S/F1cO6m4G9tCxdJi4gw0UdGEkZ5lKhlzoEkQLYi1PyBfBbzo9BKlmkHGRimixzDfQ 2w9tkVW5sE59DpUwnkO06VXNLZj4fYSwBgK+BxVUYfc4i0w6lgXQ6JhVXAcjBsuozqVK Aeify1kucb22MtcsXSzcaSIzaotLMjEizAxn90D88yR8LzgcL3o5WlW6bUY7ZonpJC4n tOacv5ok68nRgZisJ6ZX9SvZOfE+sJpTIN9qfgl2n9iLeCk8j1F87IDkje49WI2kurpL rShkDTIpv9nmBF+nXQT1+dBdXYLTSGhIKSFJ86g987kg7S4hPm2fS8Wm7gDQF/cXEcY4 4QsQ== X-Gm-Message-State: AOJu0YzdTFFK39JcALq0ckAz0ohkejxvP/5H6PQz32+/NvdXxGZKt6RP UZ+Z2zckXqAcpGLlW+zsD6+2qFjBbeSeIns6ydVzuT7YQeir4M9cEbVJKVFHR2eiM3A= X-Gm-Gg: ASbGncshqtq7xHGnuwxATAg1l8K+9cTmpMCASahPHzIjfo3EDtyqg96PDJ4XhbKIOKt UmnnFeOD6De0jWHp64bYQGBlccflNp/Gm6gW8KfHIRtMasu3aw5uQbUxMScef2x8lxYEsIIVfX9 MslTxK2zuhkzLxkV6075mXRYKaXhU1zK+tNWz43Z0YLx49RVdVsuD3NJ/XgFGTJpgOTirTB4sPM GLbrs1kMPQER7989jyqgYWuET98wSg4mrJrZTQbMuHxMlYQD8rKg1tAhNBmG4JgXE9BBFjYSB5a PUxR7hoZpBwNL5KHVd1WJTjh0XKzyz0HfMnp/TwXju9Ufog4VEhlf6vAanojiJmte9iqRdC3Kta wmmkGJ7c= X-Google-Smtp-Source: AGHT+IGfJeq3h8K7rlOuPYAtly/3iJyNvT88y7dQq80574EeG6/ODFgxUyIVyxX17BKFV4lIfvOcKQ== X-Received: by 2002:a05:620a:2411:b0:7c5:5585:6c8b with SMTP id af79cd13be357-7d2298eb361mr2005674685a.50.1749489483575; Mon, 09 Jun 2025 10:18:03 -0700 (PDT) Received: from KASONG-MC4.tencent.com ([101.32.222.185]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7d390d4115asm240821785a.95.2025.06.09.10.17.59 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Jun 2025 10:18:02 -0700 (PDT) From: Kairui Song To: linux-mm@kvack.org Cc: Andrew Morton , Hugh Dickins , Baolin Wang , Kemeng Shi , Chris Li , Nhat Pham , Baoquan He , Barry Song , Usama Arif , linux-kernel@vger.kernel.org, Kairui Song Subject: [PATCH v2] mm/shmem, swap: fix softlockup with mTHP swapin Date: Tue, 10 Jun 2025 01:17:51 +0800 Message-ID: <20250609171751.36305-1-ryncsn@gmail.com> X-Mailer: git-send-email 2.49.0 Reply-To: Kairui Song MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Stat-Signature: j3gt3aohe5mqoqrut96ks57bjdkhy8r7 X-Rspamd-Queue-Id: 4C31C100005 X-Rspamd-Server: rspam11 X-HE-Tag: 1749489485-405897 X-HE-Meta: U2FsdGVkX1++u/R8zcPsmzsyyzXe+aA787k/jSHycX8+i0KwhZDrjjl4IoXiTRKLtltazqwuiFtjB8wUmoFC0QuVvyHmmKAGxzVBqTDIqWxRrSuSU/Yb/AE7qXXbLF4t+i50G26jsHYBpJTtqfGwVxQSHjuiABzI5pq05QBEomDgkSV36WOfFQ87p/+BIUQoz6qwz4rPqvtFfAlG6kjL4w0ZTBHE3FIMP1OMvyQ/6Ft5C8ASOUYIe4jELPnVeQDJI2JNCQulUu3pZzSoyYcN65W7Vv2AQse1G7oz8csWNM7Zvf9wCS/JSIBkyfmiUPcTmvhFTo2WMXT8jZNE9jdRSbSyn9tFasLS/mDWD38Yzlk+2UGu+nsX6G9XfUJ4vHS/e9xOaoBnD8i+RqxGn5SNodQdnoigryolV0mSxV58nrKszZaX+EJyCuKQY1h9x+fbXGYnq4tK08QcVqOHPzBx44CXHC0871UQs2P6ycT0TeKo4Te5eCzIjGjLY48TpPuPHAcwikLZ9ycWOdE5+AKSy1EC+GRWOhK3DjMCKexn4CKPynWbH8tuL3e4pkFFE/ici+izcLRm9DwY3hjzTqnyjfGZaGr6/mQMMWUMpU3MucFJFsei2sBVmwCCy0nIKKhdYxQV4KFgtvZTadk3YZQtUOCGoRGs1CsYmrt+WEP2LvTKkaIH4TqDc5HbrknnzIKfGDb2QQOeORxtfd2rI33bC4VQKRcr780ewNVti69omoNWC9u22h4pIqxMKbksfhipfI+L7hPMkVQ1Z3lPz2oQXpEEch/v0anYe2Lg2qDfgV/wRFaPRLEnxv2iYnSR0jmTBTDlHHoE9yN3+QLITztcDcvtYmI/S47A0rdhRSslr5WeCyf6J2pZOBrFELtNasTlNTBQLRvWB0OCh9XSojyd/pxqyHaUklEal2CXxUlmyZqdSGFVDpEZiqV+lexpXbLUah+YPAq90qDA1myfTn5 dZBDyezX 3TsohmyRKLqDJ2uuHn9YkQZIrI8UqnM0V1dUOBbdCna9AxhJtJd5Af/b+01vxwnKh/QjFVSpnz+9X/nFu+9XJ6twyGKfd9diDKFsLw8quHhQOGsV1yJJ9uoZoL7XxrtA43T/iwo62xz1+cS8V3xWfHKoY1H7bErRgIQqK/q2jD5twoN30BZW9xiytiq7Hu5p9fQ/SZQSLyDzRkKjLfEMvgXO89+d4i/Nkjs/eMi7oyfbHj/4rNrX4h9xlzpkv7yJhysEEZpE0EIb/IxBWtxZvlVejERwHXb8lt/dmr50YugC9VvGfTlzKptl8nxDXdjOT6BOIoM3UOKqMsU4ryQwUyvvdcCEvYb+4jVf0uBkVxLPxtikzo9Pm28dBTWCrqC+HIeOZKmv0MDIOMyO7BU3bA4rLUjnFb4BFeuJrbBEH8/Z0oi6xEHWNWVmT20Rm06NyMAnMmZv7/gnO6dFdQ3Lo65tTVZzwOhIrh9nq5Q1nXH3z5SgIp8aLdWXhCkl75TGTF335H4R5kDjWnK6gdASesHZ+KVRmVdrh7oLsiviM1q5+jqFiGuKCcGfSMS2+5dK8HIsZoFe+Ppbs0M87R4iM+5i1gx6SIJnx4qstV3R5etUskRIPwgvqsjXRk4OpNz5Oe7O4u85sE7fk2SJnAHysxxV+Iw== 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: Kairui Song Following softlockup can be easily reproduced on my test machine with: echo always > /sys/kernel/mm/transparent_hugepage/hugepages-64kB/enabled swapon /dev/zram0 # zram0 is a 48G swap device mkdir -p /sys/fs/cgroup/memory/test echo 1G > /sys/fs/cgroup/test/memory.max echo $BASHPID > /sys/fs/cgroup/test/cgroup.procs while true; do dd if=/dev/zero of=/tmp/test.img bs=1M count=5120 cat /tmp/test.img > /dev/null rm /tmp/test.img done Then after a while: watchdog: BUG: soft lockup - CPU#0 stuck for 763s! [cat:5787] Modules linked in: zram virtiofs CPU: 0 UID: 0 PID: 5787 Comm: cat Kdump: loaded Tainted: G L 6.15.0.orig-gf3021d9246bc-dirty #118 PREEMPT(voluntary)ยท Tainted: [L]=SOFTLOCKUP Hardware name: Red Hat KVM/RHEL-AV, BIOS 0.0.0 02/06/2015 RIP: 0010:mpol_shared_policy_lookup+0xd/0x70 Code: e9 b8 b4 ff ff 31 c0 c3 cc cc cc cc 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 66 0f 1f 00 0f 1f 44 00 00 41 54 55 53 <48> 8b 1f 48 85 db 74 41 4c 8d 67 08 48 89 fb 48 89 f5 4c 89 e7 e8 RSP: 0018:ffffc90002b1fc28 EFLAGS: 00000202 RAX: 00000000001c20ca RBX: 0000000000724e1e RCX: 0000000000000001 RDX: ffff888118e214c8 RSI: 0000000000057d42 RDI: ffff888118e21518 RBP: 000000000002bec8 R08: 0000000000000001 R09: 0000000000000000 R10: 0000000000000bf4 R11: 0000000000000000 R12: 0000000000000001 R13: 00000000001c20ca R14: 00000000001c20ca R15: 0000000000000000 FS: 00007f03f995c740(0000) GS:ffff88a07ad9a000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f03f98f1000 CR3: 0000000144626004 CR4: 0000000000770eb0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 PKRU: 55555554 Call Trace: shmem_alloc_folio+0x31/0xc0 shmem_swapin_folio+0x309/0xcf0 ? filemap_get_entry+0x117/0x1e0 ? xas_load+0xd/0xb0 ? filemap_get_entry+0x101/0x1e0 shmem_get_folio_gfp+0x2ed/0x5b0 shmem_file_read_iter+0x7f/0x2e0 vfs_read+0x252/0x330 ksys_read+0x68/0xf0 do_syscall_64+0x4c/0x1c0 entry_SYSCALL_64_after_hwframe+0x76/0x7e RIP: 0033:0x7f03f9a46991 Code: 00 48 8b 15 81 14 10 00 f7 d8 64 89 02 b8 ff ff ff ff eb bd e8 20 ad 01 00 f3 0f 1e fa 80 3d 35 97 10 00 00 74 13 31 c0 0f 05 <48> 3d 00 f0 ff ff 77 4f c3 66 0f 1f 44 00 00 55 48 89 e5 48 83 ec RSP: 002b:00007fff3c52bd28 EFLAGS: 00000246 ORIG_RAX: 0000000000000000 RAX: ffffffffffffffda RBX: 0000000000040000 RCX: 00007f03f9a46991 RDX: 0000000000040000 RSI: 00007f03f98ba000 RDI: 0000000000000003 RBP: 00007fff3c52bd50 R08: 0000000000000000 R09: 00007f03f9b9a380 R10: 0000000000000022 R11: 0000000000000246 R12: 0000000000040000 R13: 00007f03f98ba000 R14: 0000000000000003 R15: 0000000000000000 The reason is simple, readahead brought some order 0 folio in swap cache, and the swapin mTHP folio being allocated is in confict with it, so swapcache_prepare fails and causes shmem_swap_alloc_folio to return -EEXIST, and shmem simply retries again and again causing this loop. Fix it by applying a similar fix for anon mTHP swapin. The performance change is very slight, time of swapin 10g zero folios with shmem (test for 12 times): Before: 2.47s After: 2.48s Fixes: 1dd44c0af4fa1 ("mm: shmem: skip swapcache for swapin of synchronous swap device") Signed-off-by: Kairui Song --- V1: https://lore.kernel.org/linux-mm/20250608192713.95875-1-ryncsn@gmail.com/ Updates: - Move non_swapcache_batch check before swapcache_prepare, I was expecting this could improve the performance, turns out it barely helps and may even cause more overhead in some cases. [ Barry Song ] - Remove zero map check, no need to do that for shmem [ Barry Song, Baolin Wang ] - Fix build bot error. mm/memory.c | 20 -------------------- mm/shmem.c | 4 +++- mm/swap.h | 23 +++++++++++++++++++++++ 3 files changed, 26 insertions(+), 21 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 9ead7ab07e8e..3845ed068d74 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4313,26 +4313,6 @@ static struct folio *__alloc_swap_folio(struct vm_fault *vmf) } #ifdef CONFIG_TRANSPARENT_HUGEPAGE -static inline int non_swapcache_batch(swp_entry_t entry, int max_nr) -{ - struct swap_info_struct *si = swp_swap_info(entry); - pgoff_t offset = swp_offset(entry); - int i; - - /* - * While allocating a large folio and doing swap_read_folio, which is - * the case the being faulted pte doesn't have swapcache. We need to - * ensure all PTEs have no cache as well, otherwise, we might go to - * swap devices while the content is in swapcache. - */ - for (i = 0; i < max_nr; i++) { - if ((si->swap_map[offset + i] & SWAP_HAS_CACHE)) - return i; - } - - return i; -} - /* * Check if the PTEs within a range are contiguous swap entries * and have consistent swapcache, zeromap. diff --git a/mm/shmem.c b/mm/shmem.c index 73182e904f9c..a4fdfbd086f1 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2256,6 +2256,7 @@ static int shmem_swapin_folio(struct inode *inode, pgoff_t index, folio = swap_cache_get_folio(swap, NULL, 0); order = xa_get_order(&mapping->i_pages, index); if (!folio) { + int nr_pages = 1 << order; bool fallback_order0 = false; /* Or update major stats only when swapin succeeds?? */ @@ -2271,7 +2272,8 @@ static int shmem_swapin_folio(struct inode *inode, pgoff_t index, * to swapin order-0 folio, as well as for zswap case. */ if (order > 0 && ((vma && unlikely(userfaultfd_armed(vma))) || - !zswap_never_enabled())) + !zswap_never_enabled() || + non_swapcache_batch(swap, nr_pages) != nr_pages)) fallback_order0 = true; /* Skip swapcache for synchronous device. */ diff --git a/mm/swap.h b/mm/swap.h index e87a0f19a0ee..911ad5ff0f89 100644 --- a/mm/swap.h +++ b/mm/swap.h @@ -108,6 +108,25 @@ static inline int swap_zeromap_batch(swp_entry_t entry, int max_nr, return find_next_bit(sis->zeromap, end, start) - start; } +static inline int non_swapcache_batch(swp_entry_t entry, int max_nr) +{ + struct swap_info_struct *si = swp_swap_info(entry); + pgoff_t offset = swp_offset(entry); + int i; + + /* + * While allocating a large folio and doing mTHP swapin, we need to + * ensure all entries are not cached, otherwise, the mTHP folio will + * be in conflict with the folio in swap cache. + */ + for (i = 0; i < max_nr; i++) { + if ((si->swap_map[offset + i] & SWAP_HAS_CACHE)) + return i; + } + + return i; +} + #else /* CONFIG_SWAP */ struct swap_iocb; static inline void swap_read_folio(struct folio *folio, struct swap_iocb **plug) @@ -202,6 +221,10 @@ static inline int swap_zeromap_batch(swp_entry_t entry, int max_nr, return 0; } +static inline int non_swapcache_batch(swp_entry_t entry, int max_nr) +{ + return 0; +} #endif /* CONFIG_SWAP */ /** -- 2.49.0