mbox series

[bpf,v3,0/4] bpf, sockmap: Fix some issues with using apply_bytes

Message ID 1669718441-2654-1-git-send-email-yangpc@wangsu.com (mailing list archive)
Headers show
Series bpf, sockmap: Fix some issues with using apply_bytes | expand

Message

Pengcheng Yang Nov. 29, 2022, 10:40 a.m. UTC
Patch 1~3 fixes three issues with using apply_bytes when redirecting.
Patch 4 adds ingress tests for txmsg with apply_bytes in selftests.

Thanks to John Fastabend and Jakub Sitnicki for correct solution.

---
Changes in v3:
*Patch 2: Rename 'flags', modify based on Jakub Sitnicki's patch

Changes in v2:
*Patch 2: Clear psock->flags explicitly before releasing the sock lock

Pengcheng Yang (4):
  bpf, sockmap: Fix repeated calls to sock_put() when msg has more_data
  bpf, sockmap: Fix missing BPF_F_INGRESS flag when using apply_bytes
  bpf, sockmap: Fix data loss caused by using apply_bytes on ingress
    redirect
  selftests/bpf: Add ingress tests for txmsg with apply_bytes

 include/linux/skmsg.h                      |  1 +
 include/net/tcp.h                          |  4 ++--
 net/core/skmsg.c                           |  9 ++++++---
 net/ipv4/tcp_bpf.c                         | 19 ++++++++++++-------
 net/tls/tls_sw.c                           |  6 ++++--
 tools/testing/selftests/bpf/test_sockmap.c | 18 ++++++++++++++++++
 6 files changed, 43 insertions(+), 14 deletions(-)

Comments

Jakub Sitnicki Nov. 29, 2022, 7:14 p.m. UTC | #1
On Tue, Nov 29, 2022 at 06:40 PM +08, Pengcheng Yang wrote:
> Patch 1~3 fixes three issues with using apply_bytes when redirecting.
> Patch 4 adds ingress tests for txmsg with apply_bytes in selftests.
>
> Thanks to John Fastabend and Jakub Sitnicki for correct solution.
>
> ---
> Changes in v3:
> *Patch 2: Rename 'flags', modify based on Jakub Sitnicki's patch
>
> Changes in v2:
> *Patch 2: Clear psock->flags explicitly before releasing the sock lock
>
> Pengcheng Yang (4):
>   bpf, sockmap: Fix repeated calls to sock_put() when msg has more_data
>   bpf, sockmap: Fix missing BPF_F_INGRESS flag when using apply_bytes
>   bpf, sockmap: Fix data loss caused by using apply_bytes on ingress
>     redirect
>   selftests/bpf: Add ingress tests for txmsg with apply_bytes
>
>  include/linux/skmsg.h                      |  1 +
>  include/net/tcp.h                          |  4 ++--
>  net/core/skmsg.c                           |  9 ++++++---
>  net/ipv4/tcp_bpf.c                         | 19 ++++++++++++-------
>  net/tls/tls_sw.c                           |  6 ++++--
>  tools/testing/selftests/bpf/test_sockmap.c | 18 ++++++++++++++++++
>  6 files changed, 43 insertions(+), 14 deletions(-)

Thanks for the fixes, Pengcheng.

For the series:

Acked-by: Jakub Sitnicki <jakub@cloudflare.com>
patchwork-bot+netdevbpf@kernel.org Dec. 1, 2022, 12:10 a.m. UTC | #2
Hello:

This series was applied to bpf/bpf-next.git (master)
by Daniel Borkmann <daniel@iogearbox.net>:

On Tue, 29 Nov 2022 18:40:37 +0800 you wrote:
> Patch 1~3 fixes three issues with using apply_bytes when redirecting.
> Patch 4 adds ingress tests for txmsg with apply_bytes in selftests.
> 
> Thanks to John Fastabend and Jakub Sitnicki for correct solution.
> 
> ---
> Changes in v3:
> *Patch 2: Rename 'flags', modify based on Jakub Sitnicki's patch
> 
> [...]

Here is the summary with links:
  - [bpf,v3,1/4] bpf, sockmap: Fix repeated calls to sock_put() when msg has more_data
    https://git.kernel.org/bpf/bpf-next/c/7a9841ca0252
  - [bpf,v3,2/4] bpf, sockmap: Fix missing BPF_F_INGRESS flag when using apply_bytes
    https://git.kernel.org/bpf/bpf-next/c/a351d6087bf7
  - [bpf,v3,3/4] bpf, sockmap: Fix data loss caused by using apply_bytes on ingress redirect
    https://git.kernel.org/bpf/bpf-next/c/9072931f020b
  - [bpf,v3,4/4] selftests/bpf: Add ingress tests for txmsg with apply_bytes
    https://git.kernel.org/bpf/bpf-next/c/89903dcb3c2e

You are awesome, thank you!