Skip to content

Commit 54a9238

Browse files
pmachatadavem330
pmachata
authored and
davem330
committed
mlxsw: spectrum_qdisc: Offload action trap for qevents
When offloading action trap on a qevent, pass to_dev of NULL to the SPAN module to trigger the mirror to the CPU port. Query the buffer drops policer and use it for policing of the trapped traffic. Signed-off-by: Petr Machata <[email protected]> Reviewed-by: Jiri Pirko <[email protected]> Signed-off-by: Ido Schimmel <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 6687e95 commit 54a9238

File tree

3 files changed

+95
-13
lines changed

3 files changed

+95
-13
lines changed

‎drivers/net/ethernet/mellanox/mlxsw/spectrum.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -984,6 +984,10 @@ struct mlxsw_sp_mall_mirror_entry {
984984
int span_id;
985985
};
986986

987+
struct mlxsw_sp_mall_trap_entry {
988+
int span_id;
989+
};
990+
987991
struct mlxsw_sp_mall_entry {
988992
struct list_head list;
989993
unsigned long cookie;
@@ -992,6 +996,7 @@ struct mlxsw_sp_mall_entry {
992996
bool ingress;
993997
union {
994998
struct mlxsw_sp_mall_mirror_entry mirror;
999+
struct mlxsw_sp_mall_trap_entry trap;
9951000
struct mlxsw_sp_port_sample sample;
9961001
};
9971002
struct rcu_head rcu;
@@ -1199,6 +1204,8 @@ int
11991204
mlxsw_sp_trap_policer_counter_get(struct mlxsw_core *mlxsw_core,
12001205
const struct devlink_trap_policer *policer,
12011206
u64 *p_drops);
1207+
int mlxsw_sp_trap_group_policer_hw_id_get(struct mlxsw_sp *mlxsw_sp, u16 id,
1208+
bool *p_enabled, u16 *p_hw_id);
12021209

12031210
static inline struct net *mlxsw_sp_net(struct mlxsw_sp *mlxsw_sp)
12041211
{

‎drivers/net/ethernet/mellanox/mlxsw/spectrum_qdisc.c‎

Lines changed: 62 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1289,19 +1289,18 @@ struct mlxsw_sp_qevent_binding {
12891289

12901290
static LIST_HEAD(mlxsw_sp_qevent_block_cb_list);
12911291

1292-
static int mlxsw_sp_qevent_mirror_configure(struct mlxsw_sp *mlxsw_sp,
1293-
struct mlxsw_sp_mall_entry *mall_entry,
1294-
struct mlxsw_sp_qevent_binding *qevent_binding)
1292+
static int mlxsw_sp_qevent_span_configure(struct mlxsw_sp *mlxsw_sp,
1293+
struct mlxsw_sp_mall_entry *mall_entry,
1294+
struct mlxsw_sp_qevent_binding *qevent_binding,
1295+
const struct mlxsw_sp_span_agent_parms *agent_parms,
1296+
int *p_span_id)
12951297
{
12961298
struct mlxsw_sp_port *mlxsw_sp_port = qevent_binding->mlxsw_sp_port;
12971299
struct mlxsw_sp_span_trigger_parms trigger_parms = {};
1298-
struct mlxsw_sp_span_agent_parms agent_parms = {
1299-
.to_dev = mall_entry->mirror.to_dev,
1300-
};
13011300
int span_id;
13021301
int err;
13031302

1304-
err = mlxsw_sp_span_agent_get(mlxsw_sp, &span_id, &agent_parms);
1303+
err = mlxsw_sp_span_agent_get(mlxsw_sp, &span_id, agent_parms);
13051304
if (err)
13061305
return err;
13071306

@@ -1320,7 +1319,7 @@ static int mlxsw_sp_qevent_mirror_configure(struct mlxsw_sp *mlxsw_sp,
13201319
if (err)
13211320
goto err_trigger_enable;
13221321

1323-
mall_entry->mirror.span_id = span_id;
1322+
*p_span_id = span_id;
13241323
return 0;
13251324

13261325
err_trigger_enable:
@@ -1333,21 +1332,65 @@ static int mlxsw_sp_qevent_mirror_configure(struct mlxsw_sp *mlxsw_sp,
13331332
return err;
13341333
}
13351334

1336-
static void mlxsw_sp_qevent_mirror_deconfigure(struct mlxsw_sp *mlxsw_sp,
1337-
struct mlxsw_sp_mall_entry *mall_entry,
1338-
struct mlxsw_sp_qevent_binding *qevent_binding)
1335+
static void mlxsw_sp_qevent_span_deconfigure(struct mlxsw_sp *mlxsw_sp,
1336+
struct mlxsw_sp_qevent_binding *qevent_binding,
1337+
int span_id)
13391338
{
13401339
struct mlxsw_sp_port *mlxsw_sp_port = qevent_binding->mlxsw_sp_port;
13411340
struct mlxsw_sp_span_trigger_parms trigger_parms = {
1342-
.span_id = mall_entry->mirror.span_id,
1341+
.span_id = span_id,
13431342
};
13441343

13451344
mlxsw_sp_span_trigger_disable(mlxsw_sp_port, qevent_binding->span_trigger,
13461345
qevent_binding->tclass_num);
13471346
mlxsw_sp_span_agent_unbind(mlxsw_sp, qevent_binding->span_trigger, mlxsw_sp_port,
13481347
&trigger_parms);
13491348
mlxsw_sp_span_analyzed_port_put(mlxsw_sp_port, true);
1350-
mlxsw_sp_span_agent_put(mlxsw_sp, mall_entry->mirror.span_id);
1349+
mlxsw_sp_span_agent_put(mlxsw_sp, span_id);
1350+
}
1351+
1352+
static int mlxsw_sp_qevent_mirror_configure(struct mlxsw_sp *mlxsw_sp,
1353+
struct mlxsw_sp_mall_entry *mall_entry,
1354+
struct mlxsw_sp_qevent_binding *qevent_binding)
1355+
{
1356+
struct mlxsw_sp_span_agent_parms agent_parms = {
1357+
.to_dev = mall_entry->mirror.to_dev,
1358+
};
1359+
1360+
return mlxsw_sp_qevent_span_configure(mlxsw_sp, mall_entry, qevent_binding,
1361+
&agent_parms, &mall_entry->mirror.span_id);
1362+
}
1363+
1364+
static void mlxsw_sp_qevent_mirror_deconfigure(struct mlxsw_sp *mlxsw_sp,
1365+
struct mlxsw_sp_mall_entry *mall_entry,
1366+
struct mlxsw_sp_qevent_binding *qevent_binding)
1367+
{
1368+
mlxsw_sp_qevent_span_deconfigure(mlxsw_sp, qevent_binding, mall_entry->mirror.span_id);
1369+
}
1370+
1371+
static int mlxsw_sp_qevent_trap_configure(struct mlxsw_sp *mlxsw_sp,
1372+
struct mlxsw_sp_mall_entry *mall_entry,
1373+
struct mlxsw_sp_qevent_binding *qevent_binding)
1374+
{
1375+
struct mlxsw_sp_span_agent_parms agent_parms = {};
1376+
int err;
1377+
1378+
err = mlxsw_sp_trap_group_policer_hw_id_get(mlxsw_sp,
1379+
DEVLINK_TRAP_GROUP_GENERIC_ID_BUFFER_DROPS,
1380+
&agent_parms.policer_enable,
1381+
&agent_parms.policer_id);
1382+
if (err)
1383+
return err;
1384+
1385+
return mlxsw_sp_qevent_span_configure(mlxsw_sp, mall_entry, qevent_binding,
1386+
&agent_parms, &mall_entry->trap.span_id);
1387+
}
1388+
1389+
static void mlxsw_sp_qevent_trap_deconfigure(struct mlxsw_sp *mlxsw_sp,
1390+
struct mlxsw_sp_mall_entry *mall_entry,
1391+
struct mlxsw_sp_qevent_binding *qevent_binding)
1392+
{
1393+
mlxsw_sp_qevent_span_deconfigure(mlxsw_sp, qevent_binding, mall_entry->trap.span_id);
13511394
}
13521395

13531396
static int mlxsw_sp_qevent_entry_configure(struct mlxsw_sp *mlxsw_sp,
@@ -1357,6 +1400,8 @@ static int mlxsw_sp_qevent_entry_configure(struct mlxsw_sp *mlxsw_sp,
13571400
switch (mall_entry->type) {
13581401
case MLXSW_SP_MALL_ACTION_TYPE_MIRROR:
13591402
return mlxsw_sp_qevent_mirror_configure(mlxsw_sp, mall_entry, qevent_binding);
1403+
case MLXSW_SP_MALL_ACTION_TYPE_TRAP:
1404+
return mlxsw_sp_qevent_trap_configure(mlxsw_sp, mall_entry, qevent_binding);
13601405
default:
13611406
/* This should have been validated away. */
13621407
WARN_ON(1);
@@ -1371,6 +1416,8 @@ static void mlxsw_sp_qevent_entry_deconfigure(struct mlxsw_sp *mlxsw_sp,
13711416
switch (mall_entry->type) {
13721417
case MLXSW_SP_MALL_ACTION_TYPE_MIRROR:
13731418
return mlxsw_sp_qevent_mirror_deconfigure(mlxsw_sp, mall_entry, qevent_binding);
1419+
case MLXSW_SP_MALL_ACTION_TYPE_TRAP:
1420+
return mlxsw_sp_qevent_trap_deconfigure(mlxsw_sp, mall_entry, qevent_binding);
13741421
default:
13751422
WARN_ON(1);
13761423
return;
@@ -1490,6 +1537,8 @@ static int mlxsw_sp_qevent_mall_replace(struct mlxsw_sp *mlxsw_sp,
14901537
if (act->id == FLOW_ACTION_MIRRED) {
14911538
mall_entry->type = MLXSW_SP_MALL_ACTION_TYPE_MIRROR;
14921539
mall_entry->mirror.to_dev = act->dev;
1540+
} else if (act->id == FLOW_ACTION_TRAP) {
1541+
mall_entry->type = MLXSW_SP_MALL_ACTION_TYPE_TRAP;
14931542
} else {
14941543
NL_SET_ERR_MSG(f->common.extack, "Unsupported action");
14951544
err = -EOPNOTSUPP;

‎drivers/net/ethernet/mellanox/mlxsw/spectrum_trap.c‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1675,6 +1675,32 @@ mlxsw_sp_trap_policer_counter_get(struct mlxsw_core *mlxsw_core,
16751675
return 0;
16761676
}
16771677

1678+
int mlxsw_sp_trap_group_policer_hw_id_get(struct mlxsw_sp *mlxsw_sp, u16 id,
1679+
bool *p_enabled, u16 *p_hw_id)
1680+
{
1681+
struct mlxsw_sp_trap_policer_item *pol_item;
1682+
struct mlxsw_sp_trap_group_item *gr_item;
1683+
u32 pol_id;
1684+
1685+
gr_item = mlxsw_sp_trap_group_item_lookup(mlxsw_sp, id);
1686+
if (!gr_item)
1687+
return -ENOENT;
1688+
1689+
pol_id = gr_item->group.init_policer_id;
1690+
if (!pol_id) {
1691+
*p_enabled = false;
1692+
return 0;
1693+
}
1694+
1695+
pol_item = mlxsw_sp_trap_policer_item_lookup(mlxsw_sp, pol_id);
1696+
if (WARN_ON(!pol_item))
1697+
return -ENOENT;
1698+
1699+
*p_enabled = true;
1700+
*p_hw_id = pol_item->hw_id;
1701+
return 0;
1702+
}
1703+
16781704
static const struct mlxsw_sp_trap_group_item
16791705
mlxsw_sp1_trap_group_items_arr[] = {
16801706
};

0 commit comments

Comments
 (0)