Commit 5f9b7511 authored by John Hubbard's avatar John Hubbard Committed by Andrew Morton
Browse files

selftests/mm: mseal, self_elf: factor out test macros and other duplicated items 

Clean up and move some copy-pasted items into a new mseal_helpers.h.

1. The test macros can be made safer and simpler, by observing that
   they are invariably called when about to return.  This means that the
   macros do not need an intrusive label to goto; they can simply return.

2. PKEY* items.  We cannot, unfortunately use pkey-helpers.h.  The
   best we can do is to factor out these few items into mseal_helpers.h.

3. These tests still need their own definition of u64, so also move
   that to the header file.

4.  Be sure to include the new mseal_helpers.h in the Makefile
   dependencies.

[jhubbard@nvidia.com: include the new mseal_helpers.h in Makefile dependencies]
  Link: https://lkml.kernel.org/r/01685978-f6b1-4c24-8397-22cd3c24b91a@nvidia.com
Link: https://lkml.kernel.org/r/20240618022422.804305-3-jhubbard@nvidia.com


Signed-off-by: default avatarJohn Hubbard <jhubbard@nvidia.com>
Acked-by: default avatarDavid Hildenbrand <david@redhat.com>
Cc: Jeff Xu <jeffxu@chromium.org>
Cc: Andrei Vagin <avagin@google.com>
Cc: Axel Rasmussen <axelrasmussen@google.com>
Cc: Christian Brauner <brauner@kernel.org>
Cc: Kees Cook <kees@kernel.org>
Cc: Kent Overstreet <kent.overstreet@linux.dev>
Cc: Liam R. Howlett <Liam.Howlett@oracle.com>
Cc: Muhammad Usama Anjum <usama.anjum@collabora.com>
Cc: Peter Xu <peterx@redhat.com>
Cc: Rich Felker <dalias@libc.org>
Cc: Shuah Khan <shuah@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 504d8a5e

tools/testing/selftests/mm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
# Makefile for mm selftests



LOCAL_HDRS += $(selfdir)/mm/local_config.h $(top_srcdir)/mm/gup_test.h

LOCAL_HDRS += $(selfdir)/mm/mseal_helpers.h



include local_config.mk

tools/testing/selftests/mm/mseal_helpers.h

0 → 100644
+41 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */



#define FAIL_TEST_IF_FALSE(test_passed)					\

	do {								\

		if (!(test_passed)) {					\

			ksft_test_result_fail("%s: line:%d\n",		\

						__func__, __LINE__);	\

			return;						\

		}							\

	} while (0)



#define SKIP_TEST_IF_FALSE(test_passed)					\

	do {								\

		if (!(test_passed)) {					\

			ksft_test_result_skip("%s: line:%d\n",		\

						__func__, __LINE__);	\

			return;						\

		}							\

	} while (0)



#define TEST_END_CHECK() ksft_test_result_pass("%s\n", __func__)



#ifndef PKEY_DISABLE_ACCESS

#define PKEY_DISABLE_ACCESS	0x1

#endif



#ifndef PKEY_DISABLE_WRITE

#define PKEY_DISABLE_WRITE	0x2

#endif



#ifndef PKEY_BITS_PER_PKEY

#define PKEY_BITS_PER_PKEY	2

#endif



#ifndef PKEY_MASK

#define PKEY_MASK	(PKEY_DISABLE_ACCESS | PKEY_DISABLE_WRITE)

#endif



#ifndef u64

#define u64 unsigned long long

#endif

tools/testing/selftests/mm/mseal_test.c

+1 −48
Original line number Diff line number Diff line
@@ -17,54 +17,7 @@ 
#include <sys/ioctl.h>

#include <sys/vfs.h>

#include <sys/stat.h>



/*

 * need those definition for manually build using gcc.

 * gcc -I ../../../../usr/include   -DDEBUG -O3  -DDEBUG -O3 mseal_test.c -o mseal_test

 */

#ifndef PKEY_DISABLE_ACCESS

# define PKEY_DISABLE_ACCESS    0x1

#endif



#ifndef PKEY_DISABLE_WRITE

# define PKEY_DISABLE_WRITE     0x2

#endif



#ifndef PKEY_BITS_PER_PKEY

#define PKEY_BITS_PER_PKEY      2

#endif



#ifndef PKEY_MASK

#define PKEY_MASK       (PKEY_DISABLE_ACCESS | PKEY_DISABLE_WRITE)

#endif



#define FAIL_TEST_IF_FALSE(c) do {\

		if (!(c)) {\

			ksft_test_result_fail("%s, line:%d\n", __func__, __LINE__);\

			goto test_end;\

		} \

	} \

	while (0)



#define SKIP_TEST_IF_FALSE(c) do {\

		if (!(c)) {\

			ksft_test_result_skip("%s, line:%d\n", __func__, __LINE__);\

			goto test_end;\

		} \

	} \

	while (0)





#define TEST_END_CHECK() {\

		ksft_test_result_pass("%s\n", __func__);\

		return;\

test_end:\

		return;\

}



#ifndef u64

#define u64 unsigned long long

#endif

#include "mseal_helpers.h"



static unsigned long get_vma_size(void *addr, int *prot)

{

tools/testing/selftests/mm/seal_elf.c

+1 −32
Original line number Diff line number Diff line
@@ -16,38 +16,7 @@ 
#include <sys/ioctl.h>

#include <sys/vfs.h>

#include <sys/stat.h>



/*

 * need those definition for manually build using gcc.

 * gcc -I ../../../../usr/include   -DDEBUG -O3  -DDEBUG -O3 seal_elf.c -o seal_elf

 */

#define FAIL_TEST_IF_FALSE(c) do {\

		if (!(c)) {\

			ksft_test_result_fail("%s, line:%d\n", __func__, __LINE__);\

			goto test_end;\

		} \

	} \

	while (0)



#define SKIP_TEST_IF_FALSE(c) do {\

		if (!(c)) {\

			ksft_test_result_skip("%s, line:%d\n", __func__, __LINE__);\

			goto test_end;\

		} \

	} \

	while (0)





#define TEST_END_CHECK() {\

		ksft_test_result_pass("%s\n", __func__);\

		return;\

test_end:\

		return;\

}



#ifndef u64

#define u64 unsigned long long

#endif

#include "mseal_helpers.h"



/*

 * define sys_xyx to call syscall directly.