Skip to content

Commit

Permalink
net/mlx5e: Generalize IPsec work structs
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Leon Romanovsky authored and Leon Romanovsky committed Apr 6, 2023
1 parent 20fbdab commit 4562116
Show file tree
Hide file tree
Showing 3 changed files with 68 additions and 48 deletions.
86 changes: 57 additions & 29 deletions drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
{
Expand Down Expand Up @@ -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)
Expand All @@ -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;
Expand All @@ -504,6 +531,9 @@ static int mlx5e_xfrm_add_state(struct xfrm_state *x,
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");
Expand All @@ -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);
}
Expand Down Expand Up @@ -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)
Expand Down
11 changes: 3 additions & 8 deletions drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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;
Expand All @@ -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;
};

Expand Down
19 changes: 8 additions & 11 deletions drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_offload.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -448,14 +442,14 @@ static void mlx5e_ipsec_handle_event(struct work_struct *_work)

unlock:
spin_unlock(&sa_entry->x->lock);
out:
kfree(work);
}

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;
Expand All @@ -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;
Expand Down

0 comments on commit 4562116

Please sign in to comment.