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

Commit 039d52e1 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'vxlan-FDB-veto' 



Petr Machata says:

====================
vxlan: Allow vetoing FDB operations

mlxsw does not implement handling of the more advanced types of VXLAN
FDB entries. In order to provide visibility to users, it is important to
be able to reject such FDB entries, ideally with an explanation passed
in extended ack. This patch set implements this.

In patches #1-#4, vxlan is gradually transformed to support vetoing of
FDB entries added (or modified) through vxlan_fdb_update(), and the
default FDB entry added in __vxlan_dev_create().

Patches #5-#7 deal with vxlan_changelink(). The existing code recognizes
that vxlan_fdb_update() may fail, but doesn't attempt to keep things
intact if it does. These patches change the function in several steps to
gracefully handle vetoes (or other failures).

Then in patches #8-#11, extack arguments are added, respectively, to
ndo_fdb_add(), mlxsw's mlxsw_sp_nve_ops.fdb_replay, the functions that
connect to the VXLAN vetoing code, and call_switchdev_notifiers(). Note
that call_switchdev_blocking_notifiers() already does support extack.

Finally in patch #12, mlxsw is extended to add extack messages to
rejected FDB entries. In patch #13, the functionality is tested.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 12ff91c8 7e1046fd

Documentation/networking/switchdev.txt

+1 −1
Original line number Diff line number Diff line
@@ -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

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

+2 −1
Original line number Diff line number Diff line
@@ -11644,7 +11644,8 @@ static int i40e_get_phys_port_id(struct net_device *netdev, 
static int i40e_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],

			    struct net_device *dev,

			    const unsigned char *addr, u16 vid,

			    u16 flags)

			    u16 flags,

			    struct netlink_ext_ack *extack)

{

	struct i40e_netdev_priv *np = netdev_priv(dev);

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

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

+2 −1
Original line number Diff line number Diff line
@@ -2438,7 +2438,8 @@ static void ice_set_rx_mode(struct net_device *netdev) 
 */

static int ice_fdb_add(struct ndmsg *ndm, struct nlattr __always_unused *tb[],

		       struct net_device *dev, const unsigned char *addr,

		       u16 vid, u16 flags)

		       u16 vid, u16 flags,

		       struct netlink_ext_ack *extack)

{

	int err;

drivers/net/ethernet/intel/igb/igb_main.c

+2 −1
Original line number Diff line number Diff line
@@ -2486,7 +2486,8 @@ static int igb_set_features(struct net_device *netdev, 
static int igb_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],

			   struct net_device *dev,

			   const unsigned char *addr, u16 vid,

			   u16 flags)

			   u16 flags,

			   struct netlink_ext_ack *extack)

{

	/* guarantee we can provide a unique filter for the unicast address */

	if (is_unicast_ether_addr(addr) || is_link_local_ether_addr(addr)) {

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

+2 −1
Original line number Diff line number Diff line
@@ -9910,7 +9910,8 @@ static void ixgbe_del_udp_tunnel_port(struct net_device *dev, 
static int ixgbe_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],

			     struct net_device *dev,

			     const unsigned char *addr, u16 vid,

			     u16 flags)

			     u16 flags,

			     struct netlink_ext_ack *extack)

{

	/* guarantee we can provide a unique filter for the unicast address */

	if (is_unicast_ether_addr(addr) || is_link_local_ether_addr(addr)) {