You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
276 lines
10 KiB
276 lines
10 KiB
From 51391126c3b108d32bcfbd30f7bce65ae5049097 Mon Sep 17 00:00:00 2001
|
|
From: Alaa Hleihel <ahleihel@redhat.com>
|
|
Date: Sun, 10 May 2020 15:03:54 -0400
|
|
Subject: [PATCH 077/312] [netdrv] net/mlx5: Move legacy drop counter and rule
|
|
under legacy structure
|
|
|
|
Message-id: <20200510150452.10307-30-ahleihel@redhat.com>
|
|
Patchwork-id: 306653
|
|
Patchwork-instance: patchwork
|
|
O-Subject: [RHEL8.3 BZ 1789380 v2 29/87] net/mlx5: Move legacy drop counter and rule under legacy structure
|
|
Bugzilla: 1789380
|
|
RH-Acked-by: Kamal Heib <kheib@redhat.com>
|
|
RH-Acked-by: Jarod Wilson <jarod@redhat.com>
|
|
RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
|
|
RH-Acked-by: Jonathan Toppins <jtoppins@redhat.com>
|
|
|
|
Bugzilla: http://bugzilla.redhat.com/1789380
|
|
Upstream: v5.5-rc1
|
|
|
|
commit 853b53520c9d11db7652e3603665b0ad475741a5
|
|
Author: Parav Pandit <parav@mellanox.com>
|
|
Date: Mon Oct 28 23:35:11 2019 +0000
|
|
|
|
net/mlx5: Move legacy drop counter and rule under legacy structure
|
|
|
|
To improve code readability, move legacy drop counters and droup rule
|
|
under legacy structure.
|
|
|
|
While at it,
|
|
(a) prefix drop flow counters helper with legacy_.
|
|
(b) nullify the rule pointers only if they were valid.
|
|
|
|
Signed-off-by: Parav Pandit <parav@mellanox.com>
|
|
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
|
|
|
|
Signed-off-by: Alaa Hleihel <ahleihel@redhat.com>
|
|
Signed-off-by: Frantisek Hrbata <fhrbata@redhat.com>
|
|
---
|
|
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 82 ++++++++++++-----------
|
|
drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 13 ++++
|
|
2 files changed, 55 insertions(+), 40 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
|
|
index 76e2d5cba48b..54b5f290ab9d 100644
|
|
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
|
|
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
|
|
@@ -1035,14 +1035,15 @@ int esw_vport_enable_egress_acl(struct mlx5_eswitch *esw,
|
|
void esw_vport_cleanup_egress_rules(struct mlx5_eswitch *esw,
|
|
struct mlx5_vport *vport)
|
|
{
|
|
- if (!IS_ERR_OR_NULL(vport->egress.allowed_vlan))
|
|
+ if (!IS_ERR_OR_NULL(vport->egress.allowed_vlan)) {
|
|
mlx5_del_flow_rules(vport->egress.allowed_vlan);
|
|
+ vport->egress.allowed_vlan = NULL;
|
|
+ }
|
|
|
|
- if (!IS_ERR_OR_NULL(vport->egress.drop_rule))
|
|
- mlx5_del_flow_rules(vport->egress.drop_rule);
|
|
-
|
|
- vport->egress.allowed_vlan = NULL;
|
|
- vport->egress.drop_rule = NULL;
|
|
+ if (!IS_ERR_OR_NULL(vport->egress.legacy.drop_rule)) {
|
|
+ mlx5_del_flow_rules(vport->egress.legacy.drop_rule);
|
|
+ vport->egress.legacy.drop_rule = NULL;
|
|
+ }
|
|
}
|
|
|
|
void esw_vport_disable_egress_acl(struct mlx5_eswitch *esw,
|
|
@@ -1197,14 +1198,15 @@ int esw_vport_enable_ingress_acl(struct mlx5_eswitch *esw,
|
|
void esw_vport_cleanup_ingress_rules(struct mlx5_eswitch *esw,
|
|
struct mlx5_vport *vport)
|
|
{
|
|
- if (!IS_ERR_OR_NULL(vport->ingress.drop_rule))
|
|
- mlx5_del_flow_rules(vport->ingress.drop_rule);
|
|
+ if (!IS_ERR_OR_NULL(vport->ingress.legacy.drop_rule)) {
|
|
+ mlx5_del_flow_rules(vport->ingress.legacy.drop_rule);
|
|
+ vport->ingress.legacy.drop_rule = NULL;
|
|
+ }
|
|
|
|
- if (!IS_ERR_OR_NULL(vport->ingress.allow_rule))
|
|
+ if (!IS_ERR_OR_NULL(vport->ingress.allow_rule)) {
|
|
mlx5_del_flow_rules(vport->ingress.allow_rule);
|
|
-
|
|
- vport->ingress.drop_rule = NULL;
|
|
- vport->ingress.allow_rule = NULL;
|
|
+ vport->ingress.allow_rule = NULL;
|
|
+ }
|
|
|
|
esw_vport_del_ingress_acl_modify_metadata(esw, vport);
|
|
}
|
|
@@ -1233,7 +1235,7 @@ void esw_vport_disable_ingress_acl(struct mlx5_eswitch *esw,
|
|
static int esw_vport_ingress_config(struct mlx5_eswitch *esw,
|
|
struct mlx5_vport *vport)
|
|
{
|
|
- struct mlx5_fc *counter = vport->ingress.drop_counter;
|
|
+ struct mlx5_fc *counter = vport->ingress.legacy.drop_counter;
|
|
struct mlx5_flow_destination drop_ctr_dst = {0};
|
|
struct mlx5_flow_destination *dst = NULL;
|
|
struct mlx5_flow_act flow_act = {0};
|
|
@@ -1304,15 +1306,15 @@ static int esw_vport_ingress_config(struct mlx5_eswitch *esw,
|
|
dst = &drop_ctr_dst;
|
|
dest_num++;
|
|
}
|
|
- vport->ingress.drop_rule =
|
|
+ vport->ingress.legacy.drop_rule =
|
|
mlx5_add_flow_rules(vport->ingress.acl, spec,
|
|
&flow_act, dst, dest_num);
|
|
- if (IS_ERR(vport->ingress.drop_rule)) {
|
|
- err = PTR_ERR(vport->ingress.drop_rule);
|
|
+ if (IS_ERR(vport->ingress.legacy.drop_rule)) {
|
|
+ err = PTR_ERR(vport->ingress.legacy.drop_rule);
|
|
esw_warn(esw->dev,
|
|
"vport[%d] configure ingress drop rule, err(%d)\n",
|
|
vport->vport, err);
|
|
- vport->ingress.drop_rule = NULL;
|
|
+ vport->ingress.legacy.drop_rule = NULL;
|
|
goto out;
|
|
}
|
|
|
|
@@ -1363,7 +1365,7 @@ int mlx5_esw_create_vport_egress_acl_vlan(struct mlx5_eswitch *esw,
|
|
static int esw_vport_egress_config(struct mlx5_eswitch *esw,
|
|
struct mlx5_vport *vport)
|
|
{
|
|
- struct mlx5_fc *counter = vport->egress.drop_counter;
|
|
+ struct mlx5_fc *counter = vport->egress.legacy.drop_counter;
|
|
struct mlx5_flow_destination drop_ctr_dst = {0};
|
|
struct mlx5_flow_destination *dst = NULL;
|
|
struct mlx5_flow_act flow_act = {0};
|
|
@@ -1411,15 +1413,15 @@ static int esw_vport_egress_config(struct mlx5_eswitch *esw,
|
|
dst = &drop_ctr_dst;
|
|
dest_num++;
|
|
}
|
|
- vport->egress.drop_rule =
|
|
+ vport->egress.legacy.drop_rule =
|
|
mlx5_add_flow_rules(vport->egress.acl, spec,
|
|
&flow_act, dst, dest_num);
|
|
- if (IS_ERR(vport->egress.drop_rule)) {
|
|
- err = PTR_ERR(vport->egress.drop_rule);
|
|
+ if (IS_ERR(vport->egress.legacy.drop_rule)) {
|
|
+ err = PTR_ERR(vport->egress.legacy.drop_rule);
|
|
esw_warn(esw->dev,
|
|
"vport[%d] configure egress drop rule failed, err(%d)\n",
|
|
vport->vport, err);
|
|
- vport->egress.drop_rule = NULL;
|
|
+ vport->egress.legacy.drop_rule = NULL;
|
|
}
|
|
out:
|
|
kvfree(spec);
|
|
@@ -1662,39 +1664,39 @@ static void esw_apply_vport_conf(struct mlx5_eswitch *esw,
|
|
}
|
|
}
|
|
|
|
-static void esw_vport_create_drop_counters(struct mlx5_vport *vport)
|
|
+static void esw_legacy_vport_create_drop_counters(struct mlx5_vport *vport)
|
|
{
|
|
struct mlx5_core_dev *dev = vport->dev;
|
|
|
|
if (MLX5_CAP_ESW_INGRESS_ACL(dev, flow_counter)) {
|
|
- vport->ingress.drop_counter = mlx5_fc_create(dev, false);
|
|
- if (IS_ERR(vport->ingress.drop_counter)) {
|
|
+ vport->ingress.legacy.drop_counter = mlx5_fc_create(dev, false);
|
|
+ if (IS_ERR(vport->ingress.legacy.drop_counter)) {
|
|
esw_warn(dev,
|
|
"vport[%d] configure ingress drop rule counter failed\n",
|
|
vport->vport);
|
|
- vport->ingress.drop_counter = NULL;
|
|
+ vport->ingress.legacy.drop_counter = NULL;
|
|
}
|
|
}
|
|
|
|
if (MLX5_CAP_ESW_EGRESS_ACL(dev, flow_counter)) {
|
|
- vport->egress.drop_counter = mlx5_fc_create(dev, false);
|
|
- if (IS_ERR(vport->egress.drop_counter)) {
|
|
+ vport->egress.legacy.drop_counter = mlx5_fc_create(dev, false);
|
|
+ if (IS_ERR(vport->egress.legacy.drop_counter)) {
|
|
esw_warn(dev,
|
|
"vport[%d] configure egress drop rule counter failed\n",
|
|
vport->vport);
|
|
- vport->egress.drop_counter = NULL;
|
|
+ vport->egress.legacy.drop_counter = NULL;
|
|
}
|
|
}
|
|
}
|
|
|
|
-static void esw_vport_destroy_drop_counters(struct mlx5_vport *vport)
|
|
+static void esw_legacy_vport_destroy_drop_counters(struct mlx5_vport *vport)
|
|
{
|
|
struct mlx5_core_dev *dev = vport->dev;
|
|
|
|
- if (vport->ingress.drop_counter)
|
|
- mlx5_fc_destroy(dev, vport->ingress.drop_counter);
|
|
- if (vport->egress.drop_counter)
|
|
- mlx5_fc_destroy(dev, vport->egress.drop_counter);
|
|
+ if (vport->ingress.legacy.drop_counter)
|
|
+ mlx5_fc_destroy(dev, vport->ingress.legacy.drop_counter);
|
|
+ if (vport->egress.legacy.drop_counter)
|
|
+ mlx5_fc_destroy(dev, vport->egress.legacy.drop_counter);
|
|
}
|
|
|
|
static void esw_enable_vport(struct mlx5_eswitch *esw, struct mlx5_vport *vport,
|
|
@@ -1710,7 +1712,7 @@ static void esw_enable_vport(struct mlx5_eswitch *esw, struct mlx5_vport *vport,
|
|
/* Create steering drop counters for ingress and egress ACLs */
|
|
if (!mlx5_esw_is_manager_vport(esw, vport_num) &&
|
|
esw->mode == MLX5_ESWITCH_LEGACY)
|
|
- esw_vport_create_drop_counters(vport);
|
|
+ esw_legacy_vport_create_drop_counters(vport);
|
|
|
|
/* Restore old vport configuration */
|
|
esw_apply_vport_conf(esw, vport);
|
|
@@ -1770,7 +1772,7 @@ static void esw_disable_vport(struct mlx5_eswitch *esw,
|
|
MLX5_VPORT_ADMIN_STATE_DOWN);
|
|
esw_vport_disable_egress_acl(esw, vport);
|
|
esw_vport_disable_ingress_acl(esw, vport);
|
|
- esw_vport_destroy_drop_counters(vport);
|
|
+ esw_legacy_vport_destroy_drop_counters(vport);
|
|
}
|
|
esw->enabled_vports--;
|
|
mutex_unlock(&esw->state_lock);
|
|
@@ -2503,12 +2505,12 @@ static int mlx5_eswitch_query_vport_drop_stats(struct mlx5_core_dev *dev,
|
|
if (!vport->enabled || esw->mode != MLX5_ESWITCH_LEGACY)
|
|
return 0;
|
|
|
|
- if (vport->egress.drop_counter)
|
|
- mlx5_fc_query(dev, vport->egress.drop_counter,
|
|
+ if (vport->egress.legacy.drop_counter)
|
|
+ mlx5_fc_query(dev, vport->egress.legacy.drop_counter,
|
|
&stats->rx_dropped, &bytes);
|
|
|
|
- if (vport->ingress.drop_counter)
|
|
- mlx5_fc_query(dev, vport->ingress.drop_counter,
|
|
+ if (vport->ingress.legacy.drop_counter)
|
|
+ mlx5_fc_query(dev, vport->ingress.legacy.drop_counter,
|
|
&stats->tx_dropped, &bytes);
|
|
|
|
if (!MLX5_CAP_GEN(dev, receive_discard_vport_down) &&
|
|
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
|
|
index f21d528057fa..f12d446e2c87 100644
|
|
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
|
|
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
|
|
@@ -74,10 +74,16 @@ struct vport_ingress {
|
|
struct mlx5_flow_handle *modify_metadata_rule;
|
|
#endif
|
|
struct mlx5_flow_handle *allow_rule;
|
|
+#ifdef __GENKSYMS__
|
|
struct mlx5_flow_handle *drop_rule;
|
|
struct mlx5_fc *drop_counter;
|
|
+#endif
|
|
#ifndef __GENKSYMS__
|
|
struct {
|
|
+ struct mlx5_flow_handle *drop_rule;
|
|
+ struct mlx5_fc *drop_counter;
|
|
+ } legacy;
|
|
+ struct {
|
|
struct mlx5_modify_hdr *modify_metadata;
|
|
struct mlx5_flow_handle *modify_metadata_rule;
|
|
} offloads;
|
|
@@ -89,8 +95,15 @@ struct vport_egress {
|
|
struct mlx5_flow_group *allowed_vlans_grp;
|
|
struct mlx5_flow_group *drop_grp;
|
|
struct mlx5_flow_handle *allowed_vlan;
|
|
+#ifdef __GENKSYMS__
|
|
struct mlx5_flow_handle *drop_rule;
|
|
struct mlx5_fc *drop_counter;
|
|
+#else
|
|
+ struct {
|
|
+ struct mlx5_flow_handle *drop_rule;
|
|
+ struct mlx5_fc *drop_counter;
|
|
+ } legacy;
|
|
+#endif
|
|
};
|
|
|
|
struct mlx5_vport_drop_stats {
|
|
--
|
|
2.13.6
|
|
|