Skip to content

Make struct bpf_cpumask RCU safe

David Vernet bpf lkml 2 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. v2 Latest5 patches 0 repliesApplied 5/5
  2. v15 patches 0 repliesSuperseded

Changes in v2 from the cover letter

- Add doxygen comment for new @rcu field in struct bpf_cpumask.

Patches in v2 All 5 applied

#Subject and filesSizeRepliesApplied
1/5bpf: Free struct bpf_cpumask in call_rcu handlerkernel/bpf/cpumask.c+14 -50 repliesApplied
2/5bpf: Mark struct bpf_cpumask as rcu protectedkernel/bpf/verifier.c+1 -00 repliesApplied
3/5bpf/selftests: Test using global cpumask kptr with RCUtools/testing/selftests/bpf/prog_tests/cpumask.c tools/testing/selftests/bpf/progs/cpumask_common.h tools/testing/selftests/bpf/progs/cpumask_failure.c +1 more+102 -00 repliesApplied
4/5bpf: Remove bpf_cpumask_kptr_get() kfunckernel/bpf/cpumask.c tools/testing/selftests/bpf/prog_tests/cpumask.c tools/testing/selftests/bpf/progs/cpumask_common.h +2 more+0 -850 repliesApplied
5/5bpf,docs: Remove bpf_cpumask_kptr_get() from documentationDocumentation/bpf/cpumasks.rst+10 -200 repliesApplied

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.

Read the v2 thread

Cover letter [PATCH bpf-next v2 0/5] Make struct bpf_cpumask RCU safe

The struct bpf_cpumask type is currently not RCU safe. It uses the bpf_mem_cache_{alloc,free}() APIs to allocate and release cpumasks, and those allocations may be reused before an RCU grace period has elapsed. We want to be able to enable using this pattern in BPF programs:

private(MASK) static struct bpf_cpumask __kptr *global;

int BPF_PROG(prog, ...)

{
	struct bpf_cpumask *cpumask;

	bpf_rcu_read_lock();
	cpumask = global;
	if (!cpumask) {
		bpf_rcu_read_unlock();
		return -1;
	}
	bpf_cpumask_setall(cpumask);
	...
	bpf_rcu_read_unlock();
}

In other words, to be able to pass a kptr to KF_RCU bpf_cpumask kfuncs without requiring the acquisition and release of refcounts using bpf_cpumask_kptr_get(). This patchset enables this by making the struct bpf_cpumask type RCU safe, and removing the bpf_cpumask_kptr_get() function.

---
v1: https://lore.kernel.org/all/[email protected]/

Changelog:
----------
v1 -> v2:
- Add doxygen comment for new @rcu field in struct bpf_cpumask.

David Vernet (5):
bpf: Free struct bpf_cpumask in call_rcu handler
bpf: Mark struct bpf_cpumask as rcu protected bpf/selftests: Test using global cpumask kptr with RCU
bpf: Remove bpf_cpumask_kptr_get() kfunc bpf,docs: Remove bpf_cpumask_kptr_get() from documentation

 Documentation/bpf/cpumasks.rst                | 30 +++-----
 kernel/bpf/cpumask.c                          | 38 +++--------
 kernel/bpf/verifier.c                         |  1 +
 .../selftests/bpf/prog_tests/cpumask.c        |  2 +-
 .../selftests/bpf/progs/cpumask_common.h      |  7 +-
 .../selftests/bpf/progs/cpumask_failure.c     | 68 +++++++++++++++----
 .../selftests/bpf/progs/cpumask_success.c     | 29 ++++----
 7 files changed, 96 insertions(+), 79 deletions(-)
Signature · 1 line
2.39.0