selftests-mm-reuse-pagemap_get_entry-in-vm_utilh.patch removed from -mm tree
The quilt patch titled
Subject: selftests/mm: reuse pagemap_get_entry() in vm_util.h
has been removed from the -mm tree. Its filename was
selftests-mm-reuse-pagemap_get_entry-in-vm_utilh.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Peter Xu <[email protected]>
Subject: selftests/mm: reuse pagemap_get_entry() in vm_util.h
Date: Wed, 12 Apr 2023 12:42:31 -0400
Meanwhile drop pagemap_read_vaddr().
---
tools/testing/selftests/mm/userfaultfd.c | 31 ++++++--------------- 1 file changed, 9 insertions(+), 22 deletions(-)
tools/testing/selftests/mm/userfaultfd.c renamed from tools/testing/selftests/mm/userfaultfd.c~selftests-mm-reuse-pagemap_get_entry-in-vm_utilh +9 -22
@@ -1399,19 +1399,6 @@ static int pagemap_open(void)return fd; } -static uint64_t pagemap_read_vaddr (int fd,void *vaddr) -{ -uint64_t value; -int ret; - - ret =pread (fd, &value,sizeof (uint64_t ), - ((uint64_t )vaddr >>12 ) *sizeof (uint64_t )); -if (ret !=sizeof (uint64_t )) -err ("pread() on pagemap failed" ); - -return value; -} -/* This macro let __LINE__ works in err() */ #define pagemap_check_wp (value, wp) do { \ if (!!(value & PM_UFFD_WP) != wp) \
@@ -1427,7 +1414,7 @@ static int pagemap_test_fork(bool presenif (!child) {/* Open the pagemap fd of the child itself */ fd =pagemap_open (); - value =pagemap_read_vaddr (fd, area_dst); + value =pagemap_get_entry (fd, area_dst);/* * After fork() uffd-wp bit should be gone as long as we're * without UFFD_FEATURE_EVENT_FORK
@@ -1446,24 +1433,24 @@ static void userfaultfd_wp_unpopulated_t/* Test applying pte marker to anon unpopulated */ wp_range (uffd, (uint64_t )area_dst, page_size, true); - value =pagemap_read_vaddr (pagemap_fd, area_dst); + value =pagemap_get_entry (pagemap_fd, area_dst);pagemap_check_wp (value, true);/* Test unprotect on anon pte marker */ wp_range (uffd, (uint64_t )area_dst, page_size, false); - value =pagemap_read_vaddr (pagemap_fd, area_dst); + value =pagemap_get_entry (pagemap_fd, area_dst);pagemap_check_wp (value, false);/* Test zap on anon marker */ wp_range (uffd, (uint64_t )area_dst, page_size, true);if (madvise (area_dst, page_size,MADV_DONTNEED ))err ("madvise(MADV_DONTNEED) failed" ); - value =pagemap_read_vaddr (pagemap_fd, area_dst); + value =pagemap_get_entry (pagemap_fd, area_dst);pagemap_check_wp (value, false);/* Test fault in after marker removed */ *area_dst =1 ; - value =pagemap_read_vaddr (pagemap_fd, area_dst); + value =pagemap_get_entry (pagemap_fd, area_dst);pagemap_check_wp (value, false);/* Drop it to make pte none again */ if (madvise (area_dst, page_size,MADV_DONTNEED ))
@@ -1522,7 +1509,7 @@ static void userfaultfd_pagemap_test(uns/* Touch the page */ *area_dst =1 ;wp_range (uffd, (uint64_t )area_dst, test_pgsize, true); - value =pagemap_read_vaddr (pagemap_fd, area_dst); + value =pagemap_get_entry (pagemap_fd, area_dst);pagemap_check_wp (value, true);/* Make sure uffd-wp bit dropped when fork */ if (pagemap_test_fork (true))
@@ -1536,7 +1523,7 @@ static void userfaultfd_pagemap_test(unserr ("madvise(MADV_PAGEOUT) failed" );/* Uffd-wp should persist even swapped out */ - value =pagemap_read_vaddr (pagemap_fd, area_dst); + value =pagemap_get_entry (pagemap_fd, area_dst);pagemap_check_wp (value, true);/* Make sure uffd-wp bit dropped when fork */ if (pagemap_test_fork (false))
@@ -1544,12 +1531,12 @@ static void userfaultfd_pagemap_test(uns/* Unprotect; this tests swap pte modifications */ wp_range (uffd, (uint64_t )area_dst, page_size, false); - value =pagemap_read_vaddr (pagemap_fd, area_dst); + value =pagemap_get_entry (pagemap_fd, area_dst);pagemap_check_wp (value, false);/* Fault in the page from disk */ *area_dst =2 ; - value =pagemap_read_vaddr (pagemap_fd, area_dst); + value =pagemap_get_entry (pagemap_fd, area_dst);pagemap_check_wp (value, false);close (pagemap_fd);
_
Patches currently in -mm which might be from [email protected] are
selftests-mm-test-uffdio_zeropage-only-when-hugetlb.patch selftests-mm-drop-test_uffdio_zeropage_eexist.patch selftests-mm-create-uffd-common.patch selftests-mm-split-uffd-tests-into-uffd-stress-and-uffd-unit-tests.patch selftests-mm-uffd_register.patch selftests-mm-uffd_open_devsys.patch selftests-mm-uffdio_api-test.patch selftests-mm-drop-global-mem_fd-in-uffd-tests.patch selftests-mm-drop-global-hpage_size-in-uffd-tests.patch selftests-mm-rename-uffd_stats-to-uffd_args.patch selftests-mm-let-uffd_handle_page_fault-take-wp-parameter.patch selftests-mm-allow-allocate_area-to-fail-properly.patch selftests-mm-add-framework-for-uffd-unit-test.patch selftests-mm-move-uffd-pagemap-test-to-unit-test.patch selftests-mm-move-uffd-minor-test-to-unit-test.patch selftests-mm-move-uffd-sig-events-tests-into-uffd-unit-tests.patch selftests-mm-move-zeropage-test-into-uffd-unit-tests.patch selftests-mm-workaround-no-way-to-detect-uffd-minor-wp.patch selftests-mm-allow-uffd-test-to-skip-properly-with-no-privilege.patch selftests-mm-drop-sys-dev-test-in-uffd-stress-test.patch selftests-mm-add-shmem-private-test-to-uffd-stress.patch selftests-mm-add-uffdio-register-ioctls-test.patch mm-hugetlb-fix-uffd-wp-during-fork.patch mm-hugetlb-fix-uffd-wp-bit-lost-when-unsharing-happens.patch selftests-mm-add-a-few-options-for-uffd-unit-test.patch selftests-mm-extend-and-rename-uffd-pagemap-test.patch selftests-mm-rename-cow_extra_libs-to-iouring_extra_libs.patch selftests-mm-add-tests-for-ro-pinning-vs-fork.patch