From: Jiri Pirko <j...@mellanox.com>
Implement netdevsim bus probing of netdevsim devices. For every probed
device create a devlink instance. According to the user-passed value,
create a number of ports represented by devlink port instances.
Signed-off-by: Jiri Pirko <j...@mellanox.com>
---
drivers/net/netdevsim/bus.c | 29 ++++++++
drivers/net/netdevsim/dev.c | 115 ++++++++++++++++++++++++++----
drivers/net/netdevsim/netdev.c | 15 ++--
drivers/net/netdevsim/netdevsim.h | 14 +++-
4 files changed, 144 insertions(+), 29 deletions(-)
diff --git a/drivers/net/netdevsim/bus.c b/drivers/net/netdevsim/bus.c
index 4471f5db50ee..46108a926890 100644
--- a/drivers/net/netdevsim/bus.c
+++ b/drivers/net/netdevsim/bus.c
@@ -194,6 +194,21 @@ static struct attribute *nsim_bus_attrs[] = {
};
ATTRIBUTE_GROUPS(nsim_bus);
+static int nsim_bus_probe(struct device *dev)
+{
+ struct nsim_bus_dev *nsim_bus_dev = to_nsim_bus_dev(dev);
+
+ return nsim_dev_probe(nsim_bus_dev);
+}
+
+static int nsim_bus_remove(struct device *dev)
+{
+ struct nsim_bus_dev *nsim_bus_dev = to_nsim_bus_dev(dev);
+
+ nsim_dev_remove(nsim_bus_dev);
+ return 0;
+}
+
int nsim_num_vf(struct device *dev)
{
struct nsim_bus_dev *nsim_bus_dev = to_nsim_bus_dev(dev);
@@ -205,6 +220,8 @@ static struct bus_type nsim_bus = {
.name = DRV_NAME,
.dev_name = DRV_NAME,
.bus_groups = nsim_bus_groups,
+ .probe = nsim_bus_probe,
+ .remove = nsim_bus_remove,
.num_vf = nsim_num_vf,
};
@@ -238,6 +255,18 @@ struct nsim_bus_dev *nsim_bus_dev_new(unsigned int id,
unsigned int port_count)
return ERR_PTR(err);
}
+struct nsim_bus_dev *nsim_bus_dev_new_with_ns(struct netdevsim *ns)
+{
+ struct nsim_bus_dev *nsim_bus_dev;
+
+ dev_hold(ns->netdev);
+ rtnl_unlock();
+ nsim_bus_dev = nsim_bus_dev_new(~0, 0);
+ rtnl_lock();
+ dev_put(ns->netdev);
+ return nsim_bus_dev;
+}
+
void nsim_bus_dev_del(struct nsim_bus_dev *nsim_bus_dev)
{
device_unregister(&nsim_bus_dev->dev);
diff --git a/drivers/net/netdevsim/dev.c b/drivers/net/netdevsim/dev.c
index ef518d59afba..43d87c457ad9 100644
--- a/drivers/net/netdevsim/dev.c
+++ b/drivers/net/netdevsim/dev.c
@@ -45,6 +45,30 @@ static void nsim_dev_debugfs_exit(struct nsim_dev *nsim_dev)
debugfs_remove_recursive(nsim_dev->ddir);
}
+static int nsim_dev_port_debugfs_init(struct nsim_dev *nsim_dev,
+ struct nsim_dev_port *nsim_dev_port)
+{
+ char port_ddir_name[16];
+ char dev_link_name[32];
+
+ sprintf(port_ddir_name, "%u", nsim_dev_port->port_index);
+ nsim_dev_port->ddir = debugfs_create_dir(port_ddir_name,
+ nsim_dev->ports_ddir);
+ if (IS_ERR_OR_NULL(nsim_dev_port->ddir))
+ return -ENOMEM;
+
+ sprintf(dev_link_name, "../../../" DRV_NAME "%u",
+ nsim_dev->nsim_bus_dev->dev.id);
+ debugfs_create_symlink("dev", nsim_dev_port->ddir, dev_link_name);
+
+ return 0;
+}
+
+static void nsim_dev_port_debugfs_exit(struct nsim_dev_port *nsim_dev_port)
+{
+ debugfs_remove_recursive(nsim_dev_port->ddir);
+}
+
static u64 nsim_dev_ipv4_fib_resource_occ_get(void *priv)
{
struct nsim_dev *nsim_dev = priv;
@@ -198,13 +222,15 @@ static const struct devlink_ops nsim_dev_devlink_ops = {
.reload = nsim_dev_reload,
};
-static struct nsim_dev *nsim_dev_create(struct nsim_bus_dev *nsim_bus_dev)
+static struct nsim_dev *nsim_dev_create(struct nsim_bus_dev *nsim_bus_dev,
+ unsigned int port_count)
{
struct nsim_dev *nsim_dev;
struct devlink *devlink;
int err;
- devlink = devlink_alloc(&nsim_dev_devlink_ops, sizeof(*nsim_dev));
+ devlink = devlink_alloc(&nsim_dev_devlink_ops,
+ struct_size(nsim_dev, ports, port_count));
if (!devlink)
return ERR_PTR(-ENOMEM);
nsim_dev = devlink_priv(devlink);
@@ -249,19 +275,6 @@ static struct nsim_dev *nsim_dev_create(struct
nsim_bus_dev *nsim_bus_dev)
return ERR_PTR(err);
}
-struct nsim_dev *nsim_dev_create_with_ns(struct nsim_bus_dev *nsim_bus_dev,
- struct netdevsim *ns)
-{
- struct nsim_dev *nsim_dev;
-
- dev_hold(ns->netdev);
- rtnl_unlock();
- nsim_dev = nsim_dev_create(nsim_bus_dev);
- rtnl_lock();
- dev_put(ns->netdev);
- return nsim_dev;
-}
-
void nsim_dev_destroy(struct nsim_dev *nsim_dev)
{
struct devlink *devlink = priv_to_devlink(nsim_dev);
@@ -274,6 +287,78 @@ void nsim_dev_destroy(struct nsim_dev *nsim_dev)
devlink_free(devlink);
}
+static int nsim_dev_port_init(struct nsim_dev *nsim_dev,
+ unsigned int port_index)
+{
+ struct nsim_dev_port *nsim_dev_port = &nsim_dev->ports[port_index];
+ struct devlink_port *devlink_port = &nsim_dev_port->devlink_port;
+ int err;
+
+ nsim_dev_port->port_index = port_index;
+ devlink_port_attrs_set(devlink_port, DEVLINK_PORT_FLAVOUR_PHYSICAL,
+ port_index + 1, 0, 0,
+ nsim_dev->switch_id.id,
+ nsim_dev->switch_id.id_len);
+ err = devlink_port_register(priv_to_devlink(nsim_dev), devlink_port,
+ port_index);
+ if (err)
+ return err;
+
+ err = nsim_dev_port_debugfs_init(nsim_dev, nsim_dev_port);
+ if (err)
+ goto err_dl_port_unregister;
+ return 0;
+
+err_dl_port_unregister:
+ devlink_port_unregister(devlink_port);
+ return err;
+}
+
+static void nsim_dev_port_exit(struct nsim_dev *nsim_dev,
+ unsigned int port_index)
+{
+ struct nsim_dev_port *nsim_dev_port = &nsim_dev->ports[port_index];
+ struct devlink_port *devlink_port = &nsim_dev_port->devlink_port;
+
+ nsim_dev_port_debugfs_exit(nsim_dev_port);
+ devlink_port_unregister(devlink_port);
+}
+
+int nsim_dev_probe(struct nsim_bus_dev *nsim_bus_dev)
+{
+ struct nsim_dev *nsim_dev;
+ int i;
+ int err;
+
+ nsim_dev = nsim_dev_create(nsim_bus_dev, nsim_bus_dev->port_count);
+ if (IS_ERR(nsim_dev))
+ return PTR_ERR(nsim_dev);
+ dev_set_drvdata(&nsim_bus_dev->dev, nsim_dev);
+
+ for (i = 0; i < nsim_bus_dev->port_count; i++) {
+ err = nsim_dev_port_init(nsim_dev, i);
+ if (err)
+ goto port_rollback;
+ }
+ return 0;
+
+port_rollback:
+ for (i--; i >= 0; i--)
+ nsim_dev_port_exit(nsim_dev, i);
+ nsim_dev_destroy(nsim_dev);
+ return err;
+}
+
+void nsim_dev_remove(struct nsim_bus_dev *nsim_bus_dev)
+{
+ struct nsim_dev *nsim_dev = dev_get_drvdata(&nsim_bus_dev->dev);
+ int i;
+
+ for (i = nsim_bus_dev->port_count - 1; i >= 0; i--)
+ nsim_dev_port_exit(nsim_dev, i);
+ nsim_dev_destroy(nsim_dev);
+}
+
int nsim_dev_init(void)
{
nsim_dev_ddir = debugfs_create_dir(DRV_NAME, NULL);
diff --git a/drivers/net/netdevsim/netdev.c b/drivers/net/netdevsim/netdev.c
index eb823bd0dc39..99169fe521f2 100644
--- a/drivers/net/netdevsim/netdev.c
+++ b/drivers/net/netdevsim/netdev.c
@@ -74,7 +74,6 @@ static void nsim_free(struct net_device *dev)
{
struct netdevsim *ns = netdev_priv(dev);
- nsim_dev_destroy(ns->nsim_dev);
nsim_bus_dev_del(ns->nsim_bus_dev);
/* netdev and vf state will be freed out of device_release() */
}
@@ -364,26 +363,20 @@ static int nsim_newlink(struct net *src_net, struct
net_device *dev,
struct netdevsim *ns = netdev_priv(dev);
int err;
- ns->nsim_bus_dev = nsim_bus_dev_new(~0, 0);
+ ns->netdev = dev;
+ ns->nsim_bus_dev = nsim_bus_dev_new_with_ns(ns);
if (IS_ERR(ns->nsim_bus_dev))
return PTR_ERR(ns->nsim_bus_dev);
SET_NETDEV_DEV(dev, &ns->nsim_bus_dev->dev);
- ns->netdev = dev;
- ns->nsim_dev = nsim_dev_create_with_ns(ns->nsim_bus_dev, ns);
- if (IS_ERR(ns->nsim_dev)) {
- err = PTR_ERR(ns->nsim_dev);
- goto err_dev_del;
- }
+ ns->nsim_dev = dev_get_drvdata(&ns->nsim_bus_dev->dev);
err = register_netdevice(dev);
if (err)
- goto err_dev_destroy;
+ goto err_dev_del;
return 0;
-err_dev_destroy:
- nsim_dev_destroy(ns->nsim_dev);
err_dev_del:
nsim_bus_dev_del(ns->nsim_bus_dev);
return err;
diff --git a/drivers/net/netdevsim/netdevsim.h
b/drivers/net/netdevsim/netdevsim.h
index ec678371865f..c0a08af5e724 100644
--- a/drivers/net/netdevsim/netdevsim.h
+++ b/drivers/net/netdevsim/netdevsim.h
@@ -18,6 +18,7 @@
#include <linux/list.h>
#include <linux/netdevice.h>
#include <linux/u64_stats_sync.h>
+#include <net/devlink.h>
#include <net/xdp.h>
#define DRV_NAME "netdevsim"
@@ -130,6 +131,12 @@ enum nsim_resource_id {
NSIM_RESOURCE_IPV6_FIB_RULES,
};
+struct nsim_dev_port {
+ struct devlink_port devlink_port;
+ unsigned int port_index;
+ struct dentry *ddir;
+};
+
struct nsim_dev {
struct nsim_bus_dev *nsim_bus_dev;
struct nsim_fib_data *fib_data;
@@ -143,13 +150,13 @@ struct nsim_dev {
struct list_head bpf_bound_progs;
struct list_head bpf_bound_maps;
struct netdev_phys_item_id switch_id;
+ struct nsim_dev_port ports[0];
};
-struct nsim_dev *nsim_dev_create_with_ns(struct nsim_bus_dev *nsim_bus_dev,
- struct netdevsim *ns);
-void nsim_dev_destroy(struct nsim_dev *nsim_dev);
int nsim_dev_init(void);
void nsim_dev_exit(void);
+int nsim_dev_probe(struct nsim_bus_dev *nsim_bus_dev);
+void nsim_dev_remove(struct nsim_bus_dev *nsim_bus_dev);
struct nsim_fib_data *nsim_fib_create(void);
void nsim_fib_destroy(struct nsim_fib_data *fib_data);
@@ -200,6 +207,7 @@ struct nsim_bus_dev {
};
struct nsim_bus_dev *nsim_bus_dev_new(unsigned int id, unsigned int
port_count);
+struct nsim_bus_dev *nsim_bus_dev_new_with_ns(struct netdevsim *ns);
void nsim_bus_dev_del(struct nsim_bus_dev *nsim_bus_dev);
int nsim_bus_init(void);
void nsim_bus_exit(void);
--
2.17.2
