tests: enhance madvise decoder check

* tests/mmap.c (main): Remove madvise check.
* tests/madvise.c: New file.
* tests/gen_tests.in (madvise): New entry.
* tests/.gitignore: Add madvise.
* tests/pure_executables.list: Likewise.

diff --git a/tests/.gitignore b/tests/.gitignore
index 4a7fe258d4f0b7470fe822646bf15cddd0f87876..d0a287372cc83a35c1fb661e8ef9bc69cd2b9968 100644 (file)
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -159,6 +159,7 @@ lookup_dcookie
 lseek
 lstat
 lstat64
+madvise
 mbind
 membarrier
 memfd_create

diff --git a/tests/gen_tests.in b/tests/gen_tests.in
index de9da6d424bcc9277678600fd796f6a77761efc3..f7be375235d3d3948379f1868848b3d14e0eae53 100644 (file)
--- a/tests/gen_tests.in
+++ b/tests/gen_tests.in
@@ -153,6 +153,7 @@ linkat
 lookup_dcookie -a27
 lstat  -a32 -v -P stat.sample -P /dev/full
 lstat64        -a32 -v -P stat.sample -P /dev/full
+madvise        -a33
 mbind
 membarrier     -a36
 memfd_create

diff --git a/tests/madvise.c b/tests/madvise.c
new file mode 100644 (file)
index 0000000..bf9cd78
--- /dev/null
+++ b/tests/madvise.c
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2017 The strace developers.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "tests.h"
+#include <stdint.h>
+#include <stdio.h>
+#include <sys/mman.h>
+#include <unistd.h>
+#include <asm/unistd.h>
+
+static const char *errstr;
+
+static long
+k_madvise(const kernel_ulong_t addr,
+         const kernel_ulong_t length,
+         const kernel_ulong_t advice)
+{
+       long rc = syscall(__NR_madvise, addr, length, advice);
+       errstr = sprintrc(rc);
+       return rc;
+}
+
+int
+main(void)
+{
+       const unsigned long length = get_page_size();
+       void *const addr = tail_alloc(length);
+       long rc;
+
+       rc = madvise(addr, length, MADV_NORMAL);
+       printf("madvise(%p, %lu, MADV_NORMAL) = %s\n",
+              addr, length, sprintrc(rc));
+
+       static const kernel_ulong_t advice =
+               (kernel_ulong_t) 0xfacefeed00000000ULL | MADV_RANDOM;
+       rc = k_madvise((uintptr_t) addr, length, advice);
+       printf("madvise(%p, %lu, MADV_RANDOM) = %s\n",
+              addr, length, sprintrc(rc));
+
+       static const kernel_ulong_t bogus_length =
+               (kernel_ulong_t) 0xfffffffffffffaceULL;
+       rc = k_madvise(0, bogus_length, MADV_SEQUENTIAL);
+       printf("madvise(NULL, %llu, MADV_SEQUENTIAL) = %s\n",
+              (unsigned long long) bogus_length, sprintrc(rc));
+
+       if (F8ILL_KULONG_SUPPORTED) {
+               rc = k_madvise(f8ill_ptr_to_kulong(addr), length, MADV_NORMAL);
+               printf("madvise(%#llx, %lu, MADV_NORMAL) = %s\n",
+                      (unsigned long long) f8ill_ptr_to_kulong(addr),
+                      length, sprintrc(rc));
+       }
+
+       puts("+++ exited with 0 +++");
+       return 0;
+}

diff --git a/tests/mmap.c b/tests/mmap.c
index f726f63efa1f022201a6a90bcd9252073fec96bd..ee6dcb006ac20673a75a1a9ecb18d469ac76551b 100644 (file)
--- a/tests/mmap.c
+++ b/tests/mmap.c
@@ -89,10 +89,6 @@ main(int ac, char **av)
        printf("mremap(%p, %lu, %lu, MREMAP_MAYMOVE|MREMAP_FIXED"
               ", %p) = %p\n", addr, length2, length3, addr + length2, p);
 
-       if (madvise(p, length3, MADV_NORMAL))
-               perror_msg_and_fail("madvise");
-       printf("madvise(%p, %lu, MADV_NORMAL) = 0\n", p, length3);
-
        if (munmap(p, length3))
                perror_msg_and_fail("munmap");
        printf("munmap(%p, %lu) = 0\n", p, length3);

diff --git a/tests/pure_executables.list b/tests/pure_executables.list
index c76114157886e2cf6db0e795f455d3223de54192..7e474b53aa98e501e72280381f37bbce0e9b170e 100755 (executable)
--- a/tests/pure_executables.list
+++ b/tests/pure_executables.list
@@ -132,6 +132,7 @@ lookup_dcookie
 lseek
 lstat
 lstat64
+madvise
 mbind
 membarrier
 memfd_create