From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B82E538F947 for ; Sun, 4 Oct 2026 20:08:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791144517; cv=none; b=Uiw3R+sAFMcxBN2pCi2EOWuwotyavXjDBSHChNrTvgX3Hcyvpn/DgPXsBHNfRjfzc9KS3gJn5cuo8hvsN2ck/luXcvEUVbV0HDybYHBMdGruWGcgX3DMfVsNwH67XyEJALJIkTIwDRop7joq/rZmks+EjAPKO6RGrj0E55Ft8Wc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791144517; c=relaxed/simple; bh=jdwBxIrpXSw/U9GxOUy3aS4hC5+6c3Wr5e63DvqSPvU=; h=Date:To:From:Subject:Message-Id; b=uG8+GbOkHYazhT5oofTPtdQ/pzXF9pWCKUueK0i2cpZ+VHp+Hi3iB7ZFRTw4b7xnPeJCnRI1XuT/UMDaMSau3XHgFPmqlceSbEk7L1YXKMFGBtayEGCFMqfq+T+lgbeGlIVwJAL7MnRv232YRNX+KJG9uWp7iewpEg/KNGdSyJk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=zNDB+/AZ; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="zNDB+/AZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4D9251F000FF; Sun, 4 Oct 2026 20:08:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-foundation.org; s=korg; t=1791144515; bh=5zDiAIh7Wva4Z7RtES1yI9SDNow2BNsZJKG8H8g+ZY4=; h=Date:To:From:Subject; b=zNDB+/AZivkx/TohYegshBRhcuNOTxbFVux8+9YmuQvHJ+wgw8AzrusxQwf5KX/y4 xmmxp5aF+Zuf2Z6XxEUy9HyjpnGtTBhToE+R1+U1fljNk+l8UCqr4CrKtdf8Bcmt9t t/bZ6SSNnFVlTZrOtHgpD9Veg7CkvrOtHbWROzlI= Date: Sun, 04 Oct 2026 13:08:34 -0700 To: mm-commits@vger.kernel.org,vbabka@kernel.org,surenb@google.com,shuah@kernel.org,rppt@kernel.org,peterx@redhat.com,mhocko@suse.com,ljs@kernel.org,liam@infradead.org,kas@kernel.org,david@kernel.org,aarcange@redhat.com,donggeunyoo.kernel@gmail.com,akpm@linux-foundation.org From: Andrew Morton Subject: + selftests-mm-add-tests-for-uffdio_move-of-a-uffd-protected-swap-entry.patch added to mm-hotfixes-unstable branch Message-Id: <20261004200835.4D9251F000FF@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The patch titled Subject: selftests/mm: add tests for UFFDIO_MOVE of a uffd-protected swap entry has been added to the -mm mm-hotfixes-unstable branch. Its filename is selftests-mm-add-tests-for-uffdio_move-of-a-uffd-protected-swap-entry.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/selftests-mm-add-tests-for-uffdio_move-of-a-uffd-protected-swap-entry.patch This patch will later appear in the mm-hotfixes-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via various branches at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there most days ------------------------------------------------------ From: Donggeun Yoo Subject: selftests/mm: add tests for UFFDIO_MOVE of a uffd-protected swap entry Date: Sat, 3 Oct 2026 19:30:30 +0900 Move a swapped-out page out of a write-protected or RWP-protected area into a destination registered for missing faults only, and read pagemap bit 57 at the destination. The destination was never protected, so the bit must be clear. Link: https://lore.kernel.org/20261003103030.63380-3-donggeunyoo.kernel@gmail.com Signed-off-by: Donggeun Yoo Signed-off-by: Andrew Morton Assisted-by: LLM Cc: Mike Rapoport Cc: Peter Xu Cc: Suren Baghdasaryan Cc: Andrea Arcangeli Cc: David Hildenbrand Cc: Lorenzo Stoakes Cc: Liam R. Howlett Cc: Vlastimil Babka Cc: Michal Hocko Cc: Shuah Khan Cc: Kiryl Shutsemau --- tools/testing/selftests/mm/uffd-unit-tests.c | 84 +++++++++++++++++ 1 file changed, 84 insertions(+) --- a/tools/testing/selftests/mm/uffd-unit-tests.c~selftests-mm-add-tests-for-uffdio_move-of-a-uffd-protected-swap-entry +++ a/tools/testing/selftests/mm/uffd-unit-tests.c @@ -2037,6 +2037,75 @@ static void uffd_move_pmd_split_test(uff uffd_move_pmd_handle_fault); } +/* + * Moving a swapped-out page out of a write-protected or RWP-protected area + * must not carry the uffd bit into a destination registered for missing + * faults only: such a bit is never cleared afterwards, so pagemap keeps + * reporting the page as uffd-tracked. + * + * Needs a swap device; skipped if MADV_PAGEOUT cannot evict the page. + */ +static void uffd_move_swap_test_common(uffd_global_test_opts_t *gopts, + bool rwp) +{ + unsigned long page_size = gopts->page_size; + struct uffdio_move move = { + .dst = (unsigned long)gopts->area_dst, + .src = (unsigned long)gopts->area_src, + .len = page_size, + }; + int pagemap_fd = pagemap_open(); + + if (rwp) { + if (uffd_register_rwp(gopts->uffd, gopts->area_src, page_size)) + err("register src failure"); + rwprotect_range(gopts->uffd, (unsigned long)gopts->area_src, + page_size, true); + } else { + if (uffd_register(gopts->uffd, gopts->area_src, page_size, + false, true, false)) + err("register src failure"); + wp_range(gopts->uffd, (unsigned long)gopts->area_src, + page_size, true); + } + if (uffd_register(gopts->uffd, gopts->area_dst, page_size, + true, false, false)) + err("register dst failure"); + + if (madvise(gopts->area_src, page_size, MADV_PAGEOUT)) + err("MADV_PAGEOUT"); + if (!pagemap_is_swapped(pagemap_fd, gopts->area_src)) { + uffd_test_skip("MADV_PAGEOUT did not swap the page; is swap enabled?"); + goto out; + } + + if (ioctl(gopts->uffd, UFFDIO_MOVE, &move)) { + uffd_test_fail("UFFDIO_MOVE failed: %s", strerror(errno)); + goto out; + } + + if (pagemap_get_entry(pagemap_fd, gopts->area_dst) & PM_UFFD_WP) + uffd_test_fail("uffd bit moved into an area registered for missing faults only"); + else + uffd_test_pass(); +out: + close(pagemap_fd); + uffd_unregister(gopts->uffd, gopts->area_src, page_size); + uffd_unregister(gopts->uffd, gopts->area_dst, page_size); +} + +static void uffd_move_swap_wp_test(uffd_global_test_opts_t *gopts, + uffd_test_args_t *targs) +{ + uffd_move_swap_test_common(gopts, false); +} + +static void uffd_move_swap_rwp_test(uffd_global_test_opts_t *gopts, + uffd_test_args_t *targs) +{ + uffd_move_swap_test_common(gopts, true); +} + static bool uffdio_verify_results(const char *name, int ret, int error, long result) { @@ -2360,6 +2429,21 @@ uffd_test_case_t uffd_tests[] = { .test_case_ops = &uffd_move_test_pmd_case_ops, }, { + .name = "move-swap-wp", + .uffd_fn = uffd_move_swap_wp_test, + .mem_targets = MEM_ANON, + .uffd_feature_required = UFFD_FEATURE_MOVE | + UFFD_FEATURE_PAGEFAULT_FLAG_WP, + .test_case_ops = &uffd_move_test_case_ops, + }, + { + .name = "move-swap-rwp", + .uffd_fn = uffd_move_swap_rwp_test, + .mem_targets = MEM_ANON, + .uffd_feature_required = UFFD_FEATURE_MOVE | UFFD_FEATURE_RWP, + .test_case_ops = &uffd_move_test_case_ops, + }, + { .name = "wp-fork", .uffd_fn = uffd_wp_fork_test, .mem_targets = MEM_ALL, _ Patches currently in -mm which might be from donggeunyoo.kernel@gmail.com are userfaultfd-clear-the-inherited-uffd-bit-in-move_swap_pte.patch selftests-mm-add-tests-for-uffdio_move-of-a-uffd-protected-swap-entry.patch mm-damon-core-charge-only-the-part-of-a-region-the-filter-left.patch mm-damon-tests-core-kunit-test-the-size-charged-for-a-filter-trimmed-region.patch mm-damon-core-prevent-size-quota-overflow-in-the-temporal-goal-tuner.patch mm-damon-tests-core-kunit-test-the-temporal-tuners-size-quota-conversion.patch