RDMA/mlx5: Add support for drop action in DV steering
Subsystems (2)
PATCH 1/1 RDMA/mlx5: Add support for drop action in DV steering
From: Daria Velikovsky <[email protected]>
When drop action is used the matching packet will stop processing in steering and will be dropped. This functionality will allow users to drop matching packets.
.
---
Changelog:
v1: Rebased on top of https://lore.kernel.org/linux-rdma/[email protected]
[PATCH rdma-next v1 0/4] Add steering support for default miss
v0: https://lore.kernel.org/linux-rdma/[email protected]
--- drivers/infiniband/hw/mlx5/flow.c | 35 ++++++++++++++---------- include/uapi/rdma/mlx5_user_ioctl_cmds.h | 1 + 2 files changed, 22 insertions(+), 14 deletions(-)
drivers/infiniband/hw/mlx5/flow.c +21 -14
@@ -69,11 +69,10 @@ static const struct uverbs_attr_spec mlx5_ib_flow_type[] = {static int get_dests (struct uverbs_attr_bundle *attrs,struct mlx5_ib_flow_matcher *fs_matcher,int *dest_id, -int *dest_type,struct ib_qp **qp,bool *def_miss) +int *dest_type,struct ib_qp **qp,u32 *flags) {bool dest_devx, dest_qp;void *devx_obj; -u32 flags;int err; dest_devx = uverbs_attr_is_valid(attrs,
@@ -81,23 +80,28 @@ static int get_dests(struct uverbs_attr_bundle *attrs, dest_qp =uverbs_attr_is_valid (attrs,MLX5_IB_ATTR_CREATE_FLOW_DEST_QP ); - *def_miss = false; - err =uverbs_get_flags32 (&flags, attrs, -MLX5_IB_ATTR_CREATE_FLOW_FLAGS , -MLX5_IB_ATTR_CREATE_FLOW_FLAGS_DEFAULT_MISS ); + *flags =0 ; + err =uverbs_get_flags32 (flags, attrs,MLX5_IB_ATTR_CREATE_FLOW_FLAGS , +MLX5_IB_ATTR_CREATE_FLOW_FLAGS_DEFAULT_MISS | +MLX5_IB_ATTR_CREATE_FLOW_FLAGS_DROP );if (err)return err; - *def_miss = flags &MLX5_IB_ATTR_CREATE_FLOW_FLAGS_DEFAULT_MISS ; + +/* Both flags are not allowed */ +if (*flags &MLX5_IB_ATTR_CREATE_FLOW_FLAGS_DEFAULT_MISS && + *flags &MLX5_IB_ATTR_CREATE_FLOW_FLAGS_DROP ) +return -EINVAL ;if (fs_matcher->ns_type ==MLX5_FLOW_NAMESPACE_BYPASS ) { -if (dest_devx && (dest_qp || *def_miss)) +if (dest_devx && (dest_qp || *flags))return -EINVAL ; -else if (dest_qp && *def_miss) +else if (dest_qp && *flags)return -EINVAL ; } -/* Allow only DEVX object as dest when inserting to FDB */ -if (fs_matcher->ns_type ==MLX5_FLOW_NAMESPACE_FDB && !dest_devx) +/* Allow only DEVX object, drop as dest for FDB */ +if (fs_matcher->ns_type ==MLX5_FLOW_NAMESPACE_FDB && !(dest_devx || + (*flags &MLX5_IB_ATTR_CREATE_FLOW_FLAGS_DROP )))return -EINVAL ;/* Allow only DEVX object or QP as dest when inserting to RDMA_RX */
@@ -166,7 +170,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_CREATE_FLOW)(void *devx_obj, *cmd_in;struct ib_uobject *uobj;struct mlx5_ib_dev *dev; -bool def_miss; +u32 flags;if (!capable (CAP_NET_RAW ))return -EPERM ;
@@ -176,12 +180,15 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_CREATE_FLOW)( uobj =uverbs_attr_get_uobject (attrs,MLX5_IB_ATTR_CREATE_FLOW_HANDLE ); dev =mlx5_udata_to_mdev (&attrs->driver_udata); -if (get_dests (attrs, fs_matcher, &dest_id, &dest_type, &qp, &def_miss)) +if (get_dests (attrs, fs_matcher, &dest_id, &dest_type, &qp, &flags))return -EINVAL ; -if (def_miss) +if (flags &MLX5_IB_ATTR_CREATE_FLOW_FLAGS_DEFAULT_MISS ) flow_act.action |=MLX5_FLOW_CONTEXT_ACTION_FWD_NEXT_NS ; +if (flags &MLX5_IB_ATTR_CREATE_FLOW_FLAGS_DROP ) + flow_act.action |=MLX5_FLOW_CONTEXT_ACTION_DROP ; + len =uverbs_attr_get_uobjs_arr (attrs,MLX5_IB_ATTR_CREATE_FLOW_ARR_COUNTERS_DEVX , &arr_flow_actions);if (len) {
include/uapi/rdma/mlx5_user_ioctl_cmds.h +1 -0
@@ -243,6 +243,7 @@ enum mlx5_ib_flow_type {enum mlx5_ib_create_flow_flags {MLX5_IB_ATTR_CREATE_FLOW_FLAGS_DEFAULT_MISS =1 <<0 , +MLX5_IB_ATTR_CREATE_FLOW_FLAGS_DROP =1 <<1 , };enum mlx5_ib_create_flow_attrs {
--
2.26.2
Quoted 6 lines · Leon Romanovsky
From: Daria Velikovsky <[email protected]>
When drop action is used the matching packet will stop processing in steering and will be dropped. This functionality will allow users to drop matching packets.
.
An extra dot slipped in.
Quoted 3 lines
Signed-off-by Daria Velikovsky <[email protected]>Reviewed-by Maor Gottlieb <[email protected]>Signed-off-by Leon Romanovsky <[email protected]>
Quoted 9 lines · Gal Pressman
Quoted 6 lines · Leon Romanovsky
From: Daria Velikovsky <[email protected]>
When drop action is used the matching packet will stop processing in steering and will be dropped. This functionality will allow users to drop matching packets.
.An extra dot slipped in.
Thanks
Quoted 4 lines
Quoted 4 lines
Signed-off-by Daria Velikovsky <[email protected]>Reviewed-by Maor Gottlieb <[email protected]>Signed-off-by Leon Romanovsky <[email protected]>
Jason Gunthorpe
AppliedQuoted 14 lines · Leon Romanovsky
From: Daria Velikovsky <[email protected]>
When drop action is used the matching packet will stop processing in steering and will be dropped. This functionality will allow users to drop matching packets.
.Signed-off-by Daria Velikovsky <[email protected]>Reviewed-by Maor Gottlieb <[email protected]>Signed-off-by Leon Romanovsky <[email protected]>---
Changelog:
v1: Rebased on top of https://lore.kernel.org/linux-rdma/[email protected]
[PATCH rdma-next v1 0/4] Add steering support for default miss
v0: https://lore.kernel.org/linux-rdma/[email protected]
Quoted 4 lines
--- drivers/infiniband/hw/mlx5/flow.c | 35 ++++++++++++++---------- include/uapi/rdma/mlx5_user_ioctl_cmds.h | 1 + 2 files changed, 22 insertions(+), 14 deletions(-)
Applied to for-next, thanks
Json