1974 pages_pp_maximum/lotsfree discrepancy leads to mlock() failure
Reviewed by: Keith Wesolowski <
[email protected]>
Reviewed by: Brendan Gregg <
[email protected]>
Approved by: Garrett D'Amore <
[email protected]>
--- a/usr/src/uts/common/fs/zfs/arc.c Fri Aug 23 18:31:03 2013 -0400
+++ b/usr/src/uts/common/fs/zfs/arc.c Sat Aug 03 16:27:57 2013 -0700
@@ -21,6 +21,7 @@
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright 2011 Nexenta Systems, Inc. All rights reserved.
+ * Copyright (c) 2012, Joyent, Inc. All rights reserved.
* Copyright (c) 2013 by Delphix. All rights reserved.
* Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
*/
@@ -2235,6 +2236,16 @@
if (availrmem < swapfs_minfree + swapfs_reserve + extra)
return (1);
+ /*
+ * Check that we have enough availrmem that memory locking (e.g., via
+ * mlock(3C) or memcntl(2)) can still succeed. (pages_pp_maximum
+ * stores the number of pages that cannot be locked; when availrmem
+ * drops below pages_pp_maximum, page locking mechanisms such as
+ * page_pp_lock() will fail.)
+ */
+ if (availrmem <= pages_pp_maximum)
+ return (1);
+
#if defined(__i386)
/*
* If we're on an i386 platform, it's possible that we'll exhaust the