From owner-svn-src-head@freebsd.org  Sat Dec 10 22:08:34 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 B168CC71E5F;
 Sat, 10 Dec 2016 22:08:34 +0000 (UTC)
 (envelope-from ngie@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 5D1EB1A71;
 Sat, 10 Dec 2016 22:08:34 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBAM8XPk076160;
 Sat, 10 Dec 2016 22:08:33 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBAM8XER076159;
 Sat, 10 Dec 2016 22:08:33 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201612102208.uBAM8XER076159@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Sat, 10 Dec 2016 22:08:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r309837 - head/contrib/netbsd-tests/lib/libc/sys
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Dec 2016 22:08:34 -0000

Author: ngie
Date: Sat Dec 10 22:08:33 2016
New Revision: 309837
URL: https://svnweb.freebsd.org/changeset/base/309837

Log:
  Change the process limits for RLIMIT_MEMLOCK to RLIM_INFINITY when
  executing :mincore_resid
  
  The default process limits in FreeBSD is 64kB for unprivileged users,
  which empirically is too low to run the :mincore_resid testcase.
  
  Process limits are inherited, so even though the default limit for
  root users is RLIM_INFINITY, the inherited limit with "sudo" with the
  default login.conf will be 64kB.
  
  Use setrlimit to set rlim_max for RLIMIT_MEMLOCK to RLIM_INFINITY to
  avoid ENOMEM issues when calling mlock to wire the mmap'ed address
  space.
  
  setrlimit requires root access to increase rlim_max, so require root
  privileges when running the test
  
  Discovered when executing the tests with sudo, e.g.
  "sudo kyua test -k /usr/tests/lib/libc/sys/Kyuafile mincore_test"
  
  MFC after:	2 weeks

Modified:
  head/contrib/netbsd-tests/lib/libc/sys/t_mincore.c

Modified: head/contrib/netbsd-tests/lib/libc/sys/t_mincore.c
==============================================================================
--- head/contrib/netbsd-tests/lib/libc/sys/t_mincore.c	Sat Dec 10 22:05:24 2016	(r309836)
+++ head/contrib/netbsd-tests/lib/libc/sys/t_mincore.c	Sat Dec 10 22:08:33 2016	(r309837)
@@ -144,6 +144,9 @@ ATF_TC_WITH_CLEANUP(mincore_resid);
 ATF_TC_HEAD(mincore_resid, tc)
 {
 	atf_tc_set_md_var(tc, "descr", "Test page residency with mincore(2)");
+#ifdef __FreeBSD__
+	atf_tc_set_md_var(tc, "require.user", "root");
+#endif
 }
 
 ATF_TC_BODY(mincore_resid, tc)
@@ -155,6 +158,13 @@ ATF_TC_BODY(mincore_resid, tc)
 	struct rlimit rlim;
 
 	ATF_REQUIRE(getrlimit(RLIMIT_MEMLOCK, &rlim) == 0);
+#ifdef __FreeBSD__
+	/*
+	 * Bump the mlock limit to unlimited so the rest of the testcase
+	 * passes instead of failing on the mlock call.
+	 */
+	rlim.rlim_max = RLIM_INFINITY;
+#endif
 	rlim.rlim_cur = rlim.rlim_max;
 	ATF_REQUIRE(setrlimit(RLIMIT_MEMLOCK, &rlim) == 0);
 
@@ -206,8 +216,9 @@ ATF_TC_BODY(mincore_resid, tc)
 		    "might be low on memory");
 
 #ifdef __FreeBSD__
-	ATF_REQUIRE_MSG(mlock(addr, npgs * page) == 0, "mlock failed: %s",
-	    strerror(errno));
+	if (mlock(addr, npgs * page) == -1 && errno != ENOMEM)
+		atf_tc_skip("could not wire anonymous test area, system might "
+		    "be low on memory");
 #endif
 	ATF_REQUIRE(check_residency(addr, npgs) == npgs);
 	ATF_REQUIRE(munmap(addr, npgs * page) == 0);