tcp: add a helper for setting EOR on tail skb

TLS (and hopefully soon PSP will) use EOR to prevent skbs
with different decrypted state from getting merged, without
adding new tests to the skb handling. In both cases once
the connection switches to an "encrypted" state, all subsequent
skbs will be encrypted, so a single "EOR fence" is sufficient
to prevent mixing.

Add a helper for setting the EOR bit, to make this arrangement
more explicit.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/include/net/tcp.h b/include/net/tcp.h
index 32741856da0152af19074662b8183a3c47cc63f1..08c3b99501cf6e021dd8d3d8f72d8b1e3dbdc8f5 100644 (file)
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -1066,6 +1066,7 @@ static inline bool tcp_skb_can_collapse_to(const struct sk_buff *skb)
 static inline bool tcp_skb_can_collapse(const struct sk_buff *to,
                                        const struct sk_buff *from)
 {
+       /* skb_cmp_decrypted() not needed, use tcp_write_collapse_fence() */
        return likely(tcp_skb_can_collapse_to(to) &&
                      mptcp_skb_can_collapse(to, from) &&
                      skb_pure_zcopy_same(to, from));
@@ -2102,6 +2103,14 @@ static inline void tcp_rtx_queue_unlink_and_free(struct sk_buff *skb, struct soc
        tcp_wmem_free_skb(sk, skb);
 }
 
+static inline void tcp_write_collapse_fence(struct sock *sk)
+{
+       struct sk_buff *skb = tcp_write_queue_tail(sk);
+
+       if (skb)
+               TCP_SKB_CB(skb)->eor = 1;
+}
+
 static inline void tcp_push_pending_frames(struct sock *sk)
 {
        if (tcp_send_head(sk)) {

diff --git a/net/tls/tls_device.c b/net/tls/tls_device.c
index ab6e694f7bc2582ddc8fbbf53d4d534b13bb5fb3..dc063c2c7950edc28961d877712827bc56bb58e6 100644 (file)
--- a/net/tls/tls_device.c
+++ b/net/tls/tls_device.c
@@ -231,14 +231,10 @@ static void tls_device_resync_tx(struct sock *sk, struct tls_context *tls_ctx,
                                 u32 seq)
 {
        struct net_device *netdev;
-       struct sk_buff *skb;
        int err = 0;
        u8 *rcd_sn;
 
-       skb = tcp_write_queue_tail(sk);
-       if (skb)
-               TCP_SKB_CB(skb)->eor = 1;
-
+       tcp_write_collapse_fence(sk);
        rcd_sn = tls_ctx->tx.rec_seq;
 
        trace_tls_device_tx_resync_send(sk, seq, rcd_sn);
@@ -1067,7 +1063,6 @@ int tls_set_device_offload(struct sock *sk)
        struct tls_prot_info *prot;
        struct net_device *netdev;
        struct tls_context *ctx;
-       struct sk_buff *skb;
        char *iv, *rec_seq;
        int rc;
 
@@ -1138,9 +1133,7 @@ int tls_set_device_offload(struct sock *sk)
         * SKBs where only part of the payload needs to be encrypted.
         * So mark the last skb in the write queue as end of record.
         */
-       skb = tcp_write_queue_tail(sk);
-       if (skb)
-               TCP_SKB_CB(skb)->eor = 1;
+       tcp_write_collapse_fence(sk);
 
        /* Avoid offloading if the device is down
         * We don't want to offload new flows after