net/mlx5: DR, moved all the SWS code into a separate directory

After adding HWS support in a separate folder, moving all the SWS
code into its own folder as well.
Now SWS and HWS implementation are located in their appropriate
folders:
 - steering/sws/
 - steering/hws/

Signed-off-by: Yevgeny Kliteynik <kliteyn@nvidia.com>
Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
Link: https://patch.msgid.link/20241031125856.530927-3-tariqt@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/Makefile b/drivers/net/ethernet/mellanox/mlx5/core/Makefile
index 5912f7e614f9c0ba0781474f4d50f25ea7b6e6fd..42411fe772abbcf85e37c6b3eed03564a24784c5 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/Makefile
+++ b/drivers/net/ethernet/mellanox/mlx5/core/Makefile
@@ -109,16 +109,29 @@ mlx5_core-$(CONFIG_MLX5_EN_TLS) += en_accel/ktls_stats.o \
                                   en_accel/fs_tcp.o en_accel/ktls.o en_accel/ktls_txrx.o \
                                   en_accel/ktls_tx.o en_accel/ktls_rx.o
 
-mlx5_core-$(CONFIG_MLX5_SW_STEERING) += steering/dr_domain.o steering/dr_table.o \
-                                       steering/dr_matcher.o steering/dr_rule.o \
-                                       steering/dr_icm_pool.o steering/dr_buddy.o \
-                                       steering/dr_ste.o steering/dr_send.o \
-                                       steering/dr_ste_v0.o steering/dr_ste_v1.o \
-                                       steering/dr_ste_v2.o \
-                                       steering/dr_cmd.o steering/dr_fw.o \
-                                       steering/dr_action.o steering/fs_dr.o \
-                                       steering/dr_definer.o steering/dr_ptrn.o \
-                                       steering/dr_arg.o steering/dr_dbg.o lib/smfs.o
+#
+# SW Steering
+#
+mlx5_core-$(CONFIG_MLX5_SW_STEERING) += steering/sws/dr_domain.o \
+                                       steering/sws/dr_table.o \
+                                       steering/sws/dr_matcher.o \
+                                       steering/sws/dr_rule.o \
+                                       steering/sws/dr_icm_pool.o \
+                                       steering/sws/dr_buddy.o \
+                                       steering/sws/dr_ste.o \
+                                       steering/sws/dr_send.o \
+                                       steering/sws/dr_ste_v0.o \
+                                       steering/sws/dr_ste_v1.o \
+                                       steering/sws/dr_ste_v2.o \
+                                       steering/sws/dr_cmd.o \
+                                       steering/sws/dr_fw.o \
+                                       steering/sws/dr_action.o \
+                                       steering/sws/dr_definer.o \
+                                       steering/sws/dr_ptrn.o \
+                                       steering/sws/dr_arg.o \
+                                       steering/sws/dr_dbg.o \
+                                       steering/sws/fs_dr.o \
+                                       lib/smfs.o
 
 #
 # HW Steering

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h
index b30976627c6b91d5c6eaaed422d993ad70e25d0d..bad2df0715ecc977162bb9bf3c37ab80d9e245b1 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h
@@ -37,7 +37,7 @@
 #include <linux/mlx5/fs.h>
 #include <linux/rhashtable.h>
 #include <linux/llist.h>
-#include <steering/fs_dr.h>
+#include <steering/sws/fs_dr.h>
 
 #define FDB_TC_MAX_CHAIN 3
 #define FDB_FT_CHAIN (FDB_TC_MAX_CHAIN + 1)

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/smfs.h b/drivers/net/ethernet/mellanox/mlx5/core/lib/smfs.h
index 452d0df339acd49f3627b27336450c5c14a07fbe..404f3d4b6380ca9f7c7d3f7ffc5e42f7b6408765 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/lib/smfs.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/smfs.h
@@ -4,8 +4,8 @@
 #ifndef __MLX5_LIB_SMFS_H__
 #define __MLX5_LIB_SMFS_H__
 
-#include "steering/mlx5dr.h"
-#include "steering/dr_types.h"
+#include "steering/sws/mlx5dr.h"
+#include "steering/sws/dr_types.h"
 
 struct mlx5dr_matcher *
 mlx5_smfs_matcher_create(struct mlx5dr_table *table, u32 priority, struct mlx5_flow_spec *spec);

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_action.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_action.c
similarity index 100%
rename from drivers/net/ethernet/mellanox/mlx5/core/steering/dr_action.c
rename to drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_action.c

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_arg.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_arg.c
similarity index 100%
rename from drivers/net/ethernet/mellanox/mlx5/core/steering/dr_arg.c
rename to drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_arg.c

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_buddy.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_buddy.c
similarity index 100%
rename from drivers/net/ethernet/mellanox/mlx5/core/steering/dr_buddy.c
rename to drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_buddy.c

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_cmd.c
similarity index 100%
rename from drivers/net/ethernet/mellanox/mlx5/core/steering/dr_cmd.c
rename to drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_cmd.c

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_dbg.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_dbg.c
similarity index 100%
rename from drivers/net/ethernet/mellanox/mlx5/core/steering/dr_dbg.c
rename to drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_dbg.c

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_dbg.h b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_dbg.h
similarity index 100%
rename from drivers/net/ethernet/mellanox/mlx5/core/steering/dr_dbg.h
rename to drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_dbg.h

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_definer.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_definer.c
similarity index 100%
rename from drivers/net/ethernet/mellanox/mlx5/core/steering/dr_definer.c
rename to drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_definer.c

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_domain.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_domain.c
similarity index 100%
rename from drivers/net/ethernet/mellanox/mlx5/core/steering/dr_domain.c
rename to drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_domain.c

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_fw.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_fw.c
similarity index 100%
rename from drivers/net/ethernet/mellanox/mlx5/core/steering/dr_fw.c
rename to drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_fw.c

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_icm_pool.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_icm_pool.c
similarity index 100%
rename from drivers/net/ethernet/mellanox/mlx5/core/steering/dr_icm_pool.c
rename to drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_icm_pool.c

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_matcher.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_matcher.c
similarity index 100%
rename from drivers/net/ethernet/mellanox/mlx5/core/steering/dr_matcher.c
rename to drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_matcher.c

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ptrn.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ptrn.c
similarity index 100%
rename from drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ptrn.c
rename to drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ptrn.c

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_rule.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_rule.c
similarity index 100%
rename from drivers/net/ethernet/mellanox/mlx5/core/steering/dr_rule.c
rename to drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_rule.c

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_send.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_send.c
similarity index 100%
rename from drivers/net/ethernet/mellanox/mlx5/core/steering/dr_send.c
rename to drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_send.c

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ste.c
similarity index 100%
rename from drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste.c
rename to drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ste.c

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste.h b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ste.h
similarity index 100%
rename from drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste.h
rename to drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ste.h

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste_v0.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ste_v0.c
similarity index 100%
rename from drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste_v0.c
rename to drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ste_v0.c

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste_v1.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ste_v1.c
similarity index 100%
rename from drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste_v1.c
rename to drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ste_v1.c

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste_v1.h b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ste_v1.h
similarity index 100%
rename from drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste_v1.h
rename to drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ste_v1.h

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste_v2.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ste_v2.c
similarity index 100%
rename from drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste_v2.c
rename to drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ste_v2.c

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_table.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_table.c
similarity index 100%
rename from drivers/net/ethernet/mellanox/mlx5/core/steering/dr_table.c
rename to drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_table.c

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_types.h b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_types.h
similarity index 100%
rename from drivers/net/ethernet/mellanox/mlx5/core/steering/dr_types.h
rename to drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_types.h

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/fs_dr.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/fs_dr.c
similarity index 100%
rename from drivers/net/ethernet/mellanox/mlx5/core/steering/fs_dr.c
rename to drivers/net/ethernet/mellanox/mlx5/core/steering/sws/fs_dr.c

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/fs_dr.h b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/fs_dr.h
similarity index 100%
rename from drivers/net/ethernet/mellanox/mlx5/core/steering/fs_dr.h
rename to drivers/net/ethernet/mellanox/mlx5/core/steering/sws/fs_dr.h

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/mlx5_ifc_dr.h b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/mlx5_ifc_dr.h
similarity index 100%
rename from drivers/net/ethernet/mellanox/mlx5/core/steering/mlx5_ifc_dr.h
rename to drivers/net/ethernet/mellanox/mlx5/core/steering/sws/mlx5_ifc_dr.h

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/mlx5_ifc_dr_ste_v1.h b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/mlx5_ifc_dr_ste_v1.h
similarity index 100%
rename from drivers/net/ethernet/mellanox/mlx5/core/steering/mlx5_ifc_dr_ste_v1.h
rename to drivers/net/ethernet/mellanox/mlx5/core/steering/sws/mlx5_ifc_dr_ste_v1.h

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/mlx5dr.h b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/mlx5dr.h
similarity index 100%
rename from drivers/net/ethernet/mellanox/mlx5/core/steering/mlx5dr.h
rename to drivers/net/ethernet/mellanox/mlx5/core/steering/sws/mlx5dr.h