Merge branch 'bpf-Allow-selecting-numa-node-during-map-creation'

Martin KaFai Lau says:

====================
bpf: Allow selecting numa node during map creation

This series allows user to pick the numa node during map creation.
The first patch has the details
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 5 insertions, 2 deletions

diff --git a/kernel/bpf/arraymap.c b/kernel/bpf/arraymap.c
index d771a3872500..96e9c5c1dfc9 100644
--- a/kernel/bpf/arraymap.c
+++ b/kernel/bpf/arraymap.c
@@ -49,13 +49,15 @@ static int bpf_array_alloc_percpu(struct bpf_array *array)
 static struct bpf_map *array_map_alloc(union bpf_attr *attr)
 {
         bool percpu = attr->map_type == BPF_MAP_TYPE_PERCPU_ARRAY;
+        int numa_node = bpf_map_attr_numa_node(attr);
         struct bpf_array *array;
         u64 array_size;
         u32 elem_size;
 
         /* check sanity of attributes */
         if (attr->max_entries == 0 || attr->key_size != 4 ||
-            attr->value_size == 0 || attr->map_flags)
+            attr->value_size == 0 || attr->map_flags & ~BPF_F_NUMA_NODE ||
+            (percpu && numa_node != NUMA_NO_NODE))
                 return ERR_PTR(-EINVAL);
 
         if (attr->value_size > KMALLOC_MAX_SIZE)
@@ -77,7 +79,7 @@ static struct bpf_map *array_map_alloc(union bpf_attr *attr)
                 return ERR_PTR(-ENOMEM);
 
         /* allocate all map elements and zero-initialize them */
-        array = bpf_map_area_alloc(array_size);
+        array = bpf_map_area_alloc(array_size, numa_node);
         if (!array)
                 return ERR_PTR(-ENOMEM);
 
@@ -87,6 +89,7 @@ static struct bpf_map *array_map_alloc(union bpf_attr *attr)
         array->map.value_size = attr->value_size;
         array->map.max_entries = attr->max_entries;
         array->map.map_flags = attr->map_flags;
+        array->map.numa_node = numa_node;
         array->elem_size = elem_size;
 
         if (!percpu)