tests: remove manual creation of memory mapping holes
We used to call tail_alloc(1) to create memory mapping holes around
regular tail_alloc allocations. This is no longer needed since regular
tail_alloc allocations create additional memory mapping holes.
* tests/clock_adjtime.c (main): Remove creation of memory mapping holes
using tail_alloc(1).
* tests/futimesat.c (main): Likewise.
* tests/get_mempolicy.c (print_nodes, main): Likewise.
* tests/getgroups.c (main): Likewise.
* tests/getresugid.c (main): Likewise.
* tests/ioctl_uffdio.c (main): Likewise.
* tests/ioctl_v4l2.c (main): Likewise.
* tests/move_pages.c (main): Likewise.
* tests/net-icmp_filter.c (main): Likewise.
* tests/ptrace.c (test_peeksiginfo, main): Likewise.
* tests/pwritev.c (main): Likewise.
* tests/set_mempolicy.c (print_nodes): Likewise.
* tests/setgroups.c (main): Likewise.
* tests/umovestr3.c (main): Likewise.
* tests/utimes.c (main): Likewise.
* tests/xattr.c (main): Likewise.
diff --git a/tests/clock_adjtime.c b/tests/clock_adjtime.c
index c9bacf4..93c58b7 100644
--- a/tests/clock_adjtime.c
+++ b/tests/clock_adjtime.c
@@ -44,7 +44,6 @@
rc, errno2name());
void *efault = tail_alloc(1);
- (void) tail_alloc(1);
rc = syscall(__NR_clock_adjtime, CLOCK_REALTIME, efault);
printf("clock_adjtime(CLOCK_REALTIME, %p) = %ld %s (%m)\n",
diff --git a/tests/futimesat.c b/tests/futimesat.c
index b670270..785c894 100644
--- a/tests/futimesat.c
+++ b/tests/futimesat.c
@@ -56,7 +56,6 @@
sample, rc, errno2name());
struct timeval *const ts = tail_alloc(sizeof(*ts) * 2);
- (void) tail_alloc(1);
dirfd = (unsigned long) 0xdeadbeefffffffff;
rc = syscall(__NR_futimesat, dirfd, 0, ts + 1);
diff --git a/tests/get_mempolicy.c b/tests/get_mempolicy.c
index dbecc8d..6923a21 100644
--- a/tests/get_mempolicy.c
+++ b/tests/get_mempolicy.c
@@ -47,7 +47,6 @@
{
unsigned long *const nodemask =
tail_alloc(sizeof(*nodemask) * NLONGS(maxnode));
- (void) tail_alloc(1);
if (syscall(__NR_get_mempolicy, 0, nodemask, maxnode, 0, 0)) {
printf("get_mempolicy(NULL, %p, %lu, NULL, 0) = -1 %s (%m)\n",
@@ -92,9 +91,7 @@
"MPOL_F_NODE|MPOL_F_ADDR",
flags & ~3, rc, errno2name());
- (void) tail_alloc(1);
mode = tail_alloc(sizeof(*mode));
- (void) tail_alloc(1);
rc = syscall(__NR_get_mempolicy, mode, 0, 0, 0, 0);
printf("get_mempolicy([");
diff --git a/tests/getgroups.c b/tests/getgroups.c
index f3611fb..d70689c 100644
--- a/tests/getgroups.c
+++ b/tests/getgroups.c
@@ -125,7 +125,6 @@
tail_alloc(ngroups ? sizeof(*g1) * ngroups : 1);
GID_TYPE *const g2 = tail_alloc(sizeof(*g2) * (ngroups + 1));
void *efault = g2 + ngroups + 1;
- (void) tail_alloc(1);
get_groups(ngroups, g1);
get_groups(ngroups + 1, g1);
diff --git a/tests/getresugid.c b/tests/getresugid.c
index 1ed134f..0ee721c 100644
--- a/tests/getresugid.c
+++ b/tests/getresugid.c
@@ -37,7 +37,6 @@
unsigned UGID_TYPE *const r = tail_alloc(sizeof(*r));
unsigned UGID_TYPE *const e = tail_alloc(sizeof(*e));
unsigned UGID_TYPE *const s = tail_alloc(sizeof(*s));
- (void) tail_alloc(1);
if (syscall(SYSCALL_NR, r, e, s))
perror_msg_and_fail(SYSCALL_NAME);
diff --git a/tests/ioctl_uffdio.c b/tests/ioctl_uffdio.c
index 4f27e6d..73a8a99 100644
--- a/tests/ioctl_uffdio.c
+++ b/tests/ioctl_uffdio.c
@@ -54,7 +54,6 @@
perror_msg_and_skip("userfaultfd");
/* ---- API ---- */
- (void) tail_alloc(1);
struct uffdio_api *api_struct = tail_alloc(sizeof(*api_struct));
/* With a bad fd */
@@ -96,7 +95,6 @@
*(char *)area1 = 42;
/* ---- REGISTER ---- */
- (void) tail_alloc(1);
struct uffdio_register *register_struct =
tail_alloc(sizeof(*register_struct));
memset(register_struct, 0, sizeof(*register_struct));
@@ -129,7 +127,6 @@
* userfaultfd will cause us to stall.
*/
/* ---- COPY ---- */
- (void) tail_alloc(1);
struct uffdio_copy *copy_struct = tail_alloc(sizeof(*copy_struct));
memset(copy_struct, 0, sizeof(*copy_struct));
@@ -151,7 +148,6 @@
fd, area2, area1, pagesize, pagesize, rc);
/* ---- ZEROPAGE ---- */
- (void) tail_alloc(1);
struct uffdio_zeropage *zero_struct = tail_alloc(sizeof(*zero_struct));
madvise(area2, pagesize, MADV_DONTNEED);
@@ -173,7 +169,6 @@
fd, area2, pagesize, pagesize, rc);
/* ---- WAKE ---- */
- (void) tail_alloc(1);
struct uffdio_range *range_struct = tail_alloc(sizeof(*range_struct));
memset(range_struct, 0, sizeof(*range_struct));
diff --git a/tests/ioctl_v4l2.c b/tests/ioctl_v4l2.c
index 7969c06..850783d 100644
--- a/tests/ioctl_v4l2.c
+++ b/tests/ioctl_v4l2.c
@@ -47,11 +47,8 @@
int
main(void )
{
- (void) tail_alloc(1);
const unsigned int size = get_page_size();
- (void) tail_alloc(1);
void *const page = tail_alloc(size);
- (void) tail_alloc(1);
init_magic(page, size);
const union u_pixel_format {
diff --git a/tests/move_pages.c b/tests/move_pages.c
index d95b736..1059366 100644
--- a/tests/move_pages.c
+++ b/tests/move_pages.c
@@ -199,14 +199,12 @@
const unsigned long pid =
(unsigned long) 0xfacefeed00000000 | getpid();
unsigned long count = 1;
- (void) tail_alloc(1);
const unsigned page_size = get_page_size();
const void *const page = tail_alloc(page_size);
const void *const efault = page + page_size;
const void **pages = tail_alloc(sizeof(*pages));
int *nodes = tail_alloc(sizeof(*nodes));
int *status = tail_alloc(sizeof(*status));
- (void) tail_alloc(1);
print_stat_pages(pid, 0, pages, status);
print_move_pages(pid, 0, 0, pages, nodes, status);
diff --git a/tests/net-icmp_filter.c b/tests/net-icmp_filter.c
index c710906..d3f956d 100644
--- a/tests/net-icmp_filter.c
+++ b/tests/net-icmp_filter.c
@@ -43,7 +43,6 @@
printf("setsockopt(-1, SOL_RAW, ICMP_FILTER, NULL, 0) = -1 %s (%m)\n",
errno2name());
- (void) tail_alloc(1);
socklen_t *const plen = tail_alloc(sizeof(*plen));
void *const efault = plen + 1;
struct icmp_filter *const f = tail_alloc(sizeof(*f));
diff --git a/tests/ptrace.c b/tests/ptrace.c
index 3810bd6..2fbefdd 100644
--- a/tests/ptrace.c
+++ b/tests/ptrace.c
@@ -59,7 +59,6 @@
unsigned long long off;
unsigned int flags, nr;
} *const psi = tail_alloc(sizeof(*psi));
- (void) tail_alloc(1);
psi->off = 0xdeadbeeffacefeed;
psi->flags = 1;
@@ -100,7 +99,6 @@
const unsigned int nsigs = 4;
const uid_t uid = geteuid();
siginfo_t *sigs = tail_alloc(sizeof(*sigs) * nsigs);
- (void) tail_alloc(1);
psi->off = 0;
psi->flags = 0;
@@ -188,10 +186,8 @@
if (!sigset_size)
perror_msg_and_fail("rt_sigprocmask");
- (void) tail_alloc(1);
void *const k_set = tail_alloc(sigset_size);
siginfo_t *const sip = tail_alloc(sizeof(*sip));
- (void) tail_alloc(1);
long rc = do_ptrace(bad_request, pid, 0, 0);
printf("ptrace(%#lx /* PTRACE_??? */, %u, NULL, NULL) = %ld %s (%m)\n",
diff --git a/tests/pwritev.c b/tests/pwritev.c
index 0b7b875..ae05b7a 100644
--- a/tests/pwritev.c
+++ b/tests/pwritev.c
@@ -95,7 +95,6 @@
iov[i].iov_base = &buf[i];
iov[i].iov_len = LEN - i;
}
- tail_alloc(1);
const off_t offset = 0xdefaceddeadbeefLL;
long rc;
diff --git a/tests/set_mempolicy.c b/tests/set_mempolicy.c
index efc2663..e59e89f 100644
--- a/tests/set_mempolicy.c
+++ b/tests/set_mempolicy.c
@@ -56,7 +56,6 @@
unsigned long *const nodemask =
tail_alloc(size ? size : (offset ? 1 : 0));
memset(nodemask, 0, size);
- (void) tail_alloc(1);
long rc = syscall(__NR_set_mempolicy, 0, nodemask, maxnode);
int saved_errno = errno;
diff --git a/tests/setgroups.c b/tests/setgroups.c
index 30f363a..8355301 100644
--- a/tests/setgroups.c
+++ b/tests/setgroups.c
@@ -88,7 +88,6 @@
const GID_TYPE *const g1 = tail_alloc(sizeof(*g1));
GID_TYPE *const g2 = tail_alloc(sizeof(*g2) * 2);
GID_TYPE *const g3 = tail_alloc(sizeof(*g3) * 3);
- (void) tail_alloc(1);
if (syscall(SYSCALL_NR, 0, g1 + 1))
printf("%s(0, []) = -1 %s (%m)\n",
diff --git a/tests/umovestr3.c b/tests/umovestr3.c
index 7b2e638..cf2fa7d 100644
--- a/tests/umovestr3.c
+++ b/tests/umovestr3.c
@@ -33,12 +33,9 @@
int
main(void)
{
- (void) tail_alloc(1);
const unsigned int size = PATH_MAX - 1;
const char *p = tail_alloc(size);
const char *const efault = p + size;
- (void) tail_alloc(1);
- (void) tail_alloc(1);
for (; p <= efault; ++p) {
int rc = chdir(p);
diff --git a/tests/utimes.c b/tests/utimes.c
index e350770..e9fe931 100644
--- a/tests/utimes.c
+++ b/tests/utimes.c
@@ -55,7 +55,6 @@
sample, rc, errno2name());
struct timeval *const ts = tail_alloc(sizeof(*ts) * 2);
- (void) tail_alloc(1);
rc = syscall(__NR_utimes, 0, ts + 1);
printf("utimes(NULL, %p) = %ld %s (%m)\n",
diff --git a/tests/xattr.c b/tests/xattr.c
index c7a3342..e72436c 100644
--- a/tests/xattr.c
+++ b/tests/xattr.c
@@ -44,12 +44,10 @@
static const char c_value[] = "foo\0bar";
static const char q_value[] = "foo\\0bar";
- tail_alloc(1);
const char *const z_value = tail_memdup(c_value, sizeof(c_value));
char *const efault = tail_alloc(1) + 1;
const char *const value = tail_memdup(c_value, sizeof(c_value) - 1);
char *const big = tail_alloc(XATTR_SIZE_MAX + 1);
- tail_alloc(1);
assert(fsetxattr(-1, 0, 0, 0, XATTR_CREATE) == -1);
printf("fsetxattr(-1, NULL, NULL, 0, XATTR_CREATE) = -1 %s (%m)\n",
