netdevsim: add switch_id attribute

Grouping netdevsim devices into "ASICs" will soon be supported.
Add switch_id attribute to all netdevsims.  For now each netdevsim
will have its switch_id matching the device id.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Quentin Monnet <quentin.monnet@netronome.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

diff --git a/drivers/net/netdevsim/netdev.c b/drivers/net/netdevsim/netdev.c
index a7b179f0d95451ddb8f01300880077d019e717b3..9125637ef5d846baaa9741161dcbea42777887f4 100644 (file)
--- a/drivers/net/netdevsim/netdev.c
+++ b/drivers/net/netdevsim/netdev.c
@@ -22,6 +22,7 @@
 #include <net/netlink.h>
 #include <net/pkt_cls.h>
 #include <net/rtnetlink.h>
+#include <net/switchdev.h>
 
 #include "netdevsim.h"
 
@@ -144,12 +145,34 @@ static struct device_type nsim_dev_type = {
        .release = nsim_dev_release,
 };
 
+static int
+nsim_port_attr_get(struct net_device *dev, struct switchdev_attr *attr)
+{
+       struct netdevsim *ns = netdev_priv(dev);
+
+       switch (attr->id) {
+       case SWITCHDEV_ATTR_ID_PORT_PARENT_ID:
+               attr->u.ppid.id_len = sizeof(ns->switch_id);
+               memcpy(&attr->u.ppid.id, &ns->switch_id,
+                      attr->u.ppid.id_len);
+               return 0;
+       default:
+               return -EOPNOTSUPP;
+       }
+}
+
+static const struct switchdev_ops nsim_switchdev_ops = {
+       .switchdev_port_attr_get        = nsim_port_attr_get,
+};
+
 static int nsim_init(struct net_device *dev)
 {
        struct netdevsim *ns = netdev_priv(dev);
        int err;
 
        ns->netdev = dev;
+       ns->switch_id = nsim_dev_id;
+
        ns->ddir = debugfs_create_dir(netdev_name(dev), nsim_ddir);
        if (IS_ERR_OR_NULL(ns->ddir))
                return -ENOMEM;
@@ -166,6 +189,7 @@ static int nsim_init(struct net_device *dev)
                goto err_bpf_uninit;
 
        SET_NETDEV_DEV(dev, &ns->dev);
+       SWITCHDEV_SET_OPS(dev, &nsim_switchdev_ops);
 
        err = nsim_devlink_setup(ns);
        if (err)

diff --git a/drivers/net/netdevsim/netdevsim.h b/drivers/net/netdevsim/netdevsim.h
index 0aeabbe81cc6fbe616188238a2ec3244766c4ccd..e2f2323252592d3c9df5602a350823ea143097c1 100644 (file)
--- a/drivers/net/netdevsim/netdevsim.h
+++ b/drivers/net/netdevsim/netdevsim.h
@@ -59,6 +59,7 @@ struct netdevsim {
        struct u64_stats_sync syncp;
 
        struct device dev;
+       u32 switch_id;
 
        struct dentry *ddir;