[PATCH v12 07/22] selftests/vm: fixed bugs in pkey_disable_clear()

Linux Kernel Selftest development
 help / color / mirror / Atom feed

From: linuxram at us.ibm.com (Ram Pai)
Subject: [PATCH v12 07/22] selftests/vm: fixed bugs in pkey_disable_clear()
Date: Wed, 21 Feb 2018 17:55:26 -0800	[thread overview]
Message-ID: <1519264541-7621-8-git-send-email-linuxram@us.ibm.com> (raw)
In-Reply-To: <1519264541-7621-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.

cc: Dave Hansen <dave.hansen at intel.com>
cc: Florian Weimer <fweimer at redhat.com>
Signed-off-by: Ram Pai <linuxram at 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

--
To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

WARNING: multiple messages have this Message-ID (diff)

From: linuxram@us.ibm.com (Ram Pai)
Subject: [PATCH v12 07/22] selftests/vm: fixed bugs in pkey_disable_clear()
Date: Wed, 21 Feb 2018 17:55:26 -0800	[thread overview]
Message-ID: <1519264541-7621-8-git-send-email-linuxram@us.ibm.com> (raw)
Message-ID: <20180222015526.d1GKhfDmhIt536AfNDK5heV_4zO80_5m0hqsQY9EIX8@z> (raw)
In-Reply-To: <1519264541-7621-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.

cc: Dave Hansen <dave.hansen at intel.com>
cc: Florian Weimer <fweimer at redhat.com>
Signed-off-by: Ram Pai <linuxram at 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

--
To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

next prev parent reply	other threads:[~2018-02-22  1:55 UTC|newest]

Thread overview: 98+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-22  1:55 [PATCH v12 00/22] selftests, powerpc, x86 : Memory Protection Keys linuxram
2018-02-22  1:55 ` Ram Pai
2018-02-22  1:55 ` [PATCH v12 01/22] selftests/x86: Move protecton key selftest to arch neutral directory linuxram
2018-02-22  1:55   ` Ram Pai
2018-02-22  5:51   ` mingo
2018-02-22  5:51     ` Ingo Molnar
2018-02-22  1:55 ` [PATCH v12 02/22] selftests/vm: rename all references to pkru to a generic name linuxram
2018-02-22  1:55   ` Ram Pai
2018-03-16 21:55   ` dave.hansen
2018-03-16 21:55     ` Dave Hansen
2018-02-22  1:55 ` [PATCH v12 03/22] selftests/vm: move generic definitions to header file linuxram
2018-02-22  1:55   ` Ram Pai
2018-02-22  1:55 ` [PATCH v12 04/22] selftests/vm: typecast the pkey register linuxram
2018-02-22  1:55   ` Ram Pai
2018-03-16 21:58   ` dave.hansen
2018-03-16 21:58     ` Dave Hansen
2018-03-26 19:38     ` bauerman
2018-03-26 19:38       ` Thiago Jung Bauermann
2018-02-22  1:55 ` [PATCH v12 05/22] selftests/vm: generic function to handle shadow key register linuxram
2018-02-22  1:55   ` Ram Pai
2018-03-16 22:05   ` dave.hansen
2018-03-16 22:05     ` Dave Hansen
2018-02-22  1:55 ` [PATCH v12 06/22] selftests/vm: fix the wrong assert in pkey_disable_set() linuxram
2018-02-22  1:55   ` Ram Pai
2018-03-16 22:06   ` dave.hansen
2018-03-16 22:06     ` Dave Hansen
2018-02-22  1:55 ` linuxram [this message]
2018-02-22  1:55   ` [PATCH v12 07/22] selftests/vm: fixed bugs in pkey_disable_clear() Ram Pai
2018-03-16 22:08   ` dave.hansen
2018-03-16 22:08     ` Dave Hansen
2018-03-28 20:47     ` bauerman
2018-03-28 20:47       ` Thiago Jung Bauermann
2018-03-28 20:55       ` dave.hansen
2018-03-28 20:55         ` Dave Hansen
2018-03-28 23:51         ` bauerman
2018-03-28 23:51           ` Thiago Jung Bauermann
2018-02-22  1:55 ` [PATCH v12 08/22] selftests/vm: clear the bits in shadow reg when a pkey is freed linuxram
2018-02-22  1:55   ` Ram Pai
2018-03-16 22:10   ` dave.hansen
2018-03-16 22:10     ` Dave Hansen
2018-02-22  1:55 ` [PATCH v12 09/22] selftests/vm: fix alloc_random_pkey() to make it really random linuxram
2018-02-22  1:55   ` Ram Pai
2018-03-16 22:13   ` dave.hansen
2018-03-16 22:13     ` Dave Hansen
2018-02-22  1:55 ` [PATCH v12 10/22] selftests/vm: introduce two arch independent abstraction linuxram
2018-02-22  1:55   ` Ram Pai
2018-03-16 22:15   ` dave.hansen
2018-03-16 22:15     ` Dave Hansen
2018-02-22  1:55 ` [PATCH v12 11/22] selftests/vm: pkey register should match shadow pkey linuxram
2018-02-22  1:55   ` Ram Pai
2018-03-16 22:19   ` dave.hansen
2018-03-16 22:19     ` Dave Hansen
2018-02-22  1:55 ` [PATCH v12 12/22] selftests/vm: generic cleanup linuxram
2018-02-22  1:55   ` Ram Pai
2018-03-16 22:22   ` dave.hansen
2018-03-16 22:22     ` Dave Hansen
2018-02-22  1:55 ` [PATCH v12 13/22] selftests/vm: powerpc implementation for generic abstraction linuxram
2018-02-22  1:55   ` Ram Pai
2018-03-16 22:23   ` dave.hansen
2018-03-16 22:23     ` Dave Hansen
2018-02-22  1:55 ` [PATCH v12 14/22] selftests/vm: clear the bits in shadow reg when a pkey is freed linuxram
2018-02-22  1:55   ` Ram Pai
2018-03-16 22:24   ` dave.hansen
2018-03-16 22:24     ` Dave Hansen
2018-02-22  1:55 ` [PATCH v12 15/22] selftests/vm: powerpc implementation to check support for pkey linuxram
2018-02-22  1:55   ` Ram Pai
2018-03-16 22:26   ` dave.hansen
2018-03-16 22:26     ` Dave Hansen
2018-02-22  1:55 ` [PATCH v12 16/22] selftests/vm: fix an assertion in test_pkey_alloc_exhaust() linuxram
2018-02-22  1:55   ` Ram Pai
2018-03-16 22:28   ` dave.hansen
2018-03-16 22:28     ` Dave Hansen
2018-02-22  1:55 ` [PATCH v12 17/22] selftests/vm: associate key on a mapped page and detect access violation linuxram
2018-02-22  1:55   ` Ram Pai
2018-03-16 22:30   ` dave.hansen
2018-03-16 22:30     ` Dave Hansen
2018-02-22  1:55 ` [PATCH v12 18/22] selftests/vm: associate key on a mapped page and detect write violation linuxram
2018-02-22  1:55   ` Ram Pai
2018-03-16 22:30   ` dave.hansen
2018-03-16 22:30     ` Dave Hansen
2018-02-22  1:55 ` [PATCH v12 19/22] selftests/vm: detect write violation on a mapped access-denied-key page linuxram
2018-02-22  1:55   ` Ram Pai
2018-03-16 22:31   ` dave.hansen
2018-03-16 22:31     ` Dave Hansen
2018-02-22  1:55 ` [PATCH v12 20/22] selftests/vm: testcases must restore pkey-permissions linuxram
2018-02-22  1:55   ` Ram Pai
2018-03-16 22:32   ` dave.hansen
2018-03-16 22:32     ` Dave Hansen
2018-02-22  1:55 ` [PATCH v12 21/22] selftests/vm: sub-page allocator linuxram
2018-02-22  1:55   ` Ram Pai
2018-03-16 22:33   ` dave.hansen
2018-03-16 22:33     ` Dave Hansen
2018-02-22  1:55 ` [PATCH v12 22/22] selftests/vm: Fix deadlock in protection_keys.c linuxram
2018-02-22  1:55   ` Ram Pai
2018-02-25 23:19   ` bsingharora
2018-02-25 23:19     ` Balbir Singh
2018-03-16 22:34   ` dave.hansen
2018-03-16 22:34     ` Dave Hansen

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:0109388 dfblob:ca54a95 dfblob:0109388 dfblob:ca54a95 )
 OR (
bs:"[PATCH v12 07/22] selftests/vm: fixed bugs in pkey_disable_clear()" )
	(help)

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=1519264541-7621-8-git-send-email-linuxram@us.ibm.com \
    --to=linux-kselftest@vger.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