netdev - Re: [PATCH bpf-next v6 0/7] add BPF_F_PERMANENT flag for sockmap skmsg redirect

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <6e117922-e249-37cf-2327-55355de200e2@iogearbox.net>
Date: Thu, 26 Oct 2023 15:56:10 +0200
From: Daniel Borkmann <daniel@...earbox.net>
To: John Fastabend <john.fastabend@...il.com>, Liu Jian
 <liujian56@...wei.com>, jakub@...udflare.com, ast@...nel.org,
 andrii@...nel.org, martin.lau@...ux.dev, song@...nel.org,
 yonghong.song@...ux.dev, kpsingh@...nel.org, sdf@...gle.com,
 haoluo@...gle.com, jolsa@...nel.org, davem@...emloft.net,
 edumazet@...gle.com, kuba@...nel.org, pabeni@...hat.com, dsahern@...nel.org
Cc: netdev@...r.kernel.org, bpf@...r.kernel.org
Subject: Re: [PATCH bpf-next v6 0/7] add BPF_F_PERMANENT flag for sockmap
 skmsg redirect

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@...il.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