From: linuxram at us.ibm.com (Ram Pai)
Subject: [PATCH v12 09/22] selftests/vm: fix alloc_random_pkey() to make it really random
Date: Wed, 21 Feb 2018 17:55:28 -0800 [thread overview]
Message-ID: <1519264541-7621-10-git-send-email-linuxram@us.ibm.com> (raw)
In-Reply-To: <1519264541-7621-1-git-send-email-linuxram@us.ibm.com>
alloc_random_pkey() was allocating the same pkey every time.
Not all pkeys were geting tested. fixed it.
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 | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/tools/testing/selftests/vm/protection_keys.c b/tools/testing/selftests/vm/protection_keys.c
index aaf9f09..2e4b636 100644
--- a/tools/testing/selftests/vm/protection_keys.c
+++ b/tools/testing/selftests/vm/protection_keys.c
@@ -24,6 +24,7 @@
#define _GNU_SOURCE
#include <errno.h>
#include <linux/futex.h>
+#include <time.h>
#include <sys/time.h>
#include <sys/syscall.h>
#include <string.h>
@@ -602,13 +603,15 @@ int alloc_random_pkey(void)
int alloced_pkeys[NR_PKEYS];
int nr_alloced = 0;
int random_index;
+
memset(alloced_pkeys, 0, sizeof(alloced_pkeys));
+ srand((unsigned int)time(NULL));
/* allocate every possible key and make a note of which ones we got */
max_nr_pkey_allocs = NR_PKEYS;
- max_nr_pkey_allocs = 1;
for (i = 0; i < max_nr_pkey_allocs; i++) {
int new_pkey = alloc_pkey();
+
if (new_pkey < 0)
break;
alloced_pkeys[nr_alloced++] = new_pkey;
@@ -624,13 +627,14 @@ int alloc_random_pkey(void)
/* go through the allocated ones that we did not want and free them */
for (i = 0; i < nr_alloced; i++) {
int free_ret;
+
if (!alloced_pkeys[i])
continue;
free_ret = sys_pkey_free(alloced_pkeys[i]);
pkey_assert(!free_ret);
}
- dprintf1("%s()::%d, ret: %d pkey_reg: 0x%x shadow: 0x%x\n", __func__,
- __LINE__, ret, __rdpkey_reg(), shadow_pkey_reg);
+ dprintf1("%s()::%d, ret: %d pkey_reg: 0x%x shadow: 0x%016lx\n",
+ __func__, __LINE__, ret, __rdpkey_reg(), shadow_pkey_reg);
return ret;
}
--
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 09/22] selftests/vm: fix alloc_random_pkey() to make it really random
Date: Wed, 21 Feb 2018 17:55:28 -0800 [thread overview]
Message-ID: <1519264541-7621-10-git-send-email-linuxram@us.ibm.com> (raw)
Message-ID: <20180222015528.xwbyPBU5U78pkTi7W44CbJI3BLtIJdIxxtcNVHOWqgI@z> (raw)
In-Reply-To: <1519264541-7621-1-git-send-email-linuxram@us.ibm.com>
alloc_random_pkey() was allocating the same pkey every time.
Not all pkeys were geting tested. fixed it.
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 | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/tools/testing/selftests/vm/protection_keys.c b/tools/testing/selftests/vm/protection_keys.c
index aaf9f09..2e4b636 100644
--- a/tools/testing/selftests/vm/protection_keys.c
+++ b/tools/testing/selftests/vm/protection_keys.c
@@ -24,6 +24,7 @@
#define _GNU_SOURCE
#include <errno.h>
#include <linux/futex.h>
+#include <time.h>
#include <sys/time.h>
#include <sys/syscall.h>
#include <string.h>
@@ -602,13 +603,15 @@ int alloc_random_pkey(void)
int alloced_pkeys[NR_PKEYS];
int nr_alloced = 0;
int random_index;
+
memset(alloced_pkeys, 0, sizeof(alloced_pkeys));
+ srand((unsigned int)time(NULL));
/* allocate every possible key and make a note of which ones we got */
max_nr_pkey_allocs = NR_PKEYS;
- max_nr_pkey_allocs = 1;
for (i = 0; i < max_nr_pkey_allocs; i++) {
int new_pkey = alloc_pkey();
+
if (new_pkey < 0)
break;
alloced_pkeys[nr_alloced++] = new_pkey;
@@ -624,13 +627,14 @@ int alloc_random_pkey(void)
/* go through the allocated ones that we did not want and free them */
for (i = 0; i < nr_alloced; i++) {
int free_ret;
+
if (!alloced_pkeys[i])
continue;
free_ret = sys_pkey_free(alloced_pkeys[i]);
pkey_assert(!free_ret);
}
- dprintf1("%s()::%d, ret: %d pkey_reg: 0x%x shadow: 0x%x\n", __func__,
- __LINE__, ret, __rdpkey_reg(), shadow_pkey_reg);
+ dprintf1("%s()::%d, ret: %d pkey_reg: 0x%x shadow: 0x%016lx\n",
+ __func__, __LINE__, ret, __rdpkey_reg(), shadow_pkey_reg);
return ret;
}
--
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 ` [PATCH v12 07/22] selftests/vm: fixed bugs in pkey_disable_clear() linuxram
2018-02-22 1:55 ` 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 ` linuxram [this message]
2018-02-22 1:55 ` [PATCH v12 09/22] selftests/vm: fix alloc_random_pkey() to make it really random 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
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-10-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