net/mlx5e: Remove ESN callbacks if it is not supported

There is no need in implementation of .xdo_dev_state_advance_esn() and
setting work as it will never be called in packet offload mode.

Link: https://lore.kernel.org/r/2fc9fade32e31f03b100d6086a82ad36269349dc.1680162300.git.leonro@nvidia.com
Reviewed-by: Raed Salem <raeds@nvidia.com>
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c
index 3612cdd37b5ace772dab3d5e28b6fa71c3ddf95b..067704307851708d285939e4ed221914699d9794 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c
@@ -56,11 +56,6 @@ static bool mlx5e_ipsec_update_esn_state(struct mlx5e_ipsec_sa_entry *sa_entry)
        u32 seq_bottom = 0;
        u8 overlap;
 
-       if (!(sa_entry->x->props.flags & XFRM_STATE_ESN)) {
-               sa_entry->esn_state.trigger = 0;
-               return false;
-       }
-
        replay_esn = sa_entry->x->replay_esn;
        if (replay_esn->seq >= replay_esn->replay_window)
                seq_bottom = replay_esn->seq - replay_esn->replay_window + 1;
@@ -70,7 +65,6 @@ static bool mlx5e_ipsec_update_esn_state(struct mlx5e_ipsec_sa_entry *sa_entry)
        sa_entry->esn_state.esn = xfrm_replay_seqhi(sa_entry->x,
                                                    htonl(seq_bottom));
 
-       sa_entry->esn_state.trigger = 1;
        if (unlikely(overlap && seq_bottom < MLX5E_IPSEC_ESN_SCOPE_MID)) {
                sa_entry->esn_state.overlap = 0;
                return true;
@@ -229,7 +223,7 @@ void mlx5e_ipsec_build_accel_xfrm_attrs(struct mlx5e_ipsec_sa_entry *sa_entry,
        aes_gcm->icv_len = x->aead->alg_icv_len;
 
        /* esn */
-       if (sa_entry->esn_state.trigger) {
+       if (x->props.flags & XFRM_STATE_ESN) {
                attrs->esn_trigger = true;
                attrs->esn = sa_entry->esn_state.esn;
                attrs->esn_overlap = sa_entry->esn_state.overlap;
@@ -394,6 +388,22 @@ static void _update_xfrm_state(struct work_struct *work)
        mlx5_accel_esp_modify_xfrm(sa_entry, &modify_work->attrs);
 }
 
+static void mlx5e_ipsec_set_esn_ops(struct mlx5e_ipsec_sa_entry *sa_entry)
+{
+       struct xfrm_state *x = sa_entry->x;
+
+       if (x->xso.type != XFRM_DEV_OFFLOAD_CRYPTO ||
+           x->xso.dir != XFRM_DEV_OFFLOAD_OUT)
+               return;
+
+       if (x->props.flags & XFRM_STATE_ESN) {
+               sa_entry->set_iv_op = mlx5e_ipsec_set_iv_esn;
+               return;
+       }
+
+       sa_entry->set_iv_op = mlx5e_ipsec_set_iv;
+}
+
 static int mlx5e_xfrm_add_state(struct xfrm_state *x,
                                struct netlink_ext_ack *extack)
 {
@@ -425,7 +435,8 @@ static int mlx5e_xfrm_add_state(struct xfrm_state *x,
                goto err_xfrm;
 
        /* check esn */
-       mlx5e_ipsec_update_esn_state(sa_entry);
+       if (x->props.flags & XFRM_STATE_ESN)
+               mlx5e_ipsec_update_esn_state(sa_entry);
 
        mlx5e_ipsec_build_accel_xfrm_attrs(sa_entry, &sa_entry->attrs);
        /* create hw context */
@@ -446,11 +457,17 @@ static int mlx5e_xfrm_add_state(struct xfrm_state *x,
        if (err)
                goto err_add_rule;
 
-       if (x->xso.dir == XFRM_DEV_OFFLOAD_OUT)
-               sa_entry->set_iv_op = (x->props.flags & XFRM_STATE_ESN) ?
-                               mlx5e_ipsec_set_iv_esn : mlx5e_ipsec_set_iv;
+       mlx5e_ipsec_set_esn_ops(sa_entry);
 
-       INIT_WORK(&sa_entry->modify_work.work, _update_xfrm_state);
+       switch (x->xso.type) {
+       case XFRM_DEV_OFFLOAD_CRYPTO:
+               if (x->props.flags & XFRM_STATE_ESN)
+                       INIT_WORK(&sa_entry->modify_work.work,
+                                 _update_xfrm_state);
+               break;
+       default:
+               break;
+       }
 out:
        x->xso.offload_handle = (unsigned long)sa_entry;
        return 0;
@@ -485,7 +502,15 @@ static void mlx5e_xfrm_free_state(struct xfrm_state *x)
        if (x->xso.flags & XFRM_DEV_OFFLOAD_FLAG_ACQ)
                goto sa_entry_free;
 
-       cancel_work_sync(&sa_entry->modify_work.work);
+       switch (x->xso.type) {
+       case XFRM_DEV_OFFLOAD_CRYPTO:
+               if (x->props.flags & XFRM_STATE_ESN)
+                       cancel_work_sync(&sa_entry->modify_work.work);
+               break;
+       default:
+               break;
+       }
+
        mlx5e_accel_ipsec_fs_del_rule(sa_entry);
        mlx5_ipsec_free_sa_ctx(sa_entry);
 sa_entry_free:

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.h b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.h
index 0c58c3583b0f12299a7dae45f30fe80df840f027..e4a606364a45620f764469c7ce7ce67164a968e0 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.h
@@ -160,7 +160,6 @@ struct mlx5e_ipsec {
 
 struct mlx5e_ipsec_esn_state {
        u32 esn;
-       u8 trigger: 1;
        u8 overlap: 1;
 };
 

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_offload.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_offload.c
index 6971e5e368200feee9099b07546b768fc0583ab2..a2e9af5e51e1bc040a52863b62c16767050dd84b 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_offload.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_offload.c
@@ -225,9 +225,6 @@ static int mlx5_modify_ipsec_obj(struct mlx5e_ipsec_sa_entry *sa_entry,
        void *obj;
        int err;
 
-       if (!attrs->esn_trigger)
-               return 0;
-
        general_obj_types = MLX5_CAP_GEN_64(mdev, general_obj_types);
        if (!(general_obj_types & MLX5_HCA_CAP_GENERAL_OBJECT_TYPES_IPSEC))
                return -EINVAL;