switchdev: Add extack argument to call_switchdev_notifiers()

A follow-up patch will enable vetoing of FDB entries. Make it possible
to communicate details of why an FDB entry is not acceptable back to the
user.

Signed-off-by: Petr Machata <petrm@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/Documentation/networking/switchdev.txt b/Documentation/networking/switchdev.txt
index 82236a17b5e65198be004d2cdd6a7c5bd8a9b7d4..f3244d87512adfb396389cf38338a438c24a0e35 100644 (file)
--- a/Documentation/networking/switchdev.txt
+++ b/Documentation/networking/switchdev.txt
@@ -196,7 +196,7 @@ The switch device will learn/forget source MAC address/VLAN on ingress packets
 and notify the switch driver of the mac/vlan/port tuples.  The switch driver,
 in turn, will notify the bridge driver using the switchdev notifier call:
 
-       err = call_switchdev_notifiers(val, dev, info);
+       err = call_switchdev_notifiers(val, dev, info, extack);
 
 Where val is SWITCHDEV_FDB_ADD when learning and SWITCHDEV_FDB_DEL when
 forgetting, and info points to a struct switchdev_notifier_fdb_info.  On

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
index 98e5ffd71b919d51581e3b4437aa919de861ef5a..042341c7f6b999a4b29da6112c07e179b5c7fa3e 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
@@ -7294,7 +7294,8 @@ static void mlxsw_sp_rif_vlan_fdb_del(struct mlxsw_sp_rif *rif, const char *mac)
 
        info.addr = mac;
        info.vid = vid;
-       call_switchdev_notifiers(SWITCHDEV_FDB_DEL_TO_BRIDGE, dev, &info.info);
+       call_switchdev_notifiers(SWITCHDEV_FDB_DEL_TO_BRIDGE, dev, &info.info,
+                                NULL);
 }
 
 static const struct mlxsw_sp_rif_ops mlxsw_sp_rif_vlan_ops = {
@@ -7381,7 +7382,8 @@ static void mlxsw_sp_rif_fid_fdb_del(struct mlxsw_sp_rif *rif, const char *mac)
 
        info.addr = mac;
        info.vid = 0;
-       call_switchdev_notifiers(SWITCHDEV_FDB_DEL_TO_BRIDGE, dev, &info.info);
+       call_switchdev_notifiers(SWITCHDEV_FDB_DEL_TO_BRIDGE, dev, &info.info,
+                                NULL);
 }
 
 static const struct mlxsw_sp_rif_ops mlxsw_sp_rif_fid_ops = {

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
index 0abbaa0fbf14c3cad231022f45edf3089d18c6b0..71aad9d4e160289194c6fba04f811f863dae16f4 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
@@ -2443,7 +2443,7 @@ static void mlxsw_sp_fdb_vxlan_call_notifiers(struct net_device *dev,
        ether_addr_copy(info.eth_addr, mac);
        info.vni = vni;
        info.offloaded = adding;
-       call_switchdev_notifiers(type, dev, &info.info);
+       call_switchdev_notifiers(type, dev, &info.info, NULL);
 }
 
 static void mlxsw_sp_fdb_nve_call_notifiers(struct net_device *dev,
@@ -2468,7 +2468,7 @@ mlxsw_sp_fdb_call_notifiers(enum switchdev_notifier_type type,
        info.addr = mac;
        info.vid = vid;
        info.offloaded = offloaded;
-       call_switchdev_notifiers(type, dev, &info.info);
+       call_switchdev_notifiers(type, dev, &info.info, NULL);
 }
 
 static void mlxsw_sp_fdb_notify_mac_process(struct mlxsw_sp *mlxsw_sp,
@@ -2819,7 +2819,7 @@ mlxsw_sp_switchdev_bridge_vxlan_fdb_event(struct mlxsw_sp *mlxsw_sp,
                        return;
                vxlan_fdb_info.offloaded = true;
                call_switchdev_notifiers(SWITCHDEV_VXLAN_FDB_OFFLOADED, dev,
-                                        &vxlan_fdb_info.info);
+                                        &vxlan_fdb_info.info, NULL);
                mlxsw_sp_fdb_call_notifiers(SWITCHDEV_FDB_OFFLOADED,
                                            vxlan_fdb_info.eth_addr,
                                            fdb_info->vid, dev, true);
@@ -2832,7 +2832,7 @@ mlxsw_sp_switchdev_bridge_vxlan_fdb_event(struct mlxsw_sp *mlxsw_sp,
                                                     false);
                vxlan_fdb_info.offloaded = false;
                call_switchdev_notifiers(SWITCHDEV_VXLAN_FDB_OFFLOADED, dev,
-                                        &vxlan_fdb_info.info);
+                                        &vxlan_fdb_info.info, NULL);
                break;
        }
 }
@@ -2977,7 +2977,7 @@ mlxsw_sp_switchdev_vxlan_fdb_add(struct mlxsw_sp *mlxsw_sp,
                }
                vxlan_fdb_info->offloaded = true;
                call_switchdev_notifiers(SWITCHDEV_VXLAN_FDB_OFFLOADED, dev,
-                                        &vxlan_fdb_info->info);
+                                        &vxlan_fdb_info->info, NULL);
                mlxsw_sp_fid_put(fid);
                return;
        }
@@ -2998,7 +2998,7 @@ mlxsw_sp_switchdev_vxlan_fdb_add(struct mlxsw_sp *mlxsw_sp,
                goto err_fdb_tunnel_uc_op;
        vxlan_fdb_info->offloaded = true;
        call_switchdev_notifiers(SWITCHDEV_VXLAN_FDB_OFFLOADED, dev,
-                                &vxlan_fdb_info->info);
+                                &vxlan_fdb_info->info, NULL);
        mlxsw_sp_fdb_call_notifiers(SWITCHDEV_FDB_OFFLOADED,
                                    vxlan_fdb_info->eth_addr, vid, dev, true);
 

diff --git a/drivers/net/ethernet/rocker/rocker_main.c b/drivers/net/ethernet/rocker/rocker_main.c
index 6213827e3956486a47b8e924a04f410de0dca79c..62a205eba9f75a2241bf43a7e69870fb9466e4c5 100644 (file)
--- a/drivers/net/ethernet/rocker/rocker_main.c
+++ b/drivers/net/ethernet/rocker/rocker_main.c
@@ -2725,7 +2725,7 @@ rocker_fdb_offload_notify(struct rocker_port *rocker_port,
        info.vid = recv_info->vid;
        info.offloaded = true;
        call_switchdev_notifiers(SWITCHDEV_FDB_OFFLOADED,
-                                rocker_port->dev, &info.info);
+                                rocker_port->dev, &info.info, NULL);
 }
 
 static void rocker_switchdev_event_work(struct work_struct *work)

diff --git a/drivers/net/ethernet/rocker/rocker_ofdpa.c b/drivers/net/ethernet/rocker/rocker_ofdpa.c
index 6473cc68c2d5cc081a9bc70dd320b377be0991f5..bea7895930f616a22988f8d404e0f99373e7b755 100644 (file)
--- a/drivers/net/ethernet/rocker/rocker_ofdpa.c
+++ b/drivers/net/ethernet/rocker/rocker_ofdpa.c
@@ -1833,10 +1833,10 @@ static void ofdpa_port_fdb_learn_work(struct work_struct *work)
        rtnl_lock();
        if (learned && removing)
                call_switchdev_notifiers(SWITCHDEV_FDB_DEL_TO_BRIDGE,
-                                        lw->ofdpa_port->dev, &info.info);
+                                        lw->ofdpa_port->dev, &info.info, NULL);
        else if (learned && !removing)
                call_switchdev_notifiers(SWITCHDEV_FDB_ADD_TO_BRIDGE,
-                                        lw->ofdpa_port->dev, &info.info);
+                                        lw->ofdpa_port->dev, &info.info, NULL);
        rtnl_unlock();
 
        kfree(work);

diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index a9e90159bb61b8b21bbd68b46dd76059ae93130a..ef45c3c925be19c008f10cc8ba97abb7a36b2baf 100644 (file)
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -393,7 +393,7 @@ static int vxlan_fdb_switchdev_call_notifiers(struct vxlan_dev *vxlan,
                               : SWITCHDEV_VXLAN_FDB_DEL_TO_DEVICE;
        vxlan_fdb_switchdev_notifier_info(vxlan, fdb, rd, NULL, &info);
        ret = call_switchdev_notifiers(notifier_type, vxlan->dev,
-                                      &info.info);
+                                      &info.info, extack);
        return notifier_to_errno(ret);
 }
 

diff --git a/include/net/switchdev.h b/include/net/switchdev.h
index a7fdab5ee6c3be35cf14b91a872fbcdecb61d3e7..63843ae5dc811184a03fdc3c522ababd10c0bb5f 100644 (file)
--- a/include/net/switchdev.h
+++ b/include/net/switchdev.h
@@ -195,7 +195,8 @@ int switchdev_port_obj_del(struct net_device *dev,
 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,
-                            struct switchdev_notifier_info *info);
+                            struct switchdev_notifier_info *info,
+                            struct netlink_ext_ack *extack);
 
 int register_switchdev_blocking_notifier(struct notifier_block *nb);
 int unregister_switchdev_blocking_notifier(struct notifier_block *nb);
@@ -267,7 +268,8 @@ static inline int unregister_switchdev_notifier(struct notifier_block *nb)
 
 static inline int call_switchdev_notifiers(unsigned long val,
                                           struct net_device *dev,
-                                          struct switchdev_notifier_info *info)
+                                          struct switchdev_notifier_info *info,
+                                          struct netlink_ext_ack *extack)
 {
        return NOTIFY_DONE;
 }

diff --git a/net/bridge/br_switchdev.c b/net/bridge/br_switchdev.c
index 035ff59d9cbd8dde7dc93426da8ea91be08906bd..4d2b9eb7604a7571c44ff5e4aa1af46059fdbcbc 100644 (file)
--- a/net/bridge/br_switchdev.c
+++ b/net/bridge/br_switchdev.c
@@ -113,7 +113,7 @@ br_switchdev_fdb_call_notifiers(bool adding, const unsigned char *mac,
        info.added_by_user = added_by_user;
        info.offloaded = offloaded;
        notifier_type = adding ? SWITCHDEV_FDB_ADD_TO_DEVICE : SWITCHDEV_FDB_DEL_TO_DEVICE;
-       call_switchdev_notifiers(notifier_type, dev, &info.info);
+       call_switchdev_notifiers(notifier_type, dev, &info.info, NULL);
 }
 
 void

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index d5680a98a7f021c408d51c057ad4ee5f4cea8307..91de3a6632268153022500a72f1b774c2796dbde 100644 (file)
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -1451,7 +1451,7 @@ static void dsa_slave_switchdev_event_work(struct work_struct *work)
                }
                fdb_info->offloaded = true;
                call_switchdev_notifiers(SWITCHDEV_FDB_OFFLOADED, dev,
-                                        &fdb_info->info);
+                                        &fdb_info->info, NULL);
                break;
 
        case SWITCHDEV_FDB_DEL_TO_DEVICE:

diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index 5df9d1138ac9026b03639d87b543a7cf5ea20905..cd78253de31dc1563c89d35940359db771ee20e2 100644 (file)
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@ -556,10 +556,11 @@ EXPORT_SYMBOL_GPL(unregister_switchdev_notifier);
  *     Call all network notifier blocks.
  */
 int call_switchdev_notifiers(unsigned long val, struct net_device *dev,
-                            struct switchdev_notifier_info *info)
+                            struct switchdev_notifier_info *info,
+                            struct netlink_ext_ack *extack)
 {
        info->dev = dev;
-       info->extack = NULL;
+       info->extack = extack;
        return atomic_notifier_call_chain(&switchdev_notif_chain, val, info);
 }
 EXPORT_SYMBOL_GPL(call_switchdev_notifiers);