Commit 65f50383 authored by Madhavan Srinivasan's avatar Madhavan Srinivasan
Browse files

selftest/powerpc/ptrace: Cleanup duplicate macro definitions 



Both core-pkey.c and ptrace-pkey.c tests have
similar macro definitions, move them to "pkeys.h"
and remove the macro definitions from the C file.

Reviewed-by: default avatarRitesh Harjani (IBM) <ritesh.list@gmail.com>
Signed-off-by: default avatarMadhavan Srinivasan <maddy@linux.ibm.com>
Link: https://patch.msgid.link/20241216160257.87252-3-maddy@linux.ibm.com
parent b0e1b95b

tools/testing/selftests/powerpc/include/pkeys.h

+8 −0
Original line number Diff line number Diff line
@@ -35,10 +35,18 @@ 
#define __NR_pkey_alloc		384

#define __NR_pkey_free		385



#ifndef NT_PPC_PKEY

#define NT_PPC_PKEY		0x110

#endif



#define PKEY_BITS_PER_PKEY	2

#define NR_PKEYS		32

#define PKEY_BITS_MASK		((1UL << PKEY_BITS_PER_PKEY) - 1)



#define AMR_BITS_PER_PKEY 2

#define PKEY_REG_BITS (sizeof(u64) * 8)

#define pkeyshift(pkey) (PKEY_REG_BITS - ((pkey + 1) * AMR_BITS_PER_PKEY))



inline unsigned long pkeyreg_get(void)

{

	return mfspr(SPRN_AMR);

tools/testing/selftests/powerpc/ptrace/core-pkey.c

+0 −12
Original line number Diff line number Diff line
@@ -18,18 +18,6 @@ 
#include "child.h"

#include "pkeys.h"



#ifndef NT_PPC_PKEY

#define NT_PPC_PKEY		0x110

#endif



#ifndef PKEY_DISABLE_EXECUTE

#define PKEY_DISABLE_EXECUTE	0x4

#endif



#define AMR_BITS_PER_PKEY 2

#define PKEY_REG_BITS (sizeof(u64) * 8)

#define pkeyshift(pkey) (PKEY_REG_BITS - ((pkey + 1) * AMR_BITS_PER_PKEY))



#define CORE_FILE_LIMIT	(5 * 1024 * 1024)	/* 5 MB should be enough */



static const char core_pattern_file[] = "/proc/sys/kernel/core_pattern";

tools/testing/selftests/powerpc/ptrace/ptrace-pkey.c

+0 −12
Original line number Diff line number Diff line
@@ -9,18 +9,6 @@ 
#include "child.h"

#include "pkeys.h"



#ifndef NT_PPC_PKEY

#define NT_PPC_PKEY		0x110

#endif



#ifndef PKEY_DISABLE_EXECUTE

#define PKEY_DISABLE_EXECUTE	0x4

#endif



#define AMR_BITS_PER_PKEY 2

#define PKEY_REG_BITS (sizeof(u64) * 8)

#define pkeyshift(pkey) (PKEY_REG_BITS - ((pkey + 1) * AMR_BITS_PER_PKEY))



static const char user_read[] = "[User Read (Running)]";

static const char user_write[] = "[User Write (Running)]";

static const char ptrace_read_running[] = "[Ptrace Read (Running)]";