tls: replace poll implementation with read hook

Instead of re-implementing poll routine use the poll callback to
trigger read from kTLS, we reuse the stream_memory_read callback
which is simpler and achieves the same. This helps to align sockmap
and kTLS so we can more easily embed BPF in kTLS.

Joint work with Daniel.

Signed-off-by: John Fastabend <john.fastabend@gmail.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

1 files changed, 6 insertions, 5 deletions

diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c
index b428069a1b05..e90b6d537077 100644
--- a/net/tls/tls_main.c
+++ b/net/tls/tls_main.c
@@ -620,12 +620,14 @@ static void build_protos(struct proto prot[TLS_NUM_CONFIG][TLS_NUM_CONFIG],
         prot[TLS_SW][TLS_BASE].sendpage         = tls_sw_sendpage;
 
         prot[TLS_BASE][TLS_SW] = prot[TLS_BASE][TLS_BASE];
-        prot[TLS_BASE][TLS_SW].recvmsg          = tls_sw_recvmsg;
-        prot[TLS_BASE][TLS_SW].close            = tls_sk_proto_close;
+        prot[TLS_BASE][TLS_SW].recvmsg            = tls_sw_recvmsg;
+        prot[TLS_BASE][TLS_SW].stream_memory_read = tls_sw_stream_read;
+        prot[TLS_BASE][TLS_SW].close              = tls_sk_proto_close;
 
         prot[TLS_SW][TLS_SW] = prot[TLS_SW][TLS_BASE];
-        prot[TLS_SW][TLS_SW].recvmsg    = tls_sw_recvmsg;
-        prot[TLS_SW][TLS_SW].close      = tls_sk_proto_close;
+        prot[TLS_SW][TLS_SW].recvmsg            = tls_sw_recvmsg;
+        prot[TLS_SW][TLS_SW].stream_memory_read = tls_sw_stream_read;
+        prot[TLS_SW][TLS_SW].close              = tls_sk_proto_close;
 
 #ifdef CONFIG_TLS_DEVICE
         prot[TLS_HW][TLS_BASE] = prot[TLS_BASE][TLS_BASE];
@@ -724,7 +726,6 @@ static int __init tls_register(void)
         build_protos(tls_prots[TLSV4], &tcp_prot);
 
         tls_sw_proto_ops = inet_stream_ops;
-        tls_sw_proto_ops.poll = tls_sw_poll;
         tls_sw_proto_ops.splice_read = tls_sw_splice_read;
 
 #ifdef CONFIG_TLS_DEVICE