From: Parav Pandit <parav@mellanox.com>
To: alex.williamson@redhat.com, davem@davemloft.net,
kvm@vger.kernel.org, netdev@vger.kernel.org
Cc: saeedm@mellanox.com, kwankhede@nvidia.com, leon@kernel.org,
cohuck@redhat.com, jiri@mellanox.com, linux-rdma@vger.kernel.org,
Parav Pandit <parav@mellanox.com>
Subject: [PATCH net-next 13/19] net/mlx5: Register SF devlink port
Date: Thu, 7 Nov 2019 10:08:28 -0600 [thread overview]
Message-ID: <20191107160834.21087-13-parav@mellanox.com> (raw)
In-Reply-To: <20191107160834.21087-1-parav@mellanox.com>
Register devlink port for mdev's SF eswitch port.
Make use of mdev's alias to construct devlink eswitch port's phys_port_name
as agreed in discussion [1].
[1] https://patchwork.kernel.org/cover/11084231
Reviewed-by: Saeed Mahameed <saeedm@mellanox.com>
Signed-off-by: Parav Pandit <parav@mellanox.com>
---
drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 8 +++++++-
drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 4 +++-
.../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 5 ++++-
drivers/net/ethernet/mellanox/mlx5/core/meddev/mdev.c | 11 ++++++++++-
drivers/net/ethernet/mellanox/mlx5/core/meddev/sf.c | 5 +++--
drivers/net/ethernet/mellanox/mlx5/core/meddev/sf.h | 2 +-
6 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/devlink.c b/drivers/net/ethernet/mellanox/mlx5/core/devlink.c
index ce4278dfc101..aff98c4e1ae7 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/devlink.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/devlink.c
@@ -233,7 +233,8 @@ mlx5_devlink_port_supported(const struct mlx5_core_dev *dev,
{
return vport->vport == MLX5_VPORT_UPLINK ||
vport->vport == MLX5_VPORT_PF ||
- mlx5_eswitch_is_vf_vport(dev->priv.eswitch, vport->vport);
+ mlx5_eswitch_is_vf_vport(dev->priv.eswitch, vport->vport) ||
+ mlx5_eswitch_is_sf_vport(dev->priv.eswitch, vport->vport);
}
static unsigned int
@@ -280,6 +281,11 @@ int mlx5_devlink_port_register(struct mlx5_core_dev *dev,
&ppid.id[0], ppid.id_len,
dev->pdev->devfn,
vport->vport - 1);
+ else if (mlx5_eswitch_is_sf_vport(dev->priv.eswitch, vport->vport))
+ devlink_port_attrs_mdev_set(&vport->dl_port,
+ &ppid.id[0], ppid.id_len,
+ vport->port_alias);
+
return devlink_port_register(devlink, &vport->dl_port, dl_port_index);
}
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
index ca7bf362a192..206a32c5a0af 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
@@ -141,6 +141,7 @@ struct mlx5_vport {
bool enabled;
enum mlx5_eswitch_vport_event enabled_events;
struct devlink_port dl_port;
+ const char *port_alias; /* Applicable Only for SF vport */
};
enum offloads_fdb_flags {
@@ -308,7 +309,8 @@ int mlx5_eswitch_vport_enable_qos(struct mlx5_eswitch *esw,
u32 initial_max_rate, u32 initial_bw_share);
void mlx5_eswitch_vport_disable_qos(struct mlx5_eswitch *esw,
struct mlx5_vport *vport);
-int mlx5_eswitch_setup_sf_vport(struct mlx5_eswitch *esw, u16 vport_num);
+int mlx5_eswitch_setup_sf_vport(struct mlx5_eswitch *esw, u16 vport_num,
+ const char *port_alias);
void mlx5_eswitch_cleanup_sf_vport(struct mlx5_eswitch *esw, u16 vport_num);
void mlx5_eswitch_del_send_to_vport_rule(struct mlx5_flow_handle *rule);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
index 503cefac300b..5dcaa4831b49 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
@@ -1706,7 +1706,8 @@ esw_disable_sf_vport(struct mlx5_eswitch *esw, struct mlx5_vport *vport)
esw_vport_destroy_offloads_acl_tables(esw, vport);
}
-int mlx5_eswitch_setup_sf_vport(struct mlx5_eswitch *esw, u16 vport_num)
+int mlx5_eswitch_setup_sf_vport(struct mlx5_eswitch *esw, u16 vport_num,
+ const char *port_alias)
{
struct mlx5_vport *vport = mlx5_eswitch_get_vport(esw, vport_num);
int ret;
@@ -1718,6 +1719,8 @@ int mlx5_eswitch_setup_sf_vport(struct mlx5_eswitch *esw, u16 vport_num)
if (ret)
return ret;
+ vport->port_alias = port_alias;
+
ret = esw_offloads_load_vport_reps(esw, vport_num);
if (ret)
esw_disable_sf_vport(esw, vport);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/meddev/mdev.c b/drivers/net/ethernet/mellanox/mlx5/core/meddev/mdev.c
index 295932110eff..0cf3b87f6b21 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/meddev/mdev.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/meddev/mdev.c
@@ -9,6 +9,8 @@
#include "meddev/sf.h"
#include "eswitch.h"
+#define MLX5_MEDDEV_ALIAS_LEN 12
+
struct mlx5_mdev_table {
struct mlx5_sf_table sf_table;
/* Synchronizes with mdev table cleanup check and mdev creation. */
@@ -87,7 +89,8 @@ static int mlx5_meddev_create(struct kobject *kobj, struct mdev_device *meddev)
return -ENODEV;
}
- sf = mlx5_sf_alloc(parent_coredev, &table->sf_table, mdev_dev(meddev));
+ sf = mlx5_sf_alloc(parent_coredev, &table->sf_table, mdev_dev(meddev),
+ mdev_alias(meddev));
if (IS_ERR(sf)) {
ret = PTR_ERR(sf);
goto sf_err;
@@ -111,9 +114,15 @@ static int mlx5_meddev_remove(struct mdev_device *meddev)
return 0;
}
+static unsigned int mlx5_meddev_get_alias_length(void)
+{
+ return MLX5_MEDDEV_ALIAS_LEN;
+}
+
static const struct mdev_parent_ops mlx5_meddev_ops = {
.create = mlx5_meddev_create,
.remove = mlx5_meddev_remove,
+ .get_alias_length = mlx5_meddev_get_alias_length,
.supported_type_groups = mlx5_meddev_groups,
};
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/meddev/sf.c b/drivers/net/ethernet/mellanox/mlx5/core/meddev/sf.c
index 99eb54d345a8..d496046daed8 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/meddev/sf.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/meddev/sf.c
@@ -126,7 +126,7 @@ static u16 mlx5_sf_hw_id(const struct mlx5_core_dev *coredev, u16 sf_id)
/* Perform SF allocation using parent device BAR. */
struct mlx5_sf *
mlx5_sf_alloc(struct mlx5_core_dev *coredev, struct mlx5_sf_table *sf_table,
- struct device *dev)
+ struct device *dev, const char *port_alias)
{
struct mlx5_sf *sf;
u16 hw_function_id;
@@ -150,7 +150,8 @@ mlx5_sf_alloc(struct mlx5_core_dev *coredev, struct mlx5_sf_table *sf_table,
if (ret)
goto enable_err;
- ret = mlx5_eswitch_setup_sf_vport(coredev->priv.eswitch, hw_function_id);
+ ret = mlx5_eswitch_setup_sf_vport(coredev->priv.eswitch,
+ hw_function_id, port_alias);
if (ret)
goto vport_err;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/meddev/sf.h b/drivers/net/ethernet/mellanox/mlx5/core/meddev/sf.h
index 526a6795e984..8ac032fdbb0b 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/meddev/sf.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/meddev/sf.h
@@ -42,7 +42,7 @@ void mlx5_sf_table_cleanup(struct mlx5_core_dev *dev,
struct mlx5_sf *
mlx5_sf_alloc(struct mlx5_core_dev *coredev, struct mlx5_sf_table *sf_table,
- struct device *dev);
+ struct device *dev, const char *port_alias);
void mlx5_sf_free(struct mlx5_core_dev *coredev, struct mlx5_sf_table *sf_table,
struct mlx5_sf *sf);
u16 mlx5_core_max_sfs(const struct mlx5_core_dev *dev,
--
2.19.2
next prev parent reply other threads:[~2019-11-07 16:09 UTC|newest]
Thread overview: 132+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-07 16:04 [PATCH net-next 00/19] Mellanox, mlx5 sub function support Parav Pandit
2019-11-07 16:08 ` [PATCH net-next 01/19] net/mlx5: E-switch, Move devlink port close to eswitch port Parav Pandit
2019-11-07 16:08 ` [PATCH net-next 02/19] net/mlx5: E-Switch, Add SF vport, vport-rep support Parav Pandit
2019-11-07 16:08 ` [PATCH net-next 03/19] net/mlx5: Introduce SF table framework Parav Pandit
2019-11-07 16:08 ` [PATCH net-next 04/19] net/mlx5: Introduce SF life cycle APIs to allocate/free Parav Pandit
2019-11-07 16:08 ` [PATCH net-next 05/19] net/mlx5: E-Switch, Enable/disable SF's vport during SF life cycle Parav Pandit
2019-11-07 16:08 ` [PATCH net-next 06/19] net/mlx5: Add support for mediated devices in switchdev mode Parav Pandit
2019-11-08 10:32 ` Jiri Pirko
2019-11-08 16:03 ` Parav Pandit
2019-11-08 16:22 ` Jiri Pirko
2019-11-08 16:29 ` Parav Pandit
2019-11-08 18:01 ` Jiri Pirko
2019-11-08 18:04 ` Jiri Pirko
2019-11-08 18:21 ` Parav Pandit
2019-11-07 16:08 ` [PATCH net-next 07/19] vfio/mdev: Introduce sha1 based mdev alias Parav Pandit
2019-11-08 11:04 ` Jiri Pirko
2019-11-08 15:59 ` Parav Pandit
2019-11-08 16:28 ` Jiri Pirko
2019-11-08 11:10 ` Cornelia Huck
2019-11-08 16:03 ` Parav Pandit
2019-11-07 16:08 ` [PATCH net-next 08/19] vfio/mdev: Make mdev alias unique among all mdevs Parav Pandit
2019-11-08 10:49 ` Jiri Pirko
2019-11-08 15:13 ` Parav Pandit
2019-11-07 16:08 ` [PATCH net-next 09/19] vfio/mdev: Expose mdev alias in sysfs tree Parav Pandit
2019-11-08 13:22 ` Jiri Pirko
2019-11-08 18:03 ` Alex Williamson
2019-11-08 18:16 ` Jiri Pirko
2019-11-07 16:08 ` [PATCH net-next 10/19] vfio/mdev: Introduce an API mdev_alias Parav Pandit
2019-11-07 16:08 ` [PATCH net-next 11/19] vfio/mdev: Improvise mdev life cycle and parent removal scheme Parav Pandit
2019-11-08 13:01 ` Cornelia Huck
2019-11-08 16:12 ` Parav Pandit
2019-11-07 16:08 ` [PATCH net-next 12/19] devlink: Introduce mdev port flavour Parav Pandit
2019-11-07 20:38 ` Jakub Kicinski
2019-11-07 21:03 ` Parav Pandit
2019-11-08 1:17 ` Jakub Kicinski
2019-11-08 1:44 ` Parav Pandit
2019-11-08 2:20 ` Jakub Kicinski
2019-11-08 2:31 ` Parav Pandit
2019-11-08 9:46 ` Jiri Pirko
2019-11-08 15:45 ` Parav Pandit
2019-11-08 16:31 ` Jiri Pirko
2019-11-08 16:43 ` Parav Pandit
2019-11-08 18:11 ` Jiri Pirko
2019-11-08 18:23 ` Parav Pandit
2019-11-08 18:34 ` Jiri Pirko
2019-11-08 18:56 ` Parav Pandit
2019-11-08 9:30 ` Jiri Pirko
2019-11-08 15:41 ` Parav Pandit
2019-11-07 16:08 ` Parav Pandit [this message]
2019-11-07 16:08 ` [PATCH net-next 14/19] net/mlx5: Share irqs between SFs and parent PCI device Parav Pandit
2019-11-07 16:08 ` [PATCH net-next 15/19] net/mlx5: Add load/unload routines for SF driver binding Parav Pandit
2019-11-08 9:48 ` Jiri Pirko
2019-11-08 11:13 ` Jiri Pirko
2019-11-07 16:08 ` [PATCH net-next 16/19] net/mlx5: Implement dma ops and params for mediated device Parav Pandit
2019-11-07 20:42 ` Jakub Kicinski
2019-11-07 21:30 ` Parav Pandit
2019-11-08 1:16 ` Jakub Kicinski
2019-11-08 6:37 ` Christoph Hellwig
2019-11-08 15:29 ` Parav Pandit
2019-11-07 16:08 ` [PATCH net-next 17/19] net/mlx5: Add mdev driver to bind to mdev devices Parav Pandit
2019-11-07 16:08 ` [PATCH net-next 18/19] Documentation: net: mlx5: Add mdev usage documentation Parav Pandit
2019-11-07 16:08 ` [PATCH net-next 19/19] mtty: Optionally support mtty alias Parav Pandit
2019-11-08 6:26 ` Leon Romanovsky
2019-11-08 10:45 ` Jiri Pirko
2019-11-08 15:08 ` Parav Pandit
2019-11-08 15:15 ` Jiri Pirko
2019-11-08 13:46 ` Cornelia Huck
2019-11-08 15:10 ` Parav Pandit
2019-11-08 15:28 ` Cornelia Huck
2019-11-08 15:30 ` Parav Pandit
2019-11-08 17:54 ` Alex Williamson
2019-11-08 9:51 ` [PATCH net-next 01/19] net/mlx5: E-switch, Move devlink port close to eswitch port Jiri Pirko
2019-11-08 15:50 ` Parav Pandit
2019-11-07 17:03 ` [PATCH net-next 00/19] Mellanox, mlx5 sub function support Leon Romanovsky
2019-11-07 20:10 ` Parav Pandit
2019-11-08 6:20 ` Leon Romanovsky
2019-11-08 15:01 ` Parav Pandit
2019-11-07 20:32 ` Jakub Kicinski
2019-11-07 20:52 ` Parav Pandit
2019-11-08 1:16 ` Jakub Kicinski
2019-11-08 1:49 ` Parav Pandit
2019-11-08 2:12 ` Jakub Kicinski
2019-11-08 12:12 ` Jiri Pirko
2019-11-08 14:40 ` Jason Gunthorpe
2019-11-08 15:40 ` Parav Pandit
2019-11-08 19:12 ` Jakub Kicinski
2019-11-08 20:12 ` Jason Gunthorpe
2019-11-08 20:20 ` Parav Pandit
2019-11-08 20:32 ` Jason Gunthorpe
2019-11-08 20:52 ` gregkh
2019-11-08 20:34 ` Alex Williamson
2019-11-08 21:05 ` Jason Gunthorpe
2019-11-08 21:19 ` gregkh
2019-11-08 21:52 ` Alex Williamson
2019-11-08 22:48 ` Parav Pandit
2019-11-09 0:57 ` Jason Gunthorpe
2019-11-09 17:41 ` Jakub Kicinski
2019-11-10 19:04 ` Jason Gunthorpe
2019-11-10 19:48 ` Parav Pandit
2019-11-11 14:17 ` Jiri Pirko
2019-11-11 14:58 ` Parav Pandit
2019-11-11 15:06 ` Jiri Pirko
2019-11-19 4:51 ` Parav Pandit
2019-11-09 0:12 ` Jason Gunthorpe
2019-11-09 0:45 ` Parav Pandit
2019-11-11 2:19 ` Jason Wang
2019-11-08 21:45 ` Jakub Kicinski
2019-11-09 0:44 ` Jason Gunthorpe
2019-11-09 8:46 ` gregkh
2019-11-09 11:18 ` Jiri Pirko
2019-11-09 17:28 ` Jakub Kicinski
2019-11-10 9:16 ` gregkh
2019-11-09 17:27 ` Jakub Kicinski
2019-11-10 9:18 ` gregkh
2019-11-11 3:46 ` Jakub Kicinski
2019-11-11 5:18 ` Parav Pandit
2019-11-11 13:30 ` Jiri Pirko
2019-11-11 14:14 ` gregkh
2019-11-11 14:37 ` Jiri Pirko
2019-11-10 19:37 ` Jason Gunthorpe
2019-11-11 3:57 ` Jakub Kicinski
2019-11-08 16:06 ` Parav Pandit
2019-11-08 19:06 ` Jakub Kicinski
2019-11-08 19:34 ` Parav Pandit
2019-11-08 19:48 ` Jakub Kicinski
2019-11-08 19:41 ` Jiri Pirko
2019-11-08 20:40 ` Parav Pandit
2019-11-08 21:21 ` Jakub Kicinski
2019-11-08 21:39 ` Jiri Pirko
2019-11-08 21:51 ` Jakub Kicinski
2019-11-08 22:21 ` Jiri Pirko
2019-11-07 23:57 ` David Miller
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=20191107160834.21087-13-parav@mellanox.com \
--to=parav@mellanox.com \
--cc=alex.williamson@redhat.com \
--cc=cohuck@redhat.com \
--cc=davem@davemloft.net \
--cc=jiri@mellanox.com \
--cc=kvm@vger.kernel.org \
--cc=kwankhede@nvidia.com \
--cc=leon@kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=saeedm@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).