Skip to content

New nf_conntrack kfuncs for insertion, changing timeout, status

Kumar Kartikeya Dwivedi bpf netdev netfilter-devel 3 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. v7 Latest13 patches 14 repliesApplied 13/13
  2. v613 patches 4 repliesSuperseded
  3. v58 patches 9 repliesSuperseded

Changes in v7 from the cover letter

v6: https://lore.kernel.org/bpf/[email protected]

* Use .long to encode flags (Alexei)
* Fix description of KF_RET_NULL in documentation (Toke)

Patches in v7 All 13 applied

#Subject and filesSizeRepliesApplied
1/13bpf: Introduce 8-byte BTF setinclude/linux/btf_ids.h+64 -40 repliesApplied
2/13tools/resolve_btfids: Add support for 8-byte BTF setstools/bpf/resolve_btfids/main.c+34 -61 replyApplied
3/13bpf: Switch to new kfunc flags infrastructureinclude/linux/bpf.h include/linux/btf.h kernel/bpf/btf.c +8 more+145 -2220 repliesApplied
4/13bpf: Add support for forcing kfunc args to be trustedinclude/linux/btf.h kernel/bpf/btf.c net/bpf/test_run.c+51 -37 repliesApplied
5/13bpf: Add documentation for kfuncsDocumentation/bpf/index.rst Documentation/bpf/kfuncs.rst+171 -00 repliesApplied
6/13net: netfilter: Deduplicate code in bpf_{xdp,skb}_ct_lookupnet/netfilter/nf_conntrack_bpf.c+18 -340 repliesApplied
7/13net: netfilter: Add kfuncs to allocate and insert CTinclude/net/netfilter/nf_conntrack_core.h net/netfilter/nf_conntrack_bpf.c net/netfilter/nf_conntrack_netlink.c+204 -274 repliesApplied
8/13net: netfilter: Add kfuncs to set and change CT timeoutinclude/net/netfilter/nf_conntrack_core.h net/netfilter/nf_conntrack_bpf.c net/netfilter/nf_conntrack_core.c +1 more+60 -110 repliesApplied
9/13net: netfilter: Add kfuncs to set and change CT statusinclude/net/netfilter/nf_conntrack_core.h net/netfilter/nf_conntrack_bpf.c net/netfilter/nf_conntrack_core.c +1 more+76 -370 repliesApplied
10/13selftests/bpf: Add verifier tests for trusted kfunc argstools/testing/selftests/bpf/verifier/calls.c+53 -00 repliesApplied
11/13selftests/bpf: Add tests for new nf_conntrack kfuncstools/testing/selftests/bpf/prog_tests/bpf_nf.c tools/testing/selftests/bpf/progs/test_bpf_nf.c+81 -120 repliesApplied
12/13selftests/bpf: Add negative tests for new nf_conntrack kfuncstools/testing/selftests/bpf/prog_tests/bpf_nf.c tools/testing/selftests/bpf/progs/test_bpf_nf_fail.c+189 -10 repliesApplied
13/13selftests/bpf: Fix test_verifier failed test in unprivileged modetools/testing/selftests/bpf/verifier/bpf_loop_inline.c+1 -00 repliesApplied

Reviews trailers per patch

2 of 13 patches have a Reviewed-by or Acked-by.

PatchYonghong SongJiri Olsa
1/13
2/13A-b
3/13
4/13
5/13
6/13
7/13
8/13
9/13
10/13A-b
11/13
12/13
13/13

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

Read the v7 thread

Cover letter [PATCH bpf-next v7 00/13] New nf_conntrack kfuncs for insertion, changing timeout, status

Introduce the following new kfuncs:
- bpf_{xdp,skb}_ct_alloc
- bpf_ct_insert_entry
- bpf_ct_{set,change}_timeout
- bpf_ct_{set,change}_status

The setting of timeout and status on allocated or inserted/looked up CT is same as the ctnetlink interface, hence code is refactored and shared with the kfuncs. It is ensured allocated CT cannot be passed to kfuncs that expected inserted CT, and vice versa. Please see individual patches for details.

Changelog:
----------
v6 -> v7:
v6: https://lore.kernel.org/bpf/[email protected]

* Use .long to encode flags (Alexei)
* Fix description of KF_RET_NULL in documentation (Toke)

v5 -> v6:
v5: https://lore.kernel.org/bpf/[email protected]

* Introduce kfunc flags, rework verifier to work with them
* Add documentation for kfuncs
* Add comment explaining TRUSTED_ARGS kfunc flag (Alexei)
* Fix missing offset check for trusted arguments (Alexei)
* Change nf_conntrack test minimum delta value to 8

v4 -> v5:
v4: https://lore.kernel.org/bpf/[email protected]

* Drop read-only PTR_TO_BTF_ID approach, use struct nf_conn___init (Alexei)
* Drop acquire release pair code that is no longer required (Alexei)
* Disable writes into nf_conn, use dedicated helpers (Florian, Alexei)
* Refactor and share ctnetlink code for setting timeout and status
* Do strict type matching on finding __ref suffix on argument to prevent passing nf_conn___init as nf_conn (offset = 0, match on walk)
* Remove bpf_ct_opts parameter from bpf_ct_insert_entry
* Update selftests for new additions, add more negative tests

v3 -> v4:
v3: https://lore.kernel.org/bpf/[email protected]

* split bpf_xdp_ct_add in bpf_xdp_ct_alloc/bpf_skb_ct_alloc and bpf_ct_insert_entry
* add verifier code to properly populate/configure ct entry
* improve selftests

v2 -> v3:
v2: https://lore.kernel.org/bpf/[email protected]

* add bpf_xdp_ct_add and bpf_ct_refresh_timeout kfunc helpers
* remove conntrack dependency from selftests
* add support for forcing kfunc args to be referenced and related selftests

v1 -> v2:
v1: https://lore.kernel.org/bpf/1327f8f5696ff2bc60400e8f3b79047914ccc837.1651595019.git.lorenzo@kernel.org

* add bpf_ct_refresh_timeout kfunc selftest

Kumar Kartikeya Dwivedi (10):
bpf: Introduce 8-byte BTF set
tools/resolve_btfids: Add support for 8-byte BTF sets
bpf: Switch to new kfunc flags infrastructure
bpf: Add support for forcing kfunc args to be trusted
bpf: Add documentation for kfuncs
net: netfilter: Deduplicate code in bpf_{xdp,skb}_ct_lookup
net: netfilter: Add kfuncs to set and change CT timeout selftests/bpf: Add verifier tests for trusted kfunc args selftests/bpf: Add negative tests for new nf_conntrack kfuncs selftests/bpf: Fix test_verifier failed test in unprivileged mode

Lorenzo Bianconi (3):
net: netfilter: Add kfuncs to allocate and insert CT
net: netfilter: Add kfuncs to set and change CT status selftests/bpf: Add tests for new nf_conntrack kfuncs

 Documentation/bpf/index.rst                   |   1 +
 Documentation/bpf/kfuncs.rst                  | 170 ++++++++
 include/linux/bpf.h                           |   3 +-
 include/linux/btf.h                           |  65 ++--
 include/linux/btf_ids.h                       |  68 +++-
 include/net/netfilter/nf_conntrack_core.h     |  19 +
 kernel/bpf/btf.c                              | 123 +++---
 kernel/bpf/verifier.c                         |  14 +-
 net/bpf/test_run.c                            |  75 ++--
 net/ipv4/bpf_tcp_ca.c                         |  18 +-
 net/ipv4/tcp_bbr.c                            |  24 +-
 net/ipv4/tcp_cubic.c                          |  20 +-
 net/ipv4/tcp_dctcp.c                          |  20 +-
 net/netfilter/nf_conntrack_bpf.c              | 365 +++++++++++++-----
 net/netfilter/nf_conntrack_core.c             |  62 +++
 net/netfilter/nf_conntrack_netlink.c          |  54 +--
 tools/bpf/resolve_btfids/main.c               |  40 +-
 .../selftests/bpf/bpf_testmod/bpf_testmod.c   |  10 +-
 .../testing/selftests/bpf/prog_tests/bpf_nf.c |  64 ++-
 .../testing/selftests/bpf/progs/test_bpf_nf.c |  85 +++-
 .../selftests/bpf/progs/test_bpf_nf_fail.c    | 134 +++++++
 .../selftests/bpf/verifier/bpf_loop_inline.c  |   1 +
 tools/testing/selftests/bpf/verifier/calls.c  |  53 +++
 23 files changed, 1139 insertions(+), 349 deletions(-)
 create mode 100644 Documentation/bpf/kfuncs.rst
 create mode 100644 tools/testing/selftests/bpf/progs/test_bpf_nf_fail.c
Signature · 1 line
2.34.1