Skip to content

Commit 62d648c

Browse files
ljskernelbrauner
authored andcommitted
selftests/mm: use PIDFD_SELF in guard pages test
Now we have PIDFD_SELF available for process_madvise(), make use of it in the guard pages test. This is both more convenient and asserts that PIDFD_SELF works as expected. Signed-off-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com> Link: https://lore.kernel.org/r/69fbbe088d3424de9983e145228459cb05a8f13d.1738268370.git.lorenzo.stoakes@oracle.com Reviewed-by: Shakeel Butt <shakeel.butt@linux.dev> Signed-off-by: Christian Brauner <brauner@kernel.org>
1 parent 2bbf47f commit 62d648c

1 file changed

Lines changed: 4 additions & 12 deletions

File tree

tools/testing/selftests/mm/guard-pages.c

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
#include <sys/uio.h>
2020
#include <unistd.h>
2121

22+
#include "../pidfd/pidfd.h"
23+
2224
/*
2325
* Ignore the checkpatch warning, as per the C99 standard, section 7.14.1.1:
2426
*
@@ -50,11 +52,6 @@ static void handle_fatal(int c)
5052
siglongjmp(signal_jmp_buf, c);
5153
}
5254

53-
static int pidfd_open(pid_t pid, unsigned int flags)
54-
{
55-
return syscall(SYS_pidfd_open, pid, flags);
56-
}
57-
5855
static ssize_t sys_process_madvise(int pidfd, const struct iovec *iovec,
5956
size_t n, int advice, unsigned int flags)
6057
{
@@ -370,14 +367,10 @@ TEST_F(guard_pages, multi_vma)
370367
TEST_F(guard_pages, process_madvise)
371368
{
372369
const unsigned long page_size = self->page_size;
373-
pid_t pid = getpid();
374-
int pidfd = pidfd_open(pid, 0);
375370
char *ptr_region, *ptr1, *ptr2, *ptr3;
376371
ssize_t count;
377372
struct iovec vec[6];
378373

379-
ASSERT_NE(pidfd, -1);
380-
381374
/* Reserve region to map over. */
382375
ptr_region = mmap(NULL, 100 * page_size, PROT_NONE,
383376
MAP_ANON | MAP_PRIVATE, -1, 0);
@@ -425,7 +418,7 @@ TEST_F(guard_pages, process_madvise)
425418
ASSERT_EQ(munmap(&ptr_region[99 * page_size], page_size), 0);
426419

427420
/* Now guard in one step. */
428-
count = sys_process_madvise(pidfd, vec, 6, MADV_GUARD_INSTALL, 0);
421+
count = sys_process_madvise(PIDFD_SELF, vec, 6, MADV_GUARD_INSTALL, 0);
429422

430423
/* OK we don't have permission to do this, skip. */
431424
if (count == -1 && errno == EPERM)
@@ -446,7 +439,7 @@ TEST_F(guard_pages, process_madvise)
446439
ASSERT_FALSE(try_read_write_buf(&ptr3[19 * page_size]));
447440

448441
/* Now do the same with unguard... */
449-
count = sys_process_madvise(pidfd, vec, 6, MADV_GUARD_REMOVE, 0);
442+
count = sys_process_madvise(PIDFD_SELF, vec, 6, MADV_GUARD_REMOVE, 0);
450443

451444
/* ...and everything should now succeed. */
452445

@@ -463,7 +456,6 @@ TEST_F(guard_pages, process_madvise)
463456
ASSERT_EQ(munmap(ptr1, 10 * page_size), 0);
464457
ASSERT_EQ(munmap(ptr2, 5 * page_size), 0);
465458
ASSERT_EQ(munmap(ptr3, 20 * page_size), 0);
466-
close(pidfd);
467459
}
468460

469461
/* Assert that unmapping ranges does not leave guard markers behind. */

0 commit comments

Comments
 (0)