From: Sandipan Das <sandipan@linux.ibm.com>
To: shuah@kernel.org, skhan@linuxfoundation.org,
linux-kselftest@vger.kernel.org
Cc: linux-arch@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
x86@kernel.org, linux-mm@kvack.org, fweimer@redhat.com,
dave.hansen@intel.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
Subject: [PATCH v18 11/24] selftests: vm: pkeys: Use the correct huge page size
Date: Thu, 30 Jan 2020 12:06:53 +0530 [thread overview]
Message-ID: <5f0b309b8fa4879151478a96f8aefa2756d5bc5b.1580365432.git.sandipan@linux.ibm.com> (raw)
In-Reply-To: <cover.1580365432.git.sandipan@linux.ibm.com>
In-Reply-To: <cover.1580365432.git.sandipan@linux.ibm.com>
The huge page size can vary across architectures. This will
ensure that the correct huge page size is used when accessing
the hugetlb controls under sysfs. Instead of using a hardcoded
page size (i.e. 2MB), this now uses the HPAGE_SIZE macro which
is arch-specific.
Signed-off-by: Sandipan Das <sandipan@linux.ibm.com>
---
tools/testing/selftests/vm/protection_keys.c | 23 ++++++++++++++------
1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/tools/testing/selftests/vm/protection_keys.c b/tools/testing/selftests/vm/protection_keys.c
index 9cc82b65f828..535e464e27e9 100644
--- a/tools/testing/selftests/vm/protection_keys.c
+++ b/tools/testing/selftests/vm/protection_keys.c
@@ -739,12 +739,15 @@ void *malloc_pkey_anon_huge(long size, int prot, u16 pkey)
}
int hugetlb_setup_ok;
+#define SYSFS_FMT_NR_HUGE_PAGES "/sys/kernel/mm/hugepages/hugepages-%ldkB/nr_hugepages"
#define GET_NR_HUGE_PAGES 10
void setup_hugetlbfs(void)
{
int err;
int fd;
- char buf[] = "123";
+ char buf[256];
+ long hpagesz_kb;
+ long hpagesz_mb;
if (geteuid() != 0) {
fprintf(stderr, "WARNING: not run as root, can not do hugetlb test\n");
@@ -755,11 +758,16 @@ void setup_hugetlbfs(void)
/*
* Now go make sure that we got the pages and that they
- * are 2M pages. Someone might have made 1G the default.
+ * are PMD-level pages. Someone might have made PUD-level
+ * pages the default.
*/
- fd = open("/sys/kernel/mm/hugepages/hugepages-2048kB/nr_hugepages", O_RDONLY);
+ hpagesz_kb = HPAGE_SIZE / 1024;
+ hpagesz_mb = hpagesz_kb / 1024;
+ sprintf(buf, SYSFS_FMT_NR_HUGE_PAGES, hpagesz_kb);
+ fd = open(buf, O_RDONLY);
if (fd < 0) {
- perror("opening sysfs 2M hugetlb config");
+ fprintf(stderr, "opening sysfs %ldM hugetlb config: %s\n",
+ hpagesz_mb, strerror(errno));
return;
}
@@ -767,13 +775,14 @@ void setup_hugetlbfs(void)
err = read(fd, buf, sizeof(buf)-1);
close(fd);
if (err <= 0) {
- perror("reading sysfs 2M hugetlb config");
+ fprintf(stderr, "reading sysfs %ldM hugetlb config: %s\n",
+ hpagesz_mb, strerror(errno));
return;
}
if (atoi(buf) != GET_NR_HUGE_PAGES) {
- fprintf(stderr, "could not confirm 2M pages, got: '%s' expected %d\n",
- buf, GET_NR_HUGE_PAGES);
+ fprintf(stderr, "could not confirm %ldM pages, got: '%s' expected %d\n",
+ hpagesz_mb, buf, GET_NR_HUGE_PAGES);
return;
}
--
2.17.1
next prev parent reply other threads:[~2020-01-30 6:37 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-30 6:36 [PATCH v18 00/24] selftests, powerpc, x86: Memory Protection Keys Sandipan Das
2020-01-30 6:36 ` [PATCH v18 01/24] selftests/x86/pkeys: Move selftests to arch-neutral directory Sandipan Das
2020-01-30 6:36 ` [PATCH v18 02/24] selftests/vm/pkeys: Rename all references to pkru to a generic name Sandipan Das
2020-01-30 6:36 ` [PATCH v18 03/24] selftests/vm/pkeys: Move generic definitions to header file Sandipan Das
2020-01-30 6:36 ` [PATCH v18 04/24] selftests/vm/pkeys: Move some definitions to arch-specific header Sandipan Das
2020-01-30 6:36 ` [PATCH v18 05/24] selftests/vm/pkeys: Make gcc check arguments of sigsafe_printf() Sandipan Das
2020-01-30 6:36 ` [PATCH v18 06/24] selftests: vm: pkeys: Use sane types for pkey register Sandipan Das
2020-01-30 6:36 ` [PATCH v18 07/24] selftests: vm: pkeys: Add helpers for pkey bits Sandipan Das
2020-01-30 6:36 ` [PATCH v18 08/24] selftests/vm/pkeys: Fix pkey_disable_clear() Sandipan Das
2020-01-30 6:36 ` [PATCH v18 09/24] selftests/vm/pkeys: Fix assertion in pkey_disable_set/clear() Sandipan Das
2020-01-30 6:36 ` [PATCH v18 10/24] selftests/vm/pkeys: Fix alloc_random_pkey() to make it really random Sandipan Das
2020-01-30 6:36 ` Sandipan Das [this message]
2020-01-30 6:36 ` [PATCH v18 12/24] selftests/vm/pkeys: Introduce generic pkey abstractions Sandipan Das
2020-01-30 6:36 ` [PATCH v18 13/24] selftests/vm/pkeys: Introduce powerpc support Sandipan Das
2020-01-30 6:36 ` [PATCH v18 14/24] selftests/vm/pkeys: Fix number of reserved powerpc pkeys Sandipan Das
2020-01-30 6:36 ` [PATCH v18 15/24] selftests/vm/pkeys: Fix assertion in test_pkey_alloc_exhaust() Sandipan Das
2020-01-30 6:36 ` [PATCH v18 16/24] selftests/vm/pkeys: Improve checks to determine pkey support Sandipan Das
2020-01-30 6:36 ` [PATCH v18 17/24] selftests/vm/pkeys: Associate key on a mapped page and detect access violation Sandipan Das
2020-01-30 6:37 ` [PATCH v18 18/24] selftests/vm/pkeys: Associate key on a mapped page and detect write violation Sandipan Das
2020-01-30 6:37 ` [PATCH v18 19/24] selftests/vm/pkeys: Detect write violation on a mapped access-denied-key page Sandipan Das
2020-01-30 6:37 ` [PATCH v18 20/24] selftests/vm/pkeys: Introduce a sub-page allocator Sandipan Das
2020-01-30 6:37 ` [PATCH v18 21/24] selftests/vm/pkeys: Test correct behaviour of pkey-0 Sandipan Das
2020-01-30 6:37 ` [PATCH v18 22/24] selftests/vm/pkeys: Override access right definitions on powerpc Sandipan Das
2020-01-30 6:37 ` [PATCH v18 23/24] selftests: vm: pkeys: Use the correct page size " Sandipan Das
2020-01-30 6:37 ` [PATCH v18 24/24] selftests: vm: pkeys: Fix multilib builds for x86 Sandipan Das
2020-01-30 21:51 ` [PATCH v18 00/24] selftests, powerpc, x86: Memory Protection Keys Dave Hansen
2020-03-02 10:25 ` 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=5f0b309b8fa4879151478a96f8aefa2756d5bc5b.1580365432.git.sandipan@linux.ibm.com \
--to=sandipan@linux.ibm.com \
--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=skhan@linuxfoundation.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).