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@xxxxxxxxxxxxxx/ Jakub Sitnicki (3): bpf, sk_msg: Let ULP restore sk_proto and write_space callback bpf, sk_msg: Don't clear saved sock proto on restore selftests/bpf: Test unhashing kTLS socket after removing from map include/linux/skmsg.h | 17 +-- .../selftests/bpf/prog_tests/sockmap_ktls.c | 123 ++++++++++++++++++ 2 files changed, 124 insertions(+), 16 deletions(-) create mode 100644 tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c -- 2.24.1
