Add devlink vdev creation to represent VFs, and implement hw_addr
get/set.
Signed-off-by: Yuval Avnery <yuva...@mellanox.com>
Acked-by: Jiri Pirko <j...@mellanox.com>
---
drivers/net/netdevsim/Makefile | 2 +-
drivers/net/netdevsim/dev.c | 9 ++-
drivers/net/netdevsim/netdevsim.h | 10 ++++
drivers/net/netdevsim/vdev.c | 96 +++++++++++++++++++++++++++++++
4 files changed, 115 insertions(+), 2 deletions(-)
create mode 100644 drivers/net/netdevsim/vdev.c
diff --git a/drivers/net/netdevsim/Makefile b/drivers/net/netdevsim/Makefile
index f4d8f62f28c2..62256906128f 100644
--- a/drivers/net/netdevsim/Makefile
+++ b/drivers/net/netdevsim/Makefile
@@ -3,7 +3,7 @@
obj-$(CONFIG_NETDEVSIM) += netdevsim.o
netdevsim-objs := \
- netdev.o dev.o fib.o bus.o health.o
+ netdev.o dev.o fib.o bus.o health.o vdev.o
ifeq ($(CONFIG_BPF_SYSCALL),y)
netdevsim-objs += \
diff --git a/drivers/net/netdevsim/dev.c b/drivers/net/netdevsim/dev.c
index 468e157a7cb1..3fbf4e1ca0d1 100644
--- a/drivers/net/netdevsim/dev.c
+++ b/drivers/net/netdevsim/dev.c
@@ -785,10 +785,14 @@ static struct nsim_dev *nsim_dev_create(struct
nsim_bus_dev *nsim_bus_dev)
if (err)
goto err_fib_destroy;
+ err = nsim_dev_vdevs_create(nsim_dev, devlink);
+ if (err)
+ goto err_dl_unregister;
+
err = devlink_params_register(devlink, nsim_devlink_params,
ARRAY_SIZE(nsim_devlink_params));
if (err)
- goto err_dl_unregister;
+ goto err_dl_vdevs_destroy;
nsim_devlink_set_params_init_values(nsim_dev, devlink);
err = nsim_dev_dummy_region_init(nsim_dev, devlink);
@@ -831,6 +835,8 @@ static struct nsim_dev *nsim_dev_create(struct nsim_bus_dev
*nsim_bus_dev)
err_params_unregister:
devlink_params_unregister(devlink, nsim_devlink_params,
ARRAY_SIZE(nsim_devlink_params));
+err_dl_vdevs_destroy:
+ nsim_dev_vdevs_destroy(nsim_dev);
err_dl_unregister:
devlink_unregister(devlink);
err_fib_destroy:
@@ -866,6 +872,7 @@ static void nsim_dev_destroy(struct nsim_dev *nsim_dev)
nsim_dev_debugfs_exit(nsim_dev);
devlink_params_unregister(devlink, nsim_devlink_params,
ARRAY_SIZE(nsim_devlink_params));
+ nsim_dev_vdevs_destroy(nsim_dev);
devlink_unregister(devlink);
devlink_resources_unregister(devlink, NULL);
devlink_free(devlink);
diff --git a/drivers/net/netdevsim/netdevsim.h
b/drivers/net/netdevsim/netdevsim.h
index e2049856add8..071bedb999bf 100644
--- a/drivers/net/netdevsim/netdevsim.h
+++ b/drivers/net/netdevsim/netdevsim.h
@@ -154,6 +154,12 @@ struct nsim_dev_port {
struct netdevsim *ns;
};
+struct nsim_vdev {
+ struct devlink_vdev *devlink_vdev;
+ unsigned int vdev_index;
+ struct nsim_bus_dev *nsim_bus_dev;
+};
+
struct nsim_dev {
struct nsim_bus_dev *nsim_bus_dev;
struct nsim_fib_data *fib_data;
@@ -177,6 +183,7 @@ struct nsim_dev {
bool fail_reload;
struct devlink_region *dummy_region;
struct nsim_dev_health health;
+ struct nsim_vdev *vdevs;
};
static inline struct net *nsim_dev_net(struct nsim_dev *nsim_dev)
@@ -245,3 +252,6 @@ struct nsim_bus_dev {
int nsim_bus_init(void);
void nsim_bus_exit(void);
+
+int nsim_dev_vdevs_create(struct nsim_dev *nsim_dev, struct devlink *devlink);
+void nsim_dev_vdevs_destroy(struct nsim_dev *nsim_dev);
diff --git a/drivers/net/netdevsim/vdev.c b/drivers/net/netdevsim/vdev.c
new file mode 100644
index 000000000000..c22e01982ba6
--- /dev/null
+++ b/drivers/net/netdevsim/vdev.c
@@ -0,0 +1,96 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright (c) 2019 Mellanox Technologies */
+
+#include <linux/device.h>
+#include <linux/etherdevice.h>
+#include <linux/inet.h>
+#include <linux/kernel.h>
+#include <linux/mutex.h>
+#include <linux/rtnetlink.h>
+#include <net/devlink.h>
+#include <uapi/linux/devlink.h>
+
+#include "netdevsim.h"
+
+static int
+nsim_hw_addr_set(struct devlink_vdev *devlink_vdev, u8 *hw_addr,
+ struct netlink_ext_ack *extack)
+{
+ struct nsim_bus_dev *nsim_bus_dev;
+ struct nsim_vdev *nsim_vdev;
+
+ nsim_vdev = devlink_vdev_priv(devlink_vdev);
+ nsim_bus_dev = nsim_vdev->nsim_bus_dev;
+
+ ether_addr_copy(nsim_bus_dev->vfconfigs[nsim_vdev->vdev_index].vf_mac,
+ hw_addr);
+ return 0;
+}
+
+static int
+nsim_hw_addr_get(struct devlink_vdev *devlink_vdev, u8 *hw_addr,
+ struct netlink_ext_ack *extack)
+{
+ struct nsim_bus_dev *nsim_bus_dev;
+ struct nsim_vdev *nsim_vdev;
+
+ nsim_vdev = devlink_vdev_priv(devlink_vdev);
+ nsim_bus_dev = nsim_vdev->nsim_bus_dev;
+
+ ether_addr_copy(hw_addr,
+ nsim_bus_dev->vfconfigs[nsim_vdev->vdev_index].vf_mac);
+ return 0;
+}
+
+static struct devlink_vdev_ops vdev_ops = {
+ .hw_addr_set = nsim_hw_addr_set,
+ .hw_addr_get = nsim_hw_addr_get,
+ .hw_addr_len = ETH_ALEN,
+};
+
+int nsim_dev_vdevs_create(struct nsim_dev *nsim_dev, struct devlink *devlink)
+{
+ int max_vfs = nsim_dev->nsim_bus_dev->max_vfs;
+ struct devlink_vdev_attrs attrs;
+ int err;
+ int vf;
+
+ nsim_dev->vdevs = kcalloc(max_vfs, sizeof(*nsim_dev->vdevs),
+ GFP_KERNEL);
+ if (!nsim_dev->vdevs)
+ return -ENOMEM;
+
+ for (vf = 0; vf < max_vfs; vf++) {
+ struct nsim_vdev *nsim_vdev = &nsim_dev->vdevs[vf];
+ struct devlink_vdev *devlink_vdev;
+
+ nsim_vdev->nsim_bus_dev = nsim_dev->nsim_bus_dev;
+ devlink_vdev_attrs_pci_vf_init(&attrs, 0, vf);
+ devlink_vdev = devlink_vdev_create(devlink, vf,
+ &vdev_ops,
+ &attrs,
+ nsim_vdev);
+ if (IS_ERR(devlink_vdev)) {
+ err = PTR_ERR(devlink_vdev);
+ goto err_vdevs_destroy;
+ }
+ nsim_vdev->devlink_vdev = devlink_vdev;
+ nsim_vdev->vdev_index = vf;
+ }
+
+ return 0;
+
+err_vdevs_destroy:
+ for (vf--; vf >= 0; vf--)
+ devlink_vdev_destroy(nsim_dev->vdevs[vf].devlink_vdev);
+ return err;
+}
+
+void nsim_dev_vdevs_destroy(struct nsim_dev *nsim_dev)
+{
+ int vf;
+
+ for (vf = 0; vf < nsim_dev->nsim_bus_dev->max_vfs; vf++)
+ devlink_vdev_destroy(nsim_dev->vdevs[vf].devlink_vdev);
+}
+
--
2.17.1
