| Message ID | 20231014121706.967988-1-liujian56@huawei.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | add BPF_F_PERMANENT flag for sockmap skmsg redirect | expand |
Liu Jian wrote: > v5->v6: Modified the description of the helper function. > v4->v5: Fix one refcount bug caused by patch1. > v3->v4: Change the two helpers's description. > Let BPF_F_PERMANENT takes precedence over apply/cork_bytes. > > Liu Jian (7): > bpf, sockmap: add BPF_F_PERMANENT flag for skmsg redirect > selftests/bpf: Add txmsg permanently test for sockmap > selftests/bpf: Add txmsg redir permanently test for sockmap > selftests/bpf: add skmsg verdict tests > selftests/bpf: add two skmsg verdict tests for BPF_F_PERMANENT flag > selftests/bpf: add tests for verdict skmsg to itself > selftests/bpf: add tests for verdict skmsg to closed socket > > include/linux/skmsg.h | 1 + > include/uapi/linux/bpf.h | 45 +++++-- > net/core/skmsg.c | 6 +- > net/core/sock_map.c | 4 +- > net/ipv4/tcp_bpf.c | 12 +- > tools/include/uapi/linux/bpf.h | 45 +++++-- > .../selftests/bpf/prog_tests/sockmap_basic.c | 122 ++++++++++++++++++ > .../selftests/bpf/progs/test_sockmap_kern.h | 3 +- > .../bpf/progs/test_sockmap_msg_verdict.c | 25 ++++ > tools/testing/selftests/bpf/test_sockmap.c | 41 +++++- > 10 files changed, 272 insertions(+), 32 deletions(-) > create mode 100644 tools/testing/selftests/bpf/progs/test_sockmap_msg_verdict.c > > -- > 2.34.1 > Reviewed-by: John Fastabend <john.fastabend@gmail.com>
On 10/24/23 11:55 PM, John Fastabend wrote: > Liu Jian wrote: >> v5->v6: Modified the description of the helper function. >> v4->v5: Fix one refcount bug caused by patch1. >> v3->v4: Change the two helpers's description. >> Let BPF_F_PERMANENT takes precedence over apply/cork_bytes. >> >> Liu Jian (7): >> bpf, sockmap: add BPF_F_PERMANENT flag for skmsg redirect >> selftests/bpf: Add txmsg permanently test for sockmap >> selftests/bpf: Add txmsg redir permanently test for sockmap >> selftests/bpf: add skmsg verdict tests >> selftests/bpf: add two skmsg verdict tests for BPF_F_PERMANENT flag >> selftests/bpf: add tests for verdict skmsg to itself >> selftests/bpf: add tests for verdict skmsg to closed socket >> >> include/linux/skmsg.h | 1 + >> include/uapi/linux/bpf.h | 45 +++++-- >> net/core/skmsg.c | 6 +- >> net/core/sock_map.c | 4 +- >> net/ipv4/tcp_bpf.c | 12 +- >> tools/include/uapi/linux/bpf.h | 45 +++++-- >> .../selftests/bpf/prog_tests/sockmap_basic.c | 122 ++++++++++++++++++ >> .../selftests/bpf/progs/test_sockmap_kern.h | 3 +- >> .../bpf/progs/test_sockmap_msg_verdict.c | 25 ++++ >> tools/testing/selftests/bpf/test_sockmap.c | 41 +++++- >> 10 files changed, 272 insertions(+), 32 deletions(-) >> create mode 100644 tools/testing/selftests/bpf/progs/test_sockmap_msg_verdict.c >> > > Reviewed-by: John Fastabend <john.fastabend@gmail.com> Looks like this needs one last rebase, doesn't apply against bpf-next: Switched to a new branch 'mbox' Applying: bpf, sockmap: Add BPF_F_PERMANENT flag for skmsg redirect Applying: selftests/bpf: Add txmsg permanently test for sockmap Applying: selftests/bpf: Add txmsg redir permanently test for sockmap Applying: selftests/bpf: Add skmsg verdict tests error: patch failed: tools/testing/selftests/bpf/prog_tests/sockmap_basic.c:475 error: tools/testing/selftests/bpf/prog_tests/sockmap_basic.c: patch does not apply Patch failed at 0004 selftests/bpf: Add skmsg verdict tests hint: Use 'git am --show-current-patch' to see the failed patch Thanks, Daniel
On 2023/10/26 21:56, Daniel Borkmann wrote: > On 10/24/23 11:55 PM, John Fastabend wrote: >> Liu Jian wrote: >>> v5->v6: Modified the description of the helper function. >>> v4->v5: Fix one refcount bug caused by patch1. >>> v3->v4: Change the two helpers's description. >>> Let BPF_F_PERMANENT takes precedence over apply/cork_bytes. >>> >>> Liu Jian (7): >>> bpf, sockmap: add BPF_F_PERMANENT flag for skmsg redirect >>> selftests/bpf: Add txmsg permanently test for sockmap >>> selftests/bpf: Add txmsg redir permanently test for sockmap >>> selftests/bpf: add skmsg verdict tests >>> selftests/bpf: add two skmsg verdict tests for BPF_F_PERMANENT flag >>> selftests/bpf: add tests for verdict skmsg to itself >>> selftests/bpf: add tests for verdict skmsg to closed socket >>> >>> include/linux/skmsg.h | 1 + >>> include/uapi/linux/bpf.h | 45 +++++-- >>> net/core/skmsg.c | 6 +- >>> net/core/sock_map.c | 4 +- >>> net/ipv4/tcp_bpf.c | 12 +- >>> tools/include/uapi/linux/bpf.h | 45 +++++-- >>> .../selftests/bpf/prog_tests/sockmap_basic.c | 122 ++++++++++++++++++ >>> .../selftests/bpf/progs/test_sockmap_kern.h | 3 +- >>> .../bpf/progs/test_sockmap_msg_verdict.c | 25 ++++ >>> tools/testing/selftests/bpf/test_sockmap.c | 41 +++++- >>> 10 files changed, 272 insertions(+), 32 deletions(-) >>> create mode 100644 >>> tools/testing/selftests/bpf/progs/test_sockmap_msg_verdict.c >>> >> >> Reviewed-by: John Fastabend <john.fastabend@gmail.com> > > Looks like this needs one last rebase, doesn't apply against bpf-next: > The rebased patchset has been sent, thank you~ https://lore.kernel.org/all/20231028100552.2444158-1-liujian56@huawei.com/ > Switched to a new branch 'mbox' > Applying: bpf, sockmap: Add BPF_F_PERMANENT flag for skmsg redirect > Applying: selftests/bpf: Add txmsg permanently test for sockmap > Applying: selftests/bpf: Add txmsg redir permanently test for sockmap > Applying: selftests/bpf: Add skmsg verdict tests > error: patch failed: > tools/testing/selftests/bpf/prog_tests/sockmap_basic.c:475 > error: tools/testing/selftests/bpf/prog_tests/sockmap_basic.c: patch > does not apply > Patch failed at 0004 selftests/bpf: Add skmsg verdict tests > hint: Use 'git am --show-current-patch' to see the failed patch > > Thanks, > Daniel