Merge branch 'bpf-sk-msg-peek'

Browse source

John Fastabend says:

====================
This adds support for the MSG_PEEK flag when redirecting into
an ingress psock sk_msg queue.

The first patch adds some base support to the helpers, then the
feature, and finally we add an option for the test suite to do
a duplicate MSG_PEEK call on every recv to test the feature.

With duplicate MSG_PEEK call all tests continue to PASS.
====================

Acked-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

...

This commit is contained in:

Daniel Borkmann 2018-10-17 02:30:32 +02:00

parent 3f4c3127d3 753fb2ee09

commit 44d520eb17

5 changed files with 153 additions and 74 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

17

include/linux/skmsg.h

View file

2

include/net/tcp.h

View file

42

net/ipv4/tcp_bpf.c

View file

3

net/tls/tls_sw.c

View file

165

tools/testing/selftests/bpf/test_sockmap.c

View file