1 files changed, 10 insertions, 4 deletions

diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index b8cb1b3c9bfb..9378f3ba2cbf 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -105,7 +105,7 @@ static struct bpf_map *find_and_alloc_map(union bpf_attr *attr)
         return map;
 }
 
-void *bpf_map_area_alloc(size_t size)
+void *bpf_map_area_alloc(size_t size, int numa_node)
 {
         /* We definitely need __GFP_NORETRY, so OOM killer doesn't
          * trigger under memory pressure as we really just want to
@@ -115,12 +115,13 @@ void *bpf_map_area_alloc(size_t size)
         void *area;
 
         if (size <= (PAGE_SIZE << PAGE_ALLOC_COSTLY_ORDER)) {
-                area = kmalloc(size, GFP_USER | flags);
+                area = kmalloc_node(size, GFP_USER | flags, numa_node);
                 if (area != NULL)
                         return area;
         }
 
-        return __vmalloc(size, GFP_KERNEL | flags, PAGE_KERNEL);
+        return __vmalloc_node_flags_caller(size, numa_node, GFP_KERNEL | flags,
+                                           __builtin_return_address(0));
 }
 
 void bpf_map_area_free(void *area)
@@ -309,10 +310,11 @@ int bpf_map_new_fd(struct bpf_map *map)
                    offsetof(union bpf_attr, CMD##_LAST_FIELD) - \
                    sizeof(attr->CMD##_LAST_FIELD)) != NULL
 
-#define BPF_MAP_CREATE_LAST_FIELD inner_map_fd
+#define BPF_MAP_CREATE_LAST_FIELD numa_node
 /* called via syscall */
 static int map_create(union bpf_attr *attr)
 {
+        int numa_node = bpf_map_attr_numa_node(attr);
         struct bpf_map *map;
         int err;
 
@@ -320,6 +322,10 @@ static int map_create(union bpf_attr *attr)
         if (err)
                 return -EINVAL;
 
+        if (numa_node != NUMA_NO_NODE &&
+            (numa_node >= nr_node_ids || !node_online(numa_node)))
+                return -EINVAL;
+
         /* find map type and init map: hashtable vs rbtree vs bloom vs ... */
         map = find_and_alloc_map(attr);
         if (IS_ERR(map))