David Rientjes b676b293fb
mm, thp: fix mapped pages avoiding unevictable list on mlock ...
When a transparent hugepage is mapped and it is included in an mlock()
range, follow_page() incorrectly avoids setting the page's mlock bit and
moving it to the unevictable lru.
This is evident if you try to mlock(), munlock(), and then mlock() a
range again. Currently:
#define MAP_SIZE (4 << 30) /* 4GB */
void *ptr = mmap(NULL, MAP_SIZE, PROT_READ | PROT_WRITE,
MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
mlock(ptr, MAP_SIZE);
$ grep -E "Unevictable|Inactive\(anon" /proc/meminfo
Inactive(anon): 6304 kB
Unevictable: 4213924 kB
munlock(ptr, MAP_SIZE);
Inactive(anon): 4186252 kB
Unevictable: 19652 kB
mlock(ptr, MAP_SIZE);
Inactive(anon): 4198556 kB
Unevictable: 21684 kB
Notice that less than 2MB was added to the unevictable list; this is
because these pages in the range are not transparent hugepages since the
4GB range was allocated with mmap() and has no specific alignment. If
posix_memalign() were used instead, unevictable would not have grown at
all on the second mlock().
The fix is to call mlock_vma_page() so that the mlock bit is set and the
page is added to the unevictable list. With this patch:
mlock(ptr, MAP_SIZE);
Inactive(anon): 4056 kB
Unevictable: 4213940 kB
munlock(ptr, MAP_SIZE);
Inactive(anon): 4198268 kB
Unevictable: 19636 kB
mlock(ptr, MAP_SIZE);
Inactive(anon): 4008 kB
Unevictable: 4213940 kB
Signed-off-by: David Rientjes <rientjes@google.com >
Acked-by: Hugh Dickins <hughd@google.com >
Reviewed-by: Andrea Arcangeli <aarcange@redhat.com >
Cc: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com >
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com >
Cc: Johannes Weiner <hannes@cmpxchg.org >
Cc: Michel Lespinasse <walken@google.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2012-10-09 16:23:02 +09:00
2012-10-02 17:26:42 -07:00
2012-10-03 13:45:43 -07:00
2012-10-08 06:38:18 +09:00
2012-09-19 19:08:53 -06:00
2012-10-02 18:01:25 +01:00
2012-09-27 14:28:09 -03:00
2012-09-05 12:20:49 -07:00
2012-10-09 07:07:14 +09:00
2012-09-17 21:48:51 +01:00
2012-10-02 17:16:10 -07:00
2012-09-19 19:08:37 -06:00
2012-10-09 07:07:14 +09:00
2012-09-30 20:33:43 -07:00
2012-09-04 13:58:10 -04:00
2012-09-04 09:38:58 +03:00
2012-10-03 13:45:43 -07:00
2012-08-30 03:00:25 +02:00
2012-10-03 13:45:43 -07:00
2012-10-09 07:07:14 +09:00
2012-10-07 17:29:24 +09:00
2012-09-28 14:45:07 +01:00
2012-08-17 22:54:15 +01:00
2012-09-07 11:43:49 -04:00
2012-09-18 17:40:56 +01:00
2012-09-24 16:36:10 -06:00
2012-09-13 01:08:53 -04:00
2012-09-11 08:56:37 +02:00
2012-08-28 10:14:01 -07:00
2012-10-09 16:22:46 +09:00
2012-10-06 03:04:35 +09:00
2012-09-10 11:13:16 -07:00
2012-09-19 19:08:46 -06:00
2012-10-06 03:05:16 +09:00
2012-09-14 09:57:37 -07:00
2012-10-02 10:52:28 -07:00
2012-09-07 18:30:19 -07:00
2012-09-04 01:36:01 +02:00
2012-10-09 16:22:51 +09:00
2012-10-06 03:05:16 +09:00
2012-09-17 15:00:38 -07:00
2012-09-17 15:00:38 -07:00
2012-10-06 03:05:16 +09:00
2012-08-23 17:16:42 +02:00
2012-09-18 11:23:51 -07:00
2012-10-02 18:32:35 -07:00
2012-09-24 18:35:29 +02:00
2012-10-02 18:01:25 +01:00
2012-09-29 12:21:03 -07:00
2012-09-29 12:21:03 -07:00
2012-10-06 03:05:17 +09:00
2012-09-10 15:49:54 -04:00
2012-08-21 01:19:54 -07:00
2012-10-06 03:05:00 +09:00
2012-09-05 12:18:11 -07:00
2012-09-27 09:29:33 -04:00
2012-09-26 21:10:00 -04:00
2012-09-26 22:20:08 -04:00
2012-09-24 16:49:21 -04:00
2012-09-28 11:47:42 +02:00
2012-08-16 13:24:21 -07:00
2012-09-21 10:38:12 -04:00
2012-10-09 16:22:39 +09:00
2012-09-24 13:42:45 -07:00
2012-10-06 03:04:57 +09:00
2012-10-09 16:23:01 +09:00
2012-09-25 15:31:31 +02:00
2012-09-06 19:13:13 +01:00
2012-09-06 19:13:13 +01:00
2012-09-19 19:50:20 +02:00
2012-10-09 16:23:02 +09:00
2012-09-10 16:42:33 -07:00
2012-10-05 22:23:54 +02:00
2012-10-05 22:23:51 +02:00
2012-09-12 17:52:44 +02:00
2012-10-05 22:23:54 +02:00
2012-10-06 03:04:56 +09:00
2012-09-06 17:05:36 +02:00
2012-10-01 18:39:45 -04:00
2012-08-22 14:21:38 -07:00
2012-08-24 13:46:39 -04:00
2012-09-07 14:57:47 -04:00
2012-09-17 18:08:54 -07:00
2012-10-06 03:04:37 +09:00
2012-09-19 19:50:18 +02:00
2012-09-07 14:57:45 -04:00
2012-09-23 07:42:52 -07:00
2012-10-09 16:22:40 +09:00
2012-10-09 16:22:39 +09:00
2012-09-25 12:14:56 +02:00
2012-09-11 10:15:02 +02:00
2012-09-06 22:17:20 -07:00
2012-08-30 03:00:10 +02:00
2012-10-01 09:06:36 -07:00
2012-08-22 14:21:38 -07:00
2012-10-07 17:49:05 +09:00
2012-09-26 13:42:26 -07:00
2012-09-25 15:42:37 +02:00
2012-09-19 06:51:25 -07:00
2012-09-13 18:28:02 -07:00
2012-09-26 13:52:36 -07:00
2012-09-06 10:13:58 -07:00
2012-08-22 10:24:41 -04:00
2012-10-04 09:30:33 -07:00
2012-09-23 13:50:15 +02:00
2012-10-02 19:01:32 -07:00
2012-10-06 02:48:09 +09:00
2012-09-21 03:13:20 -07:00
2012-08-22 22:58:27 -07:00
2012-10-09 16:22:47 +09:00
2012-10-09 16:23:02 +09:00
2012-09-17 15:00:37 -07:00
2012-10-09 16:22:22 +09:00
2012-09-24 15:54:33 -04:00
2012-09-13 14:58:54 -04:00
2012-10-09 16:22:39 +09:00
2012-10-09 16:22:54 +09:00
2012-10-09 16:22:18 +09:00
2012-10-09 16:22:58 +09:00
2012-10-09 16:23:00 +09:00
2012-10-01 18:02:07 -07:00
2012-10-06 03:05:24 +09:00
2012-10-02 20:25:04 -07:00
2012-10-02 13:38:27 -07:00
2012-08-30 03:00:14 +02:00
2012-08-30 03:00:14 +02:00
2012-09-23 02:09:23 -04:00
2012-09-27 10:47:59 +02:00
2012-09-04 14:52:42 -04:00
2012-09-06 11:11:53 -04:00
2012-09-18 19:54:06 +02:00
2012-09-20 12:32:30 +02:00
2012-08-30 12:37:52 -04:00
2012-10-05 12:01:30 +09:00
2012-09-10 16:34:00 -07:00
2012-10-09 16:22:24 +09:00
2012-09-09 22:06:33 +02:00
2012-08-20 02:23:14 -07:00
2012-10-09 16:22:52 +09:00
2012-10-09 16:22:50 +09:00
2012-10-05 22:23:53 +02:00
2012-08-23 18:32:36 -06:00
2012-09-24 14:51:23 -06:00
2012-09-13 09:08:02 -06:00
2012-09-07 16:24:59 -06:00
2012-10-06 03:04:44 +09:00
2012-10-01 10:28:49 -07:00
2012-08-16 10:32:07 -07:00
2012-09-04 01:36:53 +02:00
2012-10-02 18:32:35 -07:00
2012-09-18 01:01:35 -07:00
2012-09-18 01:01:35 -07:00
2012-08-22 21:59:15 -07:00
2012-09-07 21:13:28 +01:00
2012-09-18 01:01:37 -07:00
2012-09-06 22:16:58 -07:00
2012-09-22 15:42:46 -04:00
2012-09-18 01:01:41 -07:00
2012-09-18 01:01:40 -07:00
2012-10-09 16:22:40 +09:00
2012-10-09 16:22:40 +09:00
2012-09-26 15:47:02 +02:00
2012-08-30 11:13:41 -07:00
2012-09-18 21:55:52 +03:00
2012-08-21 20:50:25 +02:00
2012-10-06 03:05:21 +09:00
2012-10-06 03:05:23 +09:00
2012-10-09 16:22:43 +09:00
2012-10-06 03:05:01 +09:00
2012-10-06 03:05:04 +09:00
2012-10-09 16:22:24 +09:00
2012-09-17 13:29:23 +01:00
2012-10-02 21:38:48 -07:00
2012-09-26 13:47:02 -07:00
2012-09-06 09:17:01 -07:00
2012-09-05 13:15:07 -07:00
2012-08-24 15:55:33 -07:00
2012-09-29 10:02:27 +03:00
2012-09-25 10:14:18 +03:00
2012-09-25 10:11:14 +03:00
2012-08-31 20:02:18 -04:00
2012-09-22 16:35:13 +03:00
2012-08-31 16:11:28 -04:00
2012-08-21 16:45:03 -07:00
2012-10-09 16:22:55 +09:00
2012-08-21 14:47:25 -04:00
2012-09-13 16:47:34 +02:00
2012-09-05 15:15:02 -04:00
2012-09-20 17:12:27 -04:00
2012-08-16 10:11:45 -07:00
2012-09-01 10:24:48 -07:00
2012-08-21 16:28:31 +02:00
2012-10-09 16:22:32 +09:00
2012-08-20 02:26:31 -07:00
2012-08-22 11:11:33 -05:00
2012-09-12 10:20:14 -04:00
2012-09-18 01:01:32 -07:00
2012-09-05 13:11:03 -07:00
2012-10-02 11:11:09 -07:00
2012-08-21 22:29:54 -07:00
2012-09-15 17:37:28 +02:00
2012-09-05 17:21:36 -07:00
2012-09-10 13:04:01 -07:00
2012-09-10 11:10:37 -07:00
2012-09-18 01:01:37 -07:00
2012-09-26 09:25:41 -03:00
2012-09-13 16:05:27 -03:00
2012-09-26 09:49:37 -03:00
2012-09-28 15:05:15 +09:30
2012-09-28 15:05:15 +09:30
2012-09-28 15:05:15 +09:30
2012-10-09 16:22:59 +09:00
2012-10-09 16:22:59 +09:00
2012-08-16 10:02:33 -07:00
2012-08-21 13:18:24 -07:00
2012-10-02 21:38:48 -07:00
2012-09-20 18:08:40 -04:00
b676b293fb