Commit 3563b9be authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Michael Ellerman

selftests/powerpc: ptrace-pkey: Don't update expected UAMOR value

With commit 4a4a5e5d ("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: 4a4a5e5d ("powerpc/pkeys: key allocation/deallocation must not change pkey registers")
Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200709032946.881753-23-aneesh.kumar@linux.ibm.com
parent 0eaa3b5c
...@@ -101,15 +101,20 @@ static int child(struct shared_info *info) ...@@ -101,15 +101,20 @@ static int child(struct shared_info *info)
*/ */
info->invalid_amr = info->amr2 | (~0x0UL & ~info->expected_uamor); info->invalid_amr = info->amr2 | (~0x0UL & ~info->expected_uamor);
/*
* if PKEY_DISABLE_EXECUTE succeeded we should update the expected_iamr
*/
if (disable_execute) if (disable_execute)
info->expected_iamr |= 1ul << pkeyshift(pkey1); info->expected_iamr |= 1ul << pkeyshift(pkey1);
else else
info->expected_iamr &= ~(1ul << pkeyshift(pkey1)); 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. * Create an IAMR value different from expected value.
* Kernel will reject an IAMR and UAMOR change. * Kernel will reject an IAMR and UAMOR change.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment