Skip to content

Enable struct_ops programs to be sleepable

David Vernet bpf lkml 4 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. v4 Latest4 patches 0 repliesApplied 4/4
  2. v34 patches 2 repliesSuperseded
  3. v24 patches 2 repliesSuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v13 patches2 repliesSuperseded

Changes in v4 from the cover letter

- Fix accidental typo in name of dummy_st_ops introduced in v2, moving it back to dummy_st_ops from dummy_st_ops_success. Should fix s390x testruns.

Patches in v4 All 4 applied

#Subject and filesSizeRepliesApplied
1/4bpf: Allow BPF_PROG_TYPE_STRUCT_OPS programs to be sleepablekernel/bpf/verifier.c tools/testing/selftests/bpf/verifier/sleepable.c+4 -30 repliesApplied
2/4libbpf: Support sleepable struct_ops.s sectiontools/lib/bpf/libbpf.c+1 -00 repliesApplied
3/4bpf: Pass const struct bpf_prog * to .check_memberinclude/linux/bpf.h kernel/bpf/verifier.c net/ipv4/bpf_tcp_ca.c+5 -30 repliesApplied
4/4bpf/selftests: Verify struct_ops prog sleepable behaviorinclude/linux/bpf.h net/bpf/bpf_dummy_struct_ops.c tools/testing/selftests/bpf/prog_tests/dummy_st_ops.c +2 more+93 -240 repliesApplied

Reviews trailers per patch

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

Read the v4 thread

Cover letter [PATCH bpf-next v4 0/4] Enable struct_ops programs to be sleepable

This is part 4 of https://lore.kernel.org/bpf/[email protected]/

Part 3: https://lore.kernel.org/all/[email protected]/
Part 2: https://lore.kernel.org/all/[email protected]/

Changelog:
----------
v3 -> v4:
- Fix accidental typo in name of dummy_st_ops introduced in v2, moving it back to dummy_st_ops from dummy_st_ops_success. Should fix s390x testruns.

v2 -> v3:
- Don't call a KF_SLEEPABLE kfunc from the dummy_st_ops testsuite, and remove the newly added bpf_kfunc_call_test_sleepable() test kfunc (Martin).
- Include vmlinux.h from progs/dummy_st_ops_success.c (previously progs/dummy_st_ops.c) rather than manually defining struct bpf_dummy_ops_state and struct bpf_dummy_ops. (Martin).
- Fix a typo added to prog_tests/dummy_st_ops.c in a previous version:
s/trace_dummy_st_ops_success__open/trace_dummy_st_ops__open.

v1 -> v2:
- Add support for specifying sleepable struct_ops programs with struct_ops.s in libbpf (Alexei).
- Move failure test case into new dummy_st_ops_fail.c prog file.
- Update test_dummy_sleepable() to use struct_ops.s instead of manually setting prog flags. Also remove open_load_skel() helper which is no longer needed.
- Fix verifier tests to expect new sleepable prog failure message.

David Vernet (4):
bpf: Allow BPF_PROG_TYPE_STRUCT_OPS programs to be sleepable
libbpf: Support sleepable struct_ops.s section
bpf: Pass const struct bpf_prog * to .check_member bpf/selftests: Verify struct_ops prog sleepable behavior

 include/linux/bpf.h                           |  4 +-
 kernel/bpf/verifier.c                         |  7 +--
 net/bpf/bpf_dummy_struct_ops.c                | 18 +++++++
 net/ipv4/bpf_tcp_ca.c                         |  3 +-
 tools/lib/bpf/libbpf.c                        |  1 +
 .../selftests/bpf/prog_tests/dummy_st_ops.c   | 52 ++++++++++++++-----
 .../selftests/bpf/progs/dummy_st_ops_fail.c   | 27 ++++++++++
 ...{dummy_st_ops.c => dummy_st_ops_success.c} | 19 +++----
 .../selftests/bpf/verifier/sleepable.c        |  2 +-
 9 files changed, 103 insertions(+), 30 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/progs/dummy_st_ops_fail.c
 rename tools/testing/selftests/bpf/progs/{dummy_st_ops.c => dummy_st_ops_success.c} (72%)
Signature · 1 line
2.39.0