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 54DB3C61CE8 for ; Mon, 9 Jun 2025 17:24:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C6A306B007B; Mon, 9 Jun 2025 13:24:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C425B6B0088; Mon, 9 Jun 2025 13:24:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B59916B0092; Mon, 9 Jun 2025 13:24:35 -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 9BB336B007B for ; Mon, 9 Jun 2025 13:24:35 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 1C7915C6B7 for ; Mon, 9 Jun 2025 17:24:35 +0000 (UTC) X-FDA: 83536536510.28.0E5CDD0 Received: from mail-lj1-f171.google.com (mail-lj1-f171.google.com [209.85.208.171]) by imf10.hostedemail.com (Postfix) with ESMTP id 0F249C0010 for ; Mon, 9 Jun 2025 17:24:32 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=kmXukFlG; spf=pass (imf10.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.208.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=1749489873; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=gS5h1Ie0tgERrl+nIzXO9eaCUYI3r/JKh27WNUnM0Dg=; b=bvS1jMx8W3LI14X23t/O24RlM0gm+Lhv0UbUBPag0WY1Vt6KGLTNTG1TOppSEL9RcYDF6y oDpT7jkxiwTd8actf5ATw+WCTXay6K1OZFGpddQ/Nn9TsjfPncv+XTbj7KWm1eLwP/ATb9 E4c/EIBdH1QqWvCnokbPBmegD+1U+UM= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=kmXukFlG; spf=pass (imf10.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.208.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=1749489873; a=rsa-sha256; cv=none; b=mJBngv5V5UAlAt5pxw2FJNQIaHnudaVNzNdVAEdloNdqUDzOgMAOmbQ7gsL46D03WEY8H7 yKUvD7DxiR/uXC1wWo9UIxS6ZCTRd0O77zxpTqMRrWal9WnNCIhnCBIRLhC9xShpNVTbcP 2j7MyWBN46YfFGyEcM5V5zKNfPeHgd4= Received: by mail-lj1-f171.google.com with SMTP id 38308e7fff4ca-32a9e5b625eso36849191fa.2 for ; Mon, 09 Jun 2025 10:24:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749489871; x=1750094671; darn=kvack.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=gS5h1Ie0tgERrl+nIzXO9eaCUYI3r/JKh27WNUnM0Dg=; b=kmXukFlG8E/Yk1dtjkexgudUSj7MTpdr5oJ2dIP0WPunNXoMm3ug+X3VDclEbsMPV2 GhSuSlBHi4wRvTCQPVJFeU/JNvzYhhTud1zUyHStpcO5K7aq58fz7PIs6ra/PFbDefbm vSGo7bxbLFST5kkq40ua/dxriOOkBesjTLSJc0i+k1trtshhFisVda4JtfRXprzDCugr zjn55BdoyM7naMdedZLQmbmwHxgpP+HTdSq83dNSv/ELRp/jONUINdpF/IZaSS0juNFN zBYd7OESNB+I7UOMpeyklxaboAW/cNMTgPniwdltIJGuHLRvrLurvVdAEznGZvIdJBgr vJ9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749489871; x=1750094671; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gS5h1Ie0tgERrl+nIzXO9eaCUYI3r/JKh27WNUnM0Dg=; b=sOsP6yDrwzBlFE+bRa6w9WvDoftofpOpuOuBpFkUCewjMfBapIZq43uzd8EEMqOApy EQfHtdIJV84MaeCrZc2xEk3Pu/TDrDxP2Z4s7rBMQ5ZpL394jWX9iIlNSHwRFXLpxjIK KnIpxr1jTKi0NlbgT0yq6vL9DFW1C0JPNtY6QVI55bdSsba3DRstXuD1Mvp7uUak5lro x4Vow7ITRvLm5f/5yq2MO7W1UpON3OyQBW+xjfyZ7X5v16Fc1xN6T8WDLa0+fWGhoo+a pFSBnmB/s0iL8Z/JIQ1BtohX4ObPbajUF1nz5kbMDW8whi7jVET6LEP2qGIBXyCzif4q IrTg== X-Gm-Message-State: AOJu0YwPeHLPLCK8eE5kTfRvhJiP2kafBdZkKe7qkdpablW9dqapo6EV /Nm12ynLV84M2+uxlYR36ereQQcJPicyKWu3UCNDRG+A0wm+/Y/N4EiP85CK9MceW3lezWLKOcV 2vq8nbJ5Qx4Isma+HqlKRJNtHlLyOx4pA2jZEQkB7Qw== X-Gm-Gg: ASbGnctG7tRMEVvdx79qdmtAYV/H9fdjI8+FHMhw5E+aoWyA5I47z3arZOStK6QXXRI 85KP820frzh06F1mOQSruW/7MiWZBfjcVUkOl5mkATQWBPch1Hdd8P7bwM6w16rlf+KZ7wJyWPC shWN/H9c2f7ODKHNSN3kqUkBsHU2a7V4gL X-Google-Smtp-Source: AGHT+IGh0KA+fGHr2H+2Jp/BnYa7lpx49d2kmZmN36sDroN9zo1IL+JjcscoHWhhH3gN1YBNeSmz+MKNR3CsoRj1tQI= X-Received: by 2002:a2e:a595:0:b0:32a:6e20:7cdb with SMTP id 38308e7fff4ca-32adfcc5cd4mr29740751fa.17.1749489870182; Mon, 09 Jun 2025 10:24:30 -0700 (PDT) MIME-Version: 1.0 References: <20250609171751.36305-1-ryncsn@gmail.com> In-Reply-To: <20250609171751.36305-1-ryncsn@gmail.com> From: Kairui Song Date: Tue, 10 Jun 2025 01:24:12 +0800 X-Gm-Features: AX0GCFvXp8Z9b7xzJaO49rmXecnUchAIEdcdnv0ahpVgg0lak-hlmevqgvMLCEE Message-ID: Subject: Re: [PATCH v2] mm/shmem, swap: fix softlockup with mTHP swapin To: linux-mm@kvack.org, stable@vger.kernel.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 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 0F249C0010 X-Stat-Signature: h1etqzfyu184wxnn64o3iysqqbgm6eu3 X-Rspam-User: X-HE-Tag: 1749489872-717528 X-HE-Meta: U2FsdGVkX1/EyRZeMer3+3ZMC5RJyyZOxLaB4/0jCwfZAZaO5O1b2E1V1BjaAhzYqqyU9mWDnikMOnDsMzP8prpQHPPppV+XWSkof3D4XjlHozrRMWGG19f50pFD8hGiSJC/z+Ty+Y1mybF9k/rvASlFul1BFKzB+p8D2gbMrcRUu36OPf3qNc22R2QrInUlYEYLH4fC9d+sc1MLLlqLlM4YGQD+Lo+kM8zgkFPkfGzbdxDZwwLOFBhA5LCoArUffsSJeaehTtFjYJ0YeUnhw3IWGW2osls1+IWUDg/cL/KRwglxeVqwS6WY8sZ1Pkd9HLITN48ED85R7GOzmeDv05AywcU4iX95UCsH4l1FTtxufFCjK8ntqyxsvGHPtuQzbAQO4nCbNCjYNDtowJmffJU0mE18scuZKkA9JAZ0TzAhzajfthu1eDyeKU1x5A3ZZi4HuXsOradzSfgqJfUzIQz4QhW1h7SfrEJ5sgNihbwYTZc9k3FNQk50q8yaaWGCa4KqVzfj3fzRTXRquoZhpfAXkitcVlnUwGh4wx0w3O42Y9tm9sR6veLEZvJa0apJ+mZJ0e1qxZ+EC0NwdHGBOOmH3dVKbJKksRYz54O7+vx8JiDuQf5TyR25KrmzSuJlaBwgppzwWD9/Ywmp+aZiWhy/MH05XFFca+WAQCNcB22wlKrNO4DmKfq0q3j7x5KbHqGpjd3TAdOf0UKkKp29sfFHvsxP9FiARnS/b1e2mE61xQ7XDHT1yqI1n4TE0m0uF8CO8BvPUhTYuTXhNQIwuruBQ0IzOLdta3EWFI+X6bISEV9wIrTuNcMxPwp9N+9BmZ1XVw19Q6u1LgBA9cZ3x69rrT6oVFIct2JtV/xXvV9Do9C2Lntq55+QsYxYod/e1fFh1RiL+CjTvVvipoQxDt/Zsdq2vi6t+J/lx2Y5rEBZHGOYPzxIEZe3HipTTnrMlwzeBGug6F7L+NbG3/i w31dVKQG HdwhpnGxT3C5syMT5pup5KLnPUDQUNVtk658e/8E8OJzdRJI/DxnW7Ppr+Jwyy4bfWEfUshVQqT//gx2b2mpAv4Aoms69/pXdIjCcQGrHawR8Fk4N6vvCDgheuojocCqgrcYior6BqYwr9XEQ7xqoCAz9Kqx2DaEw9+Uu5y3uSsOG6pA9L4Ue+J1yWDiaBq0HuCajD+m4nbxfT/oViHbW1ZU+4WdrRP1yBFxZr1tQbpjCkWVbLbtE3iydt7M3ZvDg+k5cE6bgOfWd528b8isY7XDaRJbRJdH5LgyeC02imW1bkJnex0fSt1da7UTnDCS1O6zFiWVRS1/p6LcJ42Dt5XO5iJMNMaGDPjky4uxZePMrEHVKfkGxT622zLn6DYW+fu7+VA5Y39twg98= 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: On Tue, Jun 10, 2025 at 1:18=E2=80=AFAM Kairui Song wrot= e: > > 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=3D/dev/zero of=3D/tmp/test.img bs=3D1M count=3D5120 > 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)=C2=B7 > Tainted: [L]=3DSOFTLOCKUP > 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 9= 0 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:0000000000000= 000 > 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 a= d 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 synchronou= s 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 =3D swp_swap_info(entry); > - pgoff_t offset =3D swp_offset(entry); > - int i; > - > - /* > - * While allocating a large folio and doing swap_read_folio, whic= h 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 =3D 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 =3D swap_cache_get_folio(swap, NULL, 0); > order =3D xa_get_order(&mapping->i_pages, index); > if (!folio) { > + int nr_pages =3D 1 << order; > bool fallback_order0 =3D 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) != =3D nr_pages)) > fallback_order0 =3D 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 ent= ry, 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 =3D swp_swap_info(entry); > + pgoff_t offset =3D 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 w= ill > + * be in conflict with the folio in swap cache. > + */ > + for (i =3D 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 ent= ry, 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 > I really should Cc stable for this, sorry I forgot it. Cc: stable@vger.kernel.org # 6.14