From owner-svn-src-user@freebsd.org Sat Jun 24 17:19:32 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A0C12DA2894 for ; Sat, 24 Jun 2017 17:19:32 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6FD0C73996; Sat, 24 Jun 2017 17:19:32 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5OHJVCm022532; Sat, 24 Jun 2017 17:19:31 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5OHJV6N022531; Sat, 24 Jun 2017 17:19:31 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201706241719.v5OHJV6N022531@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Sat, 24 Jun 2017 17:19:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r320320 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Jun 2017 17:19:32 -0000 Author: pho Date: Sat Jun 24 17:19:31 2017 New Revision: 320320 URL: https://svnweb.freebsd.org/changeset/base/320320 Log: Updated to use MAP_GUARD. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/mmap16.sh Modified: user/pho/stress2/misc/mmap16.sh ============================================================================== --- user/pho/stress2/misc/mmap16.sh Sat Jun 24 17:10:33 2017 (r320319) +++ user/pho/stress2/misc/mmap16.sh Sat Jun 24 17:19:31 2017 (r320320) @@ -28,32 +28,35 @@ # $FreeBSD$ # -exit 0 # Experimental test scenario - # Test scenario by kib@ [ `uname -m` = "i386" ] || exit 0 . ../default.cfg +grep -q MAP_GUARD /usr/include/sys/mman.h 2>/dev/null || exit 0 here=`pwd` cd /tmp sed '1,/^EOF/d' < $here/$0 > mmap16.c mycc -o mmap16 -Wall -Wextra -O2 -g mmap16.c -lpthread || exit 1 rm -f mmap16.c /tmp/mmap16.core -rm -f /tmp/mmap16.core +echo "Expect: + mmap16: mprotect: Permission denied" /tmp/mmap16 > /dev/null +s=$? rm -f /tmp/mmap16 /tmp/mmap16.core -exit 0 +exit $s EOF /* $Id: map_hole.c,v 1.6 2014/06/16 05:52:03 kostik Exp kostik $ */ #include #include #include + #include +#include #include #include #include @@ -61,10 +64,6 @@ EOF #include #include -#ifndef MAP_HOLE -#define MAP_HOLE 0x00002000 /* no backing pages */ -#endif - static void sighandler(int signo, siginfo_t *info, void *uap1) { @@ -126,10 +125,10 @@ main(void) err(1, "sigaction"); pagesz = getpagesize(); - printf("MAP_HOLE\n"); - addr = mmap(NULL, pagesz, PROT_NONE, MAP_HOLE, -1, 0); + printf("MAP_GUARD\n"); + addr = mmap(NULL, pagesz, PROT_NONE, MAP_GUARD, -1, 0); if (addr == (char *)MAP_FAILED) - err(1, "FAIL: mmap(MAP_HOLE)"); + err(1, "FAIL: mmap(MAP_GUARD)"); test_access(addr); printf("PROT_NONE wire\n"); @@ -137,7 +136,8 @@ main(void) if (addr == (char *)MAP_FAILED) err(1, "mmap(PROT_NONE)"); if (mlock(addr, pagesz) == -1) - err(1, "mlock"); + if (errno != ENOMEM) + err(1, "mlock"); test_access(addr); snprintf(cmd, sizeof(cmd), "procstat -v %d", getpid());