net: dsa: exit early in dsa_slave_switchdev_event if we can't program the FDB
authorVladimir Oltean <vladimir.oltean@nxp.com>
Wed, 6 Jan 2021 09:51:34 +0000 (11:51 +0200)
committerJakub Kicinski <kuba@kernel.org>
Thu, 7 Jan 2021 23:34:46 +0000 (15:34 -0800)
Right now, the following would happen for a switch driver that does not
implement .port_fdb_add or .port_fdb_del.

dsa_slave_switchdev_event returns NOTIFY_OK and schedules:
-> dsa_slave_switchdev_event_work
   -> dsa_port_fdb_add
      -> dsa_port_notify(DSA_NOTIFIER_FDB_ADD)
         -> dsa_switch_fdb_add
            -> if (!ds->ops->port_fdb_add) return -EOPNOTSUPP;
   -> an error is printed with dev_dbg, and
      dsa_fdb_offload_notify(switchdev_work) is not called.

We can avoid scheduling the worker for nothing and say NOTIFY_DONE.
Because we don't call dsa_fdb_offload_notify, the static FDB entry will
remain just in the software bridge.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/dsa/slave.c

index 42ec18a..37dffe5 100644 (file)
@@ -2132,6 +2132,9 @@ static int dsa_slave_switchdev_event(struct notifier_block *unused,
 
                dp = dsa_slave_to_port(dev);
 
+               if (!dp->ds->ops->port_fdb_add || !dp->ds->ops->port_fdb_del)
+                       return NOTIFY_DONE;
+
                switchdev_work = kzalloc(sizeof(*switchdev_work), GFP_ATOMIC);
                if (!switchdev_work)
                        return NOTIFY_BAD;