net/mlx5e: Generalize IPsec work structs

IPsec logic has two work structs which are submitted to same workqueue.
As a preparation to addition of new work which needs to be submitted
too, let's generalize struct mlx5e_ipsec_work.

Link: https://lore.kernel.org/r/285a1550242363de181bab3a07a69296f66ad9a8.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 fa66f4f3cba7c5989016b5d6fa105bc2f4c66a2a..ef7f942b5ac77bea1d12aafa79322155e79e4f03 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c
@@ -406,14 +406,16 @@ static int mlx5e_xfrm_validate_state(struct mlx5_core_dev *mdev,
        return 0;
 }
 
-static void _update_xfrm_state(struct work_struct *work)
+static void mlx5e_ipsec_modify_state(struct work_struct *_work)
 {
-       struct mlx5e_ipsec_modify_state_work *modify_work =
-               container_of(work, struct mlx5e_ipsec_modify_state_work, work);
-       struct mlx5e_ipsec_sa_entry *sa_entry = container_of(
-               modify_work, struct mlx5e_ipsec_sa_entry, modify_work);
+       struct mlx5e_ipsec_work *work =
+               container_of(_work, struct mlx5e_ipsec_work, work);
+       struct mlx5e_ipsec_sa_entry *sa_entry = work->sa_entry;
+       struct mlx5_accel_esp_xfrm_attrs *attrs;
 
-       mlx5_accel_esp_modify_xfrm(sa_entry, &modify_work->attrs);
+       attrs = &((struct mlx5e_ipsec_sa_entry *)work->data)->attrs;
+
+       mlx5_accel_esp_modify_xfrm(sa_entry, attrs);
 }
 
 static void mlx5e_ipsec_set_esn_ops(struct mlx5e_ipsec_sa_entry *sa_entry)
@@ -432,6 +434,36 @@ static void mlx5e_ipsec_set_esn_ops(struct mlx5e_ipsec_sa_entry *sa_entry)
        sa_entry->set_iv_op = mlx5e_ipsec_set_iv;
 }
 
+static int mlx5_ipsec_create_work(struct mlx5e_ipsec_sa_entry *sa_entry)
+{
+       struct xfrm_state *x = sa_entry->x;
+       struct mlx5e_ipsec_work *work;
+
+       switch (x->xso.type) {
+       case XFRM_DEV_OFFLOAD_CRYPTO:
+               if (!(x->props.flags & XFRM_STATE_ESN))
+                       return 0;
+               break;
+       default:
+               return 0;
+       }
+
+       work = kzalloc(sizeof(*work), GFP_KERNEL);
+       if (!work)
+               return -ENOMEM;
+
+       work->data = kzalloc(sizeof(*sa_entry), GFP_KERNEL);
+       if (!work->data) {
+               kfree(work);
+               return -ENOMEM;
+       }
+
+       INIT_WORK(&work->work, mlx5e_ipsec_modify_state);
+       work->sa_entry = sa_entry;
+       sa_entry->work = work;
+       return 0;
+}
+
 static int mlx5e_xfrm_add_state(struct xfrm_state *x,
                                struct netlink_ext_ack *extack)
 {
@@ -467,10 +499,15 @@ static int mlx5e_xfrm_add_state(struct xfrm_state *x,
                mlx5e_ipsec_update_esn_state(sa_entry);
 
        mlx5e_ipsec_build_accel_xfrm_attrs(sa_entry, &sa_entry->attrs);
+
+       err = mlx5_ipsec_create_work(sa_entry);
+       if (err)
+               goto err_xfrm;
+
        /* create hw context */
        err = mlx5_ipsec_create_sa_ctx(sa_entry);
        if (err)
-               goto err_xfrm;
+               goto release_work;
 
        err = mlx5e_accel_ipsec_fs_add_rule(sa_entry);
        if (err)
@@ -486,16 +523,6 @@ static int mlx5e_xfrm_add_state(struct xfrm_state *x,
                goto err_add_rule;
 
        mlx5e_ipsec_set_esn_ops(sa_entry);
-
-       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;
@@ -504,6 +531,9 @@ err_add_rule:
        mlx5e_accel_ipsec_fs_del_rule(sa_entry);
 err_hw_ctx:
        mlx5_ipsec_free_sa_ctx(sa_entry);
+release_work:
+       kfree(sa_entry->work->data);
+       kfree(sa_entry->work);
 err_xfrm:
        kfree(sa_entry);
        NL_SET_ERR_MSG_MOD(extack, "Device failed to offload this policy");
@@ -530,17 +560,13 @@ static void mlx5e_xfrm_free_state(struct xfrm_state *x)
        if (x->xso.flags & XFRM_DEV_OFFLOAD_FLAG_ACQ)
                goto sa_entry_free;
 
-       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;
-       }
+       if (sa_entry->work)
+               cancel_work_sync(&sa_entry->work->work);
 
        mlx5e_accel_ipsec_fs_del_rule(sa_entry);
        mlx5_ipsec_free_sa_ctx(sa_entry);
+       kfree(sa_entry->work->data);
+       kfree(sa_entry->work);
 sa_entry_free:
        kfree(sa_entry);
 }
@@ -626,16 +652,18 @@ static bool mlx5e_ipsec_offload_ok(struct sk_buff *skb, struct xfrm_state *x)
 static void mlx5e_xfrm_advance_esn_state(struct xfrm_state *x)
 {
        struct mlx5e_ipsec_sa_entry *sa_entry = to_ipsec_sa_entry(x);
-       struct mlx5e_ipsec_modify_state_work *modify_work =
-               &sa_entry->modify_work;
+       struct mlx5e_ipsec_work *work = sa_entry->work;
+       struct mlx5e_ipsec_sa_entry *sa_entry_shadow;
        bool need_update;
 
        need_update = mlx5e_ipsec_update_esn_state(sa_entry);
        if (!need_update)
                return;
 
-       mlx5e_ipsec_build_accel_xfrm_attrs(sa_entry, &modify_work->attrs);
-       queue_work(sa_entry->ipsec->wq, &modify_work->work);
+       sa_entry_shadow = work->data;
+       memset(sa_entry_shadow, 0x00, sizeof(*sa_entry_shadow));
+       mlx5e_ipsec_build_accel_xfrm_attrs(sa_entry, &sa_entry_shadow->attrs);
+       queue_work(sa_entry->ipsec->wq, &work->work);
 }
 
 static void mlx5e_xfrm_update_curlft(struct xfrm_state *x)

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 8d5ce65def9f5c9353e681bfecf0459adc5090cc..ab48fb9b4698745c52d7a50aa1aa0f8bf1767b07 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.h
@@ -136,8 +136,8 @@ struct mlx5e_ipsec_tx;
 
 struct mlx5e_ipsec_work {
        struct work_struct work;
-       struct mlx5e_ipsec *ipsec;
-       u32 id;
+       struct mlx5e_ipsec_sa_entry *sa_entry;
+       void *data;
 };
 
 struct mlx5e_ipsec_aso {
@@ -176,11 +176,6 @@ struct mlx5e_ipsec_rule {
        struct mlx5_fc *fc;
 };
 
-struct mlx5e_ipsec_modify_state_work {
-       struct work_struct              work;
-       struct mlx5_accel_esp_xfrm_attrs attrs;
-};
-
 struct mlx5e_ipsec_limits {
        u64 round;
        u8 soft_limit_hit : 1;
@@ -197,7 +192,7 @@ struct mlx5e_ipsec_sa_entry {
        u32 ipsec_obj_id;
        u32 enc_key_id;
        struct mlx5e_ipsec_rule ipsec_rule;
-       struct mlx5e_ipsec_modify_state_work modify_work;
+       struct mlx5e_ipsec_work *work;
        struct mlx5e_ipsec_limits limits;
 };
 

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 c974c6153d89fafe11ce9986cdfd98e086f09fe8..5fddb86bb35e25e0d90d1a1a9cff6ebf1d491b51 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
@@ -417,18 +417,12 @@ static void mlx5e_ipsec_handle_event(struct work_struct *_work)
 {
        struct mlx5e_ipsec_work *work =
                container_of(_work, struct mlx5e_ipsec_work, work);
+       struct mlx5e_ipsec_sa_entry *sa_entry = work->data;
        struct mlx5_accel_esp_xfrm_attrs *attrs;
-       struct mlx5e_ipsec_sa_entry *sa_entry;
        struct mlx5e_ipsec_aso *aso;
-       struct mlx5e_ipsec *ipsec;
        int ret;
 
-       sa_entry = xa_load(&work->ipsec->sadb, work->id);
-       if (!sa_entry)
-               goto out;
-
-       ipsec = sa_entry->ipsec;
-       aso = ipsec->aso;
+       aso = sa_entry->ipsec->aso;
        attrs = &sa_entry->attrs;
 
        spin_lock(&sa_entry->x->lock);
@@ -448,7 +442,6 @@ static void mlx5e_ipsec_handle_event(struct work_struct *_work)
 
 unlock:
        spin_unlock(&sa_entry->x->lock);
-out:
        kfree(work);
 }
 
@@ -456,6 +449,7 @@ static int mlx5e_ipsec_event(struct notifier_block *nb, unsigned long event,
                             void *data)
 {
        struct mlx5e_ipsec *ipsec = container_of(nb, struct mlx5e_ipsec, nb);
+       struct mlx5e_ipsec_sa_entry *sa_entry;
        struct mlx5_eqe_obj_change *object;
        struct mlx5e_ipsec_work *work;
        struct mlx5_eqe *eqe = data;
@@ -470,13 +464,16 @@ static int mlx5e_ipsec_event(struct notifier_block *nb, unsigned long event,
        if (type != MLX5_GENERAL_OBJECT_TYPES_IPSEC)
                return NOTIFY_DONE;
 
+       sa_entry = xa_load(&ipsec->sadb, be32_to_cpu(object->obj_id));
+       if (!sa_entry)
+               return NOTIFY_DONE;
+
        work = kmalloc(sizeof(*work), GFP_ATOMIC);
        if (!work)
                return NOTIFY_DONE;
 
        INIT_WORK(&work->work, mlx5e_ipsec_handle_event);
-       work->ipsec = ipsec;
-       work->id = be32_to_cpu(object->obj_id);
+       work->data = sa_entry;
 
        queue_work(ipsec->wq, &work->work);
        return NOTIFY_OK;