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.
78 lines
2.6 KiB
78 lines
2.6 KiB
4 years ago
|
From 11dd730184c21d5ae4dff9ca9ee64c1e688dff32 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Alaa Hleihel <ahleihel@redhat.com>
|
||
|
|
Date: Tue, 12 May 2020 10:55:11 -0400
|
||
|
|
Subject: [PATCH 195/312] [netdrv] flow_offload: check for basic action hw
|
||
|
|
stats type
|
||
|
|
|
||
|
|
Message-id: <20200512105530.4207-106-ahleihel@redhat.com>
|
||
|
|
Patchwork-id: 306977
|
||
|
|
Patchwork-instance: patchwork
|
||
|
|
O-Subject: [RHEL8.3 BZ 1789382 105/124] flow_offload: check for basic action hw stats type
|
||
|
|
Bugzilla: 1789382
|
||
|
|
RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
|
||
|
|
RH-Acked-by: Kamal Heib <kheib@redhat.com>
|
||
|
|
RH-Acked-by: Jarod Wilson <jarod@redhat.com>
|
||
|
|
|
||
|
|
Bugzilla: http://bugzilla.redhat.com/1789382
|
||
|
|
Upstream: v5.7-rc1
|
||
|
|
Conflicts:
|
||
|
|
- Add the mlx5 hunks that were previously dropped when this patch
|
||
|
|
was backported as part of a CNB BZ.
|
||
|
|
|
||
|
|
commit 319a1d19471ec49b8a91a7f6a3fe2c4535e5c279
|
||
|
|
Author: Jiri Pirko <jiri@mellanox.com>
|
||
|
|
Date: Sat Mar 7 12:40:13 2020 +0100
|
||
|
|
|
||
|
|
flow_offload: check for basic action hw stats type
|
||
|
|
|
||
|
|
Introduce flow_action_basic_hw_stats_types_check() helper and use it
|
||
|
|
in drivers. That sanitizes the drivers which do not have support
|
||
|
|
for action HW stats types.
|
||
|
|
|
||
|
|
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
|
||
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||
|
|
|
||
|
|
Signed-off-by: Alaa Hleihel <ahleihel@redhat.com>
|
||
|
|
Signed-off-by: Frantisek Hrbata <fhrbata@redhat.com>
|
||
|
|
---
|
||
|
|
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 9 +++++++++
|
||
|
|
1 file changed, 9 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
|
||
|
|
index 284a1df33bc7..c455f73cd54e 100644
|
||
|
|
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
|
||
|
|
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
|
||
|
|
@@ -2868,6 +2868,9 @@ static int parse_tc_nic_actions(struct mlx5e_priv *priv,
|
||
|
|
if (!flow_action_has_entries(flow_action))
|
||
|
|
return -EINVAL;
|
||
|
|
|
||
|
|
+ if (!flow_action_basic_hw_stats_types_check(flow_action, extack))
|
||
|
|
+ return -EOPNOTSUPP;
|
||
|
|
+
|
||
|
|
attr->flow_tag = MLX5_FS_DEFAULT_FLOW_TAG;
|
||
|
|
|
||
|
|
flow_action_for_each(i, act, flow_action) {
|
||
|
|
@@ -3319,6 +3322,9 @@ static int parse_tc_fdb_actions(struct mlx5e_priv *priv,
|
||
|
|
if (!flow_action_has_entries(flow_action))
|
||
|
|
return -EINVAL;
|
||
|
|
|
||
|
|
+ if (!flow_action_basic_hw_stats_types_check(flow_action, extack))
|
||
|
|
+ return -EOPNOTSUPP;
|
||
|
|
+
|
||
|
|
flow_action_for_each(i, act, flow_action) {
|
||
|
|
switch (act->id) {
|
||
|
|
case FLOW_ACTION_DROP:
|
||
|
|
@@ -4118,6 +4124,9 @@ static int scan_tc_matchall_fdb_actions(struct mlx5e_priv *priv,
|
||
|
|
return -EOPNOTSUPP;
|
||
|
|
}
|
||
|
|
|
||
|
|
+ if (!flow_action_basic_hw_stats_types_check(flow_action, extack))
|
||
|
|
+ return -EOPNOTSUPP;
|
||
|
|
+
|
||
|
|
flow_action_for_each(i, act, flow_action) {
|
||
|
|
switch (act->id) {
|
||
|
|
case FLOW_ACTION_POLICE:
|
||
|
|
--
|
||
|
|
2.13.6
|
||
|
|
|