linux-kselftest.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: bauerman at linux.ibm.com (Thiago Jung Bauermann)
Subject: [PATCH v2 2/4] userfaultfd: selftest: Skip test if userfaultfd() syscall not supported
Date: Fri,  3 Aug 2018 19:00:44 -0300	[thread overview]
Message-ID: <20180803220046.4019-3-bauerman@linux.ibm.com> (raw)
In-Reply-To: <20180803220046.4019-1-bauerman@linux.ibm.com>

Since there's no point in doing anything in this case, immediately exit the
process.

And take the opportunity to improve the error message.

Before:

  # ./userfaultfd shmem 10 10
  nr_pages: 160, nr_pages_per_cpu: 40
  userfaultfd syscall not available in this kernel
  # echo $?
  1

After:

  # ./userfaultfd shmem 10 10
  nr_pages: 160, nr_pages_per_cpu: 40
  userfaultfd syscall not available in this kernel: Function not implemented
  # echo $?
  4

Suggested-by: Mike Rapoport <rppt at linux.vnet.ibm.com>
Signed-off-by: Thiago Jung Bauermann <bauerman at linux.ibm.com>
---
 tools/testing/selftests/vm/userfaultfd.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tools/testing/selftests/vm/userfaultfd.c b/tools/testing/selftests/vm/userfaultfd.c
index e4099afe7557..d728bd1cb33c 100644
--- a/tools/testing/selftests/vm/userfaultfd.c
+++ b/tools/testing/selftests/vm/userfaultfd.c
@@ -636,9 +636,11 @@ static int userfaultfd_open(int features)
 
 	uffd = syscall(__NR_userfaultfd, O_CLOEXEC | O_NONBLOCK);
 	if (uffd < 0) {
-		fprintf(stderr,
-			"userfaultfd syscall not available in this kernel\n");
-		return 1;
+		int errnum = errno;
+
+		perror("userfaultfd syscall not available in this kernel");
+
+		exit(errnum == ENOSYS ? KSFT_SKIP : 1);
 	}
 	uffd_flags = fcntl(uffd, F_GETFD, NULL);
 

--
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: bauerman@linux.ibm.com (Thiago Jung Bauermann)
Subject: [PATCH v2 2/4] userfaultfd: selftest: Skip test if userfaultfd() syscall not supported
Date: Fri,  3 Aug 2018 19:00:44 -0300	[thread overview]
Message-ID: <20180803220046.4019-3-bauerman@linux.ibm.com> (raw)
Message-ID: <20180803220044.slrZtpUqQPX4w4JEwh9HJVnC-dQxqscY0k8UIq3xusE@z> (raw)
In-Reply-To: <20180803220046.4019-1-bauerman@linux.ibm.com>

Since there's no point in doing anything in this case, immediately exit the
process.

And take the opportunity to improve the error message.

Before:

  # ./userfaultfd shmem 10 10
  nr_pages: 160, nr_pages_per_cpu: 40
  userfaultfd syscall not available in this kernel
  # echo $?
  1

After:

  # ./userfaultfd shmem 10 10
  nr_pages: 160, nr_pages_per_cpu: 40
  userfaultfd syscall not available in this kernel: Function not implemented
  # echo $?
  4

Suggested-by: Mike Rapoport <rppt at linux.vnet.ibm.com>
Signed-off-by: Thiago Jung Bauermann <bauerman at linux.ibm.com>
---
 tools/testing/selftests/vm/userfaultfd.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tools/testing/selftests/vm/userfaultfd.c b/tools/testing/selftests/vm/userfaultfd.c
index e4099afe7557..d728bd1cb33c 100644
--- a/tools/testing/selftests/vm/userfaultfd.c
+++ b/tools/testing/selftests/vm/userfaultfd.c
@@ -636,9 +636,11 @@ static int userfaultfd_open(int features)
 
 	uffd = syscall(__NR_userfaultfd, O_CLOEXEC | O_NONBLOCK);
 	if (uffd < 0) {
-		fprintf(stderr,
-			"userfaultfd syscall not available in this kernel\n");
-		return 1;
+		int errnum = errno;
+
+		perror("userfaultfd syscall not available in this kernel");
+
+		exit(errnum == ENOSYS ? KSFT_SKIP : 1);
 	}
 	uffd_flags = fcntl(uffd, F_GETFD, NULL);
 

--
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

  parent reply	other threads:[~2018-08-03 22:00 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-03 22:00 [PATCH v2 0/4] userfaultfd: selftest: Improve behavior with older kernels bauerman
2018-08-03 22:00 ` Thiago Jung Bauermann
2018-08-03 22:00 ` [PATCH v2 1/4] userfaultfd: selftest: Fix checking of userfaultfd_open() result bauerman
2018-08-03 22:00   ` Thiago Jung Bauermann
2018-08-07  6:50   ` rppt
2018-08-07  6:50     ` Mike Rapoport
2018-08-03 22:00 ` bauerman [this message]
2018-08-03 22:00   ` [PATCH v2 2/4] userfaultfd: selftest: Skip test if userfaultfd() syscall not supported Thiago Jung Bauermann
2018-08-07  6:50   ` rppt
2018-08-07  6:50     ` Mike Rapoport
2018-08-03 22:00 ` [PATCH v2 3/4] userfaultfd: selftest: Skip test if a feature isn't supported bauerman
2018-08-03 22:00   ` Thiago Jung Bauermann
2018-08-07  6:51   ` rppt
2018-08-07  6:51     ` Mike Rapoport
2018-08-03 22:00 ` [PATCH v2 4/4] userfaultfd: selftest: Cope if shmem doesn't support zeropage bauerman
2018-08-03 22:00   ` Thiago Jung Bauermann
2018-08-07  6:56   ` rppt
2018-08-07  6:56     ` Mike Rapoport
2018-08-28  2:46     ` bauerman
2018-08-28  2:46       ` Thiago Jung Bauermann
2018-08-28  6:15       ` rppt
2018-08-28  6:15         ` Mike Rapoport

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=20180803220046.4019-3-bauerman@linux.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;
as well as URLs for NNTP newsgroup(s).