linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Masami Hiramatsu <mhiramat@kernel.org>
To: Shuah Khan <shuah@kernel.org>
Cc: linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org,
	jaswinder.singh@linaro.org, Alexey Dobriyan <adobriyan@gmail.com>
Subject: [BUGFIX PATCH 1/5] selftests: proc: Make va_max 3GB on 32bit arch
Date: Tue,  8 Oct 2019 00:10:26 +0900	[thread overview]
Message-ID: <157046102656.20724.3358140818300189230.stgit@devnote2> (raw)
In-Reply-To: <157046101671.20724.9561877942986463668.stgit@devnote2>

Currently proc-self-map-files-002.c sets va_max (max test address
of user virtual address) to 4GB, but it is too big for 32bit
arch and 1UL << 32 is overflow on 32bit long.

Make va_max 3GB on 32bit arch like i386 and arm.

Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
---
 .../selftests/proc/proc-self-map-files-002.c       |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/tools/testing/selftests/proc/proc-self-map-files-002.c b/tools/testing/selftests/proc/proc-self-map-files-002.c
index 47b7473dedef..d517f8c479fb 100644
--- a/tools/testing/selftests/proc/proc-self-map-files-002.c
+++ b/tools/testing/selftests/proc/proc-self-map-files-002.c
@@ -22,6 +22,7 @@
 #include <unistd.h>
 #include <sys/mman.h>
 #include <stdlib.h>
+#include <asm/bitsperlong.h>
 
 static void pass(const char *fmt, unsigned long a, unsigned long b)
 {
@@ -44,10 +45,18 @@ static void fail(const char *fmt, unsigned long a, unsigned long b)
 	exit(1);
 }
 
+#if __BITS_PER_LONG == 32
+# define VA_MAX (3UL << 30)
+#elif __BITS_PER_LONG == 64
+# define VA_MAX (1UL << 32)
+#else
+# define VA_MAX 0
+#endif
+
 int main(void)
 {
 	const int PAGE_SIZE = sysconf(_SC_PAGESIZE);
-	const unsigned long va_max = 1UL << 32;
+	const unsigned long va_max = VA_MAX;
 	unsigned long va;
 	void *p;
 	int fd;


  reply	other threads:[~2019-10-07 15:10 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-07 15:10 [BUGFIX PATCH 0/5] selftests: Fixes for 32bit arch Masami Hiramatsu
2019-10-07 15:10 ` Masami Hiramatsu [this message]
2019-10-08 17:59   ` [BUGFIX PATCH 1/5] selftests: proc: Make va_max 3GB on " Alexey Dobriyan
2019-10-09  2:49     ` Masami Hiramatsu
2019-10-07 15:10 ` [BUGFIX PATCH 2/5] selftests: vm: Build/Run 64bit tests only on 64bit arch Masami Hiramatsu
2019-10-07 15:10 ` [BUGFIX PATCH 3/5] selftests: net: Use size_t and ssize_t for counting file size Masami Hiramatsu
2019-10-07 15:10 ` [BUGFIX PATCH 4/5] selftests: net: Fix printf format warnings on arm Masami Hiramatsu
2019-10-07 15:11 ` [BUGFIX PATCH 5/5] selftests: sync: Fix cast " Masami Hiramatsu
2019-10-18 21:45 ` [BUGFIX PATCH 0/5] selftests: Fixes for 32bit arch shuah
2019-10-21  7:24   ` Masami Hiramatsu

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=157046102656.20724.3358140818300189230.stgit@devnote2 \
    --to=mhiramat@kernel.org \
    --cc=adobriyan@gmail.com \
    --cc=jaswinder.singh@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=shuah@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).