diff options
| author | Jakub Kicinski | 2019-06-11 06:40:10 +0200 |
|---|---|---|
| committer | David S. Miller | 2019-06-11 21:22:27 +0200 |
| commit | 9ed431c1d7cf8c394aa7562ca6b84f3eeb8c78a8 (patch) | |
| tree | 540add3d2e40be7263d64cde02b30a0ca8dd7cbe /drivers/net/ethernet/netronome/nfp/nfp_net_common.c | |
| parent | net/tls: add kernel-driven resync mechanism for TX (diff) | |
| download | kernel-qcow2-linux-9ed431c1d7cf8c394aa7562ca6b84f3eeb8c78a8.tar.gz kernel-qcow2-linux-9ed431c1d7cf8c394aa7562ca6b84f3eeb8c78a8.tar.xz kernel-qcow2-linux-9ed431c1d7cf8c394aa7562ca6b84f3eeb8c78a8.zip | |
nfp: tls: make use of kernel-driven TX resync
When TCP stream gets out of sync (driver stops receiving skbs
with expected TCP sequence numbers) request a TX resync from
the kernel.
We try to distinguish retransmissions from missed transmissions
by comparing the sequence number to expected - if it's further
than the expected one - we probably missed packets.
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Dirk van der Merwe <dirk.vandermerwe@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/netronome/nfp/nfp_net_common.c')
| -rw-r--r-- | drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c index c9c43abb2427..8e9568b15062 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c @@ -829,6 +829,7 @@ nfp_net_tls_tx(struct nfp_net_dp *dp, struct nfp_net_r_vector *r_vec, { struct nfp_net_tls_offload_ctx *ntls; struct sk_buff *nskb; + bool resync_pending; u32 datalen, seq; if (likely(!dp->ktls_tx)) @@ -839,7 +840,8 @@ nfp_net_tls_tx(struct nfp_net_dp *dp, struct nfp_net_r_vector *r_vec, datalen = skb->len - (skb_transport_offset(skb) + tcp_hdrlen(skb)); seq = ntohl(tcp_hdr(skb)->seq); ntls = tls_driver_ctx(skb->sk, TLS_OFFLOAD_CTX_DIR_TX); - if (unlikely(ntls->next_seq != seq || ntls->out_of_sync)) { + resync_pending = tls_offload_tx_resync_pending(skb->sk); + if (unlikely(resync_pending || ntls->next_seq != seq)) { /* Pure ACK out of order already */ if (!datalen) return skb; @@ -869,8 +871,8 @@ nfp_net_tls_tx(struct nfp_net_dp *dp, struct nfp_net_r_vector *r_vec, } /* jump forward, a TX may have gotten lost, need to sync TX */ - if (!ntls->out_of_sync && seq - ntls->next_seq < U32_MAX / 4) - ntls->out_of_sync = true; + if (!resync_pending && seq - ntls->next_seq < U32_MAX / 4) + tls_offload_tx_resync_request(nskb->sk); *nr_frags = 0; return nskb; |