mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-14 22:44:27 +08:00
net/mlx5: Add flow steering actions to fs_cmd shim layer
Add flow steering actions: modify header and packet reformat to the fs_cmd shim layer. This allows each namespace to define possibly different functionality for alloc/dealloc action commands. Signed-off-by: Maor Gottlieb <maorg@mellanox.com> Reviewed-by: Mark Bloch <markb@mellanox.com> Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
This commit is contained in:
parent
a06ebb8d95
commit
2b688ea5ef
@ -322,11 +322,11 @@ void mlx5_ib_destroy_flow_action_raw(struct mlx5_ib_flow_action *maction)
|
||||
switch (maction->flow_action_raw.sub_type) {
|
||||
case MLX5_IB_FLOW_ACTION_MODIFY_HEADER:
|
||||
mlx5_modify_header_dealloc(maction->flow_action_raw.dev->mdev,
|
||||
maction->flow_action_raw.action_id);
|
||||
maction->flow_action_raw.modify_hdr);
|
||||
break;
|
||||
case MLX5_IB_FLOW_ACTION_PACKET_REFORMAT:
|
||||
mlx5_packet_reformat_dealloc(maction->flow_action_raw.dev->mdev,
|
||||
maction->flow_action_raw.action_id);
|
||||
maction->flow_action_raw.pkt_reformat);
|
||||
break;
|
||||
case MLX5_IB_FLOW_ACTION_DECAP:
|
||||
break;
|
||||
@ -352,10 +352,11 @@ mlx5_ib_create_modify_header(struct mlx5_ib_dev *dev,
|
||||
if (!maction)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
||||
ret = mlx5_modify_header_alloc(dev->mdev, namespace, num_actions, in,
|
||||
&maction->flow_action_raw.action_id);
|
||||
maction->flow_action_raw.modify_hdr =
|
||||
mlx5_modify_header_alloc(dev->mdev, namespace, num_actions, in);
|
||||
|
||||
if (ret) {
|
||||
if (IS_ERR(maction->flow_action_raw.modify_hdr)) {
|
||||
ret = PTR_ERR(maction->flow_action_raw.modify_hdr);
|
||||
kfree(maction);
|
||||
return ERR_PTR(ret);
|
||||
}
|
||||
@ -479,11 +480,13 @@ static int mlx5_ib_flow_action_create_packet_reformat_ctx(
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = mlx5_packet_reformat_alloc(dev->mdev, prm_prt, len,
|
||||
in, namespace,
|
||||
&maction->flow_action_raw.action_id);
|
||||
if (ret)
|
||||
maction->flow_action_raw.pkt_reformat =
|
||||
mlx5_packet_reformat_alloc(dev->mdev, prm_prt, len,
|
||||
in, namespace);
|
||||
if (IS_ERR(maction->flow_action_raw.pkt_reformat)) {
|
||||
ret = PTR_ERR(maction->flow_action_raw.pkt_reformat);
|
||||
return ret;
|
||||
}
|
||||
|
||||
maction->flow_action_raw.sub_type =
|
||||
MLX5_IB_FLOW_ACTION_PACKET_REFORMAT;
|
||||
|
@ -2658,7 +2658,8 @@ int parse_flow_flow_action(struct mlx5_ib_flow_action *maction,
|
||||
if (action->action & MLX5_FLOW_CONTEXT_ACTION_MOD_HDR)
|
||||
return -EINVAL;
|
||||
action->action |= MLX5_FLOW_CONTEXT_ACTION_MOD_HDR;
|
||||
action->modify_id = maction->flow_action_raw.action_id;
|
||||
action->modify_hdr =
|
||||
maction->flow_action_raw.modify_hdr;
|
||||
return 0;
|
||||
}
|
||||
if (maction->flow_action_raw.sub_type ==
|
||||
@ -2675,8 +2676,8 @@ int parse_flow_flow_action(struct mlx5_ib_flow_action *maction,
|
||||
return -EINVAL;
|
||||
action->action |=
|
||||
MLX5_FLOW_CONTEXT_ACTION_PACKET_REFORMAT;
|
||||
action->reformat_id =
|
||||
maction->flow_action_raw.action_id;
|
||||
action->pkt_reformat =
|
||||
maction->flow_action_raw.pkt_reformat;
|
||||
return 0;
|
||||
}
|
||||
/* fall through */
|
||||
|
@ -868,7 +868,10 @@ struct mlx5_ib_flow_action {
|
||||
struct {
|
||||
struct mlx5_ib_dev *dev;
|
||||
u32 sub_type;
|
||||
u32 action_id;
|
||||
union {
|
||||
struct mlx5_modify_hdr *modify_hdr;
|
||||
struct mlx5_pkt_reformat *pkt_reformat;
|
||||
};
|
||||
} flow_action_raw;
|
||||
};
|
||||
};
|
||||
|
@ -291,14 +291,14 @@ int mlx5e_tc_tun_create_header_ipv4(struct mlx5e_priv *priv,
|
||||
*/
|
||||
goto out;
|
||||
}
|
||||
|
||||
err = mlx5_packet_reformat_alloc(priv->mdev,
|
||||
e->reformat_type,
|
||||
ipv4_encap_size, encap_header,
|
||||
MLX5_FLOW_NAMESPACE_FDB,
|
||||
&e->encap_id);
|
||||
if (err)
|
||||
e->pkt_reformat = mlx5_packet_reformat_alloc(priv->mdev,
|
||||
e->reformat_type,
|
||||
ipv4_encap_size, encap_header,
|
||||
MLX5_FLOW_NAMESPACE_FDB);
|
||||
if (IS_ERR(e->pkt_reformat)) {
|
||||
err = PTR_ERR(e->pkt_reformat);
|
||||
goto destroy_neigh_entry;
|
||||
}
|
||||
|
||||
e->flags |= MLX5_ENCAP_ENTRY_VALID;
|
||||
mlx5e_rep_queue_neigh_stats_work(netdev_priv(out_dev));
|
||||
@ -407,13 +407,14 @@ int mlx5e_tc_tun_create_header_ipv6(struct mlx5e_priv *priv,
|
||||
goto out;
|
||||
}
|
||||
|
||||
err = mlx5_packet_reformat_alloc(priv->mdev,
|
||||
e->reformat_type,
|
||||
ipv6_encap_size, encap_header,
|
||||
MLX5_FLOW_NAMESPACE_FDB,
|
||||
&e->encap_id);
|
||||
if (err)
|
||||
e->pkt_reformat = mlx5_packet_reformat_alloc(priv->mdev,
|
||||
e->reformat_type,
|
||||
ipv6_encap_size, encap_header,
|
||||
MLX5_FLOW_NAMESPACE_FDB);
|
||||
if (IS_ERR(e->pkt_reformat)) {
|
||||
err = PTR_ERR(e->pkt_reformat);
|
||||
goto destroy_neigh_entry;
|
||||
}
|
||||
|
||||
e->flags |= MLX5_ENCAP_ENTRY_VALID;
|
||||
mlx5e_rep_queue_neigh_stats_work(netdev_priv(out_dev));
|
||||
|
@ -161,7 +161,7 @@ struct mlx5e_encap_entry {
|
||||
*/
|
||||
struct hlist_node encap_hlist;
|
||||
struct list_head flows;
|
||||
u32 encap_id;
|
||||
struct mlx5_pkt_reformat *pkt_reformat;
|
||||
const struct ip_tunnel_info *tun_info;
|
||||
unsigned char h_dest[ETH_ALEN]; /* destination eth addr */
|
||||
|
||||
|
@ -61,7 +61,7 @@
|
||||
struct mlx5_nic_flow_attr {
|
||||
u32 action;
|
||||
u32 flow_tag;
|
||||
u32 mod_hdr_id;
|
||||
struct mlx5_modify_hdr *modify_hdr;
|
||||
u32 hairpin_tirn;
|
||||
u8 match_level;
|
||||
struct mlx5_flow_table *hairpin_ft;
|
||||
@ -201,7 +201,7 @@ struct mlx5e_mod_hdr_entry {
|
||||
|
||||
struct mod_hdr_key key;
|
||||
|
||||
u32 mod_hdr_id;
|
||||
struct mlx5_modify_hdr *modify_hdr;
|
||||
|
||||
refcount_t refcnt;
|
||||
struct completion res_ready;
|
||||
@ -334,7 +334,7 @@ static void mlx5e_mod_hdr_put(struct mlx5e_priv *priv,
|
||||
|
||||
WARN_ON(!list_empty(&mh->flows));
|
||||
if (mh->compl_result > 0)
|
||||
mlx5_modify_header_dealloc(priv->mdev, mh->mod_hdr_id);
|
||||
mlx5_modify_header_dealloc(priv->mdev, mh->modify_hdr);
|
||||
|
||||
kfree(mh);
|
||||
}
|
||||
@ -395,11 +395,11 @@ static int mlx5e_attach_mod_hdr(struct mlx5e_priv *priv,
|
||||
hash_add(tbl->hlist, &mh->mod_hdr_hlist, hash_key);
|
||||
mutex_unlock(&tbl->lock);
|
||||
|
||||
err = mlx5_modify_header_alloc(priv->mdev, namespace,
|
||||
mh->key.num_actions,
|
||||
mh->key.actions,
|
||||
&mh->mod_hdr_id);
|
||||
if (err) {
|
||||
mh->modify_hdr = mlx5_modify_header_alloc(priv->mdev, namespace,
|
||||
mh->key.num_actions,
|
||||
mh->key.actions);
|
||||
if (IS_ERR(mh->modify_hdr)) {
|
||||
err = PTR_ERR(mh->modify_hdr);
|
||||
mh->compl_result = err;
|
||||
goto alloc_header_err;
|
||||
}
|
||||
@ -412,9 +412,9 @@ attach_flow:
|
||||
list_add(&flow->mod_hdr, &mh->flows);
|
||||
spin_unlock(&mh->flows_lock);
|
||||
if (mlx5e_is_eswitch_flow(flow))
|
||||
flow->esw_attr->mod_hdr_id = mh->mod_hdr_id;
|
||||
flow->esw_attr->modify_hdr = mh->modify_hdr;
|
||||
else
|
||||
flow->nic_attr->mod_hdr_id = mh->mod_hdr_id;
|
||||
flow->nic_attr->modify_hdr = mh->modify_hdr;
|
||||
|
||||
return 0;
|
||||
|
||||
@ -906,7 +906,6 @@ mlx5e_tc_add_nic_flow(struct mlx5e_priv *priv,
|
||||
struct mlx5_flow_destination dest[2] = {};
|
||||
struct mlx5_flow_act flow_act = {
|
||||
.action = attr->action,
|
||||
.reformat_id = 0,
|
||||
.flags = FLOW_ACT_NO_APPEND,
|
||||
};
|
||||
struct mlx5_fc *counter = NULL;
|
||||
@ -947,7 +946,7 @@ mlx5e_tc_add_nic_flow(struct mlx5e_priv *priv,
|
||||
|
||||
if (attr->action & MLX5_FLOW_CONTEXT_ACTION_MOD_HDR) {
|
||||
err = mlx5e_attach_mod_hdr(priv, flow, parse_attr);
|
||||
flow_act.modify_id = attr->mod_hdr_id;
|
||||
flow_act.modify_hdr = attr->modify_hdr;
|
||||
kfree(parse_attr->mod_hdr_actions);
|
||||
if (err)
|
||||
return err;
|
||||
@ -1304,14 +1303,13 @@ void mlx5e_tc_encap_flows_add(struct mlx5e_priv *priv,
|
||||
struct mlx5e_tc_flow *flow;
|
||||
int err;
|
||||
|
||||
err = mlx5_packet_reformat_alloc(priv->mdev,
|
||||
e->reformat_type,
|
||||
e->encap_size, e->encap_header,
|
||||
MLX5_FLOW_NAMESPACE_FDB,
|
||||
&e->encap_id);
|
||||
if (err) {
|
||||
mlx5_core_warn(priv->mdev, "Failed to offload cached encapsulation header, %d\n",
|
||||
err);
|
||||
e->pkt_reformat = mlx5_packet_reformat_alloc(priv->mdev,
|
||||
e->reformat_type,
|
||||
e->encap_size, e->encap_header,
|
||||
MLX5_FLOW_NAMESPACE_FDB);
|
||||
if (IS_ERR(e->pkt_reformat)) {
|
||||
mlx5_core_warn(priv->mdev, "Failed to offload cached encapsulation header, %lu\n",
|
||||
PTR_ERR(e->pkt_reformat));
|
||||
return;
|
||||
}
|
||||
e->flags |= MLX5_ENCAP_ENTRY_VALID;
|
||||
@ -1326,7 +1324,7 @@ void mlx5e_tc_encap_flows_add(struct mlx5e_priv *priv,
|
||||
esw_attr = flow->esw_attr;
|
||||
spec = &esw_attr->parse_attr->spec;
|
||||
|
||||
esw_attr->dests[flow->tmp_efi_index].encap_id = e->encap_id;
|
||||
esw_attr->dests[flow->tmp_efi_index].pkt_reformat = e->pkt_reformat;
|
||||
esw_attr->dests[flow->tmp_efi_index].flags |= MLX5_ESW_DEST_ENCAP_VALID;
|
||||
/* Flow can be associated with multiple encap entries.
|
||||
* Before offloading the flow verify that all of them have
|
||||
@ -1395,7 +1393,7 @@ void mlx5e_tc_encap_flows_del(struct mlx5e_priv *priv,
|
||||
|
||||
/* we know that the encap is valid */
|
||||
e->flags &= ~MLX5_ENCAP_ENTRY_VALID;
|
||||
mlx5_packet_reformat_dealloc(priv->mdev, e->encap_id);
|
||||
mlx5_packet_reformat_dealloc(priv->mdev, e->pkt_reformat);
|
||||
}
|
||||
|
||||
static struct mlx5_fc *mlx5e_tc_get_counter(struct mlx5e_tc_flow *flow)
|
||||
@ -1561,7 +1559,7 @@ static void mlx5e_encap_dealloc(struct mlx5e_priv *priv, struct mlx5e_encap_entr
|
||||
mlx5e_rep_encap_entry_detach(netdev_priv(e->out_dev), e);
|
||||
|
||||
if (e->flags & MLX5_ENCAP_ENTRY_VALID)
|
||||
mlx5_packet_reformat_dealloc(priv->mdev, e->encap_id);
|
||||
mlx5_packet_reformat_dealloc(priv->mdev, e->pkt_reformat);
|
||||
}
|
||||
|
||||
kfree(e->encap_header);
|
||||
@ -3048,7 +3046,7 @@ attach_flow:
|
||||
flow->encaps[out_index].index = out_index;
|
||||
*encap_dev = e->out_dev;
|
||||
if (e->flags & MLX5_ENCAP_ENTRY_VALID) {
|
||||
attr->dests[out_index].encap_id = e->encap_id;
|
||||
attr->dests[out_index].pkt_reformat = e->pkt_reformat;
|
||||
attr->dests[out_index].flags |= MLX5_ESW_DEST_ENCAP_VALID;
|
||||
*encap_valid = true;
|
||||
} else {
|
||||
|
@ -69,7 +69,7 @@ struct vport_ingress {
|
||||
struct mlx5_flow_group *allow_spoofchk_only_grp;
|
||||
struct mlx5_flow_group *allow_untagged_only_grp;
|
||||
struct mlx5_flow_group *drop_grp;
|
||||
int modify_metadata_id;
|
||||
struct mlx5_modify_hdr *modify_metadata;
|
||||
struct mlx5_flow_handle *modify_metadata_rule;
|
||||
struct mlx5_flow_handle *allow_rule;
|
||||
struct mlx5_flow_handle *drop_rule;
|
||||
@ -385,11 +385,11 @@ struct mlx5_esw_flow_attr {
|
||||
struct {
|
||||
u32 flags;
|
||||
struct mlx5_eswitch_rep *rep;
|
||||
struct mlx5_pkt_reformat *pkt_reformat;
|
||||
struct mlx5_core_dev *mdev;
|
||||
u32 encap_id;
|
||||
struct mlx5_termtbl_handle *termtbl;
|
||||
} dests[MLX5_MAX_FLOW_FWD_VPORTS];
|
||||
u32 mod_hdr_id;
|
||||
struct mlx5_modify_hdr *modify_hdr;
|
||||
u8 inner_match_level;
|
||||
u8 outer_match_level;
|
||||
struct mlx5_fc *counter;
|
||||
|
@ -190,10 +190,10 @@ mlx5_eswitch_add_offloaded_rule(struct mlx5_eswitch *esw,
|
||||
MLX5_FLOW_DEST_VPORT_VHCA_ID;
|
||||
if (attr->dests[j].flags & MLX5_ESW_DEST_ENCAP) {
|
||||
flow_act.action |= MLX5_FLOW_CONTEXT_ACTION_PACKET_REFORMAT;
|
||||
flow_act.reformat_id = attr->dests[j].encap_id;
|
||||
flow_act.pkt_reformat = attr->dests[j].pkt_reformat;
|
||||
dest[i].vport.flags |= MLX5_FLOW_DEST_VPORT_REFORMAT_ID;
|
||||
dest[i].vport.reformat_id =
|
||||
attr->dests[j].encap_id;
|
||||
dest[i].vport.pkt_reformat =
|
||||
attr->dests[j].pkt_reformat;
|
||||
}
|
||||
i++;
|
||||
}
|
||||
@ -213,7 +213,7 @@ mlx5_eswitch_add_offloaded_rule(struct mlx5_eswitch *esw,
|
||||
spec->match_criteria_enable |= MLX5_MATCH_INNER_HEADERS;
|
||||
|
||||
if (flow_act.action & MLX5_FLOW_CONTEXT_ACTION_MOD_HDR)
|
||||
flow_act.modify_id = attr->mod_hdr_id;
|
||||
flow_act.modify_hdr = attr->modify_hdr;
|
||||
|
||||
fdb = esw_get_prio_table(esw, attr->chain, attr->prio, !!split);
|
||||
if (IS_ERR(fdb)) {
|
||||
@ -276,7 +276,7 @@ mlx5_eswitch_add_fwd_rule(struct mlx5_eswitch *esw,
|
||||
dest[i].vport.flags |= MLX5_FLOW_DEST_VPORT_VHCA_ID;
|
||||
if (attr->dests[i].flags & MLX5_ESW_DEST_ENCAP) {
|
||||
dest[i].vport.flags |= MLX5_FLOW_DEST_VPORT_REFORMAT_ID;
|
||||
dest[i].vport.reformat_id = attr->dests[i].encap_id;
|
||||
dest[i].vport.pkt_reformat = attr->dests[i].pkt_reformat;
|
||||
}
|
||||
}
|
||||
dest[i].type = MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE;
|
||||
@ -1734,7 +1734,7 @@ static int esw_vport_ingress_prio_tag_config(struct mlx5_eswitch *esw,
|
||||
|
||||
if (vport->ingress.modify_metadata_rule) {
|
||||
flow_act.action |= MLX5_FLOW_CONTEXT_ACTION_MOD_HDR;
|
||||
flow_act.modify_id = vport->ingress.modify_metadata_id;
|
||||
flow_act.modify_hdr = vport->ingress.modify_metadata;
|
||||
}
|
||||
|
||||
vport->ingress.allow_rule =
|
||||
@ -1770,9 +1770,11 @@ static int esw_vport_add_ingress_acl_modify_metadata(struct mlx5_eswitch *esw,
|
||||
MLX5_SET(set_action_in, action, data,
|
||||
mlx5_eswitch_get_vport_metadata_for_match(esw, vport->vport));
|
||||
|
||||
err = mlx5_modify_header_alloc(esw->dev, MLX5_FLOW_NAMESPACE_ESW_INGRESS,
|
||||
1, action, &vport->ingress.modify_metadata_id);
|
||||
if (err) {
|
||||
vport->ingress.modify_metadata =
|
||||
mlx5_modify_header_alloc(esw->dev, MLX5_FLOW_NAMESPACE_ESW_INGRESS,
|
||||
1, action);
|
||||
if (IS_ERR(vport->ingress.modify_metadata)) {
|
||||
err = PTR_ERR(vport->ingress.modify_metadata);
|
||||
esw_warn(esw->dev,
|
||||
"failed to alloc modify header for vport %d ingress acl (%d)\n",
|
||||
vport->vport, err);
|
||||
@ -1780,7 +1782,7 @@ static int esw_vport_add_ingress_acl_modify_metadata(struct mlx5_eswitch *esw,
|
||||
}
|
||||
|
||||
flow_act.action = MLX5_FLOW_CONTEXT_ACTION_MOD_HDR | MLX5_FLOW_CONTEXT_ACTION_ALLOW;
|
||||
flow_act.modify_id = vport->ingress.modify_metadata_id;
|
||||
flow_act.modify_hdr = vport->ingress.modify_metadata;
|
||||
vport->ingress.modify_metadata_rule = mlx5_add_flow_rules(vport->ingress.acl,
|
||||
&spec, &flow_act, NULL, 0);
|
||||
if (IS_ERR(vport->ingress.modify_metadata_rule)) {
|
||||
@ -1794,7 +1796,7 @@ static int esw_vport_add_ingress_acl_modify_metadata(struct mlx5_eswitch *esw,
|
||||
|
||||
out:
|
||||
if (err)
|
||||
mlx5_modify_header_dealloc(esw->dev, vport->ingress.modify_metadata_id);
|
||||
mlx5_modify_header_dealloc(esw->dev, vport->ingress.modify_metadata);
|
||||
return err;
|
||||
}
|
||||
|
||||
@ -1803,7 +1805,7 @@ void esw_vport_del_ingress_acl_modify_metadata(struct mlx5_eswitch *esw,
|
||||
{
|
||||
if (vport->ingress.modify_metadata_rule) {
|
||||
mlx5_del_flow_rules(vport->ingress.modify_metadata_rule);
|
||||
mlx5_modify_header_dealloc(esw->dev, vport->ingress.modify_metadata_id);
|
||||
mlx5_modify_header_dealloc(esw->dev, vport->ingress.modify_metadata);
|
||||
|
||||
vport->ingress.modify_metadata_rule = NULL;
|
||||
}
|
||||
|
@ -107,6 +107,34 @@ static int mlx5_cmd_stub_delete_fte(struct mlx5_flow_root_namespace *ns,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int mlx5_cmd_stub_packet_reformat_alloc(struct mlx5_flow_root_namespace *ns,
|
||||
int reformat_type,
|
||||
size_t size,
|
||||
void *reformat_data,
|
||||
enum mlx5_flow_namespace_type namespace,
|
||||
struct mlx5_pkt_reformat *pkt_reformat)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void mlx5_cmd_stub_packet_reformat_dealloc(struct mlx5_flow_root_namespace *ns,
|
||||
struct mlx5_pkt_reformat *pkt_reformat)
|
||||
{
|
||||
}
|
||||
|
||||
static int mlx5_cmd_stub_modify_header_alloc(struct mlx5_flow_root_namespace *ns,
|
||||
u8 namespace, u8 num_actions,
|
||||
void *modify_actions,
|
||||
struct mlx5_modify_hdr *modify_hdr)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void mlx5_cmd_stub_modify_header_dealloc(struct mlx5_flow_root_namespace *ns,
|
||||
struct mlx5_modify_hdr *modify_hdr)
|
||||
{
|
||||
}
|
||||
|
||||
static int mlx5_cmd_update_root_ft(struct mlx5_flow_root_namespace *ns,
|
||||
struct mlx5_flow_table *ft, u32 underlay_qpn,
|
||||
bool disconnect)
|
||||
@ -412,11 +440,13 @@ static int mlx5_cmd_set_fte(struct mlx5_core_dev *dev,
|
||||
} else {
|
||||
MLX5_SET(flow_context, in_flow_context, action,
|
||||
fte->action.action);
|
||||
MLX5_SET(flow_context, in_flow_context, packet_reformat_id,
|
||||
fte->action.reformat_id);
|
||||
if (fte->action.pkt_reformat)
|
||||
MLX5_SET(flow_context, in_flow_context, packet_reformat_id,
|
||||
fte->action.pkt_reformat->id);
|
||||
}
|
||||
MLX5_SET(flow_context, in_flow_context, modify_header_id,
|
||||
fte->action.modify_id);
|
||||
if (fte->action.modify_hdr)
|
||||
MLX5_SET(flow_context, in_flow_context, modify_header_id,
|
||||
fte->action.modify_hdr->id);
|
||||
|
||||
vlan = MLX5_ADDR_OF(flow_context, in_flow_context, push_vlan);
|
||||
|
||||
@ -468,7 +498,7 @@ static int mlx5_cmd_set_fte(struct mlx5_core_dev *dev,
|
||||
MLX5_FLOW_DEST_VPORT_REFORMAT_ID));
|
||||
MLX5_SET(extended_dest_format, in_dests,
|
||||
packet_reformat_id,
|
||||
dst->dest_attr.vport.reformat_id);
|
||||
dst->dest_attr.vport.pkt_reformat->id);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
@ -643,14 +673,15 @@ int mlx5_cmd_fc_bulk_query(struct mlx5_core_dev *dev, u32 base_id, int bulk_len,
|
||||
return mlx5_cmd_exec(dev, in, sizeof(in), out, outlen);
|
||||
}
|
||||
|
||||
int mlx5_packet_reformat_alloc(struct mlx5_core_dev *dev,
|
||||
int reformat_type,
|
||||
size_t size,
|
||||
void *reformat_data,
|
||||
enum mlx5_flow_namespace_type namespace,
|
||||
u32 *packet_reformat_id)
|
||||
static int mlx5_cmd_packet_reformat_alloc(struct mlx5_flow_root_namespace *ns,
|
||||
int reformat_type,
|
||||
size_t size,
|
||||
void *reformat_data,
|
||||
enum mlx5_flow_namespace_type namespace,
|
||||
struct mlx5_pkt_reformat *pkt_reformat)
|
||||
{
|
||||
u32 out[MLX5_ST_SZ_DW(alloc_packet_reformat_context_out)];
|
||||
struct mlx5_core_dev *dev = ns->dev;
|
||||
void *packet_reformat_context_in;
|
||||
int max_encap_size;
|
||||
void *reformat;
|
||||
@ -693,35 +724,36 @@ int mlx5_packet_reformat_alloc(struct mlx5_core_dev *dev,
|
||||
memset(out, 0, sizeof(out));
|
||||
err = mlx5_cmd_exec(dev, in, inlen, out, sizeof(out));
|
||||
|
||||
*packet_reformat_id = MLX5_GET(alloc_packet_reformat_context_out,
|
||||
out, packet_reformat_id);
|
||||
pkt_reformat->id = MLX5_GET(alloc_packet_reformat_context_out,
|
||||
out, packet_reformat_id);
|
||||
kfree(in);
|
||||
return err;
|
||||
}
|
||||
EXPORT_SYMBOL(mlx5_packet_reformat_alloc);
|
||||
|
||||
void mlx5_packet_reformat_dealloc(struct mlx5_core_dev *dev,
|
||||
u32 packet_reformat_id)
|
||||
static void mlx5_cmd_packet_reformat_dealloc(struct mlx5_flow_root_namespace *ns,
|
||||
struct mlx5_pkt_reformat *pkt_reformat)
|
||||
{
|
||||
u32 in[MLX5_ST_SZ_DW(dealloc_packet_reformat_context_in)];
|
||||
u32 out[MLX5_ST_SZ_DW(dealloc_packet_reformat_context_out)];
|
||||
struct mlx5_core_dev *dev = ns->dev;
|
||||
|
||||
memset(in, 0, sizeof(in));
|
||||
MLX5_SET(dealloc_packet_reformat_context_in, in, opcode,
|
||||
MLX5_CMD_OP_DEALLOC_PACKET_REFORMAT_CONTEXT);
|
||||
MLX5_SET(dealloc_packet_reformat_context_in, in, packet_reformat_id,
|
||||
packet_reformat_id);
|
||||
pkt_reformat->id);
|
||||
|
||||
mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));
|
||||
}
|
||||
EXPORT_SYMBOL(mlx5_packet_reformat_dealloc);
|
||||
|
||||
int mlx5_modify_header_alloc(struct mlx5_core_dev *dev,
|
||||
u8 namespace, u8 num_actions,
|
||||
void *modify_actions, u32 *modify_header_id)
|
||||
static int mlx5_cmd_modify_header_alloc(struct mlx5_flow_root_namespace *ns,
|
||||
u8 namespace, u8 num_actions,
|
||||
void *modify_actions,
|
||||
struct mlx5_modify_hdr *modify_hdr)
|
||||
{
|
||||
u32 out[MLX5_ST_SZ_DW(alloc_modify_header_context_out)];
|
||||
int max_actions, actions_size, inlen, err;
|
||||
struct mlx5_core_dev *dev = ns->dev;
|
||||
void *actions_in;
|
||||
u8 table_type;
|
||||
u32 *in;
|
||||
@ -772,26 +804,26 @@ int mlx5_modify_header_alloc(struct mlx5_core_dev *dev,
|
||||
memset(out, 0, sizeof(out));
|
||||
err = mlx5_cmd_exec(dev, in, inlen, out, sizeof(out));
|
||||
|
||||
*modify_header_id = MLX5_GET(alloc_modify_header_context_out, out, modify_header_id);
|
||||
modify_hdr->id = MLX5_GET(alloc_modify_header_context_out, out, modify_header_id);
|
||||
kfree(in);
|
||||
return err;
|
||||
}
|
||||
EXPORT_SYMBOL(mlx5_modify_header_alloc);
|
||||
|
||||
void mlx5_modify_header_dealloc(struct mlx5_core_dev *dev, u32 modify_header_id)
|
||||
static void mlx5_cmd_modify_header_dealloc(struct mlx5_flow_root_namespace *ns,
|
||||
struct mlx5_modify_hdr *modify_hdr)
|
||||
{
|
||||
u32 in[MLX5_ST_SZ_DW(dealloc_modify_header_context_in)];
|
||||
u32 out[MLX5_ST_SZ_DW(dealloc_modify_header_context_out)];
|
||||
struct mlx5_core_dev *dev = ns->dev;
|
||||
|
||||
memset(in, 0, sizeof(in));
|
||||
MLX5_SET(dealloc_modify_header_context_in, in, opcode,
|
||||
MLX5_CMD_OP_DEALLOC_MODIFY_HEADER_CONTEXT);
|
||||
MLX5_SET(dealloc_modify_header_context_in, in, modify_header_id,
|
||||
modify_header_id);
|
||||
modify_hdr->id);
|
||||
|
||||
mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));
|
||||
}
|
||||
EXPORT_SYMBOL(mlx5_modify_header_dealloc);
|
||||
|
||||
static const struct mlx5_flow_cmds mlx5_flow_cmds = {
|
||||
.create_flow_table = mlx5_cmd_create_flow_table,
|
||||
@ -803,6 +835,10 @@ static const struct mlx5_flow_cmds mlx5_flow_cmds = {
|
||||
.update_fte = mlx5_cmd_update_fte,
|
||||
.delete_fte = mlx5_cmd_delete_fte,
|
||||
.update_root_ft = mlx5_cmd_update_root_ft,
|
||||
.packet_reformat_alloc = mlx5_cmd_packet_reformat_alloc,
|
||||
.packet_reformat_dealloc = mlx5_cmd_packet_reformat_dealloc,
|
||||
.modify_header_alloc = mlx5_cmd_modify_header_alloc,
|
||||
.modify_header_dealloc = mlx5_cmd_modify_header_dealloc
|
||||
};
|
||||
|
||||
static const struct mlx5_flow_cmds mlx5_flow_cmd_stubs = {
|
||||
@ -815,6 +851,10 @@ static const struct mlx5_flow_cmds mlx5_flow_cmd_stubs = {
|
||||
.update_fte = mlx5_cmd_stub_update_fte,
|
||||
.delete_fte = mlx5_cmd_stub_delete_fte,
|
||||
.update_root_ft = mlx5_cmd_stub_update_root_ft,
|
||||
.packet_reformat_alloc = mlx5_cmd_stub_packet_reformat_alloc,
|
||||
.packet_reformat_dealloc = mlx5_cmd_stub_packet_reformat_dealloc,
|
||||
.modify_header_alloc = mlx5_cmd_stub_modify_header_alloc,
|
||||
.modify_header_dealloc = mlx5_cmd_stub_modify_header_dealloc
|
||||
};
|
||||
|
||||
static const struct mlx5_flow_cmds *mlx5_fs_cmd_get_fw_cmds(void)
|
||||
|
@ -75,6 +75,24 @@ struct mlx5_flow_cmds {
|
||||
struct mlx5_flow_table *ft,
|
||||
u32 underlay_qpn,
|
||||
bool disconnect);
|
||||
|
||||
int (*packet_reformat_alloc)(struct mlx5_flow_root_namespace *ns,
|
||||
int reformat_type,
|
||||
size_t size,
|
||||
void *reformat_data,
|
||||
enum mlx5_flow_namespace_type namespace,
|
||||
struct mlx5_pkt_reformat *pkt_reformat);
|
||||
|
||||
void (*packet_reformat_dealloc)(struct mlx5_flow_root_namespace *ns,
|
||||
struct mlx5_pkt_reformat *pkt_reformat);
|
||||
|
||||
int (*modify_header_alloc)(struct mlx5_flow_root_namespace *ns,
|
||||
u8 namespace, u8 num_actions,
|
||||
void *modify_actions,
|
||||
struct mlx5_modify_hdr *modify_hdr);
|
||||
|
||||
void (*modify_header_dealloc)(struct mlx5_flow_root_namespace *ns,
|
||||
struct mlx5_modify_hdr *modify_hdr);
|
||||
};
|
||||
|
||||
int mlx5_cmd_fc_alloc(struct mlx5_core_dev *dev, u32 *id);
|
||||
|
@ -1415,7 +1415,8 @@ static bool mlx5_flow_dests_cmp(struct mlx5_flow_destination *d1,
|
||||
((d1->vport.flags & MLX5_FLOW_DEST_VPORT_VHCA_ID) ?
|
||||
(d1->vport.vhca_id == d2->vport.vhca_id) : true) &&
|
||||
((d1->vport.flags & MLX5_FLOW_DEST_VPORT_REFORMAT_ID) ?
|
||||
(d1->vport.reformat_id == d2->vport.reformat_id) : true)) ||
|
||||
(d1->vport.pkt_reformat->id ==
|
||||
d2->vport.pkt_reformat->id) : true)) ||
|
||||
(d1->type == MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE &&
|
||||
d1->ft == d2->ft) ||
|
||||
(d1->type == MLX5_FLOW_DESTINATION_TYPE_TIR &&
|
||||
@ -2888,3 +2889,105 @@ out:
|
||||
return err;
|
||||
}
|
||||
EXPORT_SYMBOL(mlx5_fs_remove_rx_underlay_qpn);
|
||||
|
||||
static struct mlx5_flow_root_namespace
|
||||
*get_root_namespace(struct mlx5_core_dev *dev, enum mlx5_flow_namespace_type ns_type)
|
||||
{
|
||||
struct mlx5_flow_namespace *ns;
|
||||
|
||||
if (ns_type == MLX5_FLOW_NAMESPACE_ESW_EGRESS ||
|
||||
ns_type == MLX5_FLOW_NAMESPACE_ESW_INGRESS)
|
||||
ns = mlx5_get_flow_vport_acl_namespace(dev, ns_type, 0);
|
||||
else
|
||||
ns = mlx5_get_flow_namespace(dev, ns_type);
|
||||
if (!ns)
|
||||
return NULL;
|
||||
|
||||
return find_root(&ns->node);
|
||||
}
|
||||
|
||||
struct mlx5_modify_hdr *mlx5_modify_header_alloc(struct mlx5_core_dev *dev,
|
||||
u8 ns_type, u8 num_actions,
|
||||
void *modify_actions)
|
||||
{
|
||||
struct mlx5_flow_root_namespace *root;
|
||||
struct mlx5_modify_hdr *modify_hdr;
|
||||
int err;
|
||||
|
||||
root = get_root_namespace(dev, ns_type);
|
||||
if (!root)
|
||||
return ERR_PTR(-EOPNOTSUPP);
|
||||
|
||||
modify_hdr = kzalloc(sizeof(*modify_hdr), GFP_KERNEL);
|
||||
if (!modify_hdr)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
||||
modify_hdr->ns_type = ns_type;
|
||||
err = root->cmds->modify_header_alloc(root, ns_type, num_actions,
|
||||
modify_actions, modify_hdr);
|
||||
if (err) {
|
||||
kfree(modify_hdr);
|
||||
return ERR_PTR(err);
|
||||
}
|
||||
|
||||
return modify_hdr;
|
||||
}
|
||||
EXPORT_SYMBOL(mlx5_modify_header_alloc);
|
||||
|
||||
void mlx5_modify_header_dealloc(struct mlx5_core_dev *dev,
|
||||
struct mlx5_modify_hdr *modify_hdr)
|
||||
{
|
||||
struct mlx5_flow_root_namespace *root;
|
||||
|
||||
root = get_root_namespace(dev, modify_hdr->ns_type);
|
||||
if (WARN_ON(!root))
|
||||
return;
|
||||
root->cmds->modify_header_dealloc(root, modify_hdr);
|
||||
kfree(modify_hdr);
|
||||
}
|
||||
EXPORT_SYMBOL(mlx5_modify_header_dealloc);
|
||||
|
||||
struct mlx5_pkt_reformat *mlx5_packet_reformat_alloc(struct mlx5_core_dev *dev,
|
||||
int reformat_type,
|
||||
size_t size,
|
||||
void *reformat_data,
|
||||
enum mlx5_flow_namespace_type ns_type)
|
||||
{
|
||||
struct mlx5_pkt_reformat *pkt_reformat;
|
||||
struct mlx5_flow_root_namespace *root;
|
||||
int err;
|
||||
|
||||
root = get_root_namespace(dev, ns_type);
|
||||
if (!root)
|
||||
return ERR_PTR(-EOPNOTSUPP);
|
||||
|
||||
pkt_reformat = kzalloc(sizeof(*pkt_reformat), GFP_KERNEL);
|
||||
if (!pkt_reformat)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
||||
pkt_reformat->ns_type = ns_type;
|
||||
pkt_reformat->reformat_type = reformat_type;
|
||||
err = root->cmds->packet_reformat_alloc(root, reformat_type, size,
|
||||
reformat_data, ns_type,
|
||||
pkt_reformat);
|
||||
if (err) {
|
||||
kfree(pkt_reformat);
|
||||
return ERR_PTR(err);
|
||||
}
|
||||
|
||||
return pkt_reformat;
|
||||
}
|
||||
EXPORT_SYMBOL(mlx5_packet_reformat_alloc);
|
||||
|
||||
void mlx5_packet_reformat_dealloc(struct mlx5_core_dev *dev,
|
||||
struct mlx5_pkt_reformat *pkt_reformat)
|
||||
{
|
||||
struct mlx5_flow_root_namespace *root;
|
||||
|
||||
root = get_root_namespace(dev, pkt_reformat->ns_type);
|
||||
if (WARN_ON(!root))
|
||||
return;
|
||||
root->cmds->packet_reformat_dealloc(root, pkt_reformat);
|
||||
kfree(pkt_reformat);
|
||||
}
|
||||
EXPORT_SYMBOL(mlx5_packet_reformat_dealloc);
|
||||
|
@ -38,6 +38,17 @@
|
||||
#include <linux/rhashtable.h>
|
||||
#include <linux/llist.h>
|
||||
|
||||
struct mlx5_modify_hdr {
|
||||
enum mlx5_flow_namespace_type ns_type;
|
||||
u32 id;
|
||||
};
|
||||
|
||||
struct mlx5_pkt_reformat {
|
||||
enum mlx5_flow_namespace_type ns_type;
|
||||
int reformat_type; /* from mlx5_ifc */
|
||||
u32 id;
|
||||
};
|
||||
|
||||
/* FS_TYPE_PRIO_CHAINS is a PRIO that will have namespaces only,
|
||||
* and those are in parallel to one another when going over them to connect
|
||||
* a new flow table. Meaning the last flow table in a TYPE_PRIO prio in one
|
||||
|
@ -84,6 +84,8 @@ enum {
|
||||
FDB_SLOW_PATH,
|
||||
};
|
||||
|
||||
struct mlx5_pkt_reformat;
|
||||
struct mlx5_modify_hdr;
|
||||
struct mlx5_flow_table;
|
||||
struct mlx5_flow_group;
|
||||
struct mlx5_flow_namespace;
|
||||
@ -121,7 +123,7 @@ struct mlx5_flow_destination {
|
||||
struct {
|
||||
u16 num;
|
||||
u16 vhca_id;
|
||||
u32 reformat_id;
|
||||
struct mlx5_pkt_reformat *pkt_reformat;
|
||||
u8 flags;
|
||||
} vport;
|
||||
};
|
||||
@ -195,8 +197,8 @@ enum {
|
||||
|
||||
struct mlx5_flow_act {
|
||||
u32 action;
|
||||
u32 reformat_id;
|
||||
u32 modify_id;
|
||||
struct mlx5_modify_hdr *modify_hdr;
|
||||
struct mlx5_pkt_reformat *pkt_reformat;
|
||||
uintptr_t esp_id;
|
||||
u32 flags;
|
||||
struct mlx5_fs_vlan vlan[MLX5_FS_VLAN_DEPTH];
|
||||
@ -205,8 +207,6 @@ struct mlx5_flow_act {
|
||||
|
||||
#define MLX5_DECLARE_FLOW_ACT(name) \
|
||||
struct mlx5_flow_act name = { .action = MLX5_FLOW_CONTEXT_ACTION_FWD_DEST,\
|
||||
.reformat_id = 0, \
|
||||
.modify_id = 0, \
|
||||
.flags = 0, }
|
||||
|
||||
/* Single destination per rule.
|
||||
@ -236,19 +236,18 @@ u32 mlx5_fc_id(struct mlx5_fc *counter);
|
||||
int mlx5_fs_add_rx_underlay_qpn(struct mlx5_core_dev *dev, u32 underlay_qpn);
|
||||
int mlx5_fs_remove_rx_underlay_qpn(struct mlx5_core_dev *dev, u32 underlay_qpn);
|
||||
|
||||
int mlx5_modify_header_alloc(struct mlx5_core_dev *dev,
|
||||
u8 namespace, u8 num_actions,
|
||||
void *modify_actions, u32 *modify_header_id);
|
||||
struct mlx5_modify_hdr *mlx5_modify_header_alloc(struct mlx5_core_dev *dev,
|
||||
u8 ns_type, u8 num_actions,
|
||||
void *modify_actions);
|
||||
void mlx5_modify_header_dealloc(struct mlx5_core_dev *dev,
|
||||
u32 modify_header_id);
|
||||
struct mlx5_modify_hdr *modify_hdr);
|
||||
|
||||
int mlx5_packet_reformat_alloc(struct mlx5_core_dev *dev,
|
||||
int reformat_type,
|
||||
size_t size,
|
||||
void *reformat_data,
|
||||
enum mlx5_flow_namespace_type namespace,
|
||||
u32 *packet_reformat_id);
|
||||
struct mlx5_pkt_reformat *mlx5_packet_reformat_alloc(struct mlx5_core_dev *dev,
|
||||
int reformat_type,
|
||||
size_t size,
|
||||
void *reformat_data,
|
||||
enum mlx5_flow_namespace_type ns_type);
|
||||
void mlx5_packet_reformat_dealloc(struct mlx5_core_dev *dev,
|
||||
u32 packet_reformat_id);
|
||||
struct mlx5_pkt_reformat *reformat);
|
||||
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user