Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02e1dbe4 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'Pass-extack-to-SWITCHDEV_PORT_OBJ_ADD' 



Petr Machata says:

====================
Pass extack to SWITCHDEV_PORT_OBJ_ADD

Drivers may need to do validation as a result of port object addition.
An example is mlxsw, which needs to check the configuration of a VXLAN
device attached to an offloaded bridge. Without a mapped VLAN, the
invalidity of the device is not important, but as soon as a pvid,
untagged VLAN is configured for the device, it has to be validated and
offloaded. Should the validation fail, there's currently no way to
communicate details of the failure to the user, beyond an error number.

Because currently, extack is not available at all in that area of code,
this patch starts down at the RTNL level and progresses up towards the
driver(s).

In patch #1, ndo_bridge_setlink is updated to include extack, and
callbacks of all clients are updated as well (ignoring the argument).

In patch #2, the bridge driver is updated to propagate the extack
through to the switchdev border, br_switchdev_port_vlan_add().

Patches #3, #4 and #5 then gradually extend switchdev to pass the extack
argument through to the switchdev blocking notifier chain.

Patches #6 and #7 then update mlxsw to pass the extack argument from
VXLAN events resp. port events on to mlxsw_sp_bridge_8021q_vxlan_join().

Finally in patches #8 and #9, the code paths from the previous two
patches are verified to yield an error message.

v2:
- Patch #1:
    - In ndo_bridge_setlink(), keep the whole extack declaration on the
      same line.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 351cbde9 06a2fc8f

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+1 −1
Original line number Diff line number Diff line
@@ -9618,7 +9618,7 @@ static int bnxt_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq, 
}



static int bnxt_bridge_setlink(struct net_device *dev, struct nlmsghdr *nlh,

			       u16 flags)

			       u16 flags, struct netlink_ext_ack *extack)

{

	struct bnxt *bp = netdev_priv(dev);

	struct nlattr *attr, *br_spec;

drivers/net/ethernet/emulex/benet/be_main.c

+1 −1
Original line number Diff line number Diff line
@@ -4955,7 +4955,7 @@ int be_load_fw(struct be_adapter *adapter, u8 *fw_file) 
}



static int be_ndo_bridge_setlink(struct net_device *dev, struct nlmsghdr *nlh,

				 u16 flags)

				 u16 flags, struct netlink_ext_ack *extack)

{

	struct be_adapter *adapter = netdev_priv(dev);

	struct nlattr *attr, *br_spec;

drivers/net/ethernet/intel/i40e/i40e_main.c

+3 −1
Original line number Diff line number Diff line
@@ -11685,6 +11685,7 @@ static int i40e_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], 
 * @dev: the netdev being configured

 * @nlh: RTNL message

 * @flags: bridge flags

 * @extack: netlink extended ack

 *

 * Inserts a new hardware bridge if not already created and

 * enables the bridging mode requested (VEB or VEPA). If the
@@ -11697,7 +11698,8 @@ static int i40e_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], 
 **/

static int i40e_ndo_bridge_setlink(struct net_device *dev,

				   struct nlmsghdr *nlh,

				   u16 flags)

				   u16 flags,

				   struct netlink_ext_ack *extack)

{

	struct i40e_netdev_priv *np = netdev_priv(dev);

	struct i40e_vsi *vsi = np->vsi;

drivers/net/ethernet/intel/ice/ice_main.c

+2 −1
Original line number Diff line number Diff line
@@ -3624,6 +3624,7 @@ static int ice_vsi_update_bridge_mode(struct ice_vsi *vsi, u16 bmode) 
 * @dev: the netdev being configured

 * @nlh: RTNL message

 * @flags: bridge setlink flags

 * @extack: netlink extended ack

 *

 * Sets the bridge mode (VEB/VEPA) of the switch to which the netdev (VSI) is

 * hooked up to. Iterates through the PF VSI list and sets the loopback mode (if
@@ -3632,7 +3633,7 @@ static int ice_vsi_update_bridge_mode(struct ice_vsi *vsi, u16 bmode) 
 */

static int

ice_bridge_setlink(struct net_device *dev, struct nlmsghdr *nlh,

		   u16 __always_unused flags)

		   u16 __always_unused flags, struct netlink_ext_ack *extack)

{

	struct ice_netdev_priv *np = netdev_priv(dev);

	struct ice_pf *pf = np->vsi->back;

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+2 −1
Original line number Diff line number Diff line
@@ -9979,7 +9979,8 @@ static int ixgbe_configure_bridge_mode(struct ixgbe_adapter *adapter, 
}



static int ixgbe_ndo_bridge_setlink(struct net_device *dev,

				    struct nlmsghdr *nlh, u16 flags)

				    struct nlmsghdr *nlh, u16 flags,

				    struct netlink_ext_ack *extack)

{

	struct ixgbe_adapter *adapter = netdev_priv(dev);

	struct nlattr *attr, *br_spec;