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

Commit 56607386 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

bridge: defer switchdev fdb del call in fdb_del_external_learn 



Since spinlock is held here, defer the switchdev operation. Also, ensure
that defered switchdev ops are processed before port master device
is unlinked.

Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4d429c5d

net/bridge/br_fdb.c

+4 −1
Original line number Diff line number Diff line
@@ -134,7 +134,10 @@ static void fdb_del_hw_addr(struct net_bridge *br, const unsigned char *addr) 
static void fdb_del_external_learn(struct net_bridge_fdb_entry *f)

{

	struct switchdev_obj_port_fdb fdb = {

		.obj.id = SWITCHDEV_OBJ_ID_PORT_FDB,

		.obj = {

			.id = SWITCHDEV_OBJ_ID_PORT_FDB,

			.flags = SWITCHDEV_F_DEFER,

		},

		.vid = f->vlan_id,

	};

net/bridge/br_if.c

+3 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/slab.h>

#include <net/sock.h>

#include <linux/if_vlan.h>

#include <net/switchdev.h>



#include "br_private.h"
@@ -250,6 +251,8 @@ static void del_nbp(struct net_bridge_port *p) 


	nbp_vlan_flush(p);

	br_fdb_delete_by_port(br, p, 0, 1);

	switchdev_deferred_process();



	nbp_update_port_count(br);



	netdev_upper_dev_unlink(dev, br->dev);