[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20240301011119.3267-2-witu@nvidia.com>
Date: Fri, 1 Mar 2024 03:11:19 +0200
From: William Tu <witu@...dia.com>
To: <netdev@...r.kernel.org>
CC: <jiri@...dia.com>, <bodong@...dia.com>, <tariqt@...dia.com>,
<yossiku@...dia.com>, <kuba@...nel.org>, <witu@...dia.com>
Subject: [PATCH RFC v2 net-next 2/2] net/mlx5e: Add eswitch shared descriptor devlink
Add devlink support for ewsitch shared descriptor
implementation for mlx5 driver.
Signed-off-by: William Tu <witu@...dia.com>
---
.../net/ethernet/mellanox/mlx5/core/devlink.c | 4 +
.../net/ethernet/mellanox/mlx5/core/eswitch.h | 10 +++
.../mellanox/mlx5/core/eswitch_offloads.c | 80 +++++++++++++++++++
3 files changed, 94 insertions(+)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/devlink.c b/drivers/net/ethernet/mellanox/mlx5/core/devlink.c
index 3e064234f6fe..24eb03763b60 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/devlink.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/devlink.c
@@ -312,6 +312,10 @@ static const struct devlink_ops mlx5_devlink_ops = {
.eswitch_inline_mode_get = mlx5_devlink_eswitch_inline_mode_get,
.eswitch_encap_mode_set = mlx5_devlink_eswitch_encap_mode_set,
.eswitch_encap_mode_get = mlx5_devlink_eswitch_encap_mode_get,
+ .eswitch_shrdesc_mode_set = mlx5_devlink_eswitch_shrdesc_mode_set,
+ .eswitch_shrdesc_mode_get = mlx5_devlink_eswitch_shrdesc_mode_get,
+ .eswitch_shrdesc_count_set = mlx5_devlink_eswitch_shrdesc_count_set,
+ .eswitch_shrdesc_count_get = mlx5_devlink_eswitch_shrdesc_count_get,
.rate_leaf_tx_share_set = mlx5_esw_devlink_rate_leaf_tx_share_set,
.rate_leaf_tx_max_set = mlx5_esw_devlink_rate_leaf_tx_max_set,
.rate_node_tx_share_set = mlx5_esw_devlink_rate_node_tx_share_set,
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
index 349e28a6dd8d..f678bcb98e1f 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
@@ -378,6 +378,8 @@ struct mlx5_eswitch {
struct mlx5_esw_functions esw_funcs;
struct {
u32 large_group_num;
+ u32 shared_rx_ring_counts;
+ bool enable_shared_rx_ring;
} params;
struct blocking_notifier_head n_head;
struct xarray paired;
@@ -549,6 +551,14 @@ int mlx5_devlink_eswitch_encap_mode_set(struct devlink *devlink,
struct netlink_ext_ack *extack);
int mlx5_devlink_eswitch_encap_mode_get(struct devlink *devlink,
enum devlink_eswitch_encap_mode *encap);
+int mlx5_devlink_eswitch_shrdesc_mode_set(struct devlink *devlink,
+ enum devlink_eswitch_shrdesc_mode mode,
+ struct netlink_ext_ack *extack);
+int mlx5_devlink_eswitch_shrdesc_mode_get(struct devlink *devlink,
+ enum devlink_eswitch_shrdesc_mode *mode);
+int mlx5_devlink_eswitch_shrdesc_count_set(struct devlink *devlink, int count,
+ struct netlink_ext_ack *extack);
+int mlx5_devlink_eswitch_shrdesc_count_get(struct devlink *devlink, int *count);
int mlx5_devlink_port_fn_hw_addr_get(struct devlink_port *port,
u8 *hw_addr, int *hw_addr_len,
struct netlink_ext_ack *extack);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
index b0455134c98e..5586f52e4239 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
@@ -4019,6 +4019,86 @@ int mlx5_devlink_eswitch_encap_mode_get(struct devlink *devlink,
return 0;
}
+int mlx5_devlink_eswitch_shrdesc_mode_set(struct devlink *devlink,
+ enum devlink_eswitch_shrdesc_mode shrdesc,
+ struct netlink_ext_ack *extack)
+{
+ struct mlx5_eswitch *esw;
+ int err = 0;
+
+ esw = mlx5_devlink_eswitch_get(devlink);
+ if (IS_ERR(esw))
+ return PTR_ERR(esw);
+
+ down_write(&esw->mode_lock);
+ if (esw->mode != MLX5_ESWITCH_OFFLOADS) {
+ NL_SET_ERR_MSG_MOD(extack,
+ "Can't enable shared descriptors in legacy mode");
+ err = -EOPNOTSUPP;
+ goto out;
+ }
+ esw->params.enable_shared_rx_ring = shrdesc ==
+ DEVLINK_ESWITCH_SHRDESC_MODE_BASIC;
+
+out:
+ up_write(&esw->mode_lock);
+ return err;
+}
+
+int mlx5_devlink_eswitch_shrdesc_mode_get(struct devlink *devlink,
+ enum devlink_eswitch_shrdesc_mode *shrdesc)
+{
+ struct mlx5_eswitch *esw;
+ bool enable;
+
+ esw = mlx5_devlink_eswitch_get(devlink);
+ if (IS_ERR(esw))
+ return PTR_ERR(esw);
+
+ enable = esw->params.enable_shared_rx_ring;
+ if (enable)
+ *shrdesc = DEVLINK_ESWITCH_SHRDESC_MODE_BASIC;
+ else
+ *shrdesc = DEVLINK_ESWITCH_SHRDESC_MODE_NONE;
+
+ return 0;
+}
+
+int mlx5_devlink_eswitch_shrdesc_count_set(struct devlink *devlink, int count,
+ struct netlink_ext_ack *extack)
+{
+ struct mlx5_eswitch *esw;
+ int err = 0;
+
+ esw = mlx5_devlink_eswitch_get(devlink);
+ if (IS_ERR(esw))
+ return PTR_ERR(esw);
+
+ down_write(&esw->mode_lock);
+ if (esw->mode != MLX5_ESWITCH_OFFLOADS) {
+ NL_SET_ERR_MSG_MOD(extack,
+ "Can't enable shared descriptors in legacy mode");
+ err = -EOPNOTSUPP;
+ goto out;
+ }
+ esw->params.shared_rx_ring_counts = count;
+out:
+ up_write(&esw->mode_lock);
+ return err;
+}
+
+int mlx5_devlink_eswitch_shrdesc_count_get(struct devlink *devlink, int *count)
+{
+ struct mlx5_eswitch *esw;
+
+ esw = mlx5_devlink_eswitch_get(devlink);
+ if (IS_ERR(esw))
+ return PTR_ERR(esw);
+
+ *count = esw->params.shared_rx_ring_counts;
+ return 0;
+}
+
static bool
mlx5_eswitch_vport_has_rep(const struct mlx5_eswitch *esw, u16 vport_num)
{
--
2.38.1
Powered by blists - more mailing lists