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/xskmap.c | |
| parent | bpf: add memlock precharge for socket local storage (diff) | |
| download | linux-dev-3539b96e041c06e4317082816d90ec09160aeb11.tar.xz linux-dev-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/xskmap.c')
| -rw-r--r-- | kernel/bpf/xskmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/bpf/xskmap.c b/kernel/bpf/xskmap.c index 686d244e798d..f816ee1a0fa0 100644 --- a/kernel/bpf/xskmap.c +++ b/kernel/bpf/xskmap.c @@ -40,10 +40,10 @@ static struct bpf_map *xsk_map_alloc(union bpf_attr *attr) if (cost >= U32_MAX - PAGE_SIZE) goto free_m; - m->map.pages = round_up(cost, PAGE_SIZE) >> PAGE_SHIFT; + m->map.memory.pages = round_up(cost, PAGE_SIZE) >> PAGE_SHIFT; /* Notice returns -EPERM on if map size is larger than memlock limit */ - err = bpf_map_precharge_memlock(m->map.pages); + err = bpf_map_precharge_memlock(m->map.memory.pages); if (err) goto free_m; |