Skip to content

Commit b50ce43

Browse files
roidayanSaeed Mahameed
roidayan
authored and
Saeed Mahameed
committed
net/mlx5e: Add red and green counters for metering
Add red and green counters per meter instance. TC police action is implemented as a meter instance. The meter counters represent the police action notexceed/exceed counters. TC rules using the same meter instance will use the same counters. Signed-off-by: Roi Dayan <[email protected]> Reviewed-by: Jianbo Liu <[email protected]> Reviewed-by: Oz Shlomo <[email protected]> Signed-off-by: Saeed Mahameed <[email protected]>
1 parent e5b1db2 commit b50ce43

File tree

5 files changed

+52
-13
lines changed

5 files changed

+52
-13
lines changed

‎drivers/net/ethernet/mellanox/mlx5/core/en/tc/meter.c

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,13 +240,28 @@ __mlx5e_flow_meter_alloc(struct mlx5e_flow_meters *flow_meters)
240240
struct mlx5_core_dev *mdev = flow_meters->mdev;
241241
struct mlx5e_flow_meter_aso_obj *meters_obj;
242242
struct mlx5e_flow_meter_handle *meter;
243+
struct mlx5_fc *counter;
243244
int err, pos, total;
244245
u32 id;
245246

246247
meter = kzalloc(sizeof(*meter), GFP_KERNEL);
247248
if (!meter)
248249
return ERR_PTR(-ENOMEM);
249250

251+
counter = mlx5_fc_create(mdev, true);
252+
if (IS_ERR(counter)) {
253+
err = PTR_ERR(counter);
254+
goto err_red_counter;
255+
}
256+
meter->red_counter = counter;
257+
258+
counter = mlx5_fc_create(mdev, true);
259+
if (IS_ERR(counter)) {
260+
err = PTR_ERR(counter);
261+
goto err_green_counter;
262+
}
263+
meter->green_counter = counter;
264+
250265
meters_obj = list_first_entry_or_null(&flow_meters->partial_list,
251266
struct mlx5e_flow_meter_aso_obj,
252267
entry);
@@ -292,6 +307,10 @@ __mlx5e_flow_meter_alloc(struct mlx5e_flow_meters *flow_meters)
292307
err_mem:
293308
mlx5e_flow_meter_destroy_aso_obj(mdev, id);
294309
err_create:
310+
mlx5_fc_destroy(mdev, meter->green_counter);
311+
err_green_counter:
312+
mlx5_fc_destroy(mdev, meter->red_counter);
313+
err_red_counter:
295314
kfree(meter);
296315
return ERR_PTR(err);
297316
}
@@ -304,6 +323,9 @@ __mlx5e_flow_meter_free(struct mlx5e_flow_meter_handle *meter)
304323
struct mlx5e_flow_meter_aso_obj *meters_obj;
305324
int n, pos;
306325

326+
mlx5_fc_destroy(mdev, meter->green_counter);
327+
mlx5_fc_destroy(mdev, meter->red_counter);
328+
307329
meters_obj = meter->meters_obj;
308330
pos = (meter->obj_id - meters_obj->base_id) * 2 + meter->idx;
309331
bitmap_clear(meters_obj->meters_map, pos, 1);

‎drivers/net/ethernet/mellanox/mlx5/core/en/tc/meter.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ struct mlx5e_flow_meter_handle {
3131
int refcnt;
3232
struct hlist_node hlist;
3333
struct mlx5e_flow_meter_params params;
34+
35+
struct mlx5_fc *green_counter;
36+
struct mlx5_fc *red_counter;
3437
};
3538

3639
struct mlx5e_meter_attr {

‎drivers/net/ethernet/mellanox/mlx5/core/en/tc/post_meter.c

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,11 @@ mlx5e_post_meter_fg_create(struct mlx5e_priv *priv,
8484
static int
8585
mlx5e_post_meter_rules_create(struct mlx5e_priv *priv,
8686
struct mlx5e_post_meter_priv *post_meter,
87-
struct mlx5e_post_act *post_act)
87+
struct mlx5e_post_act *post_act,
88+
struct mlx5_fc *green_counter,
89+
struct mlx5_fc *red_counter)
8890
{
89-
struct mlx5_flow_destination dest = {};
91+
struct mlx5_flow_destination dest[2] = {};
9092
struct mlx5_flow_act flow_act = {};
9193
struct mlx5_flow_handle *rule;
9294
struct mlx5_flow_spec *spec;
@@ -98,10 +100,13 @@ mlx5e_post_meter_rules_create(struct mlx5e_priv *priv,
98100

99101
mlx5e_tc_match_to_reg_match(spec, PACKET_COLOR_TO_REG,
100102
MLX5_FLOW_METER_COLOR_RED, MLX5_PACKET_COLOR_MASK);
101-
flow_act.action = MLX5_FLOW_CONTEXT_ACTION_DROP;
103+
flow_act.action = MLX5_FLOW_CONTEXT_ACTION_DROP |
104+
MLX5_FLOW_CONTEXT_ACTION_COUNT;
102105
flow_act.flags |= FLOW_ACT_IGNORE_FLOW_LEVEL;
106+
dest[0].type = MLX5_FLOW_DESTINATION_TYPE_COUNTER;
107+
dest[0].counter_id = mlx5_fc_id(red_counter);
103108

104-
rule = mlx5_add_flow_rules(post_meter->ft, spec, &flow_act, NULL, 0);
109+
rule = mlx5_add_flow_rules(post_meter->ft, spec, &flow_act, dest, 1);
105110
if (IS_ERR(rule)) {
106111
mlx5_core_warn(priv->mdev, "Failed to create post_meter flow drop rule\n");
107112
err = PTR_ERR(rule);
@@ -111,11 +116,14 @@ mlx5e_post_meter_rules_create(struct mlx5e_priv *priv,
111116

112117
mlx5e_tc_match_to_reg_match(spec, PACKET_COLOR_TO_REG,
113118
MLX5_FLOW_METER_COLOR_GREEN, MLX5_PACKET_COLOR_MASK);
114-
flow_act.action = MLX5_FLOW_CONTEXT_ACTION_FWD_DEST;
115-
dest.type = MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE;
116-
dest.ft = mlx5e_tc_post_act_get_ft(post_act);
117-
118-
rule = mlx5_add_flow_rules(post_meter->ft, spec, &flow_act, &dest, 1);
119+
flow_act.action = MLX5_FLOW_CONTEXT_ACTION_FWD_DEST |
120+
MLX5_FLOW_CONTEXT_ACTION_COUNT;
121+
dest[0].type = MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE;
122+
dest[0].ft = mlx5e_tc_post_act_get_ft(post_act);
123+
dest[1].type = MLX5_FLOW_DESTINATION_TYPE_COUNTER;
124+
dest[1].counter_id = mlx5_fc_id(green_counter);
125+
126+
rule = mlx5_add_flow_rules(post_meter->ft, spec, &flow_act, dest, 2);
119127
if (IS_ERR(rule)) {
120128
mlx5_core_warn(priv->mdev, "Failed to create post_meter flow fwd rule\n");
121129
err = PTR_ERR(rule);
@@ -155,7 +163,9 @@ mlx5e_post_meter_table_destroy(struct mlx5e_post_meter_priv *post_meter)
155163
struct mlx5e_post_meter_priv *
156164
mlx5e_post_meter_init(struct mlx5e_priv *priv,
157165
enum mlx5_flow_namespace_type ns_type,
158-
struct mlx5e_post_act *post_act)
166+
struct mlx5e_post_act *post_act,
167+
struct mlx5_fc *green_counter,
168+
struct mlx5_fc *red_counter)
159169
{
160170
struct mlx5e_post_meter_priv *post_meter;
161171
int err;
@@ -172,7 +182,8 @@ mlx5e_post_meter_init(struct mlx5e_priv *priv,
172182
if (err)
173183
goto err_fg;
174184

175-
err = mlx5e_post_meter_rules_create(priv, post_meter, post_act);
185+
err = mlx5e_post_meter_rules_create(priv, post_meter, post_act, green_counter,
186+
red_counter);
176187
if (err)
177188
goto err_rules;
178189

‎drivers/net/ethernet/mellanox/mlx5/core/en/tc/post_meter.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ mlx5e_post_meter_get_ft(struct mlx5e_post_meter_priv *post_meter);
2020
struct mlx5e_post_meter_priv *
2121
mlx5e_post_meter_init(struct mlx5e_priv *priv,
2222
enum mlx5_flow_namespace_type ns_type,
23-
struct mlx5e_post_act *post_act);
23+
struct mlx5e_post_act *post_act,
24+
struct mlx5_fc *green_counter,
25+
struct mlx5_fc *red_counter);
2426
void
2527
mlx5e_post_meter_cleanup(struct mlx5e_post_meter_priv *post_meter);
2628

‎drivers/net/ethernet/mellanox/mlx5/core/en_tc.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,8 @@ mlx5e_tc_add_flow_meter(struct mlx5e_priv *priv,
368368
}
369369

370370
ns_type = mlx5e_tc_meter_get_namespace(meter->flow_meters);
371-
post_meter = mlx5e_post_meter_init(priv, ns_type, post_act);
371+
post_meter = mlx5e_post_meter_init(priv, ns_type, post_act, meter->green_counter,
372+
meter->red_counter);
372373
if (IS_ERR(post_meter)) {
373374
mlx5_core_err(priv->mdev, "Failed to init post meter\n");
374375
goto err_meter_init;

0 commit comments

Comments
 (0)