selftests-mm-use-pm_-macros-in-vm_utilsh.patch removed from -mm tree
The quilt patch titled
Subject: selftests/mm: use PM_* macros in vm_utils.h
has been removed from the -mm tree. Its filename was
selftests-mm-use-pm_-macros-in-vm_utilsh.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: use PM_* macros in vm_utils.h
Date: Wed, 12 Apr 2023 12:42:27 -0400
We've got the macros in uffd-stress.c, move it over and use it in vm_util.h.
---
tools/testing/selftests/mm/userfaultfd.c | 8 -------- tools/testing/selftests/mm/vm_util.c | 16 ++++------------ tools/testing/selftests/mm/vm_util.h | 8 ++++++++ 3 files changed, 12 insertions(+), 20 deletions(-)
tools/testing/selftests/mm/userfaultfd.c renamed from tools/testing/selftests/mm/userfaultfd.c~selftests-mm-use-pm_-macros-in-vm_utilsh +0 -8
@@ -1389,14 +1389,6 @@ static int userfaultfd_minor_test(void)return stats.missing_faults !=0 || stats.minor_faults != nr_pages; } -#define BIT_ULL (nr) (1ULL << (nr)) -#define PM_SOFT_DIRTY BIT_ULL(55) -#define PM_MMAP_EXCLUSIVE BIT_ULL(56) -#define PM_UFFD_WP BIT_ULL(57) -#define PM_FILE BIT_ULL(61) -#define PM_SWAP BIT_ULL(62) -#define PM_PRESENT BIT_ULL(63) -static int pagemap_open (void ) {int fd =open ("/proc/self/pagemap" ,O_RDONLY );
tools/testing/selftests/mm/vm_util.c renamed from tools/testing/selftests/mm/vm_util.c~selftests-mm-use-pm_-macros-in-vm_utilsh +4 -12
@@ -25,25 +25,17 @@ uint64_t pagemap_get_entry(int fd, charbool pagemap_is_softdirty (int fd,char *start) { -uint64_t entry =pagemap_get_entry (fd, start); - -// Check if dirty bit (55th bit) is set -return entry &0x0080000000000000ull ; +return pagemap_get_entry (fd, start) &PM_SOFT_DIRTY ; }bool pagemap_is_swapped (int fd,char *start) { -uint64_t entry =pagemap_get_entry (fd, start); - -return entry &0x4000000000000000ull ; +return pagemap_get_entry (fd, start) &PM_SWAP ; }bool pagemap_is_populated (int fd,char *start) { -uint64_t entry =pagemap_get_entry (fd, start); - -/* Present or swapped. */ -return entry &0xc000000000000000ull ; +return pagemap_get_entry (fd, start) & (PM_PRESENT |PM_SWAP ); }unsigned long pagemap_get_pfn (int fd,char *start)
@@ -51,7 +43,7 @@ unsigned long pagemap_get_pfn(int fd, chuint64_t entry =pagemap_get_entry (fd, start);/* If present (63th bit), PFN is at bit 0 -- 54. */ -if (entry &0x8000000000000000ull ) +if (entry &PM_PRESENT )return entry &0x007fffffffffffffull ;return -1ul ; }
tools/testing/selftests/mm/vm_util.h renamed from tools/testing/selftests/mm/vm_util.h~selftests-mm-use-pm_-macros-in-vm_utilsh +8 -0
@@ -6,6 +6,14 @@#include <string.h> /* ffsl() */ #include <unistd.h> /* _SC_PAGESIZE */ +#define BIT_ULL (nr) (1ULL << (nr)) +#define PM_SOFT_DIRTY BIT_ULL(55) +#define PM_MMAP_EXCLUSIVE BIT_ULL(56) +#define PM_UFFD_WP BIT_ULL(57) +#define PM_FILE BIT_ULL(61) +#define PM_SWAP BIT_ULL(62) +#define PM_PRESENT BIT_ULL(63) +extern unsigned int __page_size;extern unsigned int __page_shift;
_
Patches currently in -mm which might be from [email protected] are
selftests-mm-reuse-pagemap_get_entry-in-vm_utilh.patch 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