diff mbox series

[net-next,01/13] net/mlx5: fs, add HWS root namespace functions

Message ID 20250107060708.1610882-2-tariqt@nvidia.com (mailing list archive)
State Changes Requested
Delegated to: Netdev Maintainers
Headers show
Series mlx5 HW-Managed Flow Steering in FS core level | expand

Checks

Context Check Description
netdev/series_format success Posting correctly formatted
netdev/tree_selection success Clearly marked for net-next
netdev/ynl success Generated files up to date; no warnings/errors; no diff in generated;
netdev/fixes_present success Fixes tag not required for -next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 1 this patch: 1
netdev/build_tools success No tools touched, skip
netdev/cc_maintainers warning 1 maintainers not CCed: linux-rdma@vger.kernel.org
netdev/build_clang fail Errors and warnings before: 103 this patch: 104
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 6 this patch: 6
netdev/checkpatch warning WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
netdev/build_clang_rust success No Rust files in patch. Skipping build
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0

Commit Message

Tariq Toukan Jan. 7, 2025, 6:06 a.m. UTC 
From: Moshe Shemesh <moshe@nvidia.com>

Add flow steering commands structure for HW steering. Implement create,
destroy and set peer HW steering root namespace functions.

Signed-off-by: Moshe Shemesh <moshe@nvidia.com>
Reviewed-by: Yevgeny Kliteynik <kliteyn@nvidia.com>
Reviewed-by: Mark Bloch <mbloch@nvidia.com>
Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
---
 .../net/ethernet/mellanox/mlx5/core/Makefile  |  4 +-
 .../net/ethernet/mellanox/mlx5/core/fs_core.h |  9 ++-
 .../mellanox/mlx5/core/steering/hws/fs_hws.c  | 56 +++++++++++++++++++
 .../mellanox/mlx5/core/steering/hws/fs_hws.h  | 25 +++++++++
 4 files changed, 90 insertions(+), 4 deletions(-)
 create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c
 create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.h

Comments

Przemek Kitszel Jan. 7, 2025, 11:27 a.m. UTC | #1 
On 1/7/25 07:06, Tariq Toukan wrote:
> From: Moshe Shemesh <moshe@nvidia.com>
> 
> Add flow steering commands structure for HW steering. Implement create,
> destroy and set peer HW steering root namespace functions.
> 
> Signed-off-by: Moshe Shemesh <moshe@nvidia.com>
> Reviewed-by: Yevgeny Kliteynik <kliteyn@nvidia.com>
> Reviewed-by: Mark Bloch <mbloch@nvidia.com>
> Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
> ---
>   .../net/ethernet/mellanox/mlx5/core/Makefile  |  4 +-
>   .../net/ethernet/mellanox/mlx5/core/fs_core.h |  9 ++-
>   .../mellanox/mlx5/core/steering/hws/fs_hws.c  | 56 +++++++++++++++++++
>   .../mellanox/mlx5/core/steering/hws/fs_hws.h  | 25 +++++++++
>   4 files changed, 90 insertions(+), 4 deletions(-)
>   create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c
>   create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.h
> 
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/Makefile b/drivers/net/ethernet/mellanox/mlx5/core/Makefile
> index 10a763e668ed..0008b22417c8 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/Makefile
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/Makefile
> @@ -151,8 +151,8 @@ mlx5_core-$(CONFIG_MLX5_HW_STEERING) += steering/hws/cmd.o \
>   					steering/hws/bwc.o \
>   					steering/hws/debug.o \
>   					steering/hws/vport.o \
> -					steering/hws/bwc_complex.o
> -
> +					steering/hws/bwc_complex.o \
> +					steering/hws/fs_hws.o
>   
>   #
>   # SF device
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h
> index bad2df0715ec..545fdfce7b52 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h
> @@ -38,6 +38,7 @@
>   #include <linux/rhashtable.h>
>   #include <linux/llist.h>
>   #include <steering/sws/fs_dr.h>
> +#include <steering/hws/fs_hws.h>
>   
>   #define FDB_TC_MAX_CHAIN 3
>   #define FDB_FT_CHAIN (FDB_TC_MAX_CHAIN + 1)
> @@ -126,7 +127,8 @@ enum fs_fte_status {
>   
>   enum mlx5_flow_steering_mode {
>   	MLX5_FLOW_STEERING_MODE_DMFS,
> -	MLX5_FLOW_STEERING_MODE_SMFS
> +	MLX5_FLOW_STEERING_MODE_SMFS,
> +	MLX5_FLOW_STEERING_MODE_HMFS

add comma here, to avoid git-blame churn when the next mode will be
added

>   };
>   
>   enum mlx5_flow_steering_capabilty {
> @@ -293,7 +295,10 @@ struct mlx5_flow_group {
>   struct mlx5_flow_root_namespace {
>   	struct mlx5_flow_namespace	ns;
>   	enum   mlx5_flow_steering_mode	mode;
> -	struct mlx5_fs_dr_domain	fs_dr_domain;
> +	union {
> +		struct mlx5_fs_dr_domain	fs_dr_domain;
> +		struct mlx5_fs_hws_context	fs_hws_context;
> +	};
>   	enum   fs_flow_table_type	table_type;
>   	struct mlx5_core_dev		*dev;
>   	struct mlx5_flow_table		*root_ft;
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c
> new file mode 100644
> index 000000000000..7a3c84b18d1e
> --- /dev/null
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c
> @@ -0,0 +1,56 @@
> +// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB
> +/* Copyright (c) 2024 NVIDIA Corporation & Affiliates */

you have submited it on 2025 ;)

> +
> +#include <mlx5_core.h>
> +#include <fs_core.h>
> +#include <fs_cmd.h>
> +#include "mlx5hws.h"
> +
> +#define MLX5HWS_CTX_MAX_NUM_OF_QUEUES 16
> +#define MLX5HWS_CTX_QUEUE_SIZE 256
> +
> +static int mlx5_cmd_hws_create_ns(struct mlx5_flow_root_namespace *ns)
> +{
> +	struct mlx5hws_context_attr hws_ctx_attr = {};
> +
> +	hws_ctx_attr.queues = min_t(int, num_online_cpus(),
> +				    MLX5HWS_CTX_MAX_NUM_OF_QUEUES);
> +	hws_ctx_attr.queue_size = MLX5HWS_CTX_QUEUE_SIZE;
> +
> +	ns->fs_hws_context.hws_ctx =
> +		mlx5hws_context_open(ns->dev, &hws_ctx_attr);
> +	if (!ns->fs_hws_context.hws_ctx) {
> +		mlx5_core_err(ns->dev, "Failed to create hws flow namespace\n");
> +		return -EOPNOTSUPP;

I would expect -EOPNOTSUPP to be returned only when there was no action
attempted

> +	}
> +	return 0;
> +}
diff mbox series

Patch

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/Makefile b/drivers/net/ethernet/mellanox/mlx5/core/Makefile
index 10a763e668ed..0008b22417c8 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/Makefile
+++ b/drivers/net/ethernet/mellanox/mlx5/core/Makefile
@@ -151,8 +151,8 @@  mlx5_core-$(CONFIG_MLX5_HW_STEERING) += steering/hws/cmd.o \
 					steering/hws/bwc.o \
 					steering/hws/debug.o \
 					steering/hws/vport.o \
-					steering/hws/bwc_complex.o
-
+					steering/hws/bwc_complex.o \
+					steering/hws/fs_hws.o
 
 #
 # SF device
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h
index bad2df0715ec..545fdfce7b52 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h
@@ -38,6 +38,7 @@ 
 #include <linux/rhashtable.h>
 #include <linux/llist.h>
 #include <steering/sws/fs_dr.h>
+#include <steering/hws/fs_hws.h>
 
 #define FDB_TC_MAX_CHAIN 3
 #define FDB_FT_CHAIN (FDB_TC_MAX_CHAIN + 1)
@@ -126,7 +127,8 @@  enum fs_fte_status {
 
 enum mlx5_flow_steering_mode {
 	MLX5_FLOW_STEERING_MODE_DMFS,
-	MLX5_FLOW_STEERING_MODE_SMFS
+	MLX5_FLOW_STEERING_MODE_SMFS,
+	MLX5_FLOW_STEERING_MODE_HMFS
 };
 
 enum mlx5_flow_steering_capabilty {
@@ -293,7 +295,10 @@  struct mlx5_flow_group {
 struct mlx5_flow_root_namespace {
 	struct mlx5_flow_namespace	ns;
 	enum   mlx5_flow_steering_mode	mode;
-	struct mlx5_fs_dr_domain	fs_dr_domain;
+	union {
+		struct mlx5_fs_dr_domain	fs_dr_domain;
+		struct mlx5_fs_hws_context	fs_hws_context;
+	};
 	enum   fs_flow_table_type	table_type;
 	struct mlx5_core_dev		*dev;
 	struct mlx5_flow_table		*root_ft;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c
new file mode 100644
index 000000000000..7a3c84b18d1e
--- /dev/null
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c
@@ -0,0 +1,56 @@ 
+// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB
+/* Copyright (c) 2024 NVIDIA Corporation & Affiliates */
+
+#include <mlx5_core.h>
+#include <fs_core.h>
+#include <fs_cmd.h>
+#include "mlx5hws.h"
+
+#define MLX5HWS_CTX_MAX_NUM_OF_QUEUES 16
+#define MLX5HWS_CTX_QUEUE_SIZE 256
+
+static int mlx5_cmd_hws_create_ns(struct mlx5_flow_root_namespace *ns)
+{
+	struct mlx5hws_context_attr hws_ctx_attr = {};
+
+	hws_ctx_attr.queues = min_t(int, num_online_cpus(),
+				    MLX5HWS_CTX_MAX_NUM_OF_QUEUES);
+	hws_ctx_attr.queue_size = MLX5HWS_CTX_QUEUE_SIZE;
+
+	ns->fs_hws_context.hws_ctx =
+		mlx5hws_context_open(ns->dev, &hws_ctx_attr);
+	if (!ns->fs_hws_context.hws_ctx) {
+		mlx5_core_err(ns->dev, "Failed to create hws flow namespace\n");
+		return -EOPNOTSUPP;
+	}
+	return 0;
+}
+
+static int mlx5_cmd_hws_destroy_ns(struct mlx5_flow_root_namespace *ns)
+{
+	return mlx5hws_context_close(ns->fs_hws_context.hws_ctx);
+}
+
+static int mlx5_cmd_hws_set_peer(struct mlx5_flow_root_namespace *ns,
+				 struct mlx5_flow_root_namespace *peer_ns,
+				 u16 peer_vhca_id)
+{
+	struct mlx5hws_context *peer_ctx = NULL;
+
+	if (peer_ns)
+		peer_ctx = peer_ns->fs_hws_context.hws_ctx;
+	mlx5hws_context_set_peer(ns->fs_hws_context.hws_ctx, peer_ctx,
+				 peer_vhca_id);
+	return 0;
+}
+
+static const struct mlx5_flow_cmds mlx5_flow_cmds_hws = {
+	.create_ns = mlx5_cmd_hws_create_ns,
+	.destroy_ns = mlx5_cmd_hws_destroy_ns,
+	.set_peer = mlx5_cmd_hws_set_peer,
+};
+
+const struct mlx5_flow_cmds *mlx5_fs_cmd_get_hws_cmds(void)
+{
+	return &mlx5_flow_cmds_hws;
+}
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.h b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.h
new file mode 100644
index 000000000000..a2e2935d7367
--- /dev/null
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.h
@@ -0,0 +1,25 @@ 
+/* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB */
+/* Copyright (c) 2024 NVIDIA Corporation & Affiliates */
+
+#ifndef _MLX5_FS_HWS_
+#define _MLX5_FS_HWS_
+
+#include "mlx5hws.h"
+
+struct mlx5_fs_hws_context {
+	struct mlx5hws_context	*hws_ctx;
+};
+
+#ifdef CONFIG_MLX5_HW_STEERING
+
+const struct mlx5_flow_cmds *mlx5_fs_cmd_get_hws_cmds(void);
+
+#else
+
+static inline const struct mlx5_flow_cmds *mlx5_fs_cmd_get_hws_cmds(void)
+{
+	return NULL;
+}
+
+#endif /* CONFIG_MLX5_HWS_STEERING */
+#endif