net/tls: generalize the resync callback

Currently only RX direction is ever resynced, however, TX may
also get out of sequence if packets get dropped on the way to
the driver.  Rename the resync callback and add a direction
parameter.

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>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls.c
index d65150aa829848a36c1ac4ffd8c4d261a519ceb3..dc15c5c9e5571fd058c1f1d89f3fc99e7059da5f 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls.c
@@ -160,14 +160,17 @@ static void mlx5e_tls_del(struct net_device *netdev,
                                direction == TLS_OFFLOAD_CTX_DIR_TX);
 }
 
-static void mlx5e_tls_resync_rx(struct net_device *netdev, struct sock *sk,
-                               u32 seq, u8 *rcd_sn_data)
+static void mlx5e_tls_resync(struct net_device *netdev, struct sock *sk,
+                            u32 seq, u8 *rcd_sn_data,
+                            enum tls_offload_ctx_dir direction)
 {
        struct tls_context *tls_ctx = tls_get_ctx(sk);
        struct mlx5e_priv *priv = netdev_priv(netdev);
        struct mlx5e_tls_offload_context_rx *rx_ctx;
        u64 rcd_sn = *(u64 *)rcd_sn_data;
 
+       if (WARN_ON_ONCE(direction != TLS_OFFLOAD_CTX_DIR_RX))
+               return;
        rx_ctx = mlx5e_get_tls_rx_context(tls_ctx);
 
        netdev_info(netdev, "resyncing seq %d rcd %lld\n", seq,
@@ -179,7 +182,7 @@ static void mlx5e_tls_resync_rx(struct net_device *netdev, struct sock *sk,
 static const struct tlsdev_ops mlx5e_tls_ops = {
        .tls_dev_add = mlx5e_tls_add,
        .tls_dev_del = mlx5e_tls_del,
-       .tls_dev_resync_rx = mlx5e_tls_resync_rx,
+       .tls_dev_resync = mlx5e_tls_resync,
 };
 
 void mlx5e_tls_build_netdev(struct mlx5e_priv *priv)

diff --git a/drivers/net/ethernet/netronome/nfp/crypto/tls.c b/drivers/net/ethernet/netronome/nfp/crypto/tls.c
index 4427c1d42047f604731dd147b5af6a747e8c610f..93f87b7633b13643b6dbf47bd3e0c0e3b612dc87 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/crypto/tls.c
+++ b/drivers/net/ethernet/netronome/nfp/crypto/tls.c
@@ -383,14 +383,17 @@ nfp_net_tls_del(struct net_device *netdev, struct tls_context *tls_ctx,
 }
 
 static void
-nfp_net_tls_resync_rx(struct net_device *netdev, struct sock *sk, u32 seq,
-                     u8 *rcd_sn)
+nfp_net_tls_resync(struct net_device *netdev, struct sock *sk, u32 seq,
+                  u8 *rcd_sn, enum tls_offload_ctx_dir direction)
 {
        struct nfp_net *nn = netdev_priv(netdev);
        struct nfp_net_tls_offload_ctx *ntls;
        struct nfp_crypto_req_update *req;
        struct sk_buff *skb;
 
+       if (WARN_ON_ONCE(direction != TLS_OFFLOAD_CTX_DIR_RX))
+               return;
+
        skb = nfp_net_tls_alloc_simple(nn, sizeof(*req), GFP_ATOMIC);
        if (!skb)
                return;
@@ -411,7 +414,7 @@ nfp_net_tls_resync_rx(struct net_device *netdev, struct sock *sk, u32 seq,
 static const struct tlsdev_ops nfp_net_tls_ops = {
        .tls_dev_add = nfp_net_tls_add,
        .tls_dev_del = nfp_net_tls_del,
-       .tls_dev_resync_rx = nfp_net_tls_resync_rx,
+       .tls_dev_resync = nfp_net_tls_resync,
 };
 
 static int nfp_net_tls_reset(struct nfp_net *nn)

diff --git a/include/net/tls.h b/include/net/tls.h
index 28eca6a3b61511c08f5b414ad7833f7a4d12339f..9b49baecc4a8e8c99bcb84743f10bd6e22a72998 100644 (file)
--- a/include/net/tls.h
+++ b/include/net/tls.h
@@ -299,8 +299,9 @@ struct tlsdev_ops {
        void (*tls_dev_del)(struct net_device *netdev,
                            struct tls_context *ctx,
                            enum tls_offload_ctx_dir direction);
-       void (*tls_dev_resync_rx)(struct net_device *netdev,
-                                 struct sock *sk, u32 seq, u8 *rcd_sn);
+       void (*tls_dev_resync)(struct net_device *netdev,
+                              struct sock *sk, u32 seq, u8 *rcd_sn,
+                              enum tls_offload_ctx_dir direction);
 };
 
 enum tls_offload_sync_type {

diff --git a/net/tls/tls_device.c b/net/tls/tls_device.c
index 477c869c69c8df1c6f3a477c74927b2ed24106e8..b35a3b902bfaafb195dddaaf68e765e19d4bead8 100644 (file)
--- a/net/tls/tls_device.c
+++ b/net/tls/tls_device.c
@@ -559,7 +559,8 @@ static void tls_device_resync_rx(struct tls_context *tls_ctx,
                return;
        netdev = READ_ONCE(tls_ctx->netdev);
        if (netdev)
-               netdev->tlsdev_ops->tls_dev_resync_rx(netdev, sk, seq, rcd_sn);
+               netdev->tlsdev_ops->tls_dev_resync(netdev, sk, seq, rcd_sn,
+                                                  TLS_OFFLOAD_CTX_DIR_RX);
        clear_bit_unlock(TLS_RX_SYNC_RUNNING, &tls_ctx->flags);
 }
 
@@ -1105,7 +1106,7 @@ static int tls_dev_event(struct notifier_block *this, unsigned long event,
        case NETDEV_REGISTER:
        case NETDEV_FEAT_CHANGE:
                if ((dev->features & NETIF_F_HW_TLS_RX) &&
-                   !dev->tlsdev_ops->tls_dev_resync_rx)
+                   !dev->tlsdev_ops->tls_dev_resync)
                        return NOTIFY_BAD;
 
                if  (dev->tlsdev_ops &&