From: Ram Pai <linuxram@us.ibm.com>
To: shuahkh@osg.samsung.com, linux-kselftest@vger.kernel.org
Cc: mpe@ellerman.id.au, linuxppc-dev@lists.ozlabs.org,
linux-mm@kvack.org, x86@kernel.org, linux-arch@vger.kernel.org,
linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
mingo@redhat.com, akpm@linux-foundation.org,
dave.hansen@intel.com, benh@kernel.crashing.org,
paulus@samba.org, khandual@linux.vnet.ibm.com,
aneesh.kumar@linux.vnet.ibm.com, bsingharora@gmail.com,
hbabu@us.ibm.com, mhocko@kernel.org, bauerman@linux.vnet.ibm.com,
ebiederm@xmission.com, linuxram@us.ibm.com, arnd@arndb.de
Subject: [PATCH v10 07/24] selftests/vm: fixed bugs in pkey_disable_clear()
Date: Mon, 22 Jan 2018 10:52:00 -0800 [thread overview]
Message-ID: <1516647137-11174-8-git-send-email-linuxram@us.ibm.com> (raw)
In-Reply-To: <1516647137-11174-1-git-send-email-linuxram@us.ibm.com>
instead of clearing the bits, pkey_disable_clear() was setting
the bits. Fixed it.
Also fixed a wrong assertion in that function. When bits are
cleared, the resulting bit value will be less than the original.
Signed-off-by: Ram Pai <linuxram@us.ibm.com>
---
tools/testing/selftests/vm/protection_keys.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/vm/protection_keys.c b/tools/testing/selftests/vm/protection_keys.c
index 0109388..ca54a95 100644
--- a/tools/testing/selftests/vm/protection_keys.c
+++ b/tools/testing/selftests/vm/protection_keys.c
@@ -461,7 +461,7 @@ void pkey_disable_clear(int pkey, int flags)
pkey, pkey, pkey_rights);
pkey_assert(pkey_rights >= 0);
- pkey_rights |= flags;
+ pkey_rights &= ~flags;
ret = pkey_set(pkey, pkey_rights, 0);
/* pkey_reg and flags have the same format */
@@ -475,7 +475,7 @@ void pkey_disable_clear(int pkey, int flags)
dprintf1("%s(%d) pkey_reg: 0x%016lx\n", __func__,
pkey, rdpkey_reg());
if (flags)
- assert(rdpkey_reg() > orig_pkey_reg);
+ assert(rdpkey_reg() < orig_pkey_reg);
}
void pkey_write_allow(int pkey)
--
1.7.1
next prev parent reply other threads:[~2018-01-22 18:53 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-22 18:51 [PATCH v10 00/24] selftests, powerpc, x86 : Memory Protection Keys Ram Pai
2018-01-22 18:51 ` [PATCH v10 01/24] selftests/x86: Move protecton key selftest to arch neutral directory Ram Pai
2018-01-22 18:51 ` [PATCH v10 02/24] selftests/vm: rename all references to pkru to a generic name Ram Pai
2018-01-22 18:51 ` [PATCH v10 03/24] selftests/vm: move generic definitions to header file Ram Pai
2018-01-22 18:51 ` [PATCH v10 04/24] selftests/vm: typecast the pkey register Ram Pai
2018-01-22 18:51 ` [PATCH v10 05/24] selftests/vm: generic function to handle shadow key register Ram Pai
2018-01-22 18:51 ` [PATCH v10 06/24] selftests/vm: fix the wrong assert in pkey_disable_set() Ram Pai
2018-01-22 18:52 ` Ram Pai [this message]
2018-01-22 18:52 ` [PATCH v10 08/24] selftests/vm: clear the bits in shadow reg when a pkey is freed Ram Pai
2018-01-22 18:52 ` [PATCH v10 09/24] selftests/vm: fix alloc_random_pkey() to make it really random Ram Pai
2018-01-22 18:52 ` [PATCH v10 10/24] selftests/vm: introduce two arch independent abstraction Ram Pai
2018-01-22 18:52 ` [PATCH v10 11/24] selftests/vm: pkey register should match shadow pkey Ram Pai
2018-01-22 18:52 ` [PATCH v10 12/24] selftests/vm: generic cleanup Ram Pai
2018-01-22 18:52 ` [PATCH v10 13/24] selftests/vm: powerpc implementation for generic abstraction Ram Pai
2018-01-22 18:52 ` [PATCH v10 14/24] selftests/vm: clear the bits in shadow reg when a pkey is freed Ram Pai
2018-01-22 18:52 ` [PATCH v10 15/24] selftests/vm: powerpc implementation to check support for pkey Ram Pai
2018-01-22 18:52 ` [PATCH v10 16/24] selftests/vm: fix an assertion in test_pkey_alloc_exhaust() Ram Pai
2018-01-22 18:52 ` [PATCH v10 17/24] selftests/vm: associate key on a mapped page and detect access violation Ram Pai
2018-01-22 18:52 ` [PATCH v10 18/24] selftests/vm: associate key on a mapped page and detect write violation Ram Pai
2018-01-22 18:52 ` [PATCH v10 19/24] selftests/vm: detect write violation on a mapped access-denied-key page Ram Pai
2018-01-22 18:52 ` [PATCH v10 20/24] selftests/vm: testcases must restore pkey-permissions Ram Pai
2018-01-22 18:52 ` [PATCH v10 21/24] selftests/vm: sub-page allocator Ram Pai
2018-01-22 18:52 ` [PATCH v10 22/24] selftests/vm: Fix deadlock in protection_keys.c Ram Pai
2018-01-22 18:52 ` [PATCH v10 23/24] selftests/powerpc: Add ptrace tests for Protection Key register Ram Pai
2018-01-22 18:52 ` [PATCH v10 24/24] selftests/powerpc: Add core file test " Ram Pai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1516647137-11174-8-git-send-email-linuxram@us.ibm.com \
--to=linuxram@us.ibm.com \
--cc=akpm@linux-foundation.org \
--cc=aneesh.kumar@linux.vnet.ibm.com \
--cc=arnd@arndb.de \
--cc=bauerman@linux.vnet.ibm.com \
--cc=benh@kernel.crashing.org \
--cc=bsingharora@gmail.com \
--cc=dave.hansen@intel.com \
--cc=ebiederm@xmission.com \
--cc=hbabu@us.ibm.com \
--cc=khandual@linux.vnet.ibm.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mhocko@kernel.org \
--cc=mingo@redhat.com \
--cc=mpe@ellerman.id.au \
--cc=paulus@samba.org \
--cc=shuahkh@osg.samsung.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).