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 5A55CC021B2 for ; Fri, 21 Feb 2025 00:36:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8D2B9280001; Thu, 20 Feb 2025 19:36:23 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 882DA6B00C0; Thu, 20 Feb 2025 19:36:23 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 722CF280001; Thu, 20 Feb 2025 19:36:23 -0500 (EST) 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 4CF6D6B00BF for ; Thu, 20 Feb 2025 19:36:23 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id B72F6160239 for ; Fri, 21 Feb 2025 00:36:22 +0000 (UTC) X-FDA: 83142085404.17.101B6EA Received: from mail-qt1-f175.google.com (mail-qt1-f175.google.com [209.85.160.175]) by imf18.hostedemail.com (Postfix) with ESMTP id BF3411C0008 for ; Fri, 21 Feb 2025 00:36:20 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=l4eOB2o6; spf=pass (imf18.hostedemail.com: domain of surenb@google.com designates 209.85.160.175 as permitted sender) smtp.mailfrom=surenb@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1740098180; 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=ndbATN2bQYxCQ40vKy6hYq1kBt06N1Kmt7sbVE6aE6M=; b=XocFptGnnkjO4TJIgC0FNOhU+J6lXQJODB1aNxo+PZxFYWulmewW+GLpSdHpoDr6d49aoW 4eSRUlV9mO1WClKc4COghQE57pagqZGgTx9XPEXkK1HA7fF2PwZkPlvMpu6YfSGOFkvc2x owpsTXdYGbZxI0J4CUQbxVugdu/jRK0= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=l4eOB2o6; spf=pass (imf18.hostedemail.com: domain of surenb@google.com designates 209.85.160.175 as permitted sender) smtp.mailfrom=surenb@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740098180; a=rsa-sha256; cv=none; b=nzAYoRNkQloUD2hN2z/NCHvX0pSFfDCka/B5uH+STO0mxknB4TAqQucv7iKLx6fru+5TSD puxSyGr9CUTaht52LkfKJPkwYKBlJt6ilJsMPF6ujlkHbvrNdSAvlIYHuJwiI4amqm3g22 NXWeVqCJFhIEH/UuoYAgDLVNYCjnZws= Received: by mail-qt1-f175.google.com with SMTP id d75a77b69052e-472098e6e75so70251cf.1 for ; Thu, 20 Feb 2025 16:36:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740098180; x=1740702980; 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=ndbATN2bQYxCQ40vKy6hYq1kBt06N1Kmt7sbVE6aE6M=; b=l4eOB2o6keOc2BGC1e6G1+pDd9ZVNj+8fgOlMqrm0c5yWlNS9vWFkEvJbVnzfbTPCY QY4GjxRzN/jmwWV+5LSPu4IYbBjH8ZEyFfGAIXLviGfA2oQ7VRryLKlN0odgbGH1C0b4 bFeazMnKHUExR+caHMVmxVx5nQ1W1NLN3/QTd6NIB5Uoq/FaWeWT3ITA/rRLlHxmEdxi aB8e2nzP/di1andTwO3cb+IqmLPhdNxCFV3paoersTPXTLRyJQdZoPRTF3Z7+G5Hijpb Ul8oxHVJS3lVVTV18YBx9p2s+H6aIdZliNRZ6Bt+sLikTrEDXw7SgSMk8gUnPmRPq+Uw Nq+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740098180; x=1740702980; 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=ndbATN2bQYxCQ40vKy6hYq1kBt06N1Kmt7sbVE6aE6M=; b=uqpB+L3sDwOJZHL4hhI87X01FzN/fOiWzG5ooolEhrjnMfLuU8X7eBF9Ql4ZhFb8jj pEKzcr87U6dRrl1eK3OCPdMK7cIEJa0j3i1cR0kfWWf2O24v1Rk8451+JgMgXw7cho7j c63cal0xRPmTTdRKKAt/0cHvmUUfOZ47oSA8HSWZukwNLaBqn/iKOQklC3qsEzYQjVrj 777CBJ8ObSGstIoUxDO08DCoNfzyoJO4S5ymsGz9gIb0KDMK0jJE+/0h1nvo8ljbnUn4 yH6Ud+hMv2SK5pz4a45Bh6e4qmouDM94X2YYLnFM6mJNfdOAN8CbHhOne6bPN/c9yJDQ T4Gw== X-Forwarded-Encrypted: i=1; AJvYcCW1sah7mxri6c7qQePnsGAzLKg6nnG2CdIAbYaLuMqKWS9GAfs31AThJUuhZmgJYl8c+V9ZmgSw3A==@kvack.org X-Gm-Message-State: AOJu0Yzh+R6+3sEK3wQdA/kK45Vy2RuPTtveccB8E/fQ1WO9Gn0vHtSQ vIBDnS7+loeni0dkfMg9yCcZ0g8fpvwlCif3X5krZr99EiMhJ2UjNQKSwZcTrXJRls2iJjp1vso g2XpN7VRNoirq3/RDd8hloQbWMWPBrtoYq3uL X-Gm-Gg: ASbGncsvFCJXgoztIJP5kPm/j7xQ2EHwniFZs6drjmbx6J7zz5x8bziFfR05kn0NMkK 7EghsIdyrARS+cl8I8iUWCF7zrgg+URGro8vJSiAQ0PE3ctu/otnSF7O+42MXT1LLFtgwc7O4 X-Google-Smtp-Source: AGHT+IE92lIZZbQYgejE/zFDjDSUSYgBR8VlYgUVrXto+vwpwaz2n/RkKysVuugmqszQijY20EYb8Hi2LNd0zwnYHu8= X-Received: by 2002:a05:622a:1a06:b0:471:e982:c73d with SMTP id d75a77b69052e-472250dbc04mr673351cf.11.1740098179481; Thu, 20 Feb 2025 16:36:19 -0800 (PST) MIME-Version: 1.0 References: <20250219112519.92853-1-21cnbao@gmail.com> In-Reply-To: From: Suren Baghdasaryan Date: Thu, 20 Feb 2025 16:36:08 -0800 X-Gm-Features: AWEUYZnStP-lAeMijR0y6LNLygrcaQlKBYJ8BbZJ6dED70knG-ILcs1ltaL_Xu4 Message-ID: Subject: Re: [PATCH RFC] mm: Fix kernel BUG when userfaultfd_move encounters swapcache To: Peter Xu Cc: Barry Song <21cnbao@gmail.com>, Lokesh Gidra , linux-mm@kvack.org, akpm@linux-foundation.org, linux-kernel@vger.kernel.org, zhengtangquan@oppo.com, Barry Song , Andrea Arcangeli , Al Viro , Axel Rasmussen , Brian Geffon , Christian Brauner , David Hildenbrand , Hugh Dickins , Jann Horn , Kalesh Singh , "Liam R . Howlett" , Matthew Wilcox , Michal Hocko , Mike Rapoport , Nicolas Geoffray , Ryan Roberts , Shuah Khan , ZhangPeng , Yu Zhao Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: BF3411C0008 X-Stat-Signature: 9qzdjjeo9yuhbj5d6b155ry4g99ed8i5 X-HE-Tag: 1740098180-759681 X-HE-Meta: U2FsdGVkX193mCRzhhLEfDlvAZnXLn/NtiRyIq4RY9pEGX3/rJ42yc+3IFtoqg11UF1kWZJz2Uy6I9dnxMVRUFV20YfCG05jhUyiMnyioikM3h4A1eiXGaW8ThWMdK7+O+d0NMk5PDNlWG1MqveCmLN79W6Ce6ZrMNiJ7F3O/UUggqi1q7V1/l3MXxvHy+kXz4arvwEmru3E6+MGLPNTA5oE19Ru3nFUqGi9u2TNbtdrwOm09RBLiJwo7l/aMIdycySa1i7GufaNwkt1lXLUGiAGIt+RVaJhsx+qwzrd2PPbF9Z5GgLPpg9A3X8FKvevqPvqkAzx7D8CUVYw8iub2UmpH2B/X3ujQE5y6BgCLKRk6eg7SBcIytS5qEtOCX+GhzgHAuUAatveVbsA25Sm8uLNDzYW56G5PsD0+A1gpKwLuA0s9Dg37SaoZVNeizDPsEDWrCQxbyAISguQP84uOmu4Aw8TaQCbbpWMERHSfo2oPOlLcFK84HTu18J29MpMFsaFAUHUBpEDk0g62z1TIFAwIIdAJPl+yFuV2Hskyn7tBtGR3boD6b3/x4I/bZIcec68lodZ+iVZDrthDCtJM1LOtokqX7MklUdhBRfGG7xcndu2IWh8mbsp2Mz58sikVG1lmAwyeMVJEyeKp6WvTzxnvNlIZvmRvS8o8M7NHKSkbHjrUhLMaXm/79mxcHayFoU+f36ZlBr91P/4bClUDUvTJCc3NB7H8lAosQbtUNj3T+4dxY4eALvt+f57FprlALN+rLMjJCXodICPPE6m3KToGRsqyrNzBFPURu55w4Em87+yiR2NMykXLdaSNYU0yphuFK2IZIDy9OxokkMn5Wv7Ta/m79v7O7yz/FHdjICTCBKJi2DC4ANKtSDgU9WS7ukNb4mcr8Rc9oKhKy5WStECVwbzmGnVdbxaVSaG0tW386AD8Ae3Uv9zWyKnHXHcU+HQX7dNM3gLTxI85+W 8STG3G39 15FvXawgj/1WyXyFLLjq0ZFhXSY9JuYklW6T2+fnK1xP465YfZmJ5zQSPRbaJJrZeMA8ukHLCtgOQQPwu/6gG3ZonwaDYmiE+bXathF0lGU9Zf26LLu4sddnzmvqiBvst5CmybGS7XVIiWpdynkXtN7s4IgYsSe8L3xJCZHp8aReUPSEtdHGo6mwbznd23hIe7Xn2cEiqldXKUS1fBD1JszEJjvcTrbaG9I5i1IIJ6k87tRR5kytRZFTsEYDkXWjnANLBXgOC/ZSKlkooycJmlGLsEy2+pV3R7fnwzeC5OO8kh4X730AWAM57TfPlMa9UHjEZBRBRM4E7m3A= 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 Thu, Feb 20, 2025 at 3:52=E2=80=AFPM Suren Baghdasaryan wrote: > > On Thu, Feb 20, 2025 at 3:47=E2=80=AFPM Suren Baghdasaryan wrote: > > > > On Thu, Feb 20, 2025 at 2:59=E2=80=AFPM Peter Xu wr= ote: > > > > > > On Thu, Feb 20, 2025 at 12:04:40PM +1300, Barry Song wrote: > > > > On Thu, Feb 20, 2025 at 11:15=E2=80=AFAM Peter Xu wrote: > > > > > > > > > > On Thu, Feb 20, 2025 at 09:37:50AM +1300, Barry Song wrote: > > > > > > On Thu, Feb 20, 2025 at 7:27=E2=80=AFAM Suren Baghdasaryan wrote: > > > > > > > > > > > > > > On Wed, Feb 19, 2025 at 3:25=E2=80=AFAM Barry Song <21cnbao@g= mail.com> wrote: > > > > > > > > > > > > > > > > From: Barry Song > > > > > > > > > > > > > > > > userfaultfd_move() checks whether the PTE entry is present = or a > > > > > > > > swap entry. > > > > > > > > > > > > > > > > - If the PTE entry is present, move_present_pte() handles f= olio > > > > > > > > migration by setting: > > > > > > > > > > > > > > > > src_folio->index =3D linear_page_index(dst_vma, dst_addr)= ; > > > > > > > > > > > > > > > > - If the PTE entry is a swap entry, move_swap_pte() simply = copies > > > > > > > > the PTE to the new dst_addr. > > > > > > > > > > > > > > > > This approach is incorrect because even if the PTE is a swa= p > > > > > > > > entry, it can still reference a folio that remains in the s= wap > > > > > > > > cache. > > > > > > > > > > > > > > > > If do_swap_page() is triggered, it may locate the folio in = the > > > > > > > > swap cache. However, during add_rmap operations, a kernel p= anic > > > > > > > > can occur due to: > > > > > > > > page_pgoff(folio, page) !=3D linear_page_index(vma, addres= s) > > > > > > > > > > > > > > Thanks for the report and reproducer! > > > > > > > > > > > > > > > > > > > > > > > $./a.out > /dev/null > > > > > > > > [ 13.336953] page: refcount:6 mapcount:1 mapping:00000000= f43db19c index:0xffffaf150 pfn:0x4667c > > > > > > > > [ 13.337520] head: order:2 mapcount:1 entire_mapcount:0 n= r_pages_mapped:1 pincount:0 > > > > > > > > [ 13.337716] memcg:ffff00000405f000 > > > > > > > > [ 13.337849] anon flags: 0x3fffc0000020459(locked|uptodat= e|dirty|owner_priv_1|head|swapbacked|node=3D0|zone=3D0|lastcpupid=3D0xffff) > > > > > > > > [ 13.338630] raw: 03fffc0000020459 ffff80008507b538 ffff8= 0008507b538 ffff000006260361 > > > > > > > > [ 13.338831] raw: 0000000ffffaf150 0000000000004000 00000= 00600000000 ffff00000405f000 > > > > > > > > [ 13.339031] head: 03fffc0000020459 ffff80008507b538 ffff= 80008507b538 ffff000006260361 > > > > > > > > [ 13.339204] head: 0000000ffffaf150 0000000000004000 0000= 000600000000 ffff00000405f000 > > > > > > > > [ 13.339375] head: 03fffc0000000202 fffffdffc0199f01 ffff= ffff00000000 0000000000000001 > > > > > > > > [ 13.339546] head: 0000000000000004 0000000000000000 0000= 0000ffffffff 0000000000000000 > > > > > > > > [ 13.339736] page dumped because: VM_BUG_ON_PAGE(page_pgo= ff(folio, page) !=3D linear_page_index(vma, address)) > > > > > > > > [ 13.340190] ------------[ cut here ]------------ > > > > > > > > [ 13.340316] kernel BUG at mm/rmap.c:1380! > > > > > > > > [ 13.340683] Internal error: Oops - BUG: 00000000f2000800= [#1] PREEMPT SMP > > > > > > > > [ 13.340969] Modules linked in: > > > > > > > > [ 13.341257] CPU: 1 UID: 0 PID: 107 Comm: a.out Not taint= ed 6.14.0-rc3-gcf42737e247a-dirty #299 > > > > > > > > [ 13.341470] Hardware name: linux,dummy-virt (DT) > > > > > > > > [ 13.341671] pstate: 60000005 (nZCv daif -PAN -UAO -TCO -= DIT -SSBS BTYPE=3D--) > > > > > > > > [ 13.341815] pc : __page_check_anon_rmap+0xa0/0xb0 > > > > > > > > [ 13.341920] lr : __page_check_anon_rmap+0xa0/0xb0 > > > > > > > > [ 13.342018] sp : ffff80008752bb20 > > > > > > > > [ 13.342093] x29: ffff80008752bb20 x28: fffffdffc0199f00 = x27: 0000000000000001 > > > > > > > > [ 13.342404] x26: 0000000000000000 x25: 0000000000000001 = x24: 0000000000000001 > > > > > > > > [ 13.342575] x23: 0000ffffaf0d0000 x22: 0000ffffaf0d0000 = x21: fffffdffc0199f00 > > > > > > > > [ 13.342731] x20: fffffdffc0199f00 x19: ffff000006210700 = x18: 00000000ffffffff > > > > > > > > [ 13.342881] x17: 6c203d2120296567 x16: 6170202c6f696c6f = x15: 662866666f67705f > > > > > > > > [ 13.343033] x14: 6567617028454741 x13: 2929737365726464 = x12: ffff800083728ab0 > > > > > > > > [ 13.343183] x11: ffff800082996bf8 x10: 0000000000000fd7 = x9 : ffff80008011bc40 > > > > > > > > [ 13.343351] x8 : 0000000000017fe8 x7 : 00000000fffff000 = x6 : ffff8000829eebf8 > > > > > > > > [ 13.343498] x5 : c0000000fffff000 x4 : 0000000000000000 = x3 : 0000000000000000 > > > > > > > > [ 13.343645] x2 : 0000000000000000 x1 : ffff0000062db980 = x0 : 000000000000005f > > > > > > > > [ 13.343876] Call trace: > > > > > > > > [ 13.344045] __page_check_anon_rmap+0xa0/0xb0 (P) > > > > > > > > [ 13.344234] folio_add_anon_rmap_ptes+0x22c/0x320 > > > > > > > > [ 13.344333] do_swap_page+0x1060/0x1400 > > > > > > > > [ 13.344417] __handle_mm_fault+0x61c/0xbc8 > > > > > > > > [ 13.344504] handle_mm_fault+0xd8/0x2e8 > > > > > > > > [ 13.344586] do_page_fault+0x20c/0x770 > > > > > > > > [ 13.344673] do_translation_fault+0xb4/0xf0 > > > > > > > > [ 13.344759] do_mem_abort+0x48/0xa0 > > > > > > > > [ 13.344842] el0_da+0x58/0x130 > > > > > > > > [ 13.344914] el0t_64_sync_handler+0xc4/0x138 > > > > > > > > [ 13.345002] el0t_64_sync+0x1ac/0x1b0 > > > > > > > > [ 13.345208] Code: aa1503e0 f000f801 910f6021 97ff5779 (d= 4210000) > > > > > > > > [ 13.345504] ---[ end trace 0000000000000000 ]--- > > > > > > > > [ 13.345715] note: a.out[107] exited with irqs disabled > > > > > > > > [ 13.345954] note: a.out[107] exited with preempt_count 2 > > > > > > > > > > > > > > > > Fully fixing it would be quite complex, requiring similar h= andling > > > > > > > > of folios as done in move_present_pte. > > > > > > > > > > > > > > How complex would that be? Is it a matter of adding > > > > > > > folio_maybe_dma_pinned() checks, doing folio_move_anon_rmap()= and > > > > > > > folio->index =3D linear_page_index like in move_present_pte()= or > > > > > > > something more? > > > > > > > > > > > > My main concern is still with large folios that require a split= _folio() > > > > > > during move_pages(), as the entire folio shares the same index = and > > > > > > anon_vma. However, userfaultfd_move() moves pages individually, > > > > > > making a split necessary. > > > > > > > > > > > > However, in split_huge_page_to_list_to_order(), there is a: > > > > > > > > > > > > if (folio_test_writeback(folio)) > > > > > > return -EBUSY; > > > > > > > > > > > > This is likely true for swapcache, right? However, even for mov= e_present_pte(), > > > > > > it simply returns -EBUSY: > > > > > > > > > > > > move_pages_pte() > > > > > > { > > > > > > /* at this point we have src_folio locked */ > > > > > > if (folio_test_large(src_folio)) { > > > > > > /* split_folio() can block */ > > > > > > pte_unmap(&orig_src_pte); > > > > > > pte_unmap(&orig_dst_pte); > > > > > > src_pte =3D dst_pte =3D NULL; > > > > > > err =3D split_folio(src_folio); > > > > > > if (err) > > > > > > goto out; > > > > > > > > > > > > /* have to reacquire the folio after it= got split */ > > > > > > folio_unlock(src_folio); > > > > > > folio_put(src_folio); > > > > > > src_folio =3D NULL; > > > > > > goto retry; > > > > > > } > > > > > > } > > > > > > > > > > > > Do we need a folio_wait_writeback() before calling split_folio(= )? > > > > > > > > > > Maybe no need in the first version to fix the immediate bug? > > > > > > > > > > It's also not always the case to hit writeback here. IIUC, writeb= ack only > > > > > happens for a short window when the folio was just added into swa= pcache. > > > > > MOVE can happen much later after that anytime before a swapin. M= y > > > > > understanding is that's also what Matthew wanted to point out. I= t may be > > > > > better justified of that in a separate change with some performan= ce > > > > > measurements. > > > > > > > > The bug we=E2=80=99re discussing occurs precisely within the short = window you > > > > mentioned. > > > > > > > > 1. add_to_swap: The folio is added to swapcache. > > > > 2. try_to_unmap: PTEs are converted to swap entries. > > > > 3. pageout > > > > 4. Swapcache is cleared. > > > > > > Hmm, I see. I was expecting step 4 to be "writeback is cleared".. or = at > > > least that should be step 3.5, as IIUC "writeback" needs to be cleare= d > > > before "swapcache" bit being cleared. > > > > > > > > > > > The issue happens between steps 2 and 4, where the PTE is not prese= nt, but > > > > the folio is still in swapcache - the current code does move_swap_p= te() but does > > > > not fixup folio->index within swapcache. > > > > > > One thing I'm still not clear here is why it's a race condition, rath= er > > > than more severe than that. I mean, folio->index is definitely wrong= , then > > > as long as the page still in swapcache, we should be able to move the= swp > > > entry over to dest addr of UFFDIO_MOVE, read on dest addr, then it'll= see > > > the page in swapcache with the wrong folio->index already and trigger= . > > > > > > I wrote a quick test like that, it actually won't trigger.. > > > > > > I had a closer look in the code, I think it's because do_swap_page() = has > > > the logic to detect folio->index matching first, and allocate a new f= olio > > > if it doesn't match in ksm_might_need_to_copy(). IIUC that was for > > > ksm.. but it looks like it's functioning too here. > > > > > > ksm_might_need_to_copy: > > > if (folio_test_ksm(folio)) { > > > if (folio_stable_node(folio) && > > > !(ksm_run & KSM_RUN_UNMERGE)) > > > return folio; /* no need to copy it */ > > > } else if (!anon_vma) { > > > return folio; /* no need to copy it */ > > > } else if (folio->index =3D=3D linear_page_index(vma, addr) &= & <---------- [1] > > > anon_vma->root =3D=3D vma->anon_vma->root) { > > > return folio; /* still no need to copy it *= / > > > } > > > ... > > > > > > new_folio =3D vma_alloc_folio(GFP_HIGHUSER_MOVABLE, 0, vma, a= ddr); <---- [2] > > > ... > > > > > > So I believe what I hit is at [1] it sees index doesn't match, then i= t > > > decided to allocate a new folio. In this case, it won't hit your BUG > > > because it'll be "folio !=3D swapcache" later, so it'll setup the > > > folio->index for the new one, rather than the sanity check. > > > > > > Do you know how your case got triggered, being able to bypass the abo= ve [1] > > > which should check folio->index already? > > > > To understand the change I tried applying the proposed patch to both > > mm-unstable and Linus' ToT and got conflicts for both trees. Barry, > > which baseline are you using? > > Oops, never mind. My mistake. Copying from the email messed up tabs... > It applies cleanly. Overall the code seems correct to me, however the new code has quite complex logical structure IMO. Original simplified code structure is like this: if (pte_present(orig_src_pte)) { if (is_zero_pfn) { move_zeropage_pte() return } // pin and lock src_folio spin_lock(src_ptl) folio_get(folio) folio_trylock(folio) if (folio_test_large(src_folio)) split_folio(src_folio) anon_vma_trylock_write(src_anon_vma) move_present_pte() } else { if (non_swap_entry(entry)) if (is_migration_entry(entry)) handle migration entry else move_swap_pte() } The new structure looks like this: if (!pte_present(orig_src_pte)) { if (is_migration_entry(entry)) { handle migration entry return } if (!non_swap_entry() || !pte_swp_exclusive()) return si =3D get_swap_device(entry); } if (pte_present(orig_src_pte) && is_zero_pfn(pte_pfn(orig_src_pte))) move_zeropage_pte() return } pin and lock src_folio spin_lock(src_ptl) if (pte_present(orig_src_pte)) folio_get(folio) else { folio =3D filemap_get_folio(swap_entry) if (IS_ERR(folio)) move_swap_pte() return } } folio_trylock(folio) if (folio_test_large(src_folio)) split_folio(src_folio) if (pte_present(orig_src_pte)) anon_vma_trylock_write(src_anon_vma) move_pte_and_folio() This looks more complex and harder to follow. Might be the reason David was not in favour of treating swapcache and present pages in the same path. And now I would agree that refactoring some common parts and not breaking the original structure might be cleaner. > > > > > > > > > > > > > > My point is that if we want a proper fix for mTHP, we'd better hand= le writeback. > > > > Otherwise, this isn=E2=80=99t much different from directly returnin= g -EBUSY as proposed > > > > in this RFC. > > > > > > > > For small folios, there=E2=80=99s no split_folio issue, making it r= elatively > > > > simpler. Lokesh > > > > mentioned plans to madvise NOHUGEPAGE in ART, so fixing small folio= s is likely > > > > the first priority. > > > > > > Agreed. > > > > > > -- > > > Peter Xu > > >