switchdev: convert STP update to switchdev attr set

STP update is just a settable port attribute, so convert
switchdev_port_stp_update to an attr set.

For DSA, the prepare phase is skipped and STP updates are only done in the
commit phase.  This is because currently the DSA drivers don't need to
allocate any memory for STP updates and the STP update will not fail to HW
(unless something horrible goes wrong on the MDIO bus, in which case the
prepare phase wouldn't have been able to predict anyway).

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

diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c
index fa0fa545c0d16a8da755825ea521b0caa3953c09..36827d39a70ae2d3ecfd9fc6fd105de98f69fc31 100644 (file)
--- a/drivers/net/ethernet/rocker/rocker.c
+++ b/drivers/net/ethernet/rocker/rocker.c
@@ -4395,14 +4395,6 @@ static int rocker_port_attr_get(struct net_device *dev,
        return 0;
 }
 
-static int rocker_port_switchdev_port_stp_update(struct net_device *dev,
-                                                u8 state)
-{
-       struct rocker_port *rocker_port = netdev_priv(dev);
-
-       return rocker_port_stp_update(rocker_port, SWITCHDEV_TRANS_NONE, state);
-}
-
 static void rocker_port_trans_abort(struct rocker_port *rocker_port)
 {
        struct list_head *mem, *tmp;
@@ -4431,6 +4423,10 @@ static int rocker_port_attr_set(struct net_device *dev,
        }
 
        switch (attr->id) {
+       case SWITCHDEV_ATTR_PORT_STP_STATE:
+               err = rocker_port_stp_update(rocker_port, attr->trans,
+                                            attr->stp_state);
+               break;
        default:
                err = -EOPNOTSUPP;
                break;
@@ -4466,7 +4462,7 @@ static int rocker_port_switchdev_fib_ipv4_del(struct net_device *dev,
 
 static const struct switchdev_ops rocker_port_switchdev_ops = {
        .switchdev_port_attr_get        = rocker_port_attr_get,
-       .switchdev_port_stp_update      = rocker_port_switchdev_port_stp_update,
+       .switchdev_port_attr_set        = rocker_port_attr_set,
        .switchdev_fib_ipv4_add         = rocker_port_switchdev_fib_ipv4_add,
        .switchdev_fib_ipv4_del         = rocker_port_switchdev_fib_ipv4_del,
 };

diff --git a/include/net/switchdev.h b/include/net/switchdev.h
index 93316e7ab372f523ae41a06b90fc0f099778d7ee..aec5e49661a2bc17c5e00f17369677e356c2f2da 100644 (file)
--- a/include/net/switchdev.h
+++ b/include/net/switchdev.h
@@ -26,6 +26,7 @@ enum switchdev_trans {
 enum switchdev_attr_id {
        SWITCHDEV_ATTR_UNDEFINED,
        SWITCHDEV_ATTR_PORT_PARENT_ID,
+       SWITCHDEV_ATTR_PORT_STP_STATE,
 };
 
 struct switchdev_attr {
@@ -34,6 +35,7 @@ struct switchdev_attr {
        u32 flags;
        union {
                struct netdev_phys_item_id ppid;        /* PORT_PARENT_ID */
+               u8 stp_state;                           /* PORT_STP_STATE */
        };
 };
 
@@ -46,9 +48,6 @@ struct fib_info;
  *
  * @switchdev_port_attr_set: Set a port attribute (see switchdev_attr).
  *
- * @switchdev_port_stp_update: Called to notify switch device port of bridge
- *   port STP state change.
- *
  * @switchdev_fib_ipv4_add: Called to add/modify IPv4 route to switch device.
  *
  * @switchdev_fib_ipv4_del: Called to delete IPv4 route from switch device.
@@ -58,7 +57,6 @@ struct switchdev_ops {
                                           struct switchdev_attr *attr);
        int     (*switchdev_port_attr_set)(struct net_device *dev,
                                           struct switchdev_attr *attr);
-       int     (*switchdev_port_stp_update)(struct net_device *dev, u8 state);
        int     (*switchdev_fib_ipv4_add)(struct net_device *dev, __be32 dst,
                                          int dst_len, struct fib_info *fi,
                                          u8 tos, u8 type, u32 nlflags,
@@ -95,7 +93,6 @@ int switchdev_port_attr_get(struct net_device *dev,
                            struct switchdev_attr *attr);
 int switchdev_port_attr_set(struct net_device *dev,
                            struct switchdev_attr *attr);
-int switchdev_port_stp_update(struct net_device *dev, u8 state);
 int register_switchdev_notifier(struct notifier_block *nb);
 int unregister_switchdev_notifier(struct notifier_block *nb);
 int call_switchdev_notifiers(unsigned long val, struct net_device *dev,
@@ -128,12 +125,6 @@ static inline int switchdev_port_attr_set(struct net_device *dev,
        return -EOPNOTSUPP;
 }
 
-static inline int switchdev_port_stp_update(struct net_device *dev,
-                                           u8 state)
-{
-       return -EOPNOTSUPP;
-}
-
 static inline int register_switchdev_notifier(struct notifier_block *nb)
 {
        return 0;

diff --git a/net/bridge/br_stp.c b/net/bridge/br_stp.c
index 28e3f4bc01e0f16536ed21bc279b411b1c7a5f58..b9300da3156561914125cef55d2359ddf1ccdfde 100644 (file)
--- a/net/bridge/br_stp.c
+++ b/net/bridge/br_stp.c
@@ -39,10 +39,14 @@ void br_log_state(const struct net_bridge_port *p)
 
 void br_set_state(struct net_bridge_port *p, unsigned int state)
 {
+       struct switchdev_attr attr = {
+               .id = SWITCHDEV_ATTR_PORT_STP_STATE,
+               .stp_state = state,
+       };
        int err;
 
        p->state = state;
-       err = switchdev_port_stp_update(p->dev, state);
+       err = switchdev_port_attr_set(p->dev, &attr);
        if (err && err != -EOPNOTSUPP)
                br_warn(p->br, "error setting offload STP state on port %u(%s)\n",
                                (unsigned int) p->port_no, p->dev->name);

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index de705b674ac9d68d678fc9e349c67149197bac9d..3fb5210e318c39bda1d6696f14f686bf68c386b8 100644 (file)
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -345,6 +345,24 @@ static int dsa_slave_stp_update(struct net_device *dev, u8 state)
        return ret;
 }
 
+static int dsa_slave_port_attr_set(struct net_device *dev,
+                                  struct switchdev_attr *attr)
+{
+       int ret = 0;
+
+       switch (attr->id) {
+       case SWITCHDEV_ATTR_PORT_STP_STATE:
+               if (attr->trans == SWITCHDEV_TRANS_COMMIT)
+                       ret = dsa_slave_stp_update(dev, attr->stp_state);
+               break;
+       default:
+               ret = -EOPNOTSUPP;
+               break;
+       }
+
+       return ret;
+}
+
 static int dsa_slave_bridge_port_join(struct net_device *dev,
                                      struct net_device *br)
 {
@@ -683,7 +701,7 @@ static const struct net_device_ops dsa_slave_netdev_ops = {
 
 static const struct switchdev_ops dsa_slave_switchdev_ops = {
        .switchdev_port_attr_get        = dsa_slave_port_attr_get,
-       .switchdev_port_stp_update      = dsa_slave_stp_update,
+       .switchdev_port_attr_set        = dsa_slave_port_attr_set,
 };
 
 static void dsa_slave_adjust_link(struct net_device *dev)

diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index 117fd0797abd5bbb21bea5024e32327961285df1..a3c3590049028ea8d9ec4be9a81f6c18b02b9c68 100644 (file)
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@ -187,34 +187,6 @@ int switchdev_port_attr_set(struct net_device *dev, struct switchdev_attr *attr)
 }
 EXPORT_SYMBOL_GPL(switchdev_port_attr_set);
 
-/**
- *     switchdev_port_stp_update - Notify switch device port of STP
- *                                     state change
- *     @dev: port device
- *     @state: port STP state
- *
- *     Notify switch device port of bridge port STP state change.
- */
-int switchdev_port_stp_update(struct net_device *dev, u8 state)
-{
-       const struct switchdev_ops *ops = dev->switchdev_ops;
-       struct net_device *lower_dev;
-       struct list_head *iter;
-       int err = -EOPNOTSUPP;
-
-       if (ops && ops->switchdev_port_stp_update)
-               return ops->switchdev_port_stp_update(dev, state);
-
-       netdev_for_each_lower_dev(dev, lower_dev, iter) {
-               err = switchdev_port_stp_update(lower_dev, state);
-               if (err && err != -EOPNOTSUPP)
-                       return err;
-       }
-
-       return err;
-}
-EXPORT_SYMBOL_GPL(switchdev_port_stp_update);
-
 static DEFINE_MUTEX(switchdev_mutex);
 static RAW_NOTIFIER_HEAD(switchdev_notif_chain);