switchdev: convert parent_id_get to switchdev attr get

Switch ID is just a gettable port attribute.  Convert switchdev op
switchdev_parent_id_get to a switchdev attr.

Note: for sysfs and netlink interfaces, SWITCHDEV_ATTR_PORT_PARENT_ID is
called with SWITCHDEV_F_NO_RECUSE to limit switch ID user-visiblity to only
port netdevs.  So when a port is stacked under bond/bridge, the user can
only query switch id via the switch ports, but not via the upper devices

Signed-off-by: Scott Feldman <sfeldma@gmail.com>
Acked-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>

4 files changed, 35 insertions, 38 deletions

diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index be86a7ce9282..5a9ce96f6d27 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -458,11 +458,15 @@ static ssize_t phys_switch_id_show(struct device *dev,
                 return restart_syscall();
 
         if (dev_isalive(netdev)) {
-                struct netdev_phys_item_id ppid;
+                struct switchdev_attr attr = {
+                        .id = SWITCHDEV_ATTR_PORT_PARENT_ID,
+                        .flags = SWITCHDEV_F_NO_RECURSE,
+                };
 
-                ret = switchdev_parent_id_get(netdev, &ppid);
+                ret = switchdev_port_attr_get(netdev, &attr);
                 if (!ret)
-                        ret = sprintf(buf, "%*phN\n", ppid.id_len, ppid.id);
+                        ret = sprintf(buf, "%*phN\n", attr.ppid.id_len,
+                                      attr.ppid.id);
         }
         rtnl_unlock();
 
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index fcd41fcd7e70..c6c6b2c34926 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -1004,16 +1004,19 @@ static int rtnl_phys_port_name_fill(struct sk_buff *skb, struct net_device *dev)
 static int rtnl_phys_switch_id_fill(struct sk_buff *skb, struct net_device *dev)
 {
         int err;
-        struct netdev_phys_item_id psid;
+        struct switchdev_attr attr = {
+                .id = SWITCHDEV_ATTR_PORT_PARENT_ID,
+                .flags = SWITCHDEV_F_NO_RECURSE,
+        };
 
-        err = switchdev_parent_id_get(dev, &psid);
+        err = switchdev_port_attr_get(dev, &attr);
         if (err) {
                 if (err == -EOPNOTSUPP)
                         return 0;
                 return err;
         }
 
-        if (nla_put(skb, IFLA_PHYS_SWITCH_ID, psid.id_len, psid.id))
+        if (nla_put(skb, IFLA_PHYS_SWITCH_ID, attr.ppid.id_len, attr.ppid.id))
                 return -EMSGSIZE;
 
         return 0;
diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 1546acf6ebd3..de705b674ac9 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -382,14 +382,20 @@ static int dsa_slave_bridge_port_leave(struct net_device *dev)
         return ret;
 }
 
-static int dsa_slave_parent_id_get(struct net_device *dev,
-                                   struct netdev_phys_item_id *psid)
+static int dsa_slave_port_attr_get(struct net_device *dev,
+                                   struct switchdev_attr *attr)
 {
         struct dsa_slave_priv *p = netdev_priv(dev);
         struct dsa_switch *ds = p->parent;
 
-        psid->id_len = sizeof(ds->index);
-        memcpy(&psid->id, &ds->index, psid->id_len);
+        switch (attr->id) {
+        case SWITCHDEV_ATTR_PORT_PARENT_ID:
+                attr->ppid.id_len = sizeof(ds->index);
+                memcpy(&attr->ppid.id, &ds->index, attr->ppid.id_len);
+                break;
+        default:
+                return -EOPNOTSUPP;
+        }
 
         return 0;
 }
@@ -676,7 +682,7 @@ static const struct net_device_ops dsa_slave_netdev_ops = {
 };
 
 static const struct switchdev_ops dsa_slave_switchdev_ops = {
-        .switchdev_parent_id_get        = dsa_slave_parent_id_get,
+        .switchdev_port_attr_get        = dsa_slave_port_attr_get,
         .switchdev_port_stp_update      = dsa_slave_stp_update,
 };
 
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index 8f47187dc185..117fd0797abd 100644
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@ -19,24 +19,6 @@
 #include <net/switchdev.h>
 
 /**
- *      switchdev_parent_id_get - Get ID of a switch
- *      @dev: port device
- *      @psid: switch ID
- *
- *      Get ID of a switch this port is part of.
- */
-int switchdev_parent_id_get(struct net_device *dev,
-                            struct netdev_phys_item_id *psid)
-{
-        const struct switchdev_ops *ops = dev->switchdev_ops;
-
-        if (!ops || !ops->switchdev_parent_id_get)
-                return -EOPNOTSUPP;
-        return ops->switchdev_parent_id_get(dev, psid);
-}
-EXPORT_SYMBOL_GPL(switchdev_parent_id_get);
-
-/**
  *      switchdev_port_attr_get - Get port attribute
  *
  *      @dev: port device
@@ -414,11 +396,10 @@ static struct net_device *switchdev_get_lowest_dev(struct net_device *dev)
         struct list_head *iter;
 
         /* Recusively search down until we find a sw port dev.
-         * (A sw port dev supports switchdev_parent_id_get).
+         * (A sw port dev supports switchdev_port_attr_get).
          */
 
-        if (dev->features & NETIF_F_HW_SWITCH_OFFLOAD &&
-            ops && ops->switchdev_parent_id_get)
+        if (ops && ops->switchdev_port_attr_get)
                 return dev;
 
         netdev_for_each_lower_dev(dev, lower_dev, iter) {
@@ -432,8 +413,10 @@ static struct net_device *switchdev_get_lowest_dev(struct net_device *dev)
 
 static struct net_device *switchdev_get_dev_by_nhs(struct fib_info *fi)
 {
-        struct netdev_phys_item_id psid;
-        struct netdev_phys_item_id prev_psid;
+        struct switchdev_attr attr = {
+                .id = SWITCHDEV_ATTR_PORT_PARENT_ID,
+        };
+        struct switchdev_attr prev_attr;
         struct net_device *dev = NULL;
         int nhsel;
 
@@ -449,17 +432,18 @@ static struct net_device *switchdev_get_dev_by_nhs(struct fib_info *fi)
                 if (!dev)
                         return NULL;
 
-                if (switchdev_parent_id_get(dev, &psid))
+                if (switchdev_port_attr_get(dev, &attr))
                         return NULL;
 
                 if (nhsel > 0) {
-                        if (prev_psid.id_len != psid.id_len)
+                        if (prev_attr.ppid.id_len != attr.ppid.id_len)
                                 return NULL;
-                        if (memcmp(prev_psid.id, psid.id, psid.id_len))
+                        if (memcmp(prev_attr.ppid.id, attr.ppid.id,
+                                   attr.ppid.id_len))
                                 return NULL;
                 }
 
-                prev_psid = psid;
+                prev_attr = attr;
         }
 
         return dev;