net: Get rid of switchdev_port_attr_get()
Subsystems (9)
v3 cover net: Get rid of switchdev_port_attr_get()
Hi all,
This patch series splits the removal of the switchdev_ops that was proposed a few times before and first tackles the easy part which is the removal of the single call to switchdev_port_attr_get() within the bridge code.
As suggestd by Ido, this patch series adds a SWITCHDEV_ATTR_ID_PORT_PRE_BRIDGE_FLAGS which is used in the same context as the caller of switchdev_port_attr_set(), so not deferred, and then the operation is carried out in deferred context with setting a support bridge port flag.
Follow-up patches will do the switchdev_ops removal after introducing the proper helpers for the switchdev blocking notifier to work across stacked devices (unlike the previous submissions).
David this does depend on Russell's "[PATCH net-next v5 0/3] net: dsa:
mv88e6xxx: fix IPv6".
Changes in v3:
- rebased against net-next/master after Russell's IPv6 changes to DSA
- ignore prepare/commit phase for PRE_BRIDGE_FLAGS since we don't want to trigger the WARN() in net/switchdev/switchdev.c in the commit phase
Changes in v2:
- differentiate callers not supporting switchdev_port_attr_set() from the driver not being able to support specific bridge flags
- pass "mask" instead of "flags" for the PRE_BRIDGE_FLAGS check
- skip prepare phase for PRE_BRIDGE_FLAGS
- corrected documentation a bit more
- tested bridge_vlan_aware.sh with veth/VRF
Florian Fainelli (8):
net: switchdev: Add PORT_PRE_BRIDGE_FLAGS
mlxsw: spectrum: Handle PORT_PRE_BRIDGE_FLAGS
staging: fsl-dpaa2: ethsw: Handle PORT_PRE_BRIDGE_FLAGS
net: dsa: Add setter for SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS
rocker: Check Handle PORT_PRE_BRIDGE_FLAGS
net: bridge: Stop calling switchdev_port_attr_get()
net: Remove SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS_SUPPORT
net: Get rid of switchdev_port_attr_get()
Documentation/networking/switchdev.txt | 6 +- .../mellanox/mlxsw/spectrum_switchdev.c | 32 ++++---- drivers/net/ethernet/rocker/rocker_main.c | 74 ++++++++++--------- drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 29 ++++---- include/net/switchdev.h | 13 +--- net/bridge/br_switchdev.c | 11 ++- net/dsa/dsa_priv.h | 2 + net/dsa/port.c | 12 +++ net/dsa/slave.c | 25 +------ 9 files changed, 98 insertions(+), 106 deletions(-)
Signature · 1 line
2.17.1
PATCH v3 1/8 net: switchdev: Add PORT_PRE_BRIDGE_FLAGS
In preparation for removing switchdev_port_attr_get(), introduce PORT_PRE_BRIDGE_FLAGS which will be called through switchdev_port_attr_set(), in the caller's context (possibly atomic) and which must be checked by the switchdev driver in order to return whether the operation is supported or not.
This is entirely analoguous to how the BRIDGE_FLAGS_SUPPORT works, except it goes through a set() instead of get().
--- include/net/switchdev.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
include/net/switchdev.h +2 -1
@@ -46,6 +46,7 @@ enum switchdev_attr_id {SWITCHDEV_ATTR_ID_PORT_STP_STATE ,SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS ,SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS_SUPPORT , +SWITCHDEV_ATTR_ID_PORT_PRE_BRIDGE_FLAGS ,SWITCHDEV_ATTR_ID_PORT_MROUTER ,SWITCHDEV_ATTR_ID_BRIDGE_AGEING_TIME , SWITCHDEV_ATTR_ID_BRIDGE_VLAN_FILTERING,
@@ -61,7 +62,7 @@ struct switchdev_attr {void (*complete)(struct net_device *dev,int err,void *priv);union {u8 stp_state;/* PORT_STP_STATE */ -unsigned long brport_flags;/* PORT_BRIDGE_FLAGS */ +unsigned long brport_flags;/* PORT_{PRE}_BRIDGE_FLAGS */ unsigned long brport_flags_support;/* PORT_BRIDGE_FLAGS_SUPPORT */ bool mrouter;/* PORT_MROUTER */ clock_t ageing_time;/* BRIDGE_AGEING_TIME */
Signature · 1 line
2.17.1
Re: [PATCH net-next v3 1/8] net: switchdev: Add PORT_PRE_BRIDGE_FLAGS
Quoted 10 lines · Florian Fainelli
In preparation for removing
switchdev_port_attr_get(), introducePORT_PRE_BRIDGE_FLAGSwhich will be called throughswitchdev_port_attr_set(), in the caller's context (possibly atomic) and which must be checked by the switchdev driver in order to return whether the operation is supported or not.This is entirely analoguous to how the
BRIDGE_FLAGS_SUPPORTworks, except it goes through aset()instead ofget().Signed-off-by Florian Fainelli <[email protected]>
Re: [PATCH net-next v3 1/8] net: switchdev: Add PORT_PRE_BRIDGE_FLAGS
In reply to Florian FainelliQuoted 10 lines · Thu, Feb 21, 2019 at 01:58:19AM CET, [email protected] wrote:
In preparation for removing
switchdev_port_attr_get(), introducePORT_PRE_BRIDGE_FLAGSwhich will be called throughswitchdev_port_attr_set(), in the caller's context (possibly atomic) and which must be checked by the switchdev driver in order to return whether the operation is supported or not.This is entirely analoguous to how the
BRIDGE_FLAGS_SUPPORTworks, except it goes through aset()instead ofget().Signed-off-by Florian Fainelli <[email protected]>
PATCH v3 2/8 mlxsw: spectrum: Handle PORT_PRE_BRIDGE_FLAGS
In reply to Florian FainelliIn preparation for getting rid of switchdev_port_attr_get(), have mlxsw check for the bridge flags being set through switchdev_port_attr_set() when the SWITCHDEV_ATTR_ID_PORT_PRE_BRIDGE_FLAGS attribute identifier is used.
--- .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c +16 -0
@@ -595,6 +595,17 @@ mlxsw_sp_bridge_port_learning_set(struct mlxsw_sp_port *mlxsw_sp_port,return err; } +static int mlxsw_sp_port_attr_br_pre_flags_set (struct mlxsw_sp_port + *mlxsw_sp_port, +struct switchdev_trans *trans, +unsigned long brport_flags) +{ +if (brport_flags & ~(BR_LEARNING |BR_FLOOD |BR_MCAST_FLOOD )) +return -EINVAL ; + +return 0 ; +} + static int mlxsw_sp_port_attr_br_flags_set(struct mlxsw_sp_port *mlxsw_sp_port, struct switchdev_trans *trans, struct net_device *orig_dev,
@@ -841,6 +852,11 @@ static int mlxsw_sp_port_attr_set(struct net_device *dev, attr->orig_dev, attr->u.stp_state);break ; +case SWITCHDEV_ATTR_ID_PORT_PRE_BRIDGE_FLAGS : + err =mlxsw_sp_port_attr_br_pre_flags_set (mlxsw_sp_port, + trans, + attr->u.brport_flags); +break ;case SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS : err = mlxsw_sp_port_attr_br_flags_set(mlxsw_sp_port, trans, attr->orig_dev,
Signature · 1 line
2.17.1
Re: [PATCH net-next v3 2/8] mlxsw: spectrum: Handle PORT_PRE_BRIDGE_FLAGS
Quoted 6 lines · Florian Fainelli
In preparation for getting rid of
switchdev_port_attr_get(), have mlxsw check for the bridge flags being set throughswitchdev_port_attr_set()when theSWITCHDEV_ATTR_ID_PORT_PRE_BRIDGE_FLAGSattribute identifier is used.Signed-off-by Florian Fainelli <[email protected]>
Re: [PATCH net-next v3 2/8] mlxsw: spectrum: Handle PORT_PRE_BRIDGE_FLAGS
In reply to Florian FainelliQuoted 6 lines · Thu, Feb 21, 2019 at 01:58:20AM CET, [email protected] wrote:
In preparation for getting rid of
switchdev_port_attr_get(), have mlxsw check for the bridge flags being set throughswitchdev_port_attr_set()when theSWITCHDEV_ATTR_ID_PORT_PRE_BRIDGE_FLAGSattribute identifier is used.Signed-off-by Florian Fainelli <[email protected]>
PATCH v3 3/8 staging: fsl-dpaa2: ethsw: Handle PORT_PRE_BRIDGE_FLAGS
In reply to Florian FainelliIn preparation for removing SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS_SUPPORT, handle the SWITCHDEV_ATTR_ID_PORT_PRE_BRIDGE_FLAGS attribute and check that the bridge port flags being configured are supported.
--- drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/staging/fsl-dpaa2/ethsw/ethsw.c +14 -0
@@ -666,6 +666,16 @@ static int port_attr_stp_state_set(struct net_device *netdev,return ethsw_port_set_stp_state (port_priv, state); } +static int port_attr_br_flags_pre_set (struct net_device *netdev, +struct switchdev_trans *trans, +unsigned long flags) +{ +if (flags & ~(BR_LEARNING |BR_FLOOD )) +return -EINVAL ; + +return 0 ; +} +static int port_attr_br_flags_set (struct net_device *netdev,struct switchdev_trans *trans,unsigned long flags)
@@ -698,6 +708,10 @@ static int swdev_port_attr_set(struct net_device *netdev, err =port_attr_stp_state_set (netdev, trans, attr->u.stp_state);break ; +case SWITCHDEV_ATTR_ID_PORT_PRE_BRIDGE_FLAGS : + err =port_attr_br_flags_pre_set (netdev, trans, + attr->u.brport_flags); +break ;case SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS : err =port_attr_br_flags_set (netdev, trans, attr->u.brport_flags);
Signature · 1 line
2.17.1
Re: [PATCH net-next v3 3/8] staging: fsl-dpaa2: ethsw: Handle PORT_PRE_BRIDGE_FLAGS
Quoted 5 lines · Thu, Feb 21, 2019 at 01:58:21AM CET, [email protected] wrote:
In preparation for removing
SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS_SUPPORT, handle theSWITCHDEV_ATTR_ID_PORT_PRE_BRIDGE_FLAGSattribute and check that the bridge port flags being configured are supported.Signed-off-by Florian Fainelli <[email protected]>
PATCH v3 4/8 net: dsa: Add setter for SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS
In reply to Florian FainelliIn preparation for removing SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS_SUPPORT, add support for a function that processes the SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS and SWITCHDEV_ATTR_ID_PORT_PRE_BRIDGE_FLAGS attributes and returns not supported for any flag set, since DSA does not currently support toggling those bridge port attributes (yet).
--- net/dsa/dsa_priv.h | 2 ++ net/dsa/port.c | 12 ++++++++++++ net/dsa/slave.c | 4 ++++ 3 files changed, 18 insertions(+)
net/dsa/dsa_priv.h +2 -0
@@ -160,6 +160,8 @@ int dsa_port_mdb_add(const struct dsa_port *dp, struct switchdev_trans *trans);int dsa_port_mdb_del (const struct dsa_port *dp,const struct switchdev_obj_port_mdb *mdb); +int dsa_port_pre_bridge_flags (const struct dsa_port *dp,unsigned long flags, +struct switchdev_trans *trans);int dsa_port_bridge_flags (const struct dsa_port *dp,unsigned long flags,struct switchdev_trans *trans); int dsa_port_vlan_add(struct dsa_port *dp,
net/dsa/port.c +12 -0
@@ -187,6 +187,18 @@ int dsa_port_ageing_time(struct dsa_port *dp, clock_t ageing_clock,return dsa_port_notify (dp,DSA_NOTIFIER_AGEING_TIME , &info); } +int dsa_port_pre_bridge_flags (const struct dsa_port *dp,unsigned long flags, +struct switchdev_trans *trans) +{ +struct dsa_switch *ds = dp->ds; + +if (!ds->ops->port_egress_floods || + (flags & ~(BR_FLOOD |BR_MCAST_FLOOD ))) +return -EINVAL ; + +return 0 ; +} +int dsa_port_bridge_flags (const struct dsa_port *dp,unsigned long flags,struct switchdev_trans *trans) {
net/dsa/slave.c +4 -0
@@ -295,6 +295,10 @@ static int dsa_slave_port_attr_set(struct net_device *dev,case SWITCHDEV_ATTR_ID_BRIDGE_AGEING_TIME : ret =dsa_port_ageing_time (dp, attr->u.ageing_time, trans);break ; +case SWITCHDEV_ATTR_ID_PORT_PRE_BRIDGE_FLAGS : + ret =dsa_port_pre_bridge_flags (dp, attr->u.brport_flags, + trans); +break ;case SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS : ret =dsa_port_bridge_flags (dp, attr->u.brport_flags, trans);break ;
Signature · 1 line
2.17.1
Re: [PATCH net-next v3 4/8] net: dsa: Add setter for SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS
Quoted 8 lines · Thu, Feb 21, 2019 at 01:58:22AM CET, [email protected] wrote:
In preparation for removing
SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS_SUPPORT, add support for a function that processes theSWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGSandSWITCHDEV_ATTR_ID_PORT_PRE_BRIDGE_FLAGSattributes and returns not supported for any flag set, since DSA does not currently support toggling those bridge port attributes (yet).Signed-off-by Florian Fainelli <[email protected]>
PATCH v3 5/8 rocker: Check Handle PORT_PRE_BRIDGE_FLAGS
In reply to Florian FainelliIn preparation for getting rid of switchdev_port_attr_get(), have rocker check for the bridge flags being set through switchdev_port_attr_set() with the SWITCHDEV_ATTR_ID_PORT_PRE_BRIDGE_FLAGS attribute identifier.
--- drivers/net/ethernet/rocker/rocker_main.c | 55 +++++++++++++++++------ 1 file changed, 41 insertions(+), 14 deletions(-)
drivers/net/ethernet/rocker/rocker_main.c +41 -14
@@ -1566,34 +1566,57 @@ static int rocker_world_port_attr_stp_state_set(struct rocker_port *rocker_port, }static int -rocker_world_port_attr_bridge_flags_set (struct rocker_port *rocker_port, -unsigned long brport_flags, -struct switchdev_trans *trans) +rocker_world_port_attr_bridge_flags_support_get (const struct rocker_port * + rocker_port, +unsigned long * + p_brport_flags_support) {struct rocker_world_ops *wops = rocker_port->rocker->wops; +if (!wops->port_attr_bridge_flags_support_get) +return -EOPNOTSUPP ; +return wops->port_attr_bridge_flags_support_get (rocker_port, + p_brport_flags_support); +} + +static int +rocker_world_port_attr_pre_bridge_flags_set (struct rocker_port *rocker_port, +unsigned long brport_flags, +struct switchdev_trans *trans) +{ +struct rocker_world_ops *wops = rocker_port->rocker->wops; +unsigned long brport_flags_s; +int err; +if (!wops->port_attr_bridge_flags_set)return -EOPNOTSUPP ; -if (switchdev_trans_ph_prepare (trans)) -return 0 ; + err =rocker_world_port_attr_bridge_flags_support_get (rocker_port, + &brport_flags_s); +if (err) +return err; -return wops->port_attr_bridge_flags_set (rocker_port, brport_flags, - trans); +if (brport_flags & ~brport_flags_s) +return -EINVAL ; + +return 0 ; }static int -rocker_world_port_attr_bridge_flags_support_get (const struct rocker_port * - rocker_port, -unsigned long * - p_brport_flags_support) +rocker_world_port_attr_bridge_flags_set (struct rocker_port *rocker_port, +unsigned long brport_flags, +struct switchdev_trans *trans) {struct rocker_world_ops *wops = rocker_port->rocker->wops; -if (!wops->port_attr_bridge_flags_support_get) +if (!wops->port_attr_bridge_flags_set)return -EOPNOTSUPP ; -return wops->port_attr_bridge_flags_support_get (rocker_port, - p_brport_flags_support); + +if (switchdev_trans_ph_prepare (trans)) +return 0 ; + +return wops->port_attr_bridge_flags_set (rocker_port, brport_flags, + trans); } static int
@@ -2074,6 +2097,10 @@ static int rocker_port_attr_set(struct net_device *dev, attr->u.stp_state, trans);break ; +case SWITCHDEV_ATTR_ID_PORT_PRE_BRIDGE_FLAGS : + err =rocker_world_port_attr_pre_bridge_flags_set (rocker_port, + attr->u.brport_flags, + trans);case SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS : err = rocker_world_port_attr_bridge_flags_set(rocker_port, attr->u.brport_flags,
Signature · 1 line
2.17.1
Re: [PATCH net-next v3 5/8] rocker: Check Handle PORT_PRE_BRIDGE_FLAGS
Quoted 5 lines · Thu, Feb 21, 2019 at 01:58:23AM CET, [email protected] wrote:
In preparation for getting rid of
switchdev_port_attr_get(), have rocker check for the bridge flags being set throughswitchdev_port_attr_set()with theSWITCHDEV_ATTR_ID_PORT_PRE_BRIDGE_FLAGSattribute identifier.Signed-off-by Florian Fainelli <[email protected]>
PATCH v3 6/8 net: bridge: Stop calling switchdev_port_attr_get()
In reply to Florian FainelliNow that all switchdev drivers have been converted to check the SWITCHDEV_ATTR_ID_PORT_PRE_BRIDGE_FLAGS flags and report flags that they do not support accordingly, we can migrate the bridge code to try to set that attribute first, check the results and then do the actual setting.
--- net/bridge/br_switchdev.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
net/bridge/br_switchdev.c +5 -6
@@ -64,21 +64,19 @@ int br_switchdev_set_port_flag(struct net_bridge_port *p, {struct switchdev_attr attr = { .orig_dev = p->dev, - .id =SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS_SUPPORT , + .id =SWITCHDEV_ATTR_ID_PORT_PRE_BRIDGE_FLAGS , + .u.brport_flags = mask, };int err;if (mask & ~BR_PORT_FLAGS_HW_OFFLOAD )return 0 ; - err =switchdev_port_attr_get (p->dev, &attr); + err =switchdev_port_attr_set (p->dev, &attr);if (err == -EOPNOTSUPP )return 0 ; -if (err) -return err; -/* Check if specific bridge flag attribute offload is supported */ -if (!(attr.u.brport_flags_support & mask)) { +if (err) {br_warn (p->br,"bridge flag offload is not supported %u(%s)\n" , (unsigned int )p->port_no, p->dev->name);return -EOPNOTSUPP ;
@@ -87,6 +85,7 @@ int br_switchdev_set_port_flag(struct net_bridge_port *p, attr.id =SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS ; attr.flags =SWITCHDEV_F_DEFER ; attr.u.brport_flags = flags; + err =switchdev_port_attr_set (p->dev, &attr);if (err) { br_warn(p->br, "error setting offload flag on port %u(%s)\n",
Signature · 1 line
2.17.1
Re: [PATCH net-next v3 6/8] net: bridge: Stop calling switchdev_port_attr_get()
Quoted 6 lines · Florian Fainelli
Now that all switchdev drivers have been converted to check the
SWITCHDEV_ATTR_ID_PORT_PRE_BRIDGE_FLAGSflags and report flags that they do not support accordingly, we can migrate the bridge code to try to set that attribute first, check the results and then do the actual setting.Signed-off-by Florian Fainelli <[email protected]>
Re: [PATCH net-next v3 6/8] net: bridge: Stop calling switchdev_port_attr_get()
In reply to Florian FainelliQuoted 6 lines · Thu, Feb 21, 2019 at 01:58:24AM CET, [email protected] wrote:
Now that all switchdev drivers have been converted to check the
SWITCHDEV_ATTR_ID_PORT_PRE_BRIDGE_FLAGSflags and report flags that they do not support accordingly, we can migrate the bridge code to try to set that attribute first, check the results and then do the actual setting.Signed-off-by Florian Fainelli <[email protected]>
PATCH v3 7/8 net: Remove SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS_SUPPORT
In reply to Florian FainelliNow that we have converted the bridge code and the drivers to check for bridge port(s) flags at the time we try to set them, there is no need for a get() -> set() sequence anymore and SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS_SUPPORT therefore becomes unused.
--- Documentation/networking/switchdev.txt | 6 ++---- .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 11 +---------- drivers/net/ethernet/rocker/rocker_main.c | 14 +------------- drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 10 +--------- include/net/switchdev.h | 2 -- net/dsa/slave.c | 16 +--------------- 6 files changed, 6 insertions(+), 53 deletions(-)
Documentation/networking/switchdev.txt +2 -4
@@ -232,10 +232,8 @@ Learning_sync attribute enables syncing of the learned/forgotten FDB entry to the bridge's FDB. It's possible, but not optimal, to enable learning on the device port and on the bridge port, and disable learning_sync. -To support learning and learning_sync port attributes, the driver implements -switchdev op switchdev_port_attr_get/set for -SWITCHDEV_ATTR_PORT_ID_BRIDGE_FLAGS. The driver should initialize the attributes -to the hardware defaults. +To support learning, the driver implements switchdev op +switchdev_port_attr_get/set for SWITCHDEV_ATTR_PORT_ID_BRIDGE_FLAGS. FDB Ageing ^^^^^^^^^^
drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c +1 -10
@@ -434,16 +434,7 @@ static void mlxsw_sp_bridge_vlan_put(struct mlxsw_sp_bridge_vlan *bridge_vlan)static int mlxsw_sp_port_attr_get (struct net_device *dev,struct switchdev_attr *attr) { -switch (attr->id) { -case SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS_SUPPORT : - attr->u.brport_flags_support =BR_LEARNING |BR_FLOOD | -BR_MCAST_FLOOD ; -break ; -default : -return -EOPNOTSUPP ; - } - -return 0 ; +return -EOPNOTSUPP ; } static int
drivers/net/ethernet/rocker/rocker_main.c +1 -13
@@ -2069,19 +2069,7 @@ static const struct net_device_ops rocker_port_netdev_ops = {static int rocker_port_attr_get (struct net_device *dev,struct switchdev_attr *attr) { -const struct rocker_port *rocker_port =netdev_priv (dev); -int err =0 ; - -switch (attr->id) { -case SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS_SUPPORT : - err =rocker_world_port_attr_bridge_flags_support_get (rocker_port, - &attr->u.brport_flags_support); -break ; -default : -return -EOPNOTSUPP ; - } - -return err; +return -EOPNOTSUPP ; } static int rocker_port_attr_set(struct net_device *dev,
drivers/staging/fsl-dpaa2/ethsw/ethsw.c +1 -9
@@ -643,15 +643,7 @@ static void ethsw_teardown_irqs(struct fsl_mc_device *sw_dev)static int swdev_port_attr_get (struct net_device *netdev,struct switchdev_attr *attr) { -switch (attr->id) { -case SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS_SUPPORT : - attr->u.brport_flags_support =BR_LEARNING |BR_FLOOD ; -break ; -default : -return -EOPNOTSUPP ; - } - -return 0 ; +return -EOPNOTSUPP ; } static int port_attr_stp_state_set(struct net_device *netdev,
include/net/switchdev.h +0 -2
@@ -45,7 +45,6 @@ enum switchdev_attr_id {SWITCHDEV_ATTR_ID_UNDEFINED ,SWITCHDEV_ATTR_ID_PORT_STP_STATE ,SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS , -SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS_SUPPORT ,SWITCHDEV_ATTR_ID_PORT_PRE_BRIDGE_FLAGS ,SWITCHDEV_ATTR_ID_PORT_MROUTER , SWITCHDEV_ATTR_ID_BRIDGE_AGEING_TIME,
@@ -63,7 +62,6 @@ struct switchdev_attr {union {u8 stp_state;/* PORT_STP_STATE */ unsigned long brport_flags;/* PORT_{PRE}_BRIDGE_FLAGS */ -unsigned long brport_flags_support;/* PORT_BRIDGE_FLAGS_SUPPORT */ bool mrouter;/* PORT_MROUTER */ clock_t ageing_time;/* BRIDGE_AGEING_TIME */ bool vlan_filtering;/* BRIDGE_VLAN_FILTERING */
net/dsa/slave.c +1 -15
@@ -388,21 +388,7 @@ static int dsa_slave_get_port_parent_id(struct net_device *dev,static int dsa_slave_port_attr_get (struct net_device *dev,struct switchdev_attr *attr) { -struct dsa_port *dp =dsa_slave_to_port (dev); -struct dsa_switch *ds = dp->ds; - -switch (attr->id) { -case SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS_SUPPORT : - attr->u.brport_flags_support =0 ; -if (ds->ops->port_egress_floods) - attr->u.brport_flags_support |=BR_FLOOD | -BR_MCAST_FLOOD ; -break ; -default : -return -EOPNOTSUPP ; - } - -return 0 ; +return -EOPNOTSUPP ; } static inline netdev_tx_t dsa_slave_netpoll_send_skb(struct net_device *dev,
Signature · 1 line
2.17.1
Re: [PATCH net-next v3 7/8] net: Remove SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS_SUPPORT
Quoted 7 lines · Thu, Feb 21, 2019 at 01:58:25AM CET, [email protected] wrote:
Now that we have converted the bridge code and the drivers to check for bridge port(s) flags at the time we try to set them, there is no need for a
get()->set()sequence anymore andSWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS_SUPPORTtherefore becomes unused.Reviewed-by Ido Schimmel <[email protected]>Signed-off-by Florian Fainelli <[email protected]>
PATCH v3 8/8 net: Get rid of switchdev_port_attr_get()
In reply to Florian FainelliWith the bridge no longer calling switchdev_port_attr_get() to obtain the supported bridge port flags from a driver but instead trying to set the bridge port flags directly and relying on driver to reject unsupported configurations, we can effectively get rid of switchdev_port_attr_get() entirely since this was the only place where it was called.
--- Documentation/networking/switchdev.txt | 2 +- drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c | 7 ------- drivers/net/ethernet/rocker/rocker_main.c | 7 ------- drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 7 ------- include/net/switchdev.h | 8 -------- net/dsa/slave.c | 7 ------- 6 files changed, 1 insertion(+), 37 deletions(-)
Documentation/networking/switchdev.txt +1 -1
@@ -233,7 +233,7 @@ the bridge's FDB. It's possible, but not optimal, to enable learning on the device port and on the bridge port, and disable learning_sync. To support learning, the driver implements switchdev op -switchdev_port_attr_get/set for SWITCHDEV_ATTR_PORT_ID_BRIDGE_FLAGS. +switchdev_port_attr_set for SWITCHDEV_ATTR_PORT_ID_{PRE}_BRIDGE_FLAGS. FDB Ageing ^^^^^^^^^^
drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c +0 -7
@@ -431,12 +431,6 @@ static void mlxsw_sp_bridge_vlan_put(struct mlxsw_sp_bridge_vlan *bridge_vlan)mlxsw_sp_bridge_vlan_destroy (bridge_vlan); } -static int mlxsw_sp_port_attr_get (struct net_device *dev, -struct switchdev_attr *attr) -{ -return -EOPNOTSUPP ; -} - static int mlxsw_sp_port_bridge_vlan_stp_set(struct mlxsw_sp_port *mlxsw_sp_port, struct mlxsw_sp_bridge_vlan *bridge_vlan,
@@ -1945,7 +1939,6 @@ static struct mlxsw_sp_port *mlxsw_sp_lag_rep_port(struct mlxsw_sp *mlxsw_sp, }static const struct switchdev_ops mlxsw_sp_port_switchdev_ops = { - .switchdev_port_attr_get = mlxsw_sp_port_attr_get, .switchdev_port_attr_set = mlxsw_sp_port_attr_set, };
drivers/net/ethernet/rocker/rocker_main.c +0 -7
@@ -2066,12 +2066,6 @@ static const struct net_device_ops rocker_port_netdev_ops = {* swdev interface ********************/ -static int rocker_port_attr_get (struct net_device *dev, -struct switchdev_attr *attr) -{ -return -EOPNOTSUPP ; -} -static int rocker_port_attr_set (struct net_device *dev,const struct switchdev_attr *attr,struct switchdev_trans *trans)
@@ -2148,7 +2142,6 @@ static int rocker_port_obj_del(struct net_device *dev, }static const struct switchdev_ops rocker_port_switchdev_ops = { - .switchdev_port_attr_get = rocker_port_attr_get, .switchdev_port_attr_set = rocker_port_attr_set, };
drivers/staging/fsl-dpaa2/ethsw/ethsw.c +0 -7
@@ -640,12 +640,6 @@ static void ethsw_teardown_irqs(struct fsl_mc_device *sw_dev)fsl_mc_free_irqs (sw_dev); } -static int swdev_port_attr_get (struct net_device *netdev, -struct switchdev_attr *attr) -{ -return -EOPNOTSUPP ; -} -static int port_attr_stp_state_set (struct net_device *netdev,struct switchdev_trans *trans,u8 state)
@@ -932,7 +926,6 @@ static int swdev_port_obj_del(struct net_device *netdev, }static const struct switchdev_ops ethsw_port_switchdev_ops = { - .switchdev_port_attr_get = swdev_port_attr_get, .switchdev_port_attr_set = swdev_port_attr_set, };
include/net/switchdev.h +0 -8
@@ -179,8 +179,6 @@ switchdev_notifier_info_to_extack(const struct switchdev_notifier_info *info)#ifdef CONFIG_NET_SWITCHDEV void switchdev_deferred_process (void ); -int switchdev_port_attr_get (struct net_device *dev, -struct switchdev_attr *attr);int switchdev_port_attr_set (struct net_device *dev,const struct switchdev_attr *attr); int switchdev_port_obj_add(struct net_device *dev,
@@ -225,12 +223,6 @@ static inline void switchdev_deferred_process(void) { } -static inline int switchdev_port_attr_get (struct net_device *dev, -struct switchdev_attr *attr) -{ -return -EOPNOTSUPP ; -} -static inline int switchdev_port_attr_set (struct net_device *dev,const struct switchdev_attr *attr) {
net/dsa/slave.c +0 -7
@@ -385,12 +385,6 @@ static int dsa_slave_get_port_parent_id(struct net_device *dev,return 0 ; } -static int dsa_slave_port_attr_get (struct net_device *dev, -struct switchdev_attr *attr) -{ -return -EOPNOTSUPP ; -} -static inline netdev_tx_t dsa_slave_netpoll_send_skb (struct net_device *dev,struct sk_buff *skb) {
@@ -1057,7 +1051,6 @@ static const struct net_device_ops dsa_slave_netdev_ops = { };static const struct switchdev_ops dsa_slave_switchdev_ops = { - .switchdev_port_attr_get = dsa_slave_port_attr_get, .switchdev_port_attr_set = dsa_slave_port_attr_set, };
Signature · 1 line
2.17.1
Quoted 8 lines · Florian Fainelli
With the bridge no longer calling
switchdev_port_attr_get()to obtain the supported bridge port flags from a driver but instead trying to set the bridge port flags directly and relying on driver to reject unsupported configurations, we can effectively get rid ofswitchdev_port_attr_get()entirely since this was the only place where it was called.Signed-off-by Florian Fainelli <[email protected]>
Quoted 8 lines · Thu, Feb 21, 2019 at 01:58:26AM CET, [email protected] wrote:
With the bridge no longer calling
switchdev_port_attr_get()to obtain the supported bridge port flags from a driver but instead trying to set the bridge port flags directly and relying on driver to reject unsupported configurations, we can effectively get rid ofswitchdev_port_attr_get()entirely since this was the only place where it was called.Signed-off-by Florian Fainelli <[email protected]>
Thanks!