| From 3563b9bea0ca7f53e4218b5e268550341a49f333 Mon Sep 17 00:00:00 2001 |
| From: "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com> |
| Date: Thu, 9 Jul 2020 08:59:45 +0530 |
| Subject: [PATCH] selftests/powerpc: ptrace-pkey: Don't update expected UAMOR |
| value |
| |
| commit 3563b9bea0ca7f53e4218b5e268550341a49f333 upstream. |
| |
| With commit 4a4a5e5d2aad ("powerpc/pkeys: key allocation/deallocation |
| must not change pkey registers") we are not updating UAMOR on key |
| allocation. So don't update the expected uamor value in the test. |
| |
| Fixes: 4a4a5e5d2aad ("powerpc/pkeys: key allocation/deallocation must not change pkey registers") |
| Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com> |
| Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> |
| Link: https://lore.kernel.org/r/20200709032946.881753-23-aneesh.kumar@linux.ibm.com |
| |
| diff --git a/tools/testing/selftests/powerpc/ptrace/ptrace-pkey.c b/tools/testing/selftests/powerpc/ptrace/ptrace-pkey.c |
| index 80dc5085a412..bc454f899124 100644 |
| --- a/tools/testing/selftests/powerpc/ptrace/ptrace-pkey.c |
| +++ b/tools/testing/selftests/powerpc/ptrace/ptrace-pkey.c |
| @@ -101,15 +101,20 @@ static int child(struct shared_info *info) |
| */ |
| info->invalid_amr = info->amr2 | (~0x0UL & ~info->expected_uamor); |
| |
| + /* |
| + * if PKEY_DISABLE_EXECUTE succeeded we should update the expected_iamr |
| + */ |
| if (disable_execute) |
| info->expected_iamr |= 1ul << pkeyshift(pkey1); |
| else |
| info->expected_iamr &= ~(1ul << pkeyshift(pkey1)); |
| |
| - info->expected_iamr &= ~(1ul << pkeyshift(pkey2) | 1ul << pkeyshift(pkey3)); |
| + /* |
| + * We allocated pkey2 and pkey 3 above. Clear the IAMR bits. |
| + */ |
| + info->expected_iamr &= ~(1ul << pkeyshift(pkey2)); |
| + info->expected_iamr &= ~(1ul << pkeyshift(pkey3)); |
| |
| - info->expected_uamor |= 3ul << pkeyshift(pkey1) | |
| - 3ul << pkeyshift(pkey2); |
| /* |
| * Create an IAMR value different from expected value. |
| * Kernel will reject an IAMR and UAMOR change. |
| -- |
| 2.27.0 |
| |