Skip to content

bpf: Reduce memory usage for bpf_global_percpu_ma

Yonghong Song bpf 6 versions – Applied

Status from this message: This series was applied to bpf/bpf-next.git (master)

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v6 Latest8 patches 6 repliesApplied 8/8
  2. v58 patches 5 repliesSuperseded
  3. v47 patches 6 repliesSuperseded
Earlier versions · 3
VersionPostedPatchesRepliesStatus
v36 patches8 repliesSuperseded
v26 patches10 repliesSuperseded
v15 patches8 repliesSuperseded

Changes in v6 from the cover letter

. Change bpf_mem_alloc_percpu_init() to add objcg as one of parameters.
For bpf_global_percpu_ma, the objcg is NULL, corresponding root memcg.

Patches in v6 All 8 applied

#Subject and filesSizeRepliesApplied
1/8bpf: Avoid unnecessary extra percpu memory allocationkernel/bpf/memalloc.c+3 -10 repliesApplied
2/8bpf: Add objcg to bpf_mem_allocinclude/linux/bpf_mem_alloc.h kernel/bpf/memalloc.c+7 -50 repliesApplied
3/8bpf: Allow per unit prefill for non-fix-size percpu memory allocatorinclude/linux/bpf_mem_alloc.h kernel/bpf/memalloc.c kernel/bpf/verifier.c+86 -153 repliesApplied
4/8bpf: Refill only one percpu element in memallockernel/bpf/memalloc.c+9 -40 repliesApplied
5/8bpf: Use smaller low/high marks for percpu allocationkernel/bpf/memalloc.c+7 -11 replyApplied
6/8bpf: Limit up to 512 bytes for bpf_global_percpu_ma allocationkernel/bpf/verifier.c+8 -00 repliesApplied
7/8selftests/bpf: Cope with 512 bytes limit with bpf_global_percpu_matools/testing/selftests/bpf/prog_tests/test_bpf_ma.c tools/testing/selftests/bpf/progs/test_bpf_ma.c+46 -400 repliesApplied
8/8selftests/bpf: Add a selftest with > 512-byte percpu allocation sizetools/testing/selftests/bpf/progs/percpu_alloc_fail.c+18 -00 repliesApplied

Reviews trailers per patch

All 8 patches have a Reviewed-by or Acked-by.

PatchHou Tao
1/8A-b
2/8A-b
3/8A-b
4/8A-b
5/8A-b
6/8A-b
7/8A-b
8/8A-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v6 thread

Cover letter [PATCH bpf-next v6 0/8] bpf: Reduce memory usage for bpf_global_percpu_ma

Currently when a bpf program intends to allocate memory for percpu kptr, the verifier will call bpf_mem_alloc_init() to prefill all supported unit sizes and this caused memory consumption very big for large number of cpus. For example, for 128-cpu system, the total memory consumption with initial prefill is ~175MB. Things will become worse for systems with even more cpus.

Patch 1 avoids unnecessary extra percpu memory allocation. Patch 2 adds objcg to bpf_mem_alloc at init stage so objcg can be associated with root cgroup and objcg can be passed to later bpf_mem_alloc_percpu_unit_init().
Patch 3 addresses memory consumption issue by avoiding to prefill with all unit sizes, i.e. only prefilling with user specified size. Patch 4 further reduces memory consumption by limiting the number of prefill entries for percpu memory allocation. Patch 5 has much smaller low/high watermarks for percpu allocation to reduce memory consumption.
Patch 6 rejects percpu memory allocation with bpf_global_percpu_ma when allocation size is greater than 512 bytes.
Patch 7 fixed test_bpf_ma test due to Patch 5.
Patch 8 added one test to show the verification failure log message.

Changelogs:
v5 -> v6:
. Change bpf_mem_alloc_percpu_init() to add objcg as one of parameters.
For bpf_global_percpu_ma, the objcg is NULL, corresponding root memcg.
v4 -> v5:
. Do not do bpf_global_percpu_ma initialization at init stage, instead
doing initialization when the verifier knows it is going to be used by bpf prog.
. Using much smaller low/high watermarks for percpu allocation.
v3 -> v4:
. Add objcg to bpf_mem_alloc during init stage.
. Initialize objcg at init stage but use it in bpf_mem_alloc_percpu_unit_init(). . Remove check_obj_size() in bpf_mem_alloc_percpu_unit_init().
v2 -> v3:
. Clear the bpf_mem_cache if prefill fails.
. Change test_bpf_ma percpu allocation tests to use bucket_size
as allocation size instead of bucket_size - 8.
. Remove __GFP_ZERO flag from __alloc_percpu_gfp() call.
v1 -> v2:
. Avoid unnecessary extra percpu memory allocation.
. Add a separate function to do bpf_global_percpu_ma initialization . promote.
. Promote function static 'sizes' array to file static.
. Add comments to explain to refill only one item for percpu alloc.

Yonghong Song (8):
bpf: Avoid unnecessary extra percpu memory allocation
bpf: Add objcg to bpf_mem_alloc
bpf: Allow per unit prefill for non-fix-size percpu memory allocator
bpf: Refill only one percpu element in memalloc
bpf: Use smaller low/high marks for percpu allocation
bpf: Limit up to 512 bytes for bpf_global_percpu_ma allocation selftests/bpf: Cope with 512 bytes limit with bpf_global_percpu_ma selftests/bpf: Add a selftest with > 512-byte percpu allocation size

 include/linux/bpf_mem_alloc.h                 |  8 ++
 kernel/bpf/memalloc.c                         | 93 ++++++++++++++++---
 kernel/bpf/verifier.c                         | 45 ++++++---
 .../selftests/bpf/prog_tests/test_bpf_ma.c    | 20 ++--
 .../selftests/bpf/progs/percpu_alloc_fail.c   | 18 ++++
 .../testing/selftests/bpf/progs/test_bpf_ma.c | 66 ++++++-------
 6 files changed, 184 insertions(+), 66 deletions(-)
Signature · 1 line
2.34.1