bpf: Reduce memory usage for bpf_global_percpu_ma
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
- v6 Latest8 patches 6 repliesApplied 8/8
- v58 patches 5 repliesSuperseded
- v47 patches 6 repliesSuperseded
Earlier versions · 3
| Version | Posted | Patches | Replies | Status |
|---|---|---|---|---|
| v3 | 6 patches | 8 replies | Superseded | |
| v2 | 6 patches | 10 replies | Superseded | |
| v1 | 5 patches | 8 replies | Superseded |
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 files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/8 | bpf: Avoid unnecessary extra percpu memory allocationkernel/ | +3 | 0 replies | Applied |
| 2/8 | bpf: Add objcg to bpf_mem_allocinclude/ kernel/ | +7 | 0 replies | Applied |
| 3/8 | bpf: Allow per unit prefill for non-fix-size percpu memory allocatorinclude/ kernel/ kernel/ | +86 | 3 replies | Applied |
| 4/8 | bpf: Refill only one percpu element in memallockernel/ | +9 | 0 replies | Applied |
| 5/8 | bpf: Use smaller low/high marks for percpu allocationkernel/ | +7 | 1 reply | Applied |
| 6/8 | bpf: Limit up to 512 bytes for bpf_global_percpu_ma allocationkernel/ | +8 | 0 replies | Applied |
| 7/8 | selftests/bpf: Cope with 512 bytes limit with bpf_global_percpu_matools/ tools/ | +46 | 0 replies | Applied |
| 8/8 | selftests/bpf: Add a selftest with > 512-byte percpu allocation sizetools/ | +18 | 0 replies | Applied |
Reviews trailers per patch
All 8 patches have a Reviewed-by or Acked-by.
| Patch | Hou Tao |
|---|---|
| 1/8 | A-b |
| 2/8 | A-b |
| 3/8 | A-b |
| 4/8 | A-b |
| 5/8 | A-b |
| 6/8 | A-b |
| 7/8 | A-b |
| 8/8 | A-b |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
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