Commit 00894c3f authored by Yury Khrustalev's avatar Yury Khrustalev Committed by Catalin Marinas
Browse files

selftests/powerpc: Use PKEY_UNRESTRICTED macro 



Replace literal 0 with macro PKEY_UNRESTRICTED where pkey_*() functions
are used in mm selftests for memory protection keys for ppc target.

Signed-off-by: default avatarYury Khrustalev <yury.khrustalev@arm.com>
Suggested-by: default avatarKevin Brodsky <kevin.brodsky@arm.com>
Reviewed-by: default avatarKevin Brodsky <kevin.brodsky@arm.com>
Link: https://lore.kernel.org/r/20250113170619.484698-4-yury.khrustalev@arm.com


Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 3809cefe

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

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ int pkeys_unsupported(void) 
	SKIP_IF(!hash_mmu);



	/* Check if the system call is supported */

	pkey = sys_pkey_alloc(0, 0);

	pkey = sys_pkey_alloc(0, PKEY_UNRESTRICTED);

	SKIP_IF(pkey < 0);

	sys_pkey_free(pkey);

tools/testing/selftests/powerpc/mm/pkey_exec_prot.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static void segv_handler(int signum, siginfo_t *sinfo, void *ctx) 


		switch (fault_type) {

		case PKEY_DISABLE_ACCESS:

			pkey_set_rights(fault_pkey, 0);

			pkey_set_rights(fault_pkey, PKEY_UNRESTRICTED);

			break;

		case PKEY_DISABLE_EXECUTE:

			/*

tools/testing/selftests/powerpc/mm/pkey_siginfo.c

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static void segv_handler(int signum, siginfo_t *sinfo, void *ctx) 
	    mprotect(pgstart, pgsize, PROT_EXEC))

		_exit(1);

	else

		pkey_set_rights(pkey, 0);

		pkey_set_rights(pkey, PKEY_UNRESTRICTED);



	fault_count++;

}

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

+3 −3
Original line number Diff line number Diff line
@@ -95,16 +95,16 @@ static int child(struct shared_info *info) 
	/* Get some pkeys so that we can change their bits in the AMR. */

	pkey1 = sys_pkey_alloc(0, PKEY_DISABLE_EXECUTE);

	if (pkey1 < 0) {

		pkey1 = sys_pkey_alloc(0, 0);

		pkey1 = sys_pkey_alloc(0, PKEY_UNRESTRICTED);

		FAIL_IF(pkey1 < 0);



		disable_execute = false;

	}



	pkey2 = sys_pkey_alloc(0, 0);

	pkey2 = sys_pkey_alloc(0, PKEY_UNRESTRICTED);

	FAIL_IF(pkey2 < 0);



	pkey3 = sys_pkey_alloc(0, 0);

	pkey3 = sys_pkey_alloc(0, PKEY_UNRESTRICTED);

	FAIL_IF(pkey3 < 0);



	info->amr |= 3ul << pkeyshift(pkey1) | 2ul << pkeyshift(pkey2);

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

+3 −3
Original line number Diff line number Diff line
@@ -57,16 +57,16 @@ static int child(struct shared_info *info) 
	/* Get some pkeys so that we can change their bits in the AMR. */

	pkey1 = sys_pkey_alloc(0, PKEY_DISABLE_EXECUTE);

	if (pkey1 < 0) {

		pkey1 = sys_pkey_alloc(0, 0);

		pkey1 = sys_pkey_alloc(0, PKEY_UNRESTRICTED);

		CHILD_FAIL_IF(pkey1 < 0, &info->child_sync);



		disable_execute = false;

	}



	pkey2 = sys_pkey_alloc(0, 0);

	pkey2 = sys_pkey_alloc(0, PKEY_UNRESTRICTED);

	CHILD_FAIL_IF(pkey2 < 0, &info->child_sync);



	pkey3 = sys_pkey_alloc(0, 0);

	pkey3 = sys_pkey_alloc(0, PKEY_UNRESTRICTED);

	CHILD_FAIL_IF(pkey3 < 0, &info->child_sync);



	info->amr1 |= 3ul << pkeyshift(pkey1);