tools-testing-add-procmap_query-helper-functions-in-mm-self-tests.patch removed from -mm tree
The quilt patch titled
Subject: tools/testing: add PROCMAP_QUERY helper functions in mm self tests
has been removed from the -mm tree. Its filename was
tools-testing-add-procmap_query-helper-functions-in-mm-self-tests.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: Lorenzo Stoakes <[email protected]>
Subject: tools/testing: add PROCMAP_QUERY helper functions in mm self tests
Date: Tue, 8 Apr 2025 10:29:32 +0100
The PROCMAP_QUERY ioctl() is very useful - it allows for binary access to /proc/$pid/[s]maps data and thus convenient lookup of data contained there.
This patch exposes this for convenient use by mm self tests so the state of VMAs can easily be queried.
---
tools/testing/selftests/mm/vm_util.c | 62 +++++++++++++++++++++++++ tools/testing/selftests/mm/vm_util.h | 21 ++++++++ 2 files changed, 83 insertions(+)
tools/testing/selftests/mm/vm_util.c renamed from tools/testing/selftests/mm/vm_util.c~tools-testing-add-procmap_query-helper-functions-in-mm-self-tests +62 -0
@@ -1,5 +1,6 @@// SPDX-License-Identifier: GPL-2.0 #include <string.h> +#include <errno.h> #include <fcntl.h> #include <dirent.h> #include <inttypes.h>
@@ -424,3 +425,64 @@ bool check_vmflag_io(void *addr) flags += flaglen; } } + +/* +* Open an fd at /proc/$pid/maps and configure procmap_out ready for +* PROCMAP_QUERY query. Returns 0 on success, or an error code otherwise. +*/ +int open_procmap (pid_t pid,struct procmap_fd *procmap_out) +{ +char path[256 ]; +int ret =0 ; + +memset (procmap_out,'\0' ,sizeof (*procmap_out)); +sprintf (path,"/proc/%d/maps" , pid); + procmap_out->query.size =sizeof (procmap_out->query); + procmap_out->fd =open (path,O_RDONLY ); +if (procmap_out <0 ) + ret = -errno; + +return ret; +} + +/* Perform PROCMAP_QUERY. Returns 0 on success, or an error code otherwise. */ +int query_procmap (struct procmap_fd *procmap) +{ +int ret =0 ; + +if (ioctl (procmap->fd,PROCMAP_QUERY , &procmap->query) ==-1 ) + ret = -errno; + +return ret; +} + +/* +* Try to find the VMA at specified address, returns true if found, false if not +* found, and the test is failed if any other error occurs. +* +* On success, procmap->query is populated with the results. +*/ +bool find_vma_procmap (struct procmap_fd *procmap,void *address) +{ +int err; + + procmap->query.query_flags =0 ; + procmap->query.query_addr = (unsigned long )address; + err =query_procmap (procmap); +if (!err) +return true; + +if (err != -ENOENT ) +ksft_exit_fail_msg ("%s: Error %d on ioctl(PROCMAP_QUERY)\n" , + __func__, err); +return false; +} + +/* +* Close fd used by PROCMAP_QUERY mechanism. Returns 0 on success, or an error +* code otherwise. +*/ +int close_procmap (struct procmap_fd *procmap) +{ +return close (procmap->fd); +}
tools/testing/selftests/mm/vm_util.h renamed from tools/testing/selftests/mm/vm_util.h~tools-testing-add-procmap_query-helper-functions-in-mm-self-tests +21 -0
@@ -6,6 +6,7 @@#include <strings.h> /* ffsl() */ #include <unistd.h> /* _SC_PAGESIZE */ #include "../kselftest.h" +#include <linux/fs.h> #define BIT_ULL (nr) (1ULL << (nr))#define PM_SOFT_DIRTY BIT_ULL(55)
@@ -19,6 +20,15 @@extern unsigned int __page_size;extern unsigned int __page_shift; +/* +* Represents an open fd and PROCMAP_QUERY state for binary (via ioctl) +* /proc/$pid/[s]maps lookup. +*/ +struct procmap_fd { +int fd; +struct procmap_query query; +}; +static inline unsigned int psize (void ) {if (!__page_size)
@@ -73,6 +83,17 @@ int uffd_register_with_ioctls(int uffd, bool miss, bool wp, bool minor, uint64_t *ioctls);unsigned long get_free_hugepages (void );bool check_vmflag_io (void *addr); +int open_procmap (pid_t pid,struct procmap_fd *procmap_out); +int query_procmap (struct procmap_fd *procmap); +bool find_vma_procmap (struct procmap_fd *procmap,void *address); +int close_procmap (struct procmap_fd *procmap); + +static inline int open_self_procmap (struct procmap_fd *procmap_out) +{ +pid_t pid =getpid (); + +return open_procmap (pid, procmap_out); +}/* * On ppc64 this will only work with radix 2M hugepage size
_
Patches currently in -mm which might be from [email protected] are
mm-establish-mm-vma_execc-for-shared-exec-mm-vma-functionality.patch mm-abstract-initial-stack-setup-to-mm-subsystem.patch mm-move-dup_mmap-to-mm.patch mm-perform-vma-allocation-freeing-duplication-in-mm.patch mm-introduce-new-mmap_prepare-file-callback.patch mm-secretmem-convert-to-mmap_prepare-hook.patch mm-vma-remove-mmap-retry-merge.patch