linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: Sandipan Das <sandipan@linux.ibm.com>
To: akpm@linux-foundation.org
Cc: linux-kselftest@vger.kernel.org, linux-arch@vger.kernel.org,
	linuxppc-dev@lists.ozlabs.org, x86@kernel.org,
	linux-mm@kvack.org, fweimer@redhat.com, linuxram@us.ibm.com,
	mhocko@kernel.org, mingo@redhat.com, aneesh.kumar@linux.ibm.com,
	bauerman@linux.ibm.com, msuchanek@suse.de, mpe@ellerman.id.au,
	shuah@kernel.org, Dave Hansen <dave.hansen@intel.com>
Subject: [PATCH v19 09/24] selftests/vm/pkeys: Fix assertion in pkey_disable_set/clear()
Date: Tue, 31 Mar 2020 15:28:10 +0530	[thread overview]
Message-ID: <8240665131e43fc93eed4eea8194676c1ea39a7f.1585646528.git.sandipan@linux.ibm.com> (raw)
In-Reply-To: <cover.1585646528.git.sandipan@linux.ibm.com>
In-Reply-To: <cover.1585646528.git.sandipan@linux.ibm.com>

From: Ram Pai <linuxram@us.ibm.com>

In some cases, a pkey's bits need not necessarily change
in a way that the value of the pkey register increases
when performing a pkey_disable_set() or decreases when
performing a pkey_disable_clear().

For example, on powerpc, if a pkey's current state is
PKEY_DISABLE_ACCESS and we perform a pkey_write_disable()
on it, the bits still remain the same. We will observe
something similar when the pkey's current state is 0 and
a pkey_access_enable() is performed on it.

Either case would cause some assertions to fail. This
fixes the problem.

cc: Dave Hansen <dave.hansen@intel.com>
cc: Florian Weimer <fweimer@redhat.com>
Signed-off-by: Ram Pai <linuxram@us.ibm.com>
Signed-off-by: Sandipan Das <sandipan@linux.ibm.com>
Acked-by: Dave Hansen <dave.hansen@intel.com>
---
 tools/testing/selftests/vm/protection_keys.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/testing/selftests/vm/protection_keys.c b/tools/testing/selftests/vm/protection_keys.c
index 4b1ddb526228d..7fd52d5c4bfdd 100644
--- a/tools/testing/selftests/vm/protection_keys.c
+++ b/tools/testing/selftests/vm/protection_keys.c
@@ -400,7 +400,7 @@ void pkey_disable_set(int pkey, int flags)
 	dprintf1("%s(%d) pkey_reg: 0x%016llx\n",
 		__func__, pkey, read_pkey_reg());
 	if (flags)
-		pkey_assert(read_pkey_reg() > orig_pkey_reg);
+		pkey_assert(read_pkey_reg() >= orig_pkey_reg);
 	dprintf1("END<---%s(%d, 0x%x)\n", __func__,
 		pkey, flags);
 }
@@ -431,7 +431,7 @@ void pkey_disable_clear(int pkey, int flags)
 	dprintf1("%s(%d) pkey_reg: 0x%016llx\n", __func__,
 			pkey, read_pkey_reg());
 	if (flags)
-		assert(read_pkey_reg() < orig_pkey_reg);
+		assert(read_pkey_reg() <= orig_pkey_reg);
 }
 
 void pkey_write_allow(int pkey)
-- 
2.17.1



  parent reply	other threads:[~2020-03-31  9:59 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-31  9:58 [PATCH v19 00/24] selftests, powerpc, x86: Memory Protection Keys Sandipan Das
2020-03-31  9:58 ` [PATCH v19 01/24] selftests/x86/pkeys: Move selftests to arch-neutral directory Sandipan Das
2020-03-31  9:58 ` [PATCH v19 02/24] selftests/vm/pkeys: Rename all references to pkru to a generic name Sandipan Das
2020-03-31  9:58 ` [PATCH v19 03/24] selftests/vm/pkeys: Move generic definitions to header file Sandipan Das
2020-03-31  9:58 ` [PATCH v19 04/24] selftests/vm/pkeys: Move some definitions to arch-specific header Sandipan Das
2020-03-31  9:58 ` [PATCH v19 05/24] selftests/vm/pkeys: Make gcc check arguments of sigsafe_printf() Sandipan Das
2020-03-31  9:58 ` [PATCH v19 06/24] selftests: vm: pkeys: Use sane types for pkey register Sandipan Das
2020-03-31  9:58 ` [PATCH v19 07/24] selftests: vm: pkeys: Add helpers for pkey bits Sandipan Das
2020-03-31  9:58 ` [PATCH v19 08/24] selftests/vm/pkeys: Fix pkey_disable_clear() Sandipan Das
2020-03-31  9:58 ` Sandipan Das [this message]
2020-03-31  9:58 ` [PATCH v19 10/24] selftests/vm/pkeys: Fix alloc_random_pkey() to make it really random Sandipan Das
2020-03-31  9:58 ` [PATCH v19 11/24] selftests: vm: pkeys: Use the correct huge page size Sandipan Das
2020-03-31  9:58 ` [PATCH v19 12/24] selftests/vm/pkeys: Introduce generic pkey abstractions Sandipan Das
2020-03-31  9:58 ` [PATCH v19 13/24] selftests/vm/pkeys: Introduce powerpc support Sandipan Das
2020-03-31  9:58 ` [PATCH v19 14/24] selftests/vm/pkeys: Fix number of reserved powerpc pkeys Sandipan Das
2020-03-31  9:58 ` [PATCH v19 15/24] selftests/vm/pkeys: Fix assertion in test_pkey_alloc_exhaust() Sandipan Das
2020-03-31  9:58 ` [PATCH v19 16/24] selftests/vm/pkeys: Improve checks to determine pkey support Sandipan Das
2020-03-31  9:58 ` [PATCH v19 17/24] selftests/vm/pkeys: Associate key on a mapped page and detect access violation Sandipan Das
2020-03-31  9:58 ` [PATCH v19 18/24] selftests/vm/pkeys: Associate key on a mapped page and detect write violation Sandipan Das
2020-03-31  9:58 ` [PATCH v19 19/24] selftests/vm/pkeys: Detect write violation on a mapped access-denied-key page Sandipan Das
2020-03-31  9:58 ` [PATCH v19 20/24] selftests/vm/pkeys: Introduce a sub-page allocator Sandipan Das
2020-03-31  9:58 ` [PATCH v19 21/24] selftests/vm/pkeys: Test correct behaviour of pkey-0 Sandipan Das
2020-03-31  9:58 ` [PATCH v19 22/24] selftests/vm/pkeys: Override access right definitions on powerpc Sandipan Das
2020-03-31  9:58 ` [PATCH v19 23/24] selftests: vm: pkeys: Use the correct page size " Sandipan Das
2020-03-31  9:58 ` [PATCH v19 24/24] selftests: vm: pkeys: Fix multilib builds for x86 Sandipan Das

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=8240665131e43fc93eed4eea8194676c1ea39a7f.1585646528.git.sandipan@linux.ibm.com \
    --to=sandipan@linux.ibm.com \
    --cc=akpm@linux-foundation.org \
    --cc=aneesh.kumar@linux.ibm.com \
    --cc=bauerman@linux.ibm.com \
    --cc=dave.hansen@intel.com \
    --cc=fweimer@redhat.com \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=linuxram@us.ibm.com \
    --cc=mhocko@kernel.org \
    --cc=mingo@redhat.com \
    --cc=mpe@ellerman.id.au \
    --cc=msuchanek@suse.de \
    --cc=shuah@kernel.org \
    --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).