openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mlxsw: spectrum_matchall: Pass mall_entry as arg to mlxsw_sp_mall_port_mirror_add() 

In the preparation for future changes, have the
mlxsw_sp_mall_port_mirror_add() function to accept mall_entry including
the "to_dev" originally obtained from act pointer.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jiri Pirko 2020-04-27 18:13:03 +03:00 committed by David S. Miller
parent 6c8cd435b5
commit 780ba878a1
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/net/ethernet/mellanox/mlxsw/spectrum_matchall.c
View File

@ -16,6 +16,7 @@ enum mlxsw_sp_mall_action_type {
}; };
struct mlxsw_sp_mall_mirror_entry { struct mlxsw_sp_mall_mirror_entry {
const struct net_device *to_dev;
int span_id; int span_id;
bool ingress; bool ingress;
}; };
@ -43,32 +44,34 @@ mlxsw_sp_mall_entry_find(struct mlxsw_sp_port *port, unsigned long cookie)
static int static int
mlxsw_sp_mall_port_mirror_add(struct mlxsw_sp_port *mlxsw_sp_port, mlxsw_sp_mall_port_mirror_add(struct mlxsw_sp_port *mlxsw_sp_port,
struct mlxsw_sp_mall_mirror_entry *mirror, struct mlxsw_sp_mall_entry *mall_entry,
const struct flow_action_entry *act,
bool ingress) bool ingress)
{ {
enum mlxsw_sp_span_type span_type; enum mlxsw_sp_span_type span_type;
if (!act->dev) { if (!mall_entry->mirror.to_dev) {
netdev_err(mlxsw_sp_port->dev, "Could not find requested device\n"); netdev_err(mlxsw_sp_port->dev, "Could not find requested device\n");
return -EINVAL; return -EINVAL;
} }
mirror->ingress = ingress; mall_entry->mirror.ingress = ingress;
span_type = ingress ? MLXSW_SP_SPAN_INGRESS : MLXSW_SP_SPAN_EGRESS; span_type = mall_entry->mirror.ingress ? MLXSW_SP_SPAN_INGRESS :
return mlxsw_sp_span_mirror_add(mlxsw_sp_port, act->dev, span_type, MLXSW_SP_SPAN_EGRESS;
true, &mirror->span_id); return mlxsw_sp_span_mirror_add(mlxsw_sp_port,
mall_entry->mirror.to_dev,
span_type, true,
&mall_entry->mirror.span_id);
} }
static void static void
mlxsw_sp_mall_port_mirror_del(struct mlxsw_sp_port *mlxsw_sp_port, mlxsw_sp_mall_port_mirror_del(struct mlxsw_sp_port *mlxsw_sp_port,
struct mlxsw_sp_mall_mirror_entry *mirror) struct mlxsw_sp_mall_entry *mall_entry)
{ {
enum mlxsw_sp_span_type span_type; enum mlxsw_sp_span_type span_type;
span_type = mirror->ingress ? MLXSW_SP_SPAN_INGRESS : span_type = mall_entry->mirror.ingress ? MLXSW_SP_SPAN_INGRESS :
MLXSW_SP_SPAN_EGRESS; MLXSW_SP_SPAN_EGRESS;
mlxsw_sp_span_mirror_del(mlxsw_sp_port, mirror->span_id, mlxsw_sp_span_mirror_del(mlxsw_sp_port, mall_entry->mirror.span_id,
span_type, true); span_type, true);
} }
@ -148,11 +151,9 @@ int mlxsw_sp_mall_replace(struct mlxsw_sp_port *mlxsw_sp_port,
act = &f->rule->action.entries[0]; act = &f->rule->action.entries[0];
if (act->id == FLOW_ACTION_MIRRED && protocol == htons(ETH_P_ALL)) { if (act->id == FLOW_ACTION_MIRRED && protocol == htons(ETH_P_ALL)) {
struct mlxsw_sp_mall_mirror_entry *mirror;
mall_entry->type = MLXSW_SP_MALL_ACTION_TYPE_MIRROR; mall_entry->type = MLXSW_SP_MALL_ACTION_TYPE_MIRROR;
mirror = &mall_entry->mirror; mall_entry->mirror.to_dev = act->dev;
err = mlxsw_sp_mall_port_mirror_add(mlxsw_sp_port, mirror, act, err = mlxsw_sp_mall_port_mirror_add(mlxsw_sp_port, mall_entry,
ingress); ingress);
} else if (act->id == FLOW_ACTION_SAMPLE && } else if (act->id == FLOW_ACTION_SAMPLE &&
protocol == htons(ETH_P_ALL)) { protocol == htons(ETH_P_ALL)) {
@ -188,8 +189,7 @@ void mlxsw_sp_mall_destroy(struct mlxsw_sp_port *mlxsw_sp_port,
switch (mall_entry->type) { switch (mall_entry->type) {
case MLXSW_SP_MALL_ACTION_TYPE_MIRROR: case MLXSW_SP_MALL_ACTION_TYPE_MIRROR:
mlxsw_sp_mall_port_mirror_del(mlxsw_sp_port, mlxsw_sp_mall_port_mirror_del(mlxsw_sp_port, mall_entry);
&mall_entry->mirror);
break; break;
case MLXSW_SP_MALL_ACTION_TYPE_SAMPLE: case MLXSW_SP_MALL_ACTION_TYPE_SAMPLE:
mlxsw_sp_mall_port_sample_del(mlxsw_sp_port); mlxsw_sp_mall_port_sample_del(mlxsw_sp_port);