Add steering support for default miss
Subsystems (5)
cover Add steering support for default miss
From: Leon Romanovsky <[email protected]>
Hi,
This code from Naor refactors the fs_core and adds steering support for default miss functionality.
Thanks
Maor Gottlieb (4):
{IB/net}/mlx5: Simplify don't trap code
net/mlx5: Add support in forward to namespace
RDMA/mlx5: Refactor DV create flow
RDMA/mlx5: Add support in steering default miss
drivers/infiniband/hw/mlx5/flow.c | 139 +++++++++++------- drivers/infiniband/hw/mlx5/main.c | 55 ++----- .../net/ethernet/mellanox/mlx5/core/fs_core.c | 123 +++++++++++----- .../net/ethernet/mellanox/mlx5/core/fs_core.h | 2 + include/linux/mlx5/fs.h | 1 + include/uapi/rdma/mlx5_user_ioctl_cmds.h | 5 + 6 files changed, 195 insertions(+), 130 deletions(-)
--
2.25.2
PATCH 2/4 net/mlx5: Add support in forward to namespace
From: Maor Gottlieb <[email protected]>
Currently, fs_core supports rule of forward the traffic to continue matching in the next priority, now we add support to forward the traffic matching in the next namespace.
--- .../net/ethernet/mellanox/mlx5/core/fs_core.c | 56 ++++++++++++++++--- .../net/ethernet/mellanox/mlx5/core/fs_core.h | 2 + include/linux/mlx5/fs.h | 1 + 3 files changed, 51 insertions(+), 8 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c +48 -8
@@ -384,6 +384,12 @@ static struct fs_prio *find_prio(struct mlx5_flow_namespace *ns,return NULL ; } +static bool is_fwd_next_action (u32 action) +{ +return action & (MLX5_FLOW_CONTEXT_ACTION_FWD_NEXT_PRIO | +MLX5_FLOW_CONTEXT_ACTION_FWD_NEXT_NS ); +} +static bool check_valid_spec (const struct mlx5_flow_spec *spec) {int i;
@@ -502,7 +508,7 @@ static void del_sw_hw_rule(struct fs_node *node)fs_get_obj (rule, node);fs_get_obj (fte, rule->node.parent);trace_mlx5_fs_del_rule (rule); -if (rule->sw_action ==MLX5_FLOW_CONTEXT_ACTION_FWD_NEXT_PRIO ) { +if (is_fwd_next_action (rule->sw_action)) {mutex_lock (&rule->dest_attr.ft->lock);list_del (&rule->next_ft);mutex_unlock (&rule->dest_attr.ft->lock);
@@ -826,6 +832,36 @@ static struct mlx5_flow_table *find_prev_chained_ft(struct fs_prio *prio)return find_closest_ft (prio, true); } +static struct fs_prio *find_fwd_ns_prio (struct mlx5_flow_root_namespace *root, +struct mlx5_flow_namespace *ns) +{ +struct mlx5_flow_namespace *root_ns = &root->ns; +struct fs_prio *iter_prio; +struct fs_prio *prio; + +fs_get_obj (prio, ns->node.parent); +list_for_each_entry (iter_prio, &root_ns->node.children, node.list) { +if (iter_prio == prio && + !list_is_last (&prio->node.children, &iter_prio->node.list)) +return list_next_entry (iter_prio, node.list); + } +return NULL ; +} + +static struct mlx5_flow_table *find_next_fwd_ft (struct mlx5_flow_table *ft, +struct mlx5_flow_act *flow_act) +{ +struct mlx5_flow_root_namespace *root =find_root (&ft->node); +struct fs_prio *prio; + +if (flow_act->action &MLX5_FLOW_CONTEXT_ACTION_FWD_NEXT_NS ) + prio =find_fwd_ns_prio (root, ft->ns); +else +fs_get_obj (prio, ft->node.parent); + +return (prio) ?find_next_chained_ft (prio) :NULL ; +} +static int connect_fts_in_prio (struct mlx5_core_dev *dev,struct fs_prio *prio,struct mlx5_flow_table *ft)
@@ -976,6 +1012,10 @@ static int connect_fwd_rules(struct mlx5_core_dev *dev,list_splice_init (&old_next_ft->fwd_rules, &new_next_ft->fwd_rules);mutex_unlock (&old_next_ft->lock);list_for_each_entry (iter, &new_next_ft->fwd_rules, next_ft) { +if ((iter->sw_action &MLX5_FLOW_CONTEXT_ACTION_FWD_NEXT_NS ) && + iter->ft->ns == new_next_ft->ns) +continue ; + err =_mlx5_modify_rule_destination (iter, &dest);if (err) pr_err("mlx5_core: failed to modify rule to point on flow table %d\n",
@@ -1077,6 +1117,7 @@ static struct mlx5_flow_table *__mlx5_create_flow_table(struct mlx5_flow_namespa next_ft = unmanaged ? ft_attr->next_ft :find_next_chained_ft (fs_prio); ft->def_miss_action = ns->def_miss_action; + ft->ns = ns; err = root->cmds->create_flow_table (root, ft, log_table_sz, next_ft);if (err) goto free_ft;
@@ -1903,21 +1944,19 @@ mlx5_add_flow_rules(struct mlx5_flow_table *ft,struct mlx5_flow_table *next_ft =NULL ;struct mlx5_flow_handle *handle =NULL ;u32 sw_action = flow_act->action; -struct fs_prio *prio;int i;if (!spec) spec = &zero_spec; -if (!(sw_action &MLX5_FLOW_CONTEXT_ACTION_FWD_NEXT_PRIO )) +if (!is_fwd_next_action (sw_action))return _mlx5_add_flow_rules (ft, spec, flow_act, dest, num_dest);if (!fwd_next_prio_supported (ft))return ERR_PTR (-EOPNOTSUPP );mutex_lock (&root->chain_lock); -fs_get_obj (prio, ft->node.parent); - next_ft =find_next_chained_ft (prio); + next_ft =find_next_fwd_ft (ft, flow_act);if (!next_ft) { handle =ERR_PTR (-EOPNOTSUPP ); goto unlock;
@@ -1937,7 +1976,8 @@ mlx5_add_flow_rules(struct mlx5_flow_table *ft, dest = gen_dest; num_dest++; flow_act->action &= - ~MLX5_FLOW_CONTEXT_ACTION_FWD_NEXT_PRIO ; + ~(MLX5_FLOW_CONTEXT_ACTION_FWD_NEXT_PRIO | +MLX5_FLOW_CONTEXT_ACTION_FWD_NEXT_NS ); flow_act->action |=MLX5_FLOW_CONTEXT_ACTION_FWD_DEST ; handle =_mlx5_add_flow_rules (ft, spec, flow_act, dest, num_dest);if (IS_ERR_OR_NULL (handle))
@@ -1948,8 +1988,8 @@ mlx5_add_flow_rules(struct mlx5_flow_table *ft,list_add (&handle->rule[num_dest -1 ]->next_ft, &next_ft->fwd_rules);mutex_unlock (&next_ft->lock); - handle->rule[num_dest -1 ]->sw_action = -MLX5_FLOW_CONTEXT_ACTION_FWD_NEXT_PRIO ; + handle->rule[num_dest -1 ]->sw_action = sw_action; + handle->rule[num_dest -1 ]->ft = ft; } unlock:mutex_unlock (&root->chain_lock);
drivers/net/ethernet/mellanox/mlx5/core/fs_core.h +2 -0
@@ -138,6 +138,7 @@ struct fs_node {struct mlx5_flow_rule {struct fs_node node; +struct mlx5_flow_table *ft;struct mlx5_flow_destination dest_attr;/* next_ft should be accessed under chain_lock and only of * destination type is FWD_NEXT_fT.
@@ -175,6 +176,7 @@ struct mlx5_flow_table {u32 flags;struct rhltable fgs_hash;enum mlx5_flow_table_miss_action def_miss_action; +struct mlx5_flow_namespace *ns; };struct mlx5_ft_underlay_qp {
include/linux/mlx5/fs.h +1 -0
@@ -42,6 +42,7 @@ enum {MLX5_FLOW_CONTEXT_ACTION_FWD_NEXT_PRIO =1 <<16 ,MLX5_FLOW_CONTEXT_ACTION_ENCRYPT =1 <<17 ,MLX5_FLOW_CONTEXT_ACTION_DECRYPT =1 <<18 , + MLX5_FLOW_CONTEXT_ACTION_FWD_NEXT_NS = 1 << 19, }; enum {
Signature · 1 line
2.25.2
PATCH 3/4 RDMA/mlx5: Refactor DV create flow
In reply to Leon RomanovskyFrom: Maor Gottlieb <[email protected]>
Move part of the code that get the destinations into function so the code will be more readable.
In addition change the variables definition to be in reversed christmas tree.
--- drivers/infiniband/hw/mlx5/flow.c | 108 ++++++++++++++++-------------- 1 file changed, 59 insertions(+), 49 deletions(-)
drivers/infiniband/hw/mlx5/flow.c +59 -49
@@ -67,40 +67,18 @@ static const struct uverbs_attr_spec mlx5_ib_flow_type[] = { }, }; -#define MLX5_IB_CREATE_FLOW_MAX_FLOW_ACTIONS 2 -static int UVERBS_HANDLER (MLX5_IB_METHOD_CREATE_FLOW )( -struct uverbs_attr_bundle *attrs) +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) { -struct mlx5_flow_context flow_context = {.flow_tag =MLX5_FS_DEFAULT_FLOW_TAG }; -struct mlx5_ib_flow_handler *flow_handler; -struct mlx5_ib_flow_matcher *fs_matcher; -struct ib_uobject **arr_flow_actions; -struct ib_uflow_resources *uflow_res; -struct mlx5_flow_act flow_act = {}; -void *devx_obj; -int dest_id, dest_type; -void *cmd_in; -int inlen;bool dest_devx, dest_qp; -struct ib_qp *qp =NULL ; -struct ib_uobject *uobj = -uverbs_attr_get_uobject (attrs,MLX5_IB_ATTR_CREATE_FLOW_HANDLE ); -struct mlx5_ib_dev *dev =mlx5_udata_to_mdev (&attrs->driver_udata); -int len, ret, i; -u32 counter_id =0 ; -u32 *offset_attr; -u32 offset =0 ; - -if (!capable (CAP_NET_RAW )) -return -EPERM ; +void *devx_obj; - dest_devx = -uverbs_attr_is_valid (attrs,MLX5_IB_ATTR_CREATE_FLOW_DEST_DEVX ); + dest_devx =uverbs_attr_is_valid (attrs, +MLX5_IB_ATTR_CREATE_FLOW_DEST_DEVX ); dest_qp =uverbs_attr_is_valid (attrs,MLX5_IB_ATTR_CREATE_FLOW_DEST_QP ); - fs_matcher =uverbs_attr_get_obj (attrs, -MLX5_IB_ATTR_CREATE_FLOW_MATCHER );if (fs_matcher->ns_type ==MLX5_FLOW_NAMESPACE_BYPASS && ((dest_devx && dest_qp) || (!dest_devx && !dest_qp)))return -EINVAL ;
@@ -114,43 +92,79 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_CREATE_FLOW)( ((!dest_devx && !dest_qp) || (dest_devx && dest_qp))) return -EINVAL; + *qp =NULL ;if (dest_devx) { - devx_obj =uverbs_attr_get_obj ( - attrs,MLX5_IB_ATTR_CREATE_FLOW_DEST_DEVX ); -if (IS_ERR (devx_obj)) -return PTR_ERR (devx_obj); + devx_obj = +uverbs_attr_get_obj (attrs, +MLX5_IB_ATTR_CREATE_FLOW_DEST_DEVX );/* Verify that the given DEVX object is a flow * steering destination. */ -if (!mlx5_ib_devx_is_flow_dest (devx_obj, &dest_id, &dest_type)) +if (!mlx5_ib_devx_is_flow_dest (devx_obj, dest_id, dest_type))return -EINVAL ;/* Allow only flow table as dest when inserting to FDB or RDMA_RX */ if ((fs_matcher->ns_type ==MLX5_FLOW_NAMESPACE_FDB || fs_matcher->ns_type ==MLX5_FLOW_NAMESPACE_RDMA_RX ) && - dest_type !=MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE ) + *dest_type !=MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE )return -EINVAL ; }else if (dest_qp) {struct mlx5_ib_qp *mqp; - qp =uverbs_attr_get_obj (attrs, -MLX5_IB_ATTR_CREATE_FLOW_DEST_QP ); -if (IS_ERR (qp)) -return PTR_ERR (qp); + *qp =uverbs_attr_get_obj (attrs, +MLX5_IB_ATTR_CREATE_FLOW_DEST_QP ); +if (IS_ERR (*qp)) +return PTR_ERR (*qp); -if (qp->qp_type !=IB_QPT_RAW_PACKET ) +if ((*qp)->qp_type !=IB_QPT_RAW_PACKET )return -EINVAL ; - mqp =to_mqp (qp); + mqp =to_mqp (*qp);if (mqp->flags &MLX5_IB_QP_RSS ) - dest_id = mqp->rss_qp.tirn; + *dest_id = mqp->rss_qp.tirn;else - dest_id = mqp->raw_packet_qp.rq.tirn; - dest_type =MLX5_FLOW_DESTINATION_TYPE_TIR ; - }else { - dest_type =MLX5_FLOW_DESTINATION_TYPE_PORT ; + *dest_id = mqp->raw_packet_qp.rq.tirn; + *dest_type =MLX5_FLOW_DESTINATION_TYPE_TIR ; + }else if (fs_matcher->ns_type ==MLX5_FLOW_NAMESPACE_EGRESS ) { + *dest_type =MLX5_FLOW_DESTINATION_TYPE_PORT ; } +if (*dest_type ==MLX5_FLOW_DESTINATION_TYPE_TIR && + fs_matcher->ns_type ==MLX5_FLOW_NAMESPACE_EGRESS ) +return -EINVAL ; + +return 0 ; +} + +#define MLX5_IB_CREATE_FLOW_MAX_FLOW_ACTIONS 2 +static int UVERBS_HANDLER (MLX5_IB_METHOD_CREATE_FLOW )( +struct uverbs_attr_bundle *attrs) +{ +struct mlx5_flow_context flow_context = {.flow_tag = +MLX5_FS_DEFAULT_FLOW_TAG }; +u32 *offset_attr, offset =0 , counter_id =0 ; +int dest_id, dest_type, inlen, len, ret, i; +struct mlx5_ib_flow_handler *flow_handler; +struct mlx5_ib_flow_matcher *fs_matcher; +struct ib_uobject **arr_flow_actions; +struct ib_uflow_resources *uflow_res; +struct mlx5_flow_act flow_act = {}; +struct ib_qp *qp =NULL ; +void *devx_obj, *cmd_in; +struct ib_uobject *uobj; +struct mlx5_ib_dev *dev; + +if (!capable (CAP_NET_RAW )) +return -EPERM ; + + fs_matcher =uverbs_attr_get_obj (attrs, +MLX5_IB_ATTR_CREATE_FLOW_MATCHER ); + 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)) +return -EINVAL ; + len =uverbs_attr_get_uobjs_arr (attrs,MLX5_IB_ATTR_CREATE_FLOW_ARR_COUNTERS_DEVX , &arr_flow_actions);if (len) {
@@ -180,10 +194,6 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_CREATE_FLOW)( flow_act.action |=MLX5_FLOW_CONTEXT_ACTION_COUNT ; } -if (dest_type ==MLX5_FLOW_DESTINATION_TYPE_TIR && - fs_matcher->ns_type ==MLX5_FLOW_NAMESPACE_EGRESS ) -return -EINVAL ; - cmd_in =uverbs_attr_get_alloced_ptr ( attrs,MLX5_IB_ATTR_CREATE_FLOW_MATCH_VALUE ); inlen = uverbs_attr_get_len(attrs,
Signature · 1 line
2.25.2
PATCH 4/4 RDMA/mlx5: Add support in steering default miss
In reply to Leon RomanovskyFrom: Maor Gottlieb <[email protected]>
User can configure default miss rule in order to skip matching in the user domain and forward the packet to the kernel steering domain. When user requests a default miss rule, we add steering rule to forward the traffic to the next namespace.
--- drivers/infiniband/hw/mlx5/flow.c | 35 ++++++++++++++++++++---- drivers/infiniband/hw/mlx5/main.c | 9 +++--- include/uapi/rdma/mlx5_user_ioctl_cmds.h | 5 ++++ 3 files changed, 38 insertions(+), 11 deletions(-)
drivers/infiniband/hw/mlx5/flow.c +29 -6
@@ -69,19 +69,35 @@ 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) +int *dest_type,struct ib_qp **qp,bool *def_miss) {bool dest_devx, dest_qp;void *devx_obj; +u32 flags; dest_devx =uverbs_attr_is_valid (attrs,MLX5_IB_ATTR_CREATE_FLOW_DEST_DEVX ); dest_qp =uverbs_attr_is_valid (attrs,MLX5_IB_ATTR_CREATE_FLOW_DEST_QP ); -if (fs_matcher->ns_type ==MLX5_FLOW_NAMESPACE_BYPASS && - ((dest_devx && dest_qp) || (!dest_devx && !dest_qp))) -return -EINVAL ; + *def_miss = false; +if (uverbs_attr_is_valid (attrs,MLX5_IB_ATTR_FLOW_MATCHER_FLOW_FLAGS )) { +int err; + + err =uverbs_get_flags32 (&flags, attrs, +MLX5_IB_ATTR_CREATE_FLOW_FLAGS , +MLX5_IB_ATTR_CREATE_FLOW_FLAGS_DEFAULT_MISS ); +if (err) +return err; + *def_miss = flags &MLX5_IB_ATTR_CREATE_FLOW_FLAGS_DEFAULT_MISS ; + } + +if (fs_matcher->ns_type ==MLX5_FLOW_NAMESPACE_BYPASS ) { +if (dest_devx && (dest_qp || *def_miss)) +return -EINVAL ; +else if (dest_qp && *def_miss) +return -EINVAL ; + }/* Allow only DEVX object as dest when inserting to FDB */ if (fs_matcher->ns_type ==MLX5_FLOW_NAMESPACE_FDB && !dest_devx)
@@ -153,6 +169,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;if (!capable (CAP_NET_RAW ))return -EPERM ;
@@ -162,9 +179,12 @@ 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)) +if (get_dests (attrs, fs_matcher, &dest_id, &dest_type, &qp, &def_miss))return -EINVAL ; +if (def_miss) + flow_act.action |=MLX5_FLOW_CONTEXT_ACTION_FWD_NEXT_NS ; + len =uverbs_attr_get_uobjs_arr (attrs,MLX5_IB_ATTR_CREATE_FLOW_ARR_COUNTERS_DEVX , &arr_flow_actions);if (len) {
@@ -636,7 +656,10 @@ DECLARE_UVERBS_NAMED_METHOD(UVERBS_ATTR_PTR_IN (MLX5_IB_ATTR_CREATE_FLOW_ARR_COUNTERS_DEVX_OFFSET ,UVERBS_ATTR_MIN_SIZE (sizeof (u32)),UA_OPTIONAL , - UA_ALLOC_AND_COPY)); +UA_ALLOC_AND_COPY ), +UVERBS_ATTR_FLAGS_IN (MLX5_IB_ATTR_CREATE_FLOW_FLAGS , + enum mlx5_ib_create_flow_flags, + UA_OPTIONAL)); DECLARE_UVERBS_NAMED_METHOD_DESTROY( MLX5_IB_METHOD_DESTROY_FLOW,
drivers/infiniband/hw/mlx5/main.c +4 -5
@@ -4198,18 +4198,17 @@ mlx5_ib_raw_fs_rule_add(struct mlx5_ib_dev *dev,if (dest_type ==MLX5_FLOW_DESTINATION_TYPE_TIR ) { dst[dst_num].type = dest_type; - dst[dst_num].tir_num = dest_id; + dst[dst_num++].tir_num = dest_id; flow_act->action |=MLX5_FLOW_CONTEXT_ACTION_FWD_DEST ; }else if (dest_type ==MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE ) { dst[dst_num].type =MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE_NUM ; - dst[dst_num].ft_num = dest_id; + dst[dst_num++].ft_num = dest_id; flow_act->action |=MLX5_FLOW_CONTEXT_ACTION_FWD_DEST ; - }else { - dst[dst_num].type =MLX5_FLOW_DESTINATION_TYPE_PORT ; + }else if (dest_type ==MLX5_FLOW_DESTINATION_TYPE_PORT ) { + dst[dst_num++].type =MLX5_FLOW_DESTINATION_TYPE_PORT ; flow_act->action |=MLX5_FLOW_CONTEXT_ACTION_ALLOW ; } - dst_num++;if (flow_act->action &MLX5_FLOW_CONTEXT_ACTION_COUNT ) { dst[dst_num].type =MLX5_FLOW_DESTINATION_TYPE_COUNTER ;
include/uapi/rdma/mlx5_user_ioctl_cmds.h +5 -0
@@ -241,6 +241,10 @@ enum mlx5_ib_flow_type { MLX5_IB_FLOW_TYPE_MC_DEFAULT, }; +enum mlx5_ib_create_flow_flags { +MLX5_IB_ATTR_CREATE_FLOW_FLAGS_DEFAULT_MISS =1 <<0 , +}; +enum mlx5_ib_create_flow_attrs {MLX5_IB_ATTR_CREATE_FLOW_HANDLE = (1U <<UVERBS_ID_NS_SHIFT ),MLX5_IB_ATTR_CREATE_FLOW_MATCH_VALUE ,
@@ -251,6 +255,7 @@ enum mlx5_ib_create_flow_attrs {MLX5_IB_ATTR_CREATE_FLOW_TAG ,MLX5_IB_ATTR_CREATE_FLOW_ARR_COUNTERS_DEVX ,MLX5_IB_ATTR_CREATE_FLOW_ARR_COUNTERS_DEVX_OFFSET , + MLX5_IB_ATTR_CREATE_FLOW_FLAGS, }; enum mlx5_ib_destoy_flow_attrs {
Signature · 1 line
2.25.2
PATCH 1/4 {IB/net}/mlx5: Simplify don't trap code
In reply to Leon RomanovskyFrom: Maor Gottlieb <[email protected]>
The fs_core already supports creation of rules with multiple actions/destinations. Refactor fs_core to handle the case when don't trap rule is created with destination. Adapt the calling code in the driver.
--- drivers/infiniband/hw/mlx5/main.c | 46 +++-------- .../net/ethernet/mellanox/mlx5/core/fs_core.c | 79 +++++++++++-------- 2 files changed, 55 insertions(+), 70 deletions(-)
drivers/infiniband/hw/mlx5/main.c +9 -37
@@ -3698,12 +3698,13 @@ static struct mlx5_ib_flow_handler *_create_flow_rule(struct mlx5_ib_dev *dev,if (!dest_num) rule_dst =NULL ; }else { +if (flow_attr->flags &IB_FLOW_ATTR_FLAGS_DONT_TRAP ) + flow_act.action |= +MLX5_FLOW_CONTEXT_ACTION_FWD_NEXT_PRIO ;if (is_egress) flow_act.action |=MLX5_FLOW_CONTEXT_ACTION_ALLOW ; -else - flow_act.action |= - dest_num ?MLX5_FLOW_CONTEXT_ACTION_FWD_DEST : -MLX5_FLOW_CONTEXT_ACTION_FWD_NEXT_PRIO ; +else if (dest_num) + flow_act.action |=MLX5_FLOW_CONTEXT_ACTION_FWD_DEST ; } if ((spec->flow_context.flags & FLOW_CONTEXT_HAS_TAG) &&
@@ -3747,30 +3748,6 @@ static struct mlx5_ib_flow_handler *create_flow_rule(struct mlx5_ib_dev *dev,return _create_flow_rule (dev, ft_prio, flow_attr, dst,0 ,NULL ); } -static struct mlx5_ib_flow_handler *create_dont_trap_rule (struct mlx5_ib_dev *dev, -struct mlx5_ib_flow_prio *ft_prio, -struct ib_flow_attr *flow_attr, -struct mlx5_flow_destination *dst) -{ -struct mlx5_ib_flow_handler *handler_dst =NULL ; -struct mlx5_ib_flow_handler *handler =NULL ; - - handler =create_flow_rule (dev, ft_prio, flow_attr,NULL ); -if (!IS_ERR (handler)) { - handler_dst =create_flow_rule (dev, ft_prio, - flow_attr, dst); -if (IS_ERR (handler_dst)) { -mlx5_del_flow_rules (handler->rule); - ft_prio->refcount--; -kfree (handler); - handler = handler_dst; - }else { -list_add (&handler_dst->list, &handler->list); - } - } - -return handler; -}enum {LEFTOVERS_MC ,LEFTOVERS_UC ,
@@ -3974,15 +3951,10 @@ static struct ib_flow *mlx5_ib_create_flow(struct ib_qp *qp, }if (flow_attr->type ==IB_FLOW_ATTR_NORMAL ) { -if (flow_attr->flags &IB_FLOW_ATTR_FLAGS_DONT_TRAP ) { - handler =create_dont_trap_rule (dev, ft_prio, - flow_attr, dst); - }else { - underlay_qpn = (mqp->flags &MLX5_IB_QP_UNDERLAY ) ? - mqp->underlay_qpn :0 ; - handler =_create_flow_rule (dev, ft_prio, flow_attr, - dst, underlay_qpn, ucmd); - } + underlay_qpn = (mqp->flags &MLX5_IB_QP_UNDERLAY ) ? + mqp->underlay_qpn :0 ; + handler =_create_flow_rule (dev, ft_prio, flow_attr, + dst, underlay_qpn, ucmd); }else if (flow_attr->type ==IB_FLOW_ATTR_ALL_DEFAULT || flow_attr->type ==IB_FLOW_ATTR_MC_DEFAULT ) { handler = create_leftovers_rule(dev, ft_prio, flow_attr,
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c +46 -33
101 lines not on this page · raw message
Signature · 1 line
2.25.2
Re: [PATCH rdma-next 4/4] RDMA/mlx5: Add support in steering default miss
In reply to Leon RomanovskyQuoted 29 lines · Leon Romanovsky
From: Maor Gottlieb <[email protected]>
User can configure default miss rule in order to skip matching in the user domain and forward the packet to the kernel steering domain. When user requests a default miss rule, we add steering rule to forward the traffic to the next namespace.
Signed-off-by Maor Gottlieb <[email protected]>Reviewed-by Mark Zhang <[email protected]>Signed-off-by Leon Romanovsky <[email protected]>drivers/infiniband/hw/mlx5/flow.c | 35 ++++++++++++++++++++---- drivers/infiniband/hw/mlx5/main.c | 9 +++--- include/uapi/rdma/mlx5_user_ioctl_cmds.h | 5 ++++ 3 files changed, 38 insertions(+), 11 deletions(-)drivers/infiniband/hw/mlx5/flow.c +3
-1+++ b/drivers/infiniband/hw/mlx5/flow.c@@ -69,19 +69,35 @@ 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) +int *dest_type,struct ib_qp **qp,bool *def_miss) {bool dest_devx, dest_qp;void *devx_obj; +u32 flags;
drivers/infiniband/hw/mlx5/flow.c static const struct uverbs_attr_spec mlx5_ib_flow_type[] = { · line 84
Quoted 10 lines
drivers/infiniband/hw/mlx5/flow.c +2
-3dest_devx =uverbs_attr_is_valid (attrs,MLX5_IB_ATTR_CREATE_FLOW_DEST_DEVX ); dest_qp =uverbs_attr_is_valid (attrs,MLX5_IB_ATTR_CREATE_FLOW_DEST_QP ); -if (fs_matcher->ns_type ==MLX5_FLOW_NAMESPACE_BYPASS && - ((dest_devx && dest_qp) || (!dest_devx && !dest_qp))) -return -EINVAL ; + *def_miss = false; +if (uverbs_attr_is_valid (attrs,MLX5_IB_ATTR_FLOW_MATCHER_FLOW_FLAGS )) {
attr_is_valid should not be called on flags, get_flags already knows to return 0 as the flags if the attr is not present.
Jason