Andrey Ryabinin
bf04afb613
mm: mempolicy: fix THP allocations escaping mempolicy restrictions
...
commit 338635340669d5b317c7e8dcf4fff4a0f3651d87 upstream.
alloc_pages_vma() may try to allocate THP page on the local NUMA node
first:
page = __alloc_pages_node(hpage_node,
gfp | __GFP_THISNODE | __GFP_NORETRY, order);
And if the allocation fails it retries allowing remote memory:
if (!page && (gfp & __GFP_DIRECT_RECLAIM))
page = __alloc_pages_node(hpage_node,
gfp, order);
However, this retry allocation completely ignores memory policy nodemask
allowing allocation to escape restrictions.
The first appearance of this bug seems to be the commit ac5b2c18911f
("mm: thp: relax __GFP_THISNODE for MADV_HUGEPAGE mappings").
The bug disappeared later in the commit 89c83fb539f9 ("mm, thp:
consolidate THP gfp handling into alloc_hugepage_direct_gfpmask") and
reappeared again in slightly different form in the commit 76e654cc91bb
("mm, page_alloc: allow hugepage fallback to remote nodes when
madvised")
Fix this by passing correct nodemask to the __alloc_pages() call.
The demonstration/reproducer of the problem:
$ mount -oremount,size=4G,huge=always /dev/shm/
$ echo always > /sys/kernel/mm/transparent_hugepage/defrag
$ cat mbind_thp.c
#include <unistd.h>
#include <sys/mman.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <assert.h>
#include <stdlib.h>
#include <stdio.h>
#include <numaif.h>
#define SIZE 2ULL << 30
int main(int argc, char **argv)
{
int fd;
unsigned long long i;
char *addr;
pid_t pid;
char buf[100];
unsigned long nodemask = 1;
fd = open("/dev/shm/test", O_RDWR|O_CREAT);
assert(fd > 0);
assert(ftruncate(fd, SIZE) == 0);
addr = mmap(NULL, SIZE, PROT_READ|PROT_WRITE,
MAP_SHARED, fd, 0);
assert(mbind(addr, SIZE, MPOL_BIND, &nodemask, 2, MPOL_MF_STRICT|MPOL_MF_MOVE)==0);
for (i = 0; i < SIZE; i+=4096) {
addr[i] = 1;
}
pid = getpid();
snprintf(buf, sizeof(buf), "grep shm /proc/%d/numa_maps", pid);
system(buf);
sleep(10000);
return 0;
}
$ gcc mbind_thp.c -o mbind_thp -lnuma
$ numactl -H
available: 2 nodes (0-1)
node 0 cpus: 0 2
node 0 size: 1918 MB
node 0 free: 1595 MB
node 1 cpus: 1 3
node 1 size: 2014 MB
node 1 free: 1731 MB
node distances:
node 0 1
0: 10 20
1: 20 10
$ rm -f /dev/shm/test; taskset -c 0 ./mbind_thp
7fd970a00000 bind:0 file=/dev/shm/test dirty=524288 active=0 N0=396800 N1=127488 kernelpagesize_kB=4
Link: https://lkml.kernel.org/r/20211208165343.22349-1-arbn@yandex-team.com
Fixes: ac5b2c18911f ("mm: thp: relax __GFP_THISNODE for MADV_HUGEPAGE mappings")
Signed-off-by: Andrey Ryabinin <arbn@yandex-team.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Acked-by: Mel Gorman <mgorman@techsingularity.net>
Acked-by: David Rientjes <rientjes@google.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-12-29 12:23:37 +01:00
..
2021-01-27 11:47:53 +01:00
2021-12-14 14:49:00 +01:00
2019-09-04 07:42:01 -04:00
2019-07-12 12:24:03 -07:00
2019-05-14 09:47:45 -07:00
2020-09-03 11:26:51 +02:00
2021-03-04 10:26:39 +01:00
2020-03-05 16:43:51 +01:00
2019-07-12 11:05:46 -07:00
2017-12-11 14:54:44 +01:00
2019-08-30 22:43:58 -07:00
2019-07-12 11:05:43 -07:00
2021-06-10 13:37:15 +02:00
2019-09-25 17:51:41 -07:00
2019-06-19 17:09:52 +02:00
2020-01-09 10:20:00 +01:00
2020-10-01 13:18:24 +02:00
2018-12-28 12:11:47 -08:00
2019-09-07 04:28:04 -03:00
2021-07-14 16:53:47 +02:00
2019-11-15 18:34:00 -08:00
2021-11-26 10:47:23 +01:00
2019-06-03 15:39:40 +02:00
2019-10-19 06:32:32 -04:00
2021-06-30 08:47:52 -04:00
2019-06-19 17:09:08 +02:00
2020-12-16 10:56:59 +01:00
2019-09-24 15:54:08 -07:00
2021-05-19 10:08:27 +02:00
2019-06-05 17:37:06 +02:00
2020-10-01 13:17:53 +02:00
2021-05-19 10:08:27 +02:00
2020-12-11 13:23:31 +01:00
2020-01-17 19:48:40 +01:00
2020-10-01 13:18:21 +02:00
2019-09-24 15:54:10 -07:00
2021-12-17 10:12:24 +01:00
2021-08-26 08:36:22 -04:00
2019-09-24 15:54:08 -07:00
2021-09-22 12:26:43 +02:00
2021-06-23 14:41:23 +02:00
2021-06-30 08:47:53 -04:00
2021-12-29 12:23:37 +01:00
2019-03-05 21:07:20 -08:00
2020-01-09 10:19:56 +01:00
2021-06-30 08:47:52 -04:00
2019-09-25 17:51:41 -07:00
2019-09-25 17:51:41 -07:00
2019-05-21 10:50:45 +02:00
2020-10-01 13:17:54 +02:00
2020-09-03 11:26:51 +02:00
2020-02-11 04:35:42 -08:00
2019-11-06 08:47:50 -08:00
2020-03-12 13:00:19 +01:00
2020-06-07 13:18:46 +02:00
2019-09-25 17:51:41 -07:00
2020-03-25 08:25:58 +01:00
2021-11-17 09:48:50 +01:00
2021-09-12 08:56:41 +02:00
2020-08-21 13:05:27 +02:00
2019-10-14 15:04:00 -07:00
2019-06-29 16:43:45 +08:00
2021-03-07 12:20:49 +01:00
2020-09-23 12:40:47 +02:00
2020-10-29 09:57:52 +01:00
2019-09-24 15:54:08 -07:00
2021-06-30 08:47:55 -04:00
2020-01-23 08:22:41 +01:00
2020-10-01 13:17:30 +02:00
2019-03-13 12:25:31 -07:00
2019-06-05 17:37:16 +02:00
2019-06-05 17:37:16 +02:00
2019-06-05 17:37:16 +02:00
2020-09-23 12:40:45 +02:00
2021-06-30 08:47:52 -04:00
2019-05-30 11:26:32 -07:00
2019-05-21 10:50:45 +02:00
2021-06-30 08:47:53 -04:00
2019-06-05 17:37:17 +02:00
2021-05-19 10:08:29 +02:00
2020-09-03 11:26:51 +02:00
2019-05-14 19:52:48 -07:00
2021-07-25 14:35:14 +02:00
2020-01-23 08:22:40 +01:00
2021-11-26 10:47:21 +01:00
2019-10-07 15:47:20 -07:00
2021-10-27 09:54:28 +02:00
2019-07-18 17:08:07 -07:00
2021-05-14 09:44:32 +02:00
2018-08-22 10:52:44 -07:00
2020-10-01 13:18:08 +02:00
2019-09-25 17:51:41 -07:00
2021-03-07 12:20:49 +01:00
2021-06-30 08:47:53 -04:00
2019-09-17 15:20:17 -07:00
2021-03-30 14:35:19 +02:00
2020-06-17 16:40:23 +02:00
2018-09-13 15:18:04 -10:00
2020-09-03 11:26:52 +02:00
2019-10-07 15:47:19 -07:00
2021-09-22 12:26:37 +02:00
2019-11-06 08:47:50 -08:00
2019-08-13 16:06:52 -07:00
2021-07-14 16:53:47 +02:00
2019-05-21 10:50:45 +02:00
2019-09-24 15:54:12 -07:00
2021-11-17 09:48:47 +01:00
2019-09-24 15:54:12 -07:00