tls: rx: wrap recv_pkt accesses in helpers

To allow for the logic to change later wrap accesses
which interrogate the input skb in helper functions.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/tls/tls.h b/net/tls/tls.h
index 3740740..24bec1c 100644 (file)
--- a/net/tls/tls.h
+++ b/net/tls/tls.h
@@ -142,6 +142,11 @@ static inline struct sk_buff *tls_strp_msg(struct tls_sw_context_rx *ctx)
        return ctx->recv_pkt;
 }
 
        return ctx->recv_pkt;
 }
 

+static inline bool tls_strp_msg_ready(struct tls_sw_context_rx *ctx)
+{
+       return ctx->recv_pkt;
+}
+

 #ifdef CONFIG_TLS_DEVICE
 int tls_device_init(void);
 void tls_device_cleanup(void);
 #ifdef CONFIG_TLS_DEVICE
 int tls_device_init(void);
 void tls_device_cleanup(void);

diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c
index ed5e6f1..cb99fc1 100644 (file)
--- a/net/tls/tls_sw.c
+++ b/net/tls/tls_sw.c
@@ -1289,7 +1289,7 @@ tls_rx_rec_wait(struct sock *sk, struct sk_psock *psock, bool nonblock,
        struct tls_sw_context_rx *ctx = tls_sw_ctx_rx(tls_ctx);
        DEFINE_WAIT_FUNC(wait, woken_wake_function);
 
        struct tls_sw_context_rx *ctx = tls_sw_ctx_rx(tls_ctx);
        DEFINE_WAIT_FUNC(wait, woken_wake_function);
 

-       while (!ctx->recv_pkt) {
+       while (!tls_strp_msg_ready(ctx)) {

                if (!sk_psock_queue_empty(psock))
                        return 0;
 
                if (!sk_psock_queue_empty(psock))
                        return 0;
 


@@ -1298,7 +1298,7 @@ tls_rx_rec_wait(struct sock *sk, struct sk_psock *psock, bool nonblock,
 
                if (!skb_queue_empty(&sk->sk_receive_queue)) {
                        __strp_unpause(&ctx->strp);
 
                if (!skb_queue_empty(&sk->sk_receive_queue)) {
                        __strp_unpause(&ctx->strp);

-                       if (ctx->recv_pkt)
+                       if (tls_strp_msg_ready(ctx))

                                break;
                }
 
                                break;
                }
 


@@ -1314,7 +1314,8 @@ tls_rx_rec_wait(struct sock *sk, struct sk_psock *psock, bool nonblock,
                add_wait_queue(sk_sleep(sk), &wait);
                sk_set_bit(SOCKWQ_ASYNC_WAITDATA, sk);
                sk_wait_event(sk, &timeo,
                add_wait_queue(sk_sleep(sk), &wait);
                sk_set_bit(SOCKWQ_ASYNC_WAITDATA, sk);
                sk_wait_event(sk, &timeo,

-                             ctx->recv_pkt || !sk_psock_queue_empty(psock),
+                             tls_strp_msg_ready(ctx) ||
+                             !sk_psock_queue_empty(psock),

                              &wait);
                sk_clear_bit(SOCKWQ_ASYNC_WAITDATA, sk);
                remove_wait_queue(sk_sleep(sk), &wait);
                              &wait);
                sk_clear_bit(SOCKWQ_ASYNC_WAITDATA, sk);
                remove_wait_queue(sk_sleep(sk), &wait);


@@ -1907,7 +1908,7 @@ int tls_sw_recvmsg(struct sock *sk,
        zc_capable = !bpf_strp_enabled && !is_kvec && !is_peek &&
                ctx->zc_capable;
        decrypted = 0;
        zc_capable = !bpf_strp_enabled && !is_kvec && !is_peek &&
                ctx->zc_capable;
        decrypted = 0;

-       while (len && (decrypted + copied < target || ctx->recv_pkt)) {
+       while (len && (decrypted + copied < target || tls_strp_msg_ready(ctx))) {

                struct tls_decrypt_arg darg;
                int to_decrypt, chunk;
 
                struct tls_decrypt_arg darg;
                int to_decrypt, chunk;
 


@@ -2158,7 +2159,7 @@ bool tls_sw_sock_is_readable(struct sock *sk)
                ingress_empty = list_empty(&psock->ingress_msg);
        rcu_read_unlock();
 
                ingress_empty = list_empty(&psock->ingress_msg);
        rcu_read_unlock();
 

-       return !ingress_empty || ctx->recv_pkt ||
+       return !ingress_empty || tls_strp_msg_ready(ctx) ||

                !skb_queue_empty(&ctx->rx_list);
 }
 
                !skb_queue_empty(&ctx->rx_list);
 }