switchdev: introduce switchdev add/del obj ops

Like switchdev attr get/set, add new switchdev obj add/del.  switchdev objs
will be things like VLANs or FIB entries, so add/del fits better for
objects than get/set used for attributes.

Use same two-phase prepare-commit transaction model as in attr set.

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

1 files changed, 107 insertions, 0 deletions

diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index a3c359004902..3d4d99a70b80 100644
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@ -187,6 +187,113 @@ int switchdev_port_attr_set(struct net_device *dev, struct switchdev_attr *attr)
 }
 EXPORT_SYMBOL_GPL(switchdev_port_attr_set);
 
+int __switchdev_port_obj_add(struct net_device *dev, struct switchdev_obj *obj)
+{
+        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_obj_add)
+                return ops->switchdev_port_obj_add(dev, obj);
+
+        /* Switch device port(s) may be stacked under
+         * bond/team/vlan dev, so recurse down to add object on
+         * each port.
+         */
+
+        netdev_for_each_lower_dev(dev, lower_dev, iter) {
+                err = __switchdev_port_obj_add(lower_dev, obj);
+                if (err)
+                        break;
+        }
+
+        return err;
+}
+
+/**
+ *      switchdev_port_obj_add - Add port object
+ *
+ *      @dev: port device
+ *      @obj: object to add
+ *
+ *      Use a 2-phase prepare-commit transaction model to ensure
+ *      system is not left in a partially updated state due to
+ *      failure from driver/device.
+ *
+ *      rtnl_lock must be held.
+ */
+int switchdev_port_obj_add(struct net_device *dev, struct switchdev_obj *obj)
+{
+        int err;
+
+        ASSERT_RTNL();
+
+        /* Phase I: prepare for obj add. Driver/device should fail
+         * here if there are going to be issues in the commit phase,
+         * such as lack of resources or support.  The driver/device
+         * should reserve resources needed for the commit phase here,
+         * but should not commit the obj.
+         */
+
+        obj->trans = SWITCHDEV_TRANS_PREPARE;
+        err = __switchdev_port_obj_add(dev, obj);
+        if (err) {
+                /* Prepare phase failed: abort the transaction.  Any
+                 * resources reserved in the prepare phase are
+                 * released.
+                 */
+
+                obj->trans = SWITCHDEV_TRANS_ABORT;
+                __switchdev_port_obj_add(dev, obj);
+
+                return err;
+        }
+
+        /* Phase II: commit obj add.  This cannot fail as a fault
+         * of driver/device.  If it does, it's a bug in the driver/device
+         * because the driver said everythings was OK in phase I.
+         */
+
+        obj->trans = SWITCHDEV_TRANS_COMMIT;
+        err = __switchdev_port_obj_add(dev, obj);
+        WARN(err, "%s: Commit of object (id=%d) failed.\n", dev->name, obj->id);
+
+        return err;
+}
+EXPORT_SYMBOL_GPL(switchdev_port_obj_add);
+
+/**
+ *      switchdev_port_obj_del - Delete port object
+ *
+ *      @dev: port device
+ *      @obj: object to delete
+ */
+int switchdev_port_obj_del(struct net_device *dev, struct switchdev_obj *obj)
+{
+        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_obj_del)
+                return ops->switchdev_port_obj_del(dev, obj);
+
+        /* Switch device port(s) may be stacked under
+         * bond/team/vlan dev, so recurse down to delete object on
+         * each port.
+         */
+
+        netdev_for_each_lower_dev(dev, lower_dev, iter) {
+                err = switchdev_port_obj_del(lower_dev, obj);
+                if (err)
+                        break;
+        }
+
+        return err;
+}
+EXPORT_SYMBOL_GPL(switchdev_port_obj_del);
+
 static DEFINE_MUTEX(switchdev_mutex);
 static RAW_NOTIFIER_HEAD(switchdev_notif_chain);