diff options
| author | Roman Gushchin <guro@fb.com> | 2019-05-29 18:03:57 -0700 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2019-05-31 16:52:56 -0700 |
| commit | 3539b96e041c06e4317082816d90ec09160aeb11 (patch) | |
| tree | 7e2ccf8b5526d8f13e8c5996b3b7ef76869a3012 /kernel/bpf/arraymap.c | |
| parent | d50836cda698f6966e63c2c7f718d7c2f687ec8a (diff) | |
| download | blackbird-op-linux-3539b96e041c06e4317082816d90ec09160aeb11.tar.gz blackbird-op-linux-3539b96e041c06e4317082816d90ec09160aeb11.zip | |
bpf: group memory related fields in struct bpf_map_memory
Group "user" and "pages" fields of bpf_map into the bpf_map_memory
structure. Later it can be extended with "memcg" and other related
information.
The main reason for a such change (beside cosmetics) is to pass
bpf_map_memory structure to charging functions before the actual
allocation of bpf_map.
Signed-off-by: Roman Gushchin <guro@fb.com>
Acked-by: Song Liu <songliubraving@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'kernel/bpf/arraymap.c')
| -rw-r--r-- | kernel/bpf/arraymap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/bpf/arraymap.c b/kernel/bpf/arraymap.c index 584636c9e2eb..8fda24e78193 100644 --- a/kernel/bpf/arraymap.c +++ b/kernel/bpf/arraymap.c @@ -138,7 +138,7 @@ static struct bpf_map *array_map_alloc(union bpf_attr *attr) /* copy mandatory map attributes */ bpf_map_init_from_attr(&array->map, attr); - array->map.pages = cost; + array->map.memory.pages = cost; array->elem_size = elem_size; if (percpu && bpf_array_alloc_percpu(array)) { |
