diff options
| author | Daniel Borkmann <daniel@iogearbox.net> | 2020-02-19 16:54:05 +0100 |
|---|---|---|
| committer | Daniel Borkmann <daniel@iogearbox.net> | 2020-02-19 16:54:24 +0100 |
| commit | 2f14b2d9dd80427a1c07451b623afb8b85efef21 (patch) | |
| tree | 20be453de9bbad27e82af5f26490e642ccda7437 /tools/include | |
| parent | bpf: Allow bpf_perf_event_read_value in all BPF programs (diff) | |
| parent | selftests/bpf: Test unhashing kTLS socket after removing from map (diff) | |
| download | linux-2f14b2d9dd80427a1c07451b623afb8b85efef21.tar.gz linux-2f14b2d9dd80427a1c07451b623afb8b85efef21.zip | |
Merge branch 'bpf-skmsg-simplify-restore'
Jakub Sitnicki says:
====================
This series has been split out from "Extend SOCKMAP to store listening
sockets" [0]. I think it stands on its own, and makes the latter series
smaller, which will make the review easier, hopefully.
The essence is that we don't need to do a complicated dance in
sk_psock_restore_proto, if we agree that the contract with tcp_update_ulp
is to restore callbacks even when the socket doesn't use ULP. This is what
tcp_update_ulp currently does, and we just make use of it.
Series is accompanied by a test for a particularly tricky case of restoring
callbacks when we have both sockmap and tls callbacks configured in
sk->sk_prot.
[0] https://lore.kernel.org/bpf/20200127131057.150941-1-jakub@cloudflare.com/
====================
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Diffstat (limited to 'tools/include')
0 files changed, 0 insertions, 0 deletions