From: Saeed Mahameed <saeedm@mellanox.com>
To: "David S. Miller" <davem@davemloft.net>, kuba@kernel.org
Cc: netdev@vger.kernel.org, Parav Pandit <parav@mellanox.com>,
Saeed Mahameed <saeedm@mellanox.com>
Subject: [net-next 01/10] net/mlx5: Avoid eswitch header inclusion in fs core layer
Date: Tue, 23 Jun 2020 12:52:20 -0700 [thread overview]
Message-ID: <20200623195229.26411-2-saeedm@mellanox.com> (raw)
In-Reply-To: <20200623195229.26411-1-saeedm@mellanox.com>
From: Parav Pandit <parav@mellanox.com>
Flow steering core layer is independent of the eswitch layer.
Hence avoid fs_core dependency on eswitch.
Fixes: 328edb499f99 ("net/mlx5: Split FDB fast path prio to multiple namespaces")
Signed-off-by: Parav Pandit <parav@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
---
drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 10 ----------
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 1 -
drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 10 ++++++++++
3 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
index 67e09902bd88b..522cadc09149a 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
@@ -44,16 +44,6 @@
#include "lib/mpfs.h"
#include "en/tc_ct.h"
-#define FDB_TC_MAX_CHAIN 3
-#define FDB_FT_CHAIN (FDB_TC_MAX_CHAIN + 1)
-#define FDB_TC_SLOW_PATH_CHAIN (FDB_FT_CHAIN + 1)
-
-/* The index of the last real chain (FT) + 1 as chain zero is valid as well */
-#define FDB_NUM_CHAINS (FDB_FT_CHAIN + 1)
-
-#define FDB_TC_MAX_PRIO 16
-#define FDB_TC_LEVELS_PER_PRIO 2
-
#ifdef CONFIG_MLX5_ESWITCH
#define ESW_OFFLOADS_DEFAULT_NUM_GROUPS 15
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
index 13e2fb79c21ae..e47a669839356 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
@@ -41,7 +41,6 @@
#include "diag/fs_tracepoint.h"
#include "accel/ipsec.h"
#include "fpga/ipsec.h"
-#include "eswitch.h"
#define INIT_TREE_NODE_ARRAY_SIZE(...) (sizeof((struct init_tree_node[]){__VA_ARGS__}) /\
sizeof(struct init_tree_node))
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h
index 825b662f809b4..afe7f0bffb939 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h
@@ -39,6 +39,16 @@
#include <linux/llist.h>
#include <steering/fs_dr.h>
+#define FDB_TC_MAX_CHAIN 3
+#define FDB_FT_CHAIN (FDB_TC_MAX_CHAIN + 1)
+#define FDB_TC_SLOW_PATH_CHAIN (FDB_FT_CHAIN + 1)
+
+/* The index of the last real chain (FT) + 1 as chain zero is valid as well */
+#define FDB_NUM_CHAINS (FDB_FT_CHAIN + 1)
+
+#define FDB_TC_MAX_PRIO 16
+#define FDB_TC_LEVELS_PER_PRIO 2
+
struct mlx5_modify_hdr {
enum mlx5_flow_namespace_type ns_type;
union {
--
2.26.2
next prev parent reply other threads:[~2020-06-23 19:53 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-23 19:52 [pull request][net-next 00/10] mlx5 updates 2020-06-23 Saeed Mahameed
2020-06-23 19:52 ` Saeed Mahameed [this message]
2020-06-23 21:00 ` [net-next 01/10] net/mlx5: Avoid eswitch header inclusion in fs core layer Jakub Kicinski
2020-06-23 19:52 ` [net-next 02/10] net/mlx5: FWTrace: Add missing space Saeed Mahameed
2020-06-23 19:52 ` [net-next 03/10] net/mlx5: Add a missing macro undefinition Saeed Mahameed
2020-06-23 19:52 ` [net-next 04/10] net/mlx5: Use kfree(ft->g) in arfs_create_groups() Saeed Mahameed
2020-06-23 19:52 ` [net-next 05/10] net/mlx5e: Remove unused mlx5e_xsk_first_unused_channel Saeed Mahameed
2020-06-23 19:52 ` [net-next 06/10] net/mlx5e: Move including net/arp.h from en_rep.c to rep/neigh.c Saeed Mahameed
2020-06-23 21:02 ` Jakub Kicinski
2020-06-23 19:52 ` [net-next 07/10] net/mlx5e: Move TC-specific function definitions into MLX5_CLS_ACT Saeed Mahameed
2020-06-23 21:03 ` Jakub Kicinski
2020-06-23 21:26 ` Saeed Mahameed
2020-06-23 21:33 ` Jakub Kicinski
2020-06-23 19:52 ` [net-next 08/10] net/mlx5e: vxlan: Use RCU for vxlan table lookup Saeed Mahameed
2020-06-23 19:52 ` [net-next 09/10] net/mlx5e: vxlan: Return bool instead of opaque ptr in port_lookup() Saeed Mahameed
2020-06-23 19:52 ` [net-next 10/10] net/mlx5e: Add support for PCI relaxed ordering Saeed Mahameed
2020-06-23 21:31 ` Jakub Kicinski
2020-06-24 6:56 ` Saeed Mahameed
2020-06-24 7:34 ` Aya Levin
2020-06-24 17:22 ` Jakub Kicinski
2020-06-24 20:15 ` Saeed Mahameed
[not found] ` <20200624133018.5a4d238b@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com>
2020-07-06 13:00 ` Aya Levin
2020-07-06 16:52 ` Jakub Kicinski
2020-07-06 19:49 ` David Miller
2040-07-08 8:22 ` Aya Levin
2020-07-08 23:16 ` Bjorn Helgaas
2020-07-08 23:26 ` Jason Gunthorpe
2020-07-09 17:35 ` Jonathan Lemon
2020-07-09 18:20 ` Jason Gunthorpe
2020-07-09 19:47 ` Jakub Kicinski
2020-07-10 2:18 ` Saeed Mahameed
2020-07-10 12:21 ` Jason Gunthorpe
2020-07-09 20:33 ` Jonathan Lemon
2020-07-14 10:47 ` Aya Levin
2020-07-23 21:03 ` Alexander Duyck
2020-06-26 20:12 ` Bjorn Helgaas
2020-06-26 20:24 ` David Miller
2020-06-29 9:32 ` Aya Levin
2020-06-29 19:33 ` Bjorn Helgaas
2020-06-29 19:57 ` Raj, Ashok
2020-06-30 7:32 ` Ding Tianhong
2020-07-05 11:15 ` Aya Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200623195229.26411-2-saeedm@mellanox.com \
--to=saeedm@mellanox.com \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=parav@mellanox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).