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 76CA8C61CE8 for ; Mon, 9 Jun 2025 18:16:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D69856B008A; Mon, 9 Jun 2025 14:16:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D1B646B008C; Mon, 9 Jun 2025 14:16:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C09386B0092; Mon, 9 Jun 2025 14:16:24 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id A12A56B008A for ; Mon, 9 Jun 2025 14:16:24 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 2F9CB120BA3 for ; Mon, 9 Jun 2025 18:16:24 +0000 (UTC) X-FDA: 83536667088.09.F699B52 Received: from mail-qv1-f42.google.com (mail-qv1-f42.google.com [209.85.219.42]) by imf06.hostedemail.com (Postfix) with ESMTP id 533E6180006 for ; Mon, 9 Jun 2025 18:16:22 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Mjyntp80; spf=pass (imf06.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.219.42 as permitted sender) smtp.mailfrom=nphamcs@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=1749492982; 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=YPGW08WeH45/g43t9jU88CXRE8r+aGzCSBoKpipNZjg=; b=iYJ8mWHzu6RQwbIvGvcWHPV8UoIKMinjJzXDy1Fh4p7GTDSzsO6lfb85ABEvVeMPr7Jidf fTo45FLxv/LaYytBVFAoKoRaTuXwYZNQfHVcO2LuGi63EmD05JXDsWkw/pVoy1niYqNYmg zDvxJseHYMYjIhqtnk0Eo0vELSIAJEQ= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Mjyntp80; spf=pass (imf06.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.219.42 as permitted sender) smtp.mailfrom=nphamcs@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749492982; a=rsa-sha256; cv=none; b=krmjwt1fHFHMX4MDerx5OES1riMbl0hH6anzGQcSVhXOaFRC2Y9IwKYewSSwaYy4tncX1L XpkmQiwnACg2r4HVCtmUQHj1ehAa2FtxXZRPAl6gPjs3o9HtwEaiuw/QFcVSiiy1e/e8Uk BswdZ5zqCf0FnhYU1pv11JKM8Gyid6Y= Received: by mail-qv1-f42.google.com with SMTP id 6a1803df08f44-6face1d58dcso71310086d6.2 for ; Mon, 09 Jun 2025 11:16:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749492981; x=1750097781; 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=YPGW08WeH45/g43t9jU88CXRE8r+aGzCSBoKpipNZjg=; b=Mjyntp80VXfj1Ig5E9mcdycbNa03KHUn/renY8ylO+V9ki9hAL1VXwzLZvhb8slypF WVGucPZh4LKV1mxHCIVqAgzJon1NSKORb3UeFw/RxYh49v0nIxfvcVyN1eiH5G4r4Vyd 6rJKayAZ2UeRnphJUfz70BjGfRBFWA4TWmEBL05d41B7iPEP608yHlTAc18HVKOthyZy 7KfxwlhXlvIN1snu+Yb4/Mvedna3THruvUe4mkbiNICzr2+3srCMiqyplzu1LwTXZPUV sfHnfLs4+j0fDrZThYWRLpyXwDgivMTVtv9W+/BJeikLoiAjLAOTekXKFfiMgnx8ykQE bgHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749492981; x=1750097781; 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=YPGW08WeH45/g43t9jU88CXRE8r+aGzCSBoKpipNZjg=; b=PfN7yEq9JZvnQFKYRdJbGHpbNqJv6RnRL3ckCAIQWWv4LSZnMUqChxovMCdNuaJJwO ahF4N+P7A31aPOoM8EdjFXtH37+9wM4NLvmUtIKiBCLm7OKbGYVqP2Aukw1b2sIDlaio k6A6BzjsMTcKFIlK5OTbBdDxWnJ6Wo8lJugQhiBZ9VCTIQB+of+aeESEgKspR2rX8tnu UznTkf1GLjpwm126mY3IcuhaUQKqdk7k3cEPIo0QP2nDMzDc8ED1aHgebV6KqbVZH/9g Mu32oEvOVvzPmyKLXHTVNpfeOHV9QTPzuP0lNfud0SB6CfcXaWmwVFGO2rtXSCXxwtzY XilQ== X-Gm-Message-State: AOJu0YxZc7jc0IQpiGTc4q+IKhWEzi5HOVcSNqaxv5MruKdHRjOxZLhf tkxUc2pwDUEo3wnNOcA5MnPQ3fcw/myz2+SKaZ9cP4MbLJm+EQv2wRuY7g4JHg6lxoredXIDO9V mNb1YS2eAQnuNA1oVRSavP0pfhR5Qoq4= X-Gm-Gg: ASbGncvnUhYiLujk5afm8H02B7W7jHPYH5vTWm0Za5xMMB3xN5RuvM6K3k7Z8I1WeNO LIVOtrfC8BvUeV0/oYD72wHaZ33yl5l/HoJd/pASZQr9/WaTcBGN91d2hbctMvPziOkg1RyxUpp ijeLJfxoidVUki30UEJseSdT7mUlLU87QbNCXBZ31CYOg2 X-Google-Smtp-Source: AGHT+IE1U/ltvMwieopOmj2GkLnR345XofulrqvlHIdL963prRjDQBxfnvE+8Qaj5KpOXBHnHtpDLdKlMYcRq7GdOUE= X-Received: by 2002:a05:6214:240c:b0:6fa:c41e:ccee with SMTP id 6a1803df08f44-6fb08ff60c2mr243161376d6.19.1749492981077; Mon, 09 Jun 2025 11:16:21 -0700 (PDT) MIME-Version: 1.0 References: <20250609171751.36305-1-ryncsn@gmail.com> In-Reply-To: <20250609171751.36305-1-ryncsn@gmail.com> From: Nhat Pham Date: Mon, 9 Jun 2025 11:16:10 -0700 X-Gm-Features: AX0GCFtwlx6RmFBq-z1AXu-QCRbvDPHjFlgbcB1X1ZKZ9oqA4BY53KUWkXxNuvE Message-ID: Subject: Re: [PATCH v2] mm/shmem, swap: fix softlockup with mTHP swapin To: Kairui Song Cc: linux-mm@kvack.org, Andrew Morton , Hugh Dickins , Baolin Wang , Kemeng Shi , Chris Li , 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-Queue-Id: 533E6180006 X-Stat-Signature: gisa9gdcq1hjpftmr8kcu88a8ugeo14n X-Rspam-User: X-Rspamd-Server: rspam07 X-HE-Tag: 1749492982-618279 X-HE-Meta: U2FsdGVkX1/Z4S31Dw4WSgphhYvE2n3jrUHWk7V71cfLqG9OhUVTUN7om+RxTedvYCGoDShYeHZmXI/cV/8zotC4orxdOnxSROa28rfDZLnQ4fS2enXzvo6AlyT07d1OdPpNLmNzgdFuAq7Lojwg65IoFcYp3p+kvUnokcLk2aP551fLB3nuQqXuqq6uVgbkhLwHJQR2HZ7wwD9pLhR3mSpdzZB38iJZvxDtIhN0LrKMEyFiWVr0f90UPSU85lmfn9dDRXIayIIX7sN34xoXEocwR/T3Ftddp3dXQJ0sfRVsLiw7zgUu0cYf3+e+/WoQJRVy720l2EtaANxNv4JYHO/tnYVix5zWWCiAsIS5oGvBZJz3H+dhBEHCVLubAixqF/5KRshEBLluT32OvVGNyM3Bm7x6hSQ8tQiq5T7UKnYtNjcSxC3VcmvM7EBgOSslDRXjTGE/kmDmhX6Kd2fDewVvBSe38ZQUflmykcryLdnbcTwWgI/OPmcO+0ektUDxMfuxsvraeLTqLLbUHARdBqV4SCAsWiQU+iv8tvRnCECYcyqIIXbEjnOEdVr1Rv2Ae1QDmMQe5EKtfpKiHPvAt14R6t9shs/maAHkKvjU+Pn+1LF3U6aPvkwh4ORQwcgVApeEps69WVGMrvUvffTXQx6MqGjWsIpbnHgqIgj6a3vXEDYgyFVgYRqqGolnr+niaV9p3KdgxYxLykWYJp4zG2ZtSrN8lZo2ukEQ8Nd0rcLcbJnwfuzMG7AR7T2D0pnSvrZidh65CqgGJwi7WdLRdeuuWFMR4oiJcvQWJNRIew8m0vpoUaZ9w196PJZkSV/A4FVOsq1I47WrqjEklfPnoqL6DqffdzTIyCYqYY4AvLl+bMRfVgtUbFIZRnbaXydrG3Hmpe873mHBkx7CXfU7pK/uZrAe7bNG0TTQgB7acK6TdQ04LXVnTtBiSPBNyhX9Oq6wUbKZJoZFIS/Urvj 0y2ClWhk DH2Le00NdVJCNue/7kyW57EoMDn0mOw7IZaF2PoS/E4xnBPIBYNT8GSWggNuCV/CyuKTZzWw+6tjVoPznYWdfmZcEIHLxsBdpQE6eQXvASaQCxw4eRpBH/x8Kfg1TwwzuBKEfTsA30leG2ldDtXRYe6pj8mkIE0xu9q/eiv0m6+jip1N2Q/s4UvkpzJSphDAX8IDKxHN5Fz8Pr9tBi3v2+yTQHytA44JpZHHFlqmHeXtSU92j0cwP+OBxr/YpqcQP1DdubnqI7JExEYSQAzyPxzG2zqz+cw5R6shjskUQhcGGqctZV66Q3y6h6s3iJyqhQ7i1wCEetMLnEYhXxfdh/KYLX3+3WS3ou29yVcq2Q78ZV8AZtyJv3vYRoGlD/jUbblgQFaP6Aq22+Os= 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 Mon, Jun 9, 2025 at 10: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 LGTM. 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. > > 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. nit: maybe update the above comment? > */ > 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; > } >