staging: dpaa2-switch: accept only vlan-aware upper devices

The DPAA2 Switch is not capable to handle traffic in a VLAN unaware
fashion, thus the previous handling of both the accepted upper devices
and the SWITCHDEV_ATTR_ID_BRIDGE_VLAN_FILTERING flag was wrong.

Fix this by checking if the bridge that we are joining is indeed VLAN
aware, if not return an error. Also, the RX VLAN filtering feature is
defined as 'on [fixed]' and the .ndo_vlan_rx_add_vid() and
.ndo_vlan_rx_kill_vid() callbacks are implemented just by recreating a
switchdev_obj_port_vlan object and then calling the same functions used
on the switchdev notifier path.
In addition, changing the vlan_filtering flag to 0 on a bridge under
which a DPAA2 switch interface is present is not supported, thus
rejected when SWITCHDEV_ATTR_ID_BRIDGE_VLAN_FILTERING is received with
such a request.

This patch is also adding the use of the switchdev_handle_port_attr_set
function so that we can iterate through all the lower devices of the
bridge that the notification was received on and actually catch if the
user is trying to change the vlan_filtering state. Since on a VLAN
filtering change the net_device is the bridge, we also move the
dpaa2_switch_port_dev_check call so that we do not return NOTIFY_DONE
right away.

Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/staging/fsl-dpaa2/Kconfig b/drivers/staging/fsl-dpaa2/Kconfig
index 244237bb068a7a77d037c7cea079e0f2c69ba953..7cb005b6e7ab71155307fdcd71e57386822b0395 100644 (file)
--- a/drivers/staging/fsl-dpaa2/Kconfig
+++ b/drivers/staging/fsl-dpaa2/Kconfig
@@ -12,6 +12,7 @@ config FSL_DPAA2
 
 config FSL_DPAA2_ETHSW
        tristate "Freescale DPAA2 Ethernet Switch"
+       depends on BRIDGE || BRIDGE=n
        depends on FSL_DPAA2
        depends on NET_SWITCHDEV
        help

diff --git a/drivers/staging/fsl-dpaa2/ethsw/ethsw.c b/drivers/staging/fsl-dpaa2/ethsw/ethsw.c
index 1f8976898291f9a24e1ec29a3281001837b422c8..8058bc3ed467a416fe879cbe7d3cbc5fda11ae23 100644 (file)
--- a/drivers/staging/fsl-dpaa2/ethsw/ethsw.c
+++ b/drivers/staging/fsl-dpaa2/ethsw/ethsw.c
@@ -800,6 +800,34 @@ err_map:
        return err;
 }
 
+static int dpaa2_switch_port_vlan_add(struct net_device *netdev, __be16 proto,
+                                     u16 vid)
+{
+       struct switchdev_obj_port_vlan vlan = {
+               .obj.id = SWITCHDEV_OBJ_ID_PORT_VLAN,
+               .vid = vid,
+               .obj.orig_dev = netdev,
+               /* This API only allows programming tagged, non-PVID VIDs */
+               .flags = 0,
+       };
+
+       return dpaa2_switch_port_vlans_add(netdev, &vlan);
+}
+
+static int dpaa2_switch_port_vlan_kill(struct net_device *netdev, __be16 proto,
+                                      u16 vid)
+{
+       struct switchdev_obj_port_vlan vlan = {
+               .obj.id = SWITCHDEV_OBJ_ID_PORT_VLAN,
+               .vid = vid,
+               .obj.orig_dev = netdev,
+               /* This API only allows programming tagged, non-PVID VIDs */
+               .flags = 0,
+       };
+
+       return dpaa2_switch_port_vlans_del(netdev, &vlan);
+}
+
 static int dpaa2_switch_port_set_mac_addr(struct ethsw_port_priv *port_priv)
 {
        struct ethsw_core *ethsw = port_priv->ethsw_data;
@@ -981,6 +1009,8 @@ static const struct net_device_ops dpaa2_switch_port_ops = {
        .ndo_has_offload_stats  = dpaa2_switch_port_has_offload_stats,
        .ndo_get_offload_stats  = dpaa2_switch_port_get_offload_stats,
        .ndo_fdb_dump           = dpaa2_switch_port_fdb_dump,
+       .ndo_vlan_rx_add_vid    = dpaa2_switch_port_vlan_add,
+       .ndo_vlan_rx_kill_vid   = dpaa2_switch_port_vlan_kill,
 
        .ndo_start_xmit         = dpaa2_switch_port_tx,
        .ndo_get_port_parent_id = dpaa2_switch_port_parent_id,
@@ -1114,7 +1144,8 @@ static int dpaa2_switch_port_attr_stp_state_set(struct net_device *netdev,
 }
 
 static int dpaa2_switch_port_attr_set(struct net_device *netdev,
-                                     const struct switchdev_attr *attr)
+                                     const struct switchdev_attr *attr,
+                                     struct netlink_ext_ack *extack)
 {
        int err = 0;
 
@@ -1124,7 +1155,11 @@ static int dpaa2_switch_port_attr_set(struct net_device *netdev,
                                                           attr->u.stp_state);
                break;
        case SWITCHDEV_ATTR_ID_BRIDGE_VLAN_FILTERING:
-               /* VLANs are supported by default  */
+               if (!attr->u.vlan_filtering) {
+                       NL_SET_ERR_MSG_MOD(extack,
+                                          "The DPAA2 switch does not support VLAN-unaware operation");
+                       return -EOPNOTSUPP;
+               }
                break;
        default:
                err = -EOPNOTSUPP;
@@ -1134,8 +1169,8 @@ static int dpaa2_switch_port_attr_set(struct net_device *netdev,
        return err;
 }
 
-static int dpaa2_switch_port_vlans_add(struct net_device *netdev,
-                                      const struct switchdev_obj_port_vlan *vlan)
+int dpaa2_switch_port_vlans_add(struct net_device *netdev,
+                               const struct switchdev_obj_port_vlan *vlan)
 {
        struct ethsw_port_priv *port_priv = netdev_priv(netdev);
        struct ethsw_core *ethsw = port_priv->ethsw_data;
@@ -1303,8 +1338,8 @@ static int dpaa2_switch_port_del_vlan(struct ethsw_port_priv *port_priv, u16 vid
        return 0;
 }
 
-static int dpaa2_switch_port_vlans_del(struct net_device *netdev,
-                                      const struct switchdev_obj_port_vlan *vlan)
+int dpaa2_switch_port_vlans_del(struct net_device *netdev,
+                               const struct switchdev_obj_port_vlan *vlan)
 {
        struct ethsw_port_priv *port_priv = netdev_priv(netdev);
 
@@ -1356,14 +1391,13 @@ static int dpaa2_switch_port_obj_del(struct net_device *netdev,
 }
 
 static int dpaa2_switch_port_attr_set_event(struct net_device *netdev,
-                                           struct switchdev_notifier_port_attr_info
-                                           *port_attr_info)
+                                           struct switchdev_notifier_port_attr_info *ptr)
 {
        int err;
 
-       err = dpaa2_switch_port_attr_set(netdev, port_attr_info->attr);
-
-       port_attr_info->handled = true;
+       err = switchdev_handle_port_attr_set(netdev, ptr,
+                                            dpaa2_switch_port_dev_check,
+                                            dpaa2_switch_port_attr_set);
        return notifier_from_errno(err);
 }
 
@@ -1517,14 +1551,24 @@ static int dpaa2_switch_port_netdevice_event(struct notifier_block *nb,
 {
        struct net_device *netdev = netdev_notifier_info_to_dev(ptr);
        struct netdev_notifier_changeupper_info *info = ptr;
+       struct netlink_ext_ack *extack;
        struct net_device *upper_dev;
        int err = 0;
 
        if (!dpaa2_switch_port_dev_check(netdev))
                return NOTIFY_DONE;
 
-       /* Handle just upper dev link/unlink for the moment */
-       if (event == NETDEV_CHANGEUPPER) {
+       extack = netdev_notifier_info_to_extack(&info->info);
+
+       switch (event) {
+       case NETDEV_PRECHANGEUPPER:
+               upper_dev = info->upper_dev;
+               if (netif_is_bridge_master(upper_dev) && !br_vlan_enabled(upper_dev)) {
+                       NL_SET_ERR_MSG_MOD(extack, "Cannot join a VLAN-unaware bridge");
+                       err = -EOPNOTSUPP;
+               }
+               break;
+       case NETDEV_CHANGEUPPER:
                upper_dev = info->upper_dev;
                if (netif_is_bridge_master(upper_dev)) {
                        if (info->linking)
@@ -1532,6 +1576,7 @@ static int dpaa2_switch_port_netdevice_event(struct notifier_block *nb,
                        else
                                err = dpaa2_switch_port_bridge_leave(netdev);
                }
+               break;
        }
 
        return notifier_from_errno(err);
@@ -1597,12 +1642,12 @@ static int dpaa2_switch_port_event(struct notifier_block *nb,
        struct switchdev_notifier_fdb_info *fdb_info = ptr;
        struct ethsw_core *ethsw = port_priv->ethsw_data;
 
-       if (!dpaa2_switch_port_dev_check(dev))
-               return NOTIFY_DONE;
-
        if (event == SWITCHDEV_PORT_ATTR_SET)
                return dpaa2_switch_port_attr_set_event(dev, ptr);
 
+       if (!dpaa2_switch_port_dev_check(dev))
+               return NOTIFY_DONE;
+
        switchdev_work = kzalloc(sizeof(*switchdev_work), GFP_ATOMIC);
        if (!switchdev_work)
                return NOTIFY_BAD;
@@ -1646,6 +1691,9 @@ static int dpaa2_switch_port_obj_event(unsigned long event,
 {
        int err = -EOPNOTSUPP;
 
+       if (!dpaa2_switch_port_dev_check(netdev))
+               return NOTIFY_DONE;
+
        switch (event) {
        case SWITCHDEV_PORT_OBJ_ADD:
                err = dpaa2_switch_port_obj_add(netdev, port_obj_info->obj);
@@ -1664,9 +1712,6 @@ static int dpaa2_switch_port_blocking_event(struct notifier_block *nb,
 {
        struct net_device *dev = switchdev_notifier_info_to_dev(ptr);
 
-       if (!dpaa2_switch_port_dev_check(dev))
-               return NOTIFY_DONE;
-
        switch (event) {
        case SWITCHDEV_PORT_OBJ_ADD:
        case SWITCHDEV_PORT_OBJ_DEL:
@@ -2542,6 +2587,11 @@ static int dpaa2_switch_probe_port(struct ethsw_core *ethsw,
         */
        ethsw->ports[port_idx] = port_priv;
 
+       /* The DPAA2 switch's ingress path depends on the VLAN table,
+        * thus we are not able to disable VLAN filtering.
+        */
+       port_netdev->features = NETIF_F_HW_VLAN_CTAG_FILTER | NETIF_F_HW_VLAN_STAG_FILTER;
+
        err = dpaa2_switch_port_init(port_priv, port_idx);
        if (err)
                goto err_port_probe;

diff --git a/drivers/staging/fsl-dpaa2/ethsw/ethsw.h b/drivers/staging/fsl-dpaa2/ethsw/ethsw.h
index 0c228509fcd4f7a7b98ebcbdb030c8ed99f1db9a..ac9335c833575ed6ad493d88f2db7cc1b7d8e151 100644 (file)
--- a/drivers/staging/fsl-dpaa2/ethsw/ethsw.h
+++ b/drivers/staging/fsl-dpaa2/ethsw/ethsw.h
@@ -166,4 +166,10 @@ static inline bool dpaa2_switch_supports_cpu_traffic(struct ethsw_core *ethsw)
 
 bool dpaa2_switch_port_dev_check(const struct net_device *netdev);
 
+int dpaa2_switch_port_vlans_add(struct net_device *netdev,
+                               const struct switchdev_obj_port_vlan *vlan);
+
+int dpaa2_switch_port_vlans_del(struct net_device *netdev,
+                               const struct switchdev_obj_port_vlan *vlan);
+
 #endif /* __ETHSW_H */