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 50211C677C4 for ; Tue, 10 Jun 2025 18:16:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 976526B007B; Tue, 10 Jun 2025 14:16:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 927086B0088; Tue, 10 Jun 2025 14:16:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 815F76B0089; Tue, 10 Jun 2025 14:16:58 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 634C86B007B for ; Tue, 10 Jun 2025 14:16:58 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id D2E2B1A0B38 for ; Tue, 10 Jun 2025 18:16:57 +0000 (UTC) X-FDA: 83540297274.08.734C6BB Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by imf09.hostedemail.com (Postfix) with ESMTP id D81E6140003 for ; Tue, 10 Jun 2025 18:16:55 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=NKz8cJmQ; spf=pass (imf09.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.210.182 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=1749579416; 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=DduieBxwKYFUWaIYXduFYzsh5Cay+ey5g9zc90whlU4=; b=CRP88yd98fgW4MUYBBiPoMmBTTZSFr6JAsroU9i5woq1KmBAOcxgpe0EZB2e/wYPjlhJGx ft3ZG7sBt5pNKGhloc9sVfdfwNTjqQCJ2LIADCLsjniGGHcLiAFvMmpJ2OrBKOOD/S33lt Mq+5VV4VQXpoIx6oWe8F9tvSBrzgzDw= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749579416; a=rsa-sha256; cv=none; b=i0rPttnO077A6YDeWkzzXlPi1CqaEuclepn4wl7vmaucQC4Ufl0kjpf7GSHRsPqevCbc+L mzVwQTL9UX8QzLflS2LbEiFluB84aoBtr+nNR0iTCPOvFiB2vVFOkwrZirmLgn7Eg+k/x6 pOyasXfObqBgB6J5hTJAgnQP4oYLZLU= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=NKz8cJmQ; spf=pass (imf09.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.210.182 as permitted sender) smtp.mailfrom=ryncsn@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-7426c44e014so5027187b3a.3 for ; Tue, 10 Jun 2025 11:16:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749579414; x=1750184214; 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=DduieBxwKYFUWaIYXduFYzsh5Cay+ey5g9zc90whlU4=; b=NKz8cJmQE4KC7QUbBL0bbhOWa7mRlnCNtp8DUjaFaNjdU0In6AkKtAURDcLKQ8uaFK xNA9Y26mQK4uhQBYjlj/a9CBsWsRQOIsChsEt7m4QtHk+AG5yKfgpePkjzY35/Dr3vyW O8K2ANUMqqBPyxnkam/uqpLLrFhH14Zpy/EvHtQGT0kd8+52PsOV+o+RaByXe4udaosX RLKULWeUEz/BRvY0yBg1sA6idPLAOjMIeXSVp8xDTCZczC8BW4mRXRa+dqN3wE2Vnte/ rVzgc6Jo1EqST7Ib9jG15RVf6fEcXtmEfS9eKC1Fde5HrLa/8BAT+C3S4Vkv+ylRrvhT YnrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749579414; x=1750184214; 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=DduieBxwKYFUWaIYXduFYzsh5Cay+ey5g9zc90whlU4=; b=cC/QWjQrV6+nbNvUhyBQI7ZLt0g5hI0uujslzsj5uOpBfc2waWo7RIgTo+/CnWpS8v Az3lyd5bmW3so3B/b3noVRHcHDQIA5a8lVhsil+8oQSE5R78EslLswQnHZ+aJAEeVUjz wAT8MPkEsh8OBltBXcqq+tG3aECKGj/AtkAE6bRZhb2+TUmqrBNCBKWl4WipHFjl2jcp xI9GwFXT4xo8fOcKI/Xe4QscfyG7yrNOaV50vYXhaAgbvNO+xO3gEE2k0i7a/t2debAk fSGVY/ARshZbNF1IuduEDWL19ArRO9sPCN644fAfEoUmDGammqFK4B1EVFM+XKIhmcHh zW3g== X-Gm-Message-State: AOJu0YxdfIVeeOxd0egoaWwDmMPqNHbI+tZzFTmOpstq4dtGb+pfcxgG m+pMbQe75QvLNAj6NTyxizJjLfJ6QBG2mXYIjXXdq7qWHIBS8JjYXfEc9OzdWDxaKtc= X-Gm-Gg: ASbGncub19Zi8vahkB/4hfY4yrnltA5cmZzbcYdQRegAtS7i0SlPuvWFj6E2k6yQOTZ u9a1iwRPS8TyNXerQ7fxaIKgmQG8c38r2JuLrUf7f9jNF5EIDZ7UV4kajBrvHA1AhQPWF91MugT dk63zg4pWwzSnbh0sqY0mWBn4x5L5cN8CsiTX1NcCsz/qSopjIBykhqiUlY6A3HngnQvfDR6aiC XXSCVh8iE7poxNlDaXZtbmly6FK9F9YtTjWBbA5PA9Cm/oCBNhHgIbGBs/XwSJuIxDiUyWfo/el 07kHFEFy7ttlE6U/Ze/0Tdt4UAP94BWanbaLQMGRsJRZ519QKiX9RtlBrTDfTyASJgPiErc6QKA jU84YU4I= X-Google-Smtp-Source: AGHT+IFRb5pPmXpQFPdoAC7qoXDoCFxLUXqFm0RRzubQmJUoqejBxmqSt7jX4eHk0+tpsHj5WvN8Zw== X-Received: by 2002:a05:6a20:918b:b0:1ee:dcd3:80d7 with SMTP id adf61e73a8af0-21f863a0fd3mr859577637.0.1749579413830; Tue, 10 Jun 2025 11:16:53 -0700 (PDT) Received: from KASONG-MC4.tencent.com ([101.32.222.185]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7482b0c0138sm7705822b3a.110.2025.06.10.11.16.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Jun 2025 11:16:53 -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 v3] mm/shmem, swap: fix softlockup with mTHP swapin Date: Wed, 11 Jun 2025 02:16:45 +0800 Message-ID: <20250610181645.45922-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-Rspamd-Queue-Id: D81E6140003 X-Stat-Signature: 4zpptye8yhhu7b5jiogjoswzws6yq6df X-Rspamd-Server: rspam04 X-HE-Tag: 1749579415-771704 X-HE-Meta: U2FsdGVkX19gQKHSo2zBl+oplTHTEiSmsWQ/L2E5YTRgauYHlR53q66bl6K5ptu4J6mgw8fXL/77fQOjyCA0sejYlPoTbRMjv08vQoc/FJNIkyRkCdT/GafP2wffQnXpxpSg6s/9RF7wgSL2Ukkoa5i39lQXd7lOf2h6hXW3Ewc/H8te1if1KH9LUgd3JbNUawiLhzzGGxQzIOz6BNlETFiP4yaREuYDHpoHu7dtzQSWzeTAKM85/l5/CQdWdEnt/hcUaTuBqp1dlrkUToMIh+lUxHBk8BzA2WSQqtamb6DAcLVYzmAls8ww05pwuYx3dfj+Mt3O5+mMOPZGN9InCeLyiJ48eR8Ak2SwSaiVUwFMby01Yz1JZvDs2jLXt/6HXqmfdOjK4T0UFcKagI5YGhMJD+ttXMy4zSxXbu5uApQlATNO6Be3nNbuiM8iSMIkRFhjwiNqaupG6GKHYkkiD/GRRYcDImQum9N2RobmLwNEHqTtIVTvGtaQXixdzGOJc5U+XEm8yqMYeqm5iZqAaHY2ygGq0feZTIrtNEULZ+xNeglN64vsG5G+m5jt3k7Ac+qByl2qQS+p1DkM+pTK+iw0ebe30NGg8f22APQx0h8Cm5bmLJNYi/zq8uxkpPSakZRq7q0rsV13yayQ8mG+ByQ4anwI+RFYkRDeendsqO3wo3fLRw73EPNctM6zjvu3cx+CUdpxodAIenEsuXtrfS6JTxvwumWGBMDy+Xlv0EIRLBa4bVDOJwy5BsFm/FJ2GYHChtmqzif7o8YnFxFn5tc0aXMtmBDswJnB9vXMUBfbh+/IJkIsbfMMb7N8Wx3tJoKGENWmnnqObD3GIxYR/m4xT3bU5zAiIlBOlYaPfthtb+Vx/DD2C17oL2be59mFSeEpncwL7wUnpcY8klGMp4cIXT8PhRHf3VfGA1pVTkZ8XDjpa4Q7HDgTEISv3O2+83i2Mwj9IihGb8bN8ZW YklFWeWg ZlCzxZBhUaaI1nYzLV/Jnm37CBry7Evd9JB7y/DXNCxTZpPoOaJ0A42DjIM1rQsXF7PgrQO0O8Lti5vL8y1QE8T0+7HVOpbZ1TbjH1DiDw7N5phSCCZEu8p2XGKzoZVh5yguSrLby5H1SrkqFUoyeILW42TJV+jSQkxcE1MYpQP36pFBgFbZD7Fuoiep826Eo6RVWk3bJaIHdg4hCngDOM3INGktXKTtfuSoQo77e7eCNtD2q0a4iqg++CLiYVJhulgkp5yCf/utTrT0H1pdpwC06vZnqkgdwMEEcVt6nzyLt7ZZ7zSc6LTRvck3CSEDE3riCaNXhapueZeFEoCW0DLZzw6XKH/kV49m/6SBeFoavyFgR0Hi69t9j3TqnTBbl2BZjVaio1SJrhvBi+H5tfzG/voakCZiCB2fZqIzYSMBLFPTYWkAdgPPBDBTpPIjrcmUPcE9/RsL7QS49gRx9bBimljyb71XWfhG/7qaszFxEEkMJkI/1M08TxD24duf++6sm0QZtIyo8KFkjo4uTzZ2e+jvIhmvQ7jeT0VMPPJSimplxe6hiTmV+3lOE7tT8XHxa0qIKst9lYCsaUd3v+B1dn2db+HiymJDWKHhbi7UIW6wKd/3nLh+AA1IAmH6SOycPplYWWVMQusX1x3uLKcjxLw== 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 Reviewed-by: Barry Song Acked-by: Nhat Pham --- 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. V2: https://lore.kernel.org/linux-mm/20250609171751.36305-1-ryncsn@gmail.com/ Updates: - Minor comment adjustment [ Nhat Pham ] mm/memory.c | 20 -------------------- mm/shmem.c | 6 +++++- mm/swap.h | 23 +++++++++++++++++++++++ 3 files changed, 28 insertions(+), 21 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 8eba595056fe..b0cda5aab398 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4315,26 +4315,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 0c5fb4ffa03a..3a5a65b1f41a 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2259,6 +2259,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?? */ @@ -2272,9 +2273,12 @@ static int shmem_swapin_folio(struct inode *inode, pgoff_t index, * If uffd is active for the vma, we need per-page fault * fidelity to maintain the uffd semantics, then fallback * to swapin order-0 folio, as well as for zswap case. + * Any existing sub folio in the swap cache also blocks + * mTHP swapin. */ 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 2269eb9df0af..9096082a915e 100644 --- a/mm/swap.h +++ b/mm/swap.h @@ -106,6 +106,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) @@ -199,6 +218,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