Date: Mon, 27 Apr 2015 17:53:09 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r282104 - in head: etc/mtree tests/sys tests/sys/kern tests/sys/vm Message-ID: <201504271753.t3RHr9Rj096787@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Mon Apr 27 17:53:09 2015 New Revision: 282104 URL: https://svnweb.freebsd.org/changeset/base/282104 Log: Move tests/sys/kern/mmap_test to tests/sys/vm/mmap_test As jhb noted, the actual mmap(2) implementation is under sys/vm, not sys/kern/, so the correct logical place is tests/sys/vm/, not tests/sys/kern/ X-MFC with: r282076 MFC after: 6 days Added: head/tests/sys/vm/ head/tests/sys/vm/Makefile (contents, props changed) head/tests/sys/vm/mmap_test.c - copied unchanged from r282097, head/tests/sys/kern/mmap_test.c Deleted: head/tests/sys/kern/mmap_test.c Modified: head/etc/mtree/BSD.tests.dist head/tests/sys/Makefile head/tests/sys/kern/Makefile Modified: head/etc/mtree/BSD.tests.dist ============================================================================== --- head/etc/mtree/BSD.tests.dist Mon Apr 27 17:47:08 2015 (r282103) +++ head/etc/mtree/BSD.tests.dist Mon Apr 27 17:53:09 2015 (r282104) @@ -404,6 +404,8 @@ unlink .. .. + vm + .. .. usr.bin apply Modified: head/tests/sys/Makefile ============================================================================== --- head/tests/sys/Makefile Mon Apr 27 17:47:08 2015 (r282103) +++ head/tests/sys/Makefile Mon Apr 27 17:53:09 2015 (r282104) @@ -12,6 +12,7 @@ TESTS_SUBDIRS+= kqueue TESTS_SUBDIRS+= mqueue TESTS_SUBDIRS+= netinet TESTS_SUBDIRS+= opencrypto +TESTS_SUBDIRS+= vm # Items not integrated into kyua runs by default SUBDIR+= pjdfstest Modified: head/tests/sys/kern/Makefile ============================================================================== --- head/tests/sys/kern/Makefile Mon Apr 27 17:47:08 2015 (r282103) +++ head/tests/sys/kern/Makefile Mon Apr 27 17:53:09 2015 (r282104) @@ -3,7 +3,6 @@ TESTSDIR= ${TESTSBASE}/sys/kern ATF_TESTS_C+= kern_descrip_test -TAP_TESTS_C+= mmap_test ATF_TESTS_C+= unix_seqpacket_test TEST_METADATA.unix_seqpacket_test+= timeout="15" Added: head/tests/sys/vm/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tests/sys/vm/Makefile Mon Apr 27 17:53:09 2015 (r282104) @@ -0,0 +1,7 @@ +# $FreeBSD$ + +TESTSDIR= ${TESTSBASE}/sys/vm + +TAP_TESTS_C+= mmap_test + +.include <bsd.test.mk> Copied: head/tests/sys/vm/mmap_test.c (from r282097, head/tests/sys/kern/mmap_test.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tests/sys/vm/mmap_test.c Mon Apr 27 17:53:09 2015 (r282104, copy of r282097, head/tests/sys/kern/mmap_test.c) @@ -0,0 +1,105 @@ +/*- + * Copyright (c) 2009 Simon L. Nielsen <simon@FreeBSD.org>, + * Bjoern A. Zeeb <bz@FreeBSD.org> + * + * 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. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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. + * + * $FreeBSD$ + */ + +#include <sys/param.h> +#include <sys/mman.h> +#include <sys/sysctl.h> +#include <sys/types.h> + +#include <errno.h> +#include <stdio.h> +#include <string.h> + +static const struct { + void *addr; + int ok[2]; /* Depending on security.bsd.map_at_zero {0, !=0}. */ +} tests[] = { + { (void *)0, { 0, 1 } }, /* Test sysctl. */ + { (void *)1, { 0, 0 } }, + { (void *)(PAGE_SIZE - 1), { 0, 0 } }, + { (void *)PAGE_SIZE, { 1, 1 } }, + { (void *)-1, { 0, 0 } }, + { (void *)(-PAGE_SIZE), { 0, 0 } }, + { (void *)(-1 - PAGE_SIZE), { 0, 0 } }, + { (void *)(-1 - PAGE_SIZE - 1), { 0, 0 } }, + { (void *)(0x1000 * PAGE_SIZE), { 1, 1 } }, +}; + +#define MAP_AT_ZERO "security.bsd.map_at_zero" + +int +main(void) +{ + void *p; + size_t len; + int i, error, mib[3], map_at_zero; + + error = 0; + + /* Get the current sysctl value of security.bsd.map_at_zero. */ + len = sizeof(mib) / sizeof(*mib); + if (sysctlnametomib(MAP_AT_ZERO, mib, &len) == -1) { + printf("1..0 # SKIP: sysctlnametomib(\"%s\") failed: %s\n", + MAP_AT_ZERO, strerror(errno)); + return (0); + } + + len = sizeof(map_at_zero); + if (sysctl(mib, 3, &map_at_zero, &len, NULL, 0) == -1) { + printf("1..0 # SKIP: sysctl for %s failed: %s\n", MAP_AT_ZERO, + strerror(errno)); + return (0); + } + + /* Normalize to 0 or 1 for array access. */ + map_at_zero = !!map_at_zero; + + printf("1..%zu\n", nitems(tests)); + for (i = 0; i < (int)nitems(tests); i++) { + p = mmap((void *)tests[i].addr, PAGE_SIZE, + PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANON | MAP_FIXED, + -1, 0); + if (p == MAP_FAILED) { + if (tests[i].ok[map_at_zero] != 0) + error++; + printf("%sok %d # mmap(%p, ...) failed\n", + tests[i].ok[map_at_zero] == 0 ? "" : "not ", + i + 1, + tests[i].addr); + } else { + if (tests[i].ok[map_at_zero] != 1) + error++; + printf("%sok %d # mmap(%p, ...) succeeded: p=%p\n", + tests[i].ok[map_at_zero] == 1 ? "" : "not ", + i + 1, + tests[i].addr, p); + } + } + + return (error != 0); +}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504271753.t3RHr9Rj096787>