net: Remove switchdev_ops
Subsystems (9)
v3 cover net: Remove switchdev_ops
Hi all,
This patch series completes the removal of the switchdev_ops by converting switchdev_port_attr_set() to use either the blocking (process) or non-blocking (atomic) notifier since we typically need to deal with both depending on where in the bridge code we get called from.
This was tested with the forwarding selftests and DSA hardware.
Ido, hopefully this captures your comments done on v1, if not, can you illustrate with some pseudo-code what you had in mind if that's okay?
Changes in v3:
- added Reviewed-by tags from Ido where relevant
- added missing notifier_to_errno() in net/bridge/br_switchdev.c when calling the atomic notifier for PRE_BRIDGE_FLAGS
- kept mlxsw_sp_switchdev_init() in mlxsw/
Changes in v2:
- do not check for SWITCHDEV_F_DEFER when calling the blocking notifier and instead directly call the atomic notifier from the single location where this is required
Florian Fainelli (8):
switchdev: Add SWITCHDEV_PORT_ATTR_SET
rocker: Handle SWITCHDEV_PORT_ATTR_SET
net: dsa: Handle SWITCHDEV_PORT_ATTR_SET
mlxsw: spectrum_switchdev: Handle SWITCHDEV_PORT_ATTR_SET
net: mscc: ocelot: Handle SWITCHDEV_PORT_ATTR_SET
staging: fsl-dpaa2: ethsw: Handle SWITCHDEV_PORT_ATTR_SET
net: switchdev: Replace port attr set SDO with a notification
net: Remove switchdev_ops
.../net/ethernet/mellanox/mlxsw/spectrum.c | 3 - .../net/ethernet/mellanox/mlxsw/spectrum.h | 2 - .../mellanox/mlxsw/spectrum_switchdev.c | 24 ++-- drivers/net/ethernet/mscc/ocelot.c | 32 +++++- drivers/net/ethernet/mscc/ocelot.h | 1 + drivers/net/ethernet/mscc/ocelot_board.c | 2 + drivers/net/ethernet/rocker/rocker_main.c | 23 +++- drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 24 +++- include/linux/netdevice.h | 3 - include/net/switchdev.h | 38 ++++--- net/bridge/br_switchdev.c | 8 +- net/dsa/slave.c | 23 +++- net/switchdev/switchdev.c | 104 +++++++++++++----- 13 files changed, 204 insertions(+), 83 deletions(-)
Signature · 1 line
2.17.1
PATCH v3 1/8 switchdev: Add SWITCHDEV_PORT_ATTR_SET
In preparation for allowing switchdev enabled drivers to veto specific attribute settings from within the context of the caller, introduce a new switchdev notifier type for port attributes.
--- include/net/switchdev.h | 27 +++++++++++++++++++++ net/switchdev/switchdev.c | 51 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+)
include/net/switchdev.h +27 -0
@@ -132,6 +132,7 @@ enum switchdev_notifier_type {SWITCHDEV_PORT_OBJ_ADD ,/* Blocking. */ SWITCHDEV_PORT_OBJ_DEL ,/* Blocking. */ +SWITCHDEV_PORT_ATTR_SET ,/* May be blocking . */ SWITCHDEV_VXLAN_FDB_ADD_TO_BRIDGE , SWITCHDEV_VXLAN_FDB_DEL_TO_BRIDGE,
@@ -160,6 +161,13 @@ struct switchdev_notifier_port_obj_info {bool handled; }; +struct switchdev_notifier_port_attr_info { +struct switchdev_notifier_info info;/* must be first */ +const struct switchdev_attr *attr; +struct switchdev_trans *trans; +bool handled; +}; +static inline struct net_device *switchdev_notifier_info_to_dev (const struct switchdev_notifier_info *info) {
@@ -212,7 +220,15 @@ int switchdev_handle_port_obj_del(struct net_device *dev,int (*del_cb)(struct net_device *dev, const struct switchdev_obj *obj)); +int switchdev_handle_port_attr_set (struct net_device *dev, +struct switchdev_notifier_port_attr_info *port_attr_info, +bool (*check_cb)(const struct net_device *dev), +int (*set_cb)(struct net_device *dev, +const struct switchdev_attr *attr, +struct switchdev_trans *trans)); +#define SWITCHDEV_SET_OPS (netdev, ops) ((netdev)->switchdev_ops = (ops)) +#else static inline void switchdev_deferred_process (void )
@@ -299,6 +315,17 @@ switchdev_handle_port_obj_del(struct net_device *dev, return 0; } +static inline int +switchdev_handle_port_attr_set (struct net_device *dev, +struct switchdev_notifier_port_attr_info *port_attr_info, +bool (*check_cb)(const struct net_device *dev), +int (*set_cb)(struct net_device *dev, +const struct switchdev_attr *attr, +struct switchdev_trans *trans)) +{ +return 0 ; +} +#define SWITCHDEV_SET_OPS (netdev, ops) do {} while (0)#endif
net/switchdev/switchdev.c +51 -0
54 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v3 2/8 rocker: Handle SWITCHDEV_PORT_ATTR_SET
In reply to Florian FainelliFollowing patches will change the way we communicate setting a port's attribute and use notifiers towards that goal.
Prepare rocker to support receiving notifier events targeting SWITCHDEV_PORT_ATTR_SET from both atomic and process context and use a small helper to translate the event notifier into something that rocker_port_attr_set() can process.
--- drivers/net/ethernet/rocker/rocker_main.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
drivers/net/ethernet/rocker/rocker_main.c +18 -0
@@ -2710,6 +2710,19 @@ static bool rocker_port_dev_check(const struct net_device *dev)return dev->netdev_ops == &rocker_port_netdev_ops; } +static int +rocker_switchdev_port_attr_set_event (struct net_device *netdev, +struct switchdev_notifier_port_attr_info *port_attr_info) +{ +int err; + + err =rocker_port_attr_set (netdev, port_attr_info->attr, + port_attr_info->trans); + + port_attr_info->handled = true; +return notifier_from_errno (err); +} +struct rocker_switchdev_event_work {struct work_struct work;struct switchdev_notifier_fdb_info fdb_info;
@@ -2779,6 +2792,9 @@ static int rocker_switchdev_event(struct notifier_block *unused,if (!rocker_port_dev_check (dev))return NOTIFY_DONE ; +if (event ==SWITCHDEV_PORT_ATTR_SET ) +return rocker_switchdev_port_attr_set_event (dev, ptr); + rocker_port =netdev_priv (dev); switchdev_work =kzalloc (sizeof (*switchdev_work),GFP_ATOMIC );if (WARN_ON (!switchdev_work))
@@ -2841,6 +2857,8 @@ static int rocker_switchdev_blocking_event(struct notifier_block *unused,case SWITCHDEV_PORT_OBJ_ADD :case SWITCHDEV_PORT_OBJ_DEL :return rocker_switchdev_port_obj_event (event, dev, ptr); +case SWITCHDEV_PORT_ATTR_SET : +return rocker_switchdev_port_attr_set_event (dev, ptr); }return NOTIFY_DONE ;
Signature · 1 line
2.17.1
PATCH v3 3/8 net: dsa: Handle SWITCHDEV_PORT_ATTR_SET
In reply to Florian FainelliFollowing patches will change the way we communicate setting a port's attribute and use notifiers towards that goal.
Prepare DSA to support receiving notifier events targeting SWITCHDEV_PORT_ATTR_SET from both atomic and process context and use a small helper to translate the event notifier into something that dsa_slave_port_attr_set() can process.
--- net/dsa/slave.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
net/dsa/slave.c +18 -0
@@ -1524,6 +1524,19 @@ static int dsa_slave_netdevice_event(struct notifier_block *nb,return NOTIFY_DONE ; } +static int +dsa_slave_switchdev_port_attr_set_event (struct net_device *netdev, +struct switchdev_notifier_port_attr_info *port_attr_info) +{ +int err; + + err =dsa_slave_port_attr_set (netdev, port_attr_info->attr, + port_attr_info->trans); + + port_attr_info->handled = true; +return notifier_from_errno (err); +} +struct dsa_switchdev_event_work {struct work_struct work;struct switchdev_notifier_fdb_info fdb_info;
@@ -1602,6 +1615,9 @@ static int dsa_slave_switchdev_event(struct notifier_block *unused,if (!dsa_slave_dev_check (dev))return NOTIFY_DONE ; +if (event ==SWITCHDEV_PORT_ATTR_SET ) +return dsa_slave_switchdev_port_attr_set_event (dev, ptr); + switchdev_work =kzalloc (sizeof (*switchdev_work),GFP_ATOMIC );if (!switchdev_work)return NOTIFY_BAD ;
@@ -1664,6 +1680,8 @@ static int dsa_slave_switchdev_blocking_event(struct notifier_block *unused,case SWITCHDEV_PORT_OBJ_ADD :/* fall through */ case SWITCHDEV_PORT_OBJ_DEL :return dsa_slave_switchdev_port_obj_event (event, dev, ptr); +case SWITCHDEV_PORT_ATTR_SET : +return dsa_slave_switchdev_port_attr_set_event (dev, ptr); }return NOTIFY_DONE ;
Signature · 1 line
2.17.1
PATCH v3 4/8 mlxsw: spectrum_switchdev: Handle SWITCHDEV_PORT_ATTR_SET
In reply to Florian FainelliFollowing patches will change the way we communicate setting a port's attribute and use a notifier to perform those tasks.
Prepare mlxsw to support receiving notifier events targeting SWITCHDEV_PORT_ATTR_SET and utilize the switchdev_handle_port_attr_set() to handle stacking of devices.
--- .../net/ethernet/mellanox/mlxsw/spectrum_switchdev.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c +12 -0
@@ -3123,6 +3123,13 @@ static int mlxsw_sp_switchdev_event(struct notifier_block *unused,struct net_device *br_dev;int err; +if (event ==SWITCHDEV_PORT_ATTR_SET ) { + err =switchdev_handle_port_attr_set (dev, ptr, + mlxsw_sp_port_dev_check, + mlxsw_sp_port_attr_set); +return notifier_from_errno (err); + } +/* Tunnel devices are not our uppers, so check their master instead */ br_dev =netdev_master_upper_dev_get_rcu (dev);if (!br_dev)
@@ -3446,6 +3453,11 @@ static int mlxsw_sp_switchdev_blocking_event(struct notifier_block *unused, mlxsw_sp_port_dev_check, mlxsw_sp_port_obj_del);return notifier_from_errno (err); +case SWITCHDEV_PORT_ATTR_SET : + err =switchdev_handle_port_attr_set (dev, ptr, + mlxsw_sp_port_dev_check, + mlxsw_sp_port_attr_set); +return notifier_from_errno (err); }return NOTIFY_DONE ;
Signature · 1 line
2.17.1
PATCH v3 5/8 net: mscc: ocelot: Handle SWITCHDEV_PORT_ATTR_SET
In reply to Florian FainelliFollowing patches will change the way we communicate setting a port's attribute and use notifiers to perform those tasks.
Ocelot does not currently have an atomic notifier registered for switchdev events, so we need to register one in order to deal with atomic context SWITCHDEV_PORT_ATTR_SET events.
--- drivers/net/ethernet/mscc/ocelot.c | 27 ++++++++++++++++++++++++ drivers/net/ethernet/mscc/ocelot.h | 1 + drivers/net/ethernet/mscc/ocelot_board.c | 2 ++ 3 files changed, 30 insertions(+)
drivers/net/ethernet/mscc/ocelot.c +27 -0
@@ -1582,6 +1582,28 @@ struct notifier_block ocelot_netdevice_nb __read_mostly = { };EXPORT_SYMBOL (ocelot_netdevice_nb); +static int ocelot_switchdev_event (struct notifier_block *unused, +unsigned long event,void *ptr) +{ +struct net_device *dev =switchdev_notifier_info_to_dev (ptr); +int err; + +switch (event) { +case SWITCHDEV_PORT_ATTR_SET : + err =switchdev_handle_port_attr_set (dev, ptr, + ocelot_netdevice_dev_check, + ocelot_port_attr_set); +return notifier_from_errno (err); + } + +return NOTIFY_DONE ; +} + +struct notifier_block ocelot_switchdev_nb__read_mostly = { + .notifier_call = ocelot_switchdev_event, +}; +EXPORT_SYMBOL (ocelot_switchdev_nb); +static int ocelot_switchdev_blocking_event (struct notifier_block *unused,unsigned long event,void *ptr) {
@@ -1600,6 +1622,11 @@ static int ocelot_switchdev_blocking_event(struct notifier_block *unused, ocelot_netdevice_dev_check, ocelot_port_obj_del);return notifier_from_errno (err); +case SWITCHDEV_PORT_ATTR_SET : + err =switchdev_handle_port_attr_set (dev, ptr, + ocelot_netdevice_dev_check, + ocelot_port_attr_set); +return notifier_from_errno (err); }return NOTIFY_DONE ;
drivers/net/ethernet/mscc/ocelot.h +1 -0
@@ -499,6 +499,7 @@ int ocelot_probe_port(struct ocelot *ocelot, u8 port, struct phy_device *phy);extern struct notifier_block ocelot_netdevice_nb; +extern struct notifier_block ocelot_switchdev_nb;extern struct notifier_block ocelot_switchdev_blocking_nb;#endif
drivers/net/ethernet/mscc/ocelot_board.c +2 -0
@@ -329,6 +329,7 @@ static int mscc_ocelot_probe(struct platform_device *pdev) }register_netdevice_notifier (&ocelot_netdevice_nb); +register_switchdev_notifier (&ocelot_switchdev_nb);register_switchdev_blocking_notifier (&ocelot_switchdev_blocking_nb);dev_info (&pdev->dev,"Ocelot switch probed\n" );
@@ -345,6 +346,7 @@ static int mscc_ocelot_remove(struct platform_device *pdev)ocelot_deinit (ocelot);unregister_switchdev_blocking_notifier (&ocelot_switchdev_blocking_nb); +unregister_switchdev_notifier (&ocelot_switchdev_nb);unregister_netdevice_notifier (&ocelot_netdevice_nb);return 0 ;
Signature · 1 line
2.17.1
PATCH v3 6/8 staging: fsl-dpaa2: ethsw: Handle SWITCHDEV_PORT_ATTR_SET
In reply to Florian FainelliFollowing patches will change the way we communicate setting a port's attribute and use a blocking notifier to perform those tasks.
Prepare ethsw to support receiving notifier events targeting SWITCHDEV_PORT_ATTR_SET and simply translate that into the existing swdev_port_attr_set() call.
--- drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
drivers/staging/fsl-dpaa2/ethsw/ethsw.c +21 -0
@@ -929,6 +929,19 @@ static const struct switchdev_ops ethsw_port_switchdev_ops = { .switchdev_port_attr_set = swdev_port_attr_set, }; +static int +ethsw_switchdev_port_attr_set_event (struct net_device *netdev, +struct switchdev_notifier_port_attr_info *port_attr_info) +{ +int err; + + err =swdev_port_attr_set (netdev, port_attr_info->attr, + port_attr_info->trans); + + port_attr_info->handled = true; +return notifier_from_errno (err); +} +/* For the moment, only flood setting needs to be updated */ static int port_bridge_join (struct net_device *netdev,struct net_device *upper_dev)
@@ -1047,6 +1060,12 @@ static int port_switchdev_event(struct notifier_block *unused,struct ethsw_switchdev_event_work *switchdev_work;struct switchdev_notifier_fdb_info *fdb_info = ptr; +if (!ethsw_port_dev_check (dev)) +return NOTIFY_DONE ; + +if (event ==SWITCHDEV_PORT_ATTR_SET ) +return ethsw_switchdev_port_attr_set_event (dev, ptr); + switchdev_work =kzalloc (sizeof (*switchdev_work),GFP_ATOMIC );if (!switchdev_work)return NOTIFY_BAD ;
@@ -1115,6 +1134,8 @@ static int port_switchdev_blocking_event(struct notifier_block *unused,case SWITCHDEV_PORT_OBJ_ADD :/* fall through */ case SWITCHDEV_PORT_OBJ_DEL :return ethsw_switchdev_port_obj_event (event, dev, ptr); +case SWITCHDEV_PORT_ATTR_SET : +return ethsw_switchdev_port_attr_set_event (dev, ptr); }return NOTIFY_DONE ;
Signature · 1 line
2.17.1
PATCH v3 7/8 net: switchdev: Replace port attr set SDO with a notification
In reply to Florian FainelliDrop switchdev_ops.switchdev_port_attr_set. Drop the uses of this field from all clients, which were migrated to use switchdev notification in the previous patches.
Add a new function switchdev_port_attr_notify() that sends the switchdev notifications SWITCHDEV_PORT_ATTR_SET and calls the blocking (process) notifier chain.
We have one odd case within net/bridge/br_switchdev.c with the SWITCHDEV_ATTR_ID_PORT_PRE_BRIDGE_FLAGS attribute identifier that requires executing from atomic context, we deal with that one specifically.
Drop __switchdev_port_attr_set() and update switchdev_port_attr_set() likewise.
--- net/bridge/br_switchdev.c | 8 +++++- net/switchdev/switchdev.c | 53 ++++++++++++++++++--------------------- 2 files changed, 31 insertions(+), 30 deletions(-)
net/bridge/br_switchdev.c +7 -1
@@ -67,12 +67,18 @@ int br_switchdev_set_port_flag(struct net_bridge_port *p, .id = SWITCHDEV_ATTR_ID_PORT_PRE_BRIDGE_FLAGS, .u.brport_flags = mask, }; +struct switchdev_notifier_port_attr_info info = { + .attr = &attr, + };int err;if (mask & ~BR_PORT_FLAGS_HW_OFFLOAD )return 0 ; - err =switchdev_port_attr_set (p->dev, &attr); +/* We run from atomic context here */ + err =call_switchdev_notifiers (SWITCHDEV_PORT_ATTR_SET , p->dev, + &info.info,NULL ); + err =notifier_to_errno (err);if (err == -EOPNOTSUPP )return 0 ;
net/switchdev/switchdev.c +24 -29
77 lines not on this page · raw message
Signature · 1 line
2.17.1
Re: [PATCH net-next v3 7/8] net: switchdev: Replace port attr set SDO with a notification
Quoted 13 lines · Florian Fainelli
Drop switchdev_ops.switchdev_port_attr_set. Drop the uses of this field from all clients, which were migrated to use switchdev notification in the previous patches.
Add a new function
switchdev_port_attr_notify()that sends the switchdev notificationsSWITCHDEV_PORT_ATTR_SETand calls the blocking (process) notifier chain.We have one odd case within
net/bridge/br_switchdev.cwith theSWITCHDEV_ATTR_ID_PORT_PRE_BRIDGE_FLAGSattribute identifier that requires executing from atomic context, we deal with that one specifically.
Quoted 4 lines
Drop
__switchdev_port_attr_set()and updateswitchdev_port_attr_set()likewise.Signed-off-by Florian Fainelli <[email protected]>
One small nit that you can address in a follow-up:
Quoted 9 lines
net/bridge/br_switchdev.c +3
-0@@ -67,12 +67,18 @@ int br_switchdev_set_port_flag(struct net_bridge_port *p, .id = SWITCHDEV_ATTR_ID_PORT_PRE_BRIDGE_FLAGS, .u.brport_flags = mask, }; +struct switchdev_notifier_port_attr_info info = { + .attr = &attr, + };int err;
net/bridge/br_switchdev.c int br_switchdev_set_port_flag(struct net_bridge_port *p, · line 83
Quoted 10 lines
net/bridge/br_switchdev.c +4
-1if (mask & ~BR_PORT_FLAGS_HW_OFFLOAD )return 0 ; - err =switchdev_port_attr_set (p->dev, &attr); +/* We run from atomic context here */ + err =call_switchdev_notifiers (SWITCHDEV_PORT_ATTR_SET , p->dev, + &info.info,NULL ); + err =notifier_to_errno (err);if (err == -EOPNOTSUPP )return 0 ;
This check can be removed. The code below checks err and fails the operation in case of error.
PATCH v3 8/8 net: Remove switchdev_ops
In reply to Florian FainelliNow that we have converted all possible callers to using a switchdev notifier for attributes we do not have a need for implementing switchdev_ops anymore, and this can be removed from all drivers the net_device structure.
--- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 3 --- drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 2 -- .../mellanox/mlxsw/spectrum_switchdev.c | 12 ------------ drivers/net/ethernet/mscc/ocelot.c | 5 ----- drivers/net/ethernet/rocker/rocker_main.c | 5 ----- drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 5 ----- include/linux/netdevice.h | 3 --- include/net/switchdev.h | 17 ----------------- net/dsa/slave.c | 5 ----- 9 files changed, 57 deletions(-)
drivers/net/ethernet/mellanox/mlxsw/spectrum.c +0 -3
@@ -3660,7 +3660,6 @@ static int mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port, } mlxsw_sp_port->default_vlan = mlxsw_sp_port_vlan; -mlxsw_sp_port_switchdev_init (mlxsw_sp_port); mlxsw_sp->ports[local_port] = mlxsw_sp_port; err =register_netdev (dev);if (err) {
@@ -3677,7 +3676,6 @@ static int mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port, err_register_netdev: mlxsw_sp->ports[local_port] =NULL ; -mlxsw_sp_port_switchdev_fini (mlxsw_sp_port);mlxsw_sp_port_vlan_destroy (mlxsw_sp_port_vlan); err_port_vlan_create: err_port_pvid_set:
@@ -3720,7 +3718,6 @@ static void mlxsw_sp_port_remove(struct mlxsw_sp *mlxsw_sp, u8 local_port)mlxsw_core_port_clear (mlxsw_sp->core, local_port, mlxsw_sp);unregister_netdev (mlxsw_sp_port->dev);/* This calls ndo_stop */ mlxsw_sp->ports[local_port] =NULL ; -mlxsw_sp_port_switchdev_fini (mlxsw_sp_port);mlxsw_sp_port_vlan_flush (mlxsw_sp_port, true);mlxsw_sp_port_nve_fini (mlxsw_sp_port);mlxsw_sp_tc_qdisc_fini (mlxsw_sp_port);
drivers/net/ethernet/mellanox/mlxsw/spectrum.h +0 -2
@@ -407,8 +407,6 @@ extern const struct mlxsw_sp_sb_vals mlxsw_sp2_sb_vals;/* spectrum_switchdev.c */ int mlxsw_sp_switchdev_init (struct mlxsw_sp *mlxsw_sp);void mlxsw_sp_switchdev_fini (struct mlxsw_sp *mlxsw_sp); -void mlxsw_sp_port_switchdev_init (struct mlxsw_sp_port *mlxsw_sp_port); -void mlxsw_sp_port_switchdev_fini (struct mlxsw_sp_port *mlxsw_sp_port);int mlxsw_sp_rif_fdb_op (struct mlxsw_sp *mlxsw_sp,const char *mac,u16 fid,bool adding);void
drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c +0 -12
@@ -1938,10 +1938,6 @@ static struct mlxsw_sp_port *mlxsw_sp_lag_rep_port(struct mlxsw_sp *mlxsw_sp,return NULL ; } -static const struct switchdev_ops mlxsw_sp_port_switchdev_ops = { - .switchdev_port_attr_set = mlxsw_sp_port_attr_set, -}; - static int mlxsw_sp_bridge_8021q_port_join(struct mlxsw_sp_bridge_device *bridge_device, struct mlxsw_sp_bridge_port *bridge_port,
@@ -3545,11 +3541,3 @@ void mlxsw_sp_switchdev_fini(struct mlxsw_sp *mlxsw_sp)kfree (mlxsw_sp->bridge); } -void mlxsw_sp_port_switchdev_init (struct mlxsw_sp_port *mlxsw_sp_port) -{ - mlxsw_sp_port->dev->switchdev_ops = &mlxsw_sp_port_switchdev_ops; -} - -void mlxsw_sp_port_switchdev_fini (struct mlxsw_sp_port *mlxsw_sp_port) -{ -}
drivers/net/ethernet/mscc/ocelot.c +0 -5
@@ -1324,10 +1324,6 @@ static int ocelot_port_obj_del(struct net_device *dev,return ret; } -static const struct switchdev_ops ocelot_port_switchdev_ops = { - .switchdev_port_attr_set = ocelot_port_attr_set, -}; -static int ocelot_port_bridge_join (struct ocelot_port *ocelot_port,struct net_device *bridge) {
@@ -1660,7 +1656,6 @@ int ocelot_probe_port(struct ocelot *ocelot, u8 port, dev->netdev_ops = &ocelot_port_netdev_ops; dev->ethtool_ops = &ocelot_ethtool_ops; - dev->switchdev_ops = &ocelot_port_switchdev_ops; dev->hw_features |=NETIF_F_HW_VLAN_CTAG_FILTER |NETIF_F_RXFCS ; dev->features |=NETIF_F_HW_VLAN_CTAG_FILTER ;
drivers/net/ethernet/rocker/rocker_main.c +0 -5
@@ -2142,10 +2142,6 @@ static int rocker_port_obj_del(struct net_device *dev,return err; } -static const struct switchdev_ops rocker_port_switchdev_ops = { - .switchdev_port_attr_set = rocker_port_attr_set, -}; -struct rocker_fib_event_work {struct work_struct work;union {
@@ -2599,7 +2595,6 @@ static int rocker_probe_port(struct rocker *rocker, unsigned int port_number)rocker_port_dev_addr_init (rocker_port); dev->netdev_ops = &rocker_port_netdev_ops; dev->ethtool_ops = &rocker_port_ethtool_ops; - dev->switchdev_ops = &rocker_port_switchdev_ops;netif_tx_napi_add (dev, &rocker_port->napi_tx, rocker_port_poll_tx,NAPI_POLL_WEIGHT ); netif_napi_add(dev, &rocker_port->napi_rx, rocker_port_poll_rx,
drivers/staging/fsl-dpaa2/ethsw/ethsw.c +0 -5
@@ -925,10 +925,6 @@ static int swdev_port_obj_del(struct net_device *netdev,return err; } -static const struct switchdev_ops ethsw_port_switchdev_ops = { - .switchdev_port_attr_set = swdev_port_attr_set, -}; -static int ethsw_switchdev_port_attr_set_event (struct net_device *netdev,struct switchdev_notifier_port_attr_info *port_attr_info)
@@ -1455,7 +1451,6 @@ static int ethsw_probe_port(struct ethsw_core *ethsw, u16 port_idx)SET_NETDEV_DEV (port_netdev, dev); port_netdev->netdev_ops = ðsw_port_ops; port_netdev->ethtool_ops = ðsw_port_ethtool_ops; - port_netdev->switchdev_ops = ðsw_port_switchdev_ops;/* Set MTU limits */ port_netdev->min_mtu =ETH_MIN_MTU ;
include/linux/netdevice.h +0 -3
@@ -1843,9 +1843,6 @@ struct net_device {#endif const struct net_device_ops *netdev_ops;const struct ethtool_ops *ethtool_ops; -#ifdef CONFIG_NET_SWITCHDEV -const struct switchdev_ops *switchdev_ops; -#endif #ifdef CONFIG_NET_L3_MASTER_DEV const struct l3mdev_ops *l3mdev_ops;#endif
include/net/switchdev.h +0 -17
@@ -112,17 +112,6 @@ void *switchdev_trans_item_dequeue(struct switchdev_trans *trans);typedef int switchdev_obj_dump_cb_t (struct switchdev_obj *obj); -/** -* struct switchdev_ops - switchdev operations -* -* @switchdev_port_attr_set: Set a port attribute (see switchdev_attr). -*/ -struct switchdev_ops { -int (*switchdev_port_attr_set)(struct net_device *dev, -const struct switchdev_attr *attr, -struct switchdev_trans *trans); -}; -enum switchdev_notifier_type {SWITCHDEV_FDB_ADD_TO_BRIDGE =1 ,SWITCHDEV_FDB_DEL_TO_BRIDGE ,
@@ -226,9 +215,6 @@ int switchdev_handle_port_attr_set(struct net_device *dev,int (*set_cb)(struct net_device *dev,const struct switchdev_attr *attr, struct switchdev_trans *trans)); - -#define SWITCHDEV_SET_OPS (netdev, ops) ((netdev)->switchdev_ops = (ops)) -#else static inline void switchdev_deferred_process (void )
@@ -325,9 +311,6 @@ switchdev_handle_port_attr_set(struct net_device *dev, {return 0 ; } - -#define SWITCHDEV_SET_OPS (netdev, ops) do {} while (0) -#endif #endif /* _LINUX_SWITCHDEV_H_ */
net/dsa/slave.c +0 -5
@@ -1118,10 +1118,6 @@ static const struct net_device_ops dsa_slave_netdev_ops = { .ndo_vlan_rx_kill_vid = dsa_slave_vlan_rx_kill_vid, }; -static const struct switchdev_ops dsa_slave_switchdev_ops = { - .switchdev_port_attr_set = dsa_slave_port_attr_set, -}; -static struct device_type dsa_type = { .name ="dsa" , };
@@ -1382,7 +1378,6 @@ int dsa_slave_create(struct dsa_port *port)eth_hw_addr_inherit (slave_dev, master); slave_dev->priv_flags |=IFF_NO_QUEUE ; slave_dev->netdev_ops = &dsa_slave_netdev_ops; - slave_dev->switchdev_ops = &dsa_slave_switchdev_ops; slave_dev->min_mtu =0 ; slave_dev->max_mtu =ETH_MAX_MTU ;SET_NETDEV_DEVTYPE (slave_dev, &dsa_type);
Signature · 1 line
2.17.1
Quoted 6 lines · Florian Fainelli
Now that we have converted all possible callers to using a switchdev notifier for attributes we do not have a need for implementing
switchdev_opsanymore, and this can be removed from all drivers thenet_devicestructure.Signed-off-by Florian Fainelli <[email protected]>
Quoted 8 lines · Florian Fainelli
Hi all,
This patch series completes the removal of the
switchdev_opsby convertingswitchdev_port_attr_set()to use either the blocking (process) or non-blocking (atomic) notifier since we typically need to deal with both depending on where in the bridge code we get called from.This was tested with the forwarding selftests and DSA hardware.
I ran some basic tests and nothing exploded :) Thanks, Florian!
David Miller
maintainerFrom: Florian Fainelli <[email protected]>
Date: Wed, 27 Feb 2019 11:44:24 -0800
Quoted 17 lines
This patch series completes the removal of the
switchdev_opsby convertingswitchdev_port_attr_set()to use either the blocking (process) or non-blocking (atomic) notifier since we typically need to deal with both depending on where in the bridge code we get called from.This was tested with the forwarding selftests and DSA hardware.
Ido, hopefully this captures your comments done on v1, if not, can you illustrate with some pseudo-code what you had in mind if that's okay?
Changes in v3:
- added Reviewed-by tags from Ido where relevant
- added missingnotifier_to_errno()innet/bridge/br_switchdev.cwhen calling the atomic notifier forPRE_BRIDGE_FLAGS
- keptmlxsw_sp_switchdev_init()in mlxsw/
Quoted 5 lines
Changes in v2:
- do not check for
SWITCHDEV_F_DEFERwhen calling the blocking notifier and instead directly call the atomic notifier from the single location where this is required
Series applied, thanks Florian.
I'll push this out after my build tests complete.