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 C5ACEC021AA for ; Wed, 19 Feb 2025 18:27:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2E9F9440156; Wed, 19 Feb 2025 13:27:12 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 299DA280257; Wed, 19 Feb 2025 13:27:12 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 161CA440156; Wed, 19 Feb 2025 13:27:12 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id E6E41280257 for ; Wed, 19 Feb 2025 13:27:11 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 6464B1A1C33 for ; Wed, 19 Feb 2025 18:27:11 +0000 (UTC) X-FDA: 83137526262.20.E91F295 Received: from mail-qt1-f169.google.com (mail-qt1-f169.google.com [209.85.160.169]) by imf13.hostedemail.com (Postfix) with ESMTP id 8C0CF20017 for ; Wed, 19 Feb 2025 18:27:09 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=VPGG3Ja6; spf=pass (imf13.hostedemail.com: domain of surenb@google.com designates 209.85.160.169 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=1739989629; a=rsa-sha256; cv=none; b=wC//zFRSSO1cc9fTSG2jH9m1ZtykSl3256obCBuyjIjbHTDSXSzXP8sFVMdsDoSMhTbiqy pP2/TltQsJNj9DUZwa6IWxR0sEPJYrmxhMQHbI1GijqNgI5kDP6r6WIedyDASzT5KzNavG xNw3k3VZMbtvJZBOMAwFzHrpfert9EA= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=VPGG3Ja6; spf=pass (imf13.hostedemail.com: domain of surenb@google.com designates 209.85.160.169 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=1739989629; 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=ED8ADjsrNyTyza7l4GAk/yD/qdQQ86Abl3R7CXd3+BY=; b=OKnUdDTBGSZTtmoyTshbMjplgSOEyoHYIvITX1xbEj5iiE/Mc7YkSXgR/YEZb/37Lw2NZq n8ADOi8InmEPM9u4XIuumFxbPcdFuTlt7I6FrMjpn5hMn7dG3IjXEB37kA2EwwzzaNsriw TeVOZQxXsfv2oKTYmtCvWuqEqCNY9is= Received: by mail-qt1-f169.google.com with SMTP id d75a77b69052e-471fa3b19bcso20441cf.0 for ; Wed, 19 Feb 2025 10:27:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1739989629; x=1740594429; 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=ED8ADjsrNyTyza7l4GAk/yD/qdQQ86Abl3R7CXd3+BY=; b=VPGG3Ja6ij/nLeR4YfXtt2A1cZSQKcatmw3Dpy7sQ8S/khZN2uWUxrl5zaT22Q9+FB o/Y3irFwKz83OH6pf4IB7HXAbG3z3O2vP6ByHm2rO31zRInlz3tlZPch3fdgsy9Fl81h H1sYZ8ZyJEobmmbv+WNKHa5Sk1h9/OWnSrwGHcLIVJWYL8ZelmTiVTP82vALWgfFYeXo ClPNMH0Q49R65VozU/nQuT89fw8v99bTf5Hsm3WehKBEpa6o1GQ7+GoOgVAZfU4led2I gIi4Cnz3ksk65SoDiUZBU9CM6yIa8PDE4zo8fWC7geD9hbQCFG7hBY6kfFlKE74+cILi bLnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739989629; x=1740594429; 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=ED8ADjsrNyTyza7l4GAk/yD/qdQQ86Abl3R7CXd3+BY=; b=W5pV76CRdN8sMSAJpfo4kucLuC1XoeJM2IP0nfYw59v4mFfQLYbdGAp5LcC38DQGK1 sMuHtgWVl8wlvvU0EeW+t7+RDOGyaQZ7cKoJO6CbZSKpbNVOZ0ngiCH3uUnhdzHuUcBr YaQj0KVwNoKvz61mriB+mkTRPgmt0BlHMM50s9OvrHdYz8jWsJzKLpJ2UoXKj0hGL8GC h0r9OG+LCJZ+uFTNmwnp/vlMP+/gS2ea3/MVof6iHSiJnJPmpyihF237/P4otfqIBGaB g5PYASLxXri9G3/GutZAE66gOsGrEdoTZaiNmdn8nE7qel+4X6M1brYwUif9EXmProYr AIzg== X-Gm-Message-State: AOJu0Ywa05n5h+nn07MBKoGtVgPvqmgOZfVl+qyDRhVI3uziyyxQyzfk Ni0SxDTzRcBjR38QPcab2eS9g1i9fyO1SbpofUrrJskoKIGEaDaMOc1W5kqkaosUrExSaj4p1NM miQuc3kiy5LMsZoQZmRADEXCviqY2ya3KrQjW X-Gm-Gg: ASbGncs/pTzl6pllAV1zX4XxEpoqthVHoQB+Jn3Qkz2lWfsJEFku7RqxSTDR/5iEhQR 3VEYYBmCeCiG+SQgLyYqRgwFkzJeUmuOzSH9tZZ3VM04vl3zHytMcmqZjP5bmk04Xn3w3y5br X-Google-Smtp-Source: AGHT+IGIMJ+IWwFpEiNEczPSEHnUhEe/nPJaivwQA26nA4Edhf7vVhFQXSfhTn9pJ0oANeFF4rlkk5ozAmWP7rJdbmo= X-Received: by 2002:a05:622a:85:b0:471:b772:c717 with SMTP id d75a77b69052e-472097c2b32mr4634891cf.26.1739989628403; Wed, 19 Feb 2025 10:27:08 -0800 (PST) MIME-Version: 1.0 References: <20250219112519.92853-1-21cnbao@gmail.com> In-Reply-To: <20250219112519.92853-1-21cnbao@gmail.com> From: Suren Baghdasaryan Date: Wed, 19 Feb 2025 10:26:56 -0800 X-Gm-Features: AWEUYZnumNfAyKzC6WqGX5QChJFZuJaWAV648kE2mNdcaFd-vwIZYHCuCJdSKxs Message-ID: Subject: Re: [PATCH RFC] mm: Fix kernel BUG when userfaultfd_move encounters swapcache To: Barry Song <21cnbao@gmail.com> Cc: 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" , Lokesh Gidra , Matthew Wilcox , Michal Hocko , Mike Rapoport , Nicolas Geoffray , Peter Xu , Ryan Roberts , Shuah Khan , ZhangPeng Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 8C0CF20017 X-Stat-Signature: b7z3fg3xtxfcgqr6mrn6keqskhs8yg3j X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1739989629-646847 X-HE-Meta: U2FsdGVkX19KQqtC4Nl47yQBqRf3Kjh47EIjiw+WUNPP7bXLqUnkBJdaqefCIG4cHkwIPRahXk3Om9z5ws8kuxgw4vKuRY0q+xRG85Tr+XjjXXYr9WUGk18Mw6VvGfr3NqJIW2Z8Csq+A6CoqFowrTFFFDrEfDRKqVPy1M+2/MdBS0Ynz0UDQN1LcX2IptQEdwNA4FhLLYAcl0dQTjabJRuTstbrjTyAHisg3rkrtEihJcLeispw1wYqDzjccTtOmPoMbzlawKklxtdHpdXI7JFLQffEHvImmq+WTMj8imueaGdDEo/9XFna7hL3sm48qTY5TZVjsBX7BqN3wB3REVP47vt4XSBXmeiFIqCZ+gqmHHAmjcqOJQzVB70Je486PtMgDS+A+AQeTwPd26vf+F8h8PZm70FF1OB/LPs6rNAYNMDuoF4vpEN/5roQARWAJZLuNZwk82NS3cBnPMe/a4+rQBuxzTYKn2cgZmDOz9BDbfwDbs2IAFcBURApWHUFWJpAFXrLHGF68Y/mvRzENyA5VumBsYTmSBwoBbmwf7/0fio0kcRKUJCSHbs+rU1LH4kMRy7O+OrK3G4ntQv4a/4Pzi1XCgwAx5mjfXaSAhDZupOEH6/lIjd2q5zhyqOFwbQHE4XLPEHIcO2osZFpFdBUqWAMIOun7NZghMt+FcQauILiEiD1dEsaHqKjQ6l6OXrdiiJfqcLSe0Q4vHIqBwzn+CCyxZZqSaj8LbYeZVtVXLYfaB9V6kA6Zd2xn6IhAPStHZUApUFXtb3U7bVshrqC/kDVeYF7ZDcrqKKeXBHfG3qIJHcQFLdqsr4MeiugwGAYvqxENvfFkvxDJubFmDG0dVfjc7vPPZ2tQoM8WvH/YkZD63O19yBpXk+LuVmrAshKnNBcrZ9YrPFzXuprlXnFQSILXriwiY+FPGQZjMV+L1dCw7XVZd29RBVG6wDmuyJ7/VeUu77uVDMQhZx yfIQsk2n pQ7Qj+lCEpiQvUA5k9TY/LeFxHQgl4nTg1CVrIfUFP3ivhlAHxqV+th0adKN963+q4Fov8YAEoLgFm5hCAKq2QISYGYLQkPiDaJtwesxTrM/kcOOOYjvJXdRB+RsgQ0Y53zRr+6VpiX/oEspcwH0w9u3geGQ7COqvXdLD+Z74slYFRKKXrhWhK4y+WlHISgGxViLPIXeT6auJtwBb756a0o8TsbmlZsVJ1Cpja874JE3YwBT6IcicfyvqEmwxjUcvWRIDP8FYkym4bOtaFoyDVM/Cd5dKby1swtgxzEe4QK4D6UoCIZ84BCPCNAPAwr1/rdg22TNEFsKEidX6MM94IINKra0khEPQBhAx7977CoHApUnX7mT8fz+xDOkpRsfbR9q6MleOZjLC4v/QKpyatPxP7Q5KBs1Nptc6CgV53bjbrRvSh55cU+/tGVxtZBgYoMKtm7poCzA6nxGCInNU/mSy5e/1UTLmzOWoBlBOzs4o4hmlY4l/zpxHOhkXq4/DfRvAK92RvtV/enTdNc3udewEafz5NfuRgu/PGdewFOgH8K207zhVBjvvAnPPoAD5gQ7pu8fWhW3g/5C85DqUEqkXnP0OdDWpzFYr52PEcU8ZhjyMBGSfMmiPxnxJBCqoy56hq9dPpJCLQYo= 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 Wed, Feb 19, 2025 at 3:25=E2=80=AFAM Barry Song <21cnbao@gmail.com> wrot= e: > > 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 folio > 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 swap > entry, it can still reference a folio that remains in the swap > cache. > > If do_swap_page() is triggered, it may locate the folio in the > swap cache. However, during add_rmap operations, a kernel panic > can occur due to: > page_pgoff(folio, page) !=3D linear_page_index(vma, address) Thanks for the report and reproducer! > > $./a.out > /dev/null > [ 13.336953] page: refcount:6 mapcount:1 mapping:00000000f43db19c index= :0xffffaf150 pfn:0x4667c > [ 13.337520] head: order:2 mapcount:1 entire_mapcount:0 nr_pages_mapped= :1 pincount:0 > [ 13.337716] memcg:ffff00000405f000 > [ 13.337849] anon flags: 0x3fffc0000020459(locked|uptodate|dirty|owner_= priv_1|head|swapbacked|node=3D0|zone=3D0|lastcpupid=3D0xffff) > [ 13.338630] raw: 03fffc0000020459 ffff80008507b538 ffff80008507b538 ff= ff000006260361 > [ 13.338831] raw: 0000000ffffaf150 0000000000004000 0000000600000000 ff= ff00000405f000 > [ 13.339031] head: 03fffc0000020459 ffff80008507b538 ffff80008507b538 f= fff000006260361 > [ 13.339204] head: 0000000ffffaf150 0000000000004000 0000000600000000 f= fff00000405f000 > [ 13.339375] head: 03fffc0000000202 fffffdffc0199f01 ffffffff00000000 0= 000000000000001 > [ 13.339546] head: 0000000000000004 0000000000000000 00000000ffffffff 0= 000000000000000 > [ 13.339736] page dumped because: VM_BUG_ON_PAGE(page_pgoff(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 tainted 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 BTYP= E=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: 000000000= 0000001 > [ 13.342404] x26: 0000000000000000 x25: 0000000000000001 x24: 000000000= 0000001 > [ 13.342575] x23: 0000ffffaf0d0000 x22: 0000ffffaf0d0000 x21: fffffdffc= 0199f00 > [ 13.342731] x20: fffffdffc0199f00 x19: ffff000006210700 x18: 00000000f= fffffff > [ 13.342881] x17: 6c203d2120296567 x16: 6170202c6f696c6f x15: 662866666= f67705f > [ 13.343033] x14: 6567617028454741 x13: 2929737365726464 x12: ffff80008= 3728ab0 > [ 13.343183] x11: ffff800082996bf8 x10: 0000000000000fd7 x9 : ffff80008= 011bc40 > [ 13.343351] x8 : 0000000000017fe8 x7 : 00000000fffff000 x6 : ffff80008= 29eebf8 > [ 13.343498] x5 : c0000000fffff000 x4 : 0000000000000000 x3 : 000000000= 0000000 > [ 13.343645] x2 : 0000000000000000 x1 : ffff0000062db980 x0 : 000000000= 000005f > [ 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 (d4210000) > [ 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 handling > 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? > For now, a quick solution > is to return -EBUSY. > I'd like to see others' opinions on whether a full fix is worth > pursuing. > > For anyone interested in reproducing it, the a.out test program is > as below, > > #define _GNU_SOURCE > #include > #include > #include > #include > #include > #include > #include > #include > #include > #include > #include > #include > > #define PAGE_SIZE 4096 > #define REGION_SIZE (512 * 1024) > > #ifndef UFFDIO_MOVE > struct uffdio_move { > __u64 dst; > __u64 src; > __u64 len; > #define UFFDIO_MOVE_MODE_DONTWAKE ((__u64)1<<0) > #define UFFDIO_MOVE_MODE_ALLOW_SRC_HOLES ((__u64)1<<1) > __u64 mode; > __s64 move; > }; > #define _UFFDIO_MOVE (0x05) > #define UFFDIO_MOVE _IOWR(UFFDIO, _UFFDIO_MOVE, struct uffdio_move) > #endif > > void *src, *dst; > int uffd; > > void *madvise_thread(void *arg) { > if (madvise(src, REGION_SIZE, MADV_PAGEOUT) =3D=3D -1) { > perror("madvise MADV_PAGEOUT"); > } > return NULL; > } > > void *fault_handler_thread(void *arg) { > struct uffd_msg msg; > struct uffdio_move move; > struct pollfd pollfd =3D { .fd =3D uffd, .events =3D POLLIN }; > > pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL); > pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL); > > while (1) { > if (poll(&pollfd, 1, -1) =3D=3D -1) { > perror("poll"); > exit(EXIT_FAILURE); > } > > if (read(uffd, &msg, sizeof(msg)) <=3D 0) { > perror("read"); > exit(EXIT_FAILURE); > } > > if (msg.event !=3D UFFD_EVENT_PAGEFAULT) { > fprintf(stderr, "Unexpected event\n"); > exit(EXIT_FAILURE); > } > > move.src =3D (unsigned long)src + (msg.arg.pagefault.address - (= unsigned long)dst); > move.dst =3D msg.arg.pagefault.address & ~(PAGE_SIZE - 1); > move.len =3D PAGE_SIZE; > move.mode =3D 0; > > if (ioctl(uffd, UFFDIO_MOVE, &move) =3D=3D -1) { > perror("UFFDIO_MOVE"); > exit(EXIT_FAILURE); > } > } > return NULL; > } > > int main() { > again: > pthread_t thr, madv_thr; > struct uffdio_api uffdio_api =3D { .api =3D UFFD_API, .features =3D = 0 }; > struct uffdio_register uffdio_register; > > src =3D mmap(NULL, REGION_SIZE, PROT_READ | PROT_WRITE, MAP_PRIVATE = | MAP_ANONYMOUS, -1, 0); > if (src =3D=3D MAP_FAILED) { > perror("mmap src"); > exit(EXIT_FAILURE); > } > memset(src, 1, REGION_SIZE); > > dst =3D mmap(NULL, REGION_SIZE, PROT_READ | PROT_WRITE, MAP_PRIVATE = | MAP_ANONYMOUS, -1, 0); > if (dst =3D=3D MAP_FAILED) { > perror("mmap dst"); > exit(EXIT_FAILURE); > } > > uffd =3D syscall(SYS_userfaultfd, O_CLOEXEC | O_NONBLOCK); > if (uffd =3D=3D -1) { > perror("userfaultfd"); > exit(EXIT_FAILURE); > } > > if (ioctl(uffd, UFFDIO_API, &uffdio_api) =3D=3D -1) { > perror("UFFDIO_API"); > exit(EXIT_FAILURE); > } > > uffdio_register.range.start =3D (unsigned long)dst; > uffdio_register.range.len =3D REGION_SIZE; > uffdio_register.mode =3D UFFDIO_REGISTER_MODE_MISSING; > > if (ioctl(uffd, UFFDIO_REGISTER, &uffdio_register) =3D=3D -1) { > perror("UFFDIO_REGISTER"); > exit(EXIT_FAILURE); > } > > if (pthread_create(&madv_thr, NULL, madvise_thread, NULL) !=3D 0) { > perror("pthread_create madvise_thread"); > exit(EXIT_FAILURE); > } > > if (pthread_create(&thr, NULL, fault_handler_thread, NULL) !=3D 0) { > perror("pthread_create fault_handler_thread"); > exit(EXIT_FAILURE); > } > > for (size_t i =3D 0; i < REGION_SIZE; i +=3D PAGE_SIZE) { > char val =3D ((char *)dst)[i]; > printf("Accessing dst at offset %zu, value: %d\n", i, val); > } > > pthread_join(madv_thr, NULL); > pthread_cancel(thr); > pthread_join(thr, NULL); > > munmap(src, REGION_SIZE); > munmap(dst, REGION_SIZE); > close(uffd); > goto again; > return 0; > } > > As long as you enable mTHP (which likely increases the residency > time of swapcache), you can reproduce the issue within a few > seconds. But I guess the same race condition also exists with > small folios. > > Fixes: adef440691bab ("userfaultfd: UFFDIO_MOVE uABI") > Cc: Andrea Arcangeli > Cc: Suren Baghdasaryan > Cc: Al Viro > Cc: Axel Rasmussen > Cc: Brian Geffon > Cc: Christian Brauner > Cc: David Hildenbrand > Cc: Hugh Dickins > Cc: Jann Horn > Cc: Kalesh Singh > Cc: Liam R. Howlett > Cc: Lokesh Gidra > Cc: Matthew Wilcox (Oracle) > Cc: Michal Hocko > Cc: Mike Rapoport (IBM) > Cc: Nicolas Geoffray > Cc: Peter Xu > Cc: Ryan Roberts > Cc: Shuah Khan > Cc: ZhangPeng > Signed-off-by: Barry Song > --- > mm/userfaultfd.c | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/mm/userfaultfd.c b/mm/userfaultfd.c > index 867898c4e30b..34cf1c8c725d 100644 > --- a/mm/userfaultfd.c > +++ b/mm/userfaultfd.c > @@ -18,6 +18,7 @@ > #include > #include > #include "internal.h" > +#include "swap.h" > > static __always_inline > bool validate_dst_vma(struct vm_area_struct *dst_vma, unsigned long dst_= end) > @@ -1079,9 +1080,19 @@ static int move_swap_pte(struct mm_struct *mm, > pmd_t *dst_pmd, pmd_t dst_pmdval, > spinlock_t *dst_ptl, spinlock_t *src_ptl) > { > + struct folio *folio; > + swp_entry_t entry; > + > if (!pte_swp_exclusive(orig_src_pte)) > return -EBUSY; > Would be helpful to add a comment explaining that this is the case when the folio is in the swap cache. > + entry =3D pte_to_swp_entry(orig_src_pte); > + folio =3D filemap_get_folio(swap_address_space(entry), swap_cache= _index(entry)); > + if (!IS_ERR(folio)) { > + folio_put(folio); > + return -EBUSY; > + } > + > double_pt_lock(dst_ptl, src_ptl); > > if (!is_pte_pages_stable(dst_pte, src_pte, orig_dst_pte, orig_src= _pte, > -- > 2.39.3 (Apple Git-146) >