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

Commit 92899063 authored by Nikolay Aleksandrov's avatar Nikolay Aleksandrov Committed by David S. Miller
Browse files

net: bridge: add notifications for the bridge dev on vlan change 



Currently the bridge device doesn't generate any notifications upon vlan
modifications on itself because it doesn't use the generic bridge
notifications.
With the recent changes we know if anything was modified in the vlan config
thus we can generate a notification when necessary for the bridge device
so add support to br_ifinfo_notify() similar to how other combined
functions are done - if port is present it takes precedence, otherwise
notify about the bridge. I've explicitly marked the locations where the
notification should be always for the port by setting bridge to NULL.
I've also taken the liberty to rearrange each modified function's local
variables in reverse xmas tree as well.

Signed-off-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ad88d35a

net/bridge/br.c

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static int br_device_event(struct notifier_block *unused, unsigned long event, v 
	/* Events that may cause spanning tree to refresh */

	if (event == NETDEV_CHANGEADDR || event == NETDEV_UP ||

	    event == NETDEV_CHANGE || event == NETDEV_DOWN)

		br_ifinfo_notify(RTM_NEWLINK, p);

		br_ifinfo_notify(RTM_NEWLINK, NULL, p);



	return NOTIFY_DONE;

}

net/bridge/br_if.c

+2 −2
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ static void del_nbp(struct net_bridge_port *p) 
	br_stp_disable_port(p);

	spin_unlock_bh(&br->lock);



	br_ifinfo_notify(RTM_DELLINK, p);

	br_ifinfo_notify(RTM_DELLINK, NULL, p);



	list_del_rcu(&p->list);

	if (netdev_get_fwd_headroom(dev) == br->dev->needed_headroom)
@@ -589,7 +589,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev, 
		br_stp_enable_port(p);

	spin_unlock_bh(&br->lock);



	br_ifinfo_notify(RTM_NEWLINK, p);

	br_ifinfo_notify(RTM_NEWLINK, NULL, p);



	if (changed_addr)

		call_netdevice_notifiers(NETDEV_CHANGEADDR, br->dev);

net/bridge/br_ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ static int old_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) 


	if (!ret) {

		if (p)

			br_ifinfo_notify(RTM_NEWLINK, p);

			br_ifinfo_notify(RTM_NEWLINK, NULL, p);

		else

			netdev_state_change(br->dev);

	}

net/bridge/br_netlink.c

+32 −26
Original line number Diff line number Diff line
@@ -361,14 +361,14 @@ static int br_fill_ifvlaninfo(struct sk_buff *skb, 
 * Contains port and master info as well as carrier and bridge state.

 */

static int br_fill_ifinfo(struct sk_buff *skb,

			  struct net_bridge_port *port,

			  const struct net_bridge_port *port,

			  u32 pid, u32 seq, int event, unsigned int flags,

			  u32 filter_mask, const struct net_device *dev)

{

	u8 operstate = netif_running(dev) ? dev->operstate : IF_OPER_DOWN;

	struct net_bridge *br;

	struct ifinfomsg *hdr;

	struct nlmsghdr *nlh;

	u8 operstate = netif_running(dev) ? dev->operstate : IF_OPER_DOWN;



	if (port)

		br = port->br;
@@ -454,28 +454,36 @@ static int br_fill_ifinfo(struct sk_buff *skb, 
	return -EMSGSIZE;

}



/*

 * Notify listeners of a change in port information

 */

void br_ifinfo_notify(int event, struct net_bridge_port *port)

/* Notify listeners of a change in bridge or port information */

void br_ifinfo_notify(int event, const struct net_bridge *br,

		      const struct net_bridge_port *port)

{

	struct net *net;

	u32 filter = RTEXT_FILTER_BRVLAN_COMPRESSED;

	struct net_device *dev;

	struct sk_buff *skb;

	int err = -ENOBUFS;

	u32 filter = RTEXT_FILTER_BRVLAN_COMPRESSED;

	struct net *net;

	u16 port_no = 0;



	if (!port)

	if (WARN_ON(!port && !br))

		return;



	net = dev_net(port->dev);

	br_debug(port->br, "port %u(%s) event %d\n",

		 (unsigned int)port->port_no, port->dev->name, event);

	if (port) {

		dev = port->dev;

		br = port->br;

		port_no = port->port_no;

	} else {

		dev = br->dev;

	}



	net = dev_net(dev);

	br_debug(br, "port %u(%s) event %d\n", port_no, dev->name, event);



	skb = nlmsg_new(br_nlmsg_size(port->dev, filter), GFP_ATOMIC);

	skb = nlmsg_new(br_nlmsg_size(dev, filter), GFP_ATOMIC);

	if (skb == NULL)

		goto errout;



	err = br_fill_ifinfo(skb, port, 0, 0, event, 0, filter, port->dev);

	err = br_fill_ifinfo(skb, port, 0, 0, event, 0, filter, dev);

	if (err < 0) {

		/* -EMSGSIZE implies BUG in br_nlmsg_size() */

		WARN_ON(err == -EMSGSIZE);
@@ -488,7 +496,6 @@ void br_ifinfo_notify(int event, struct net_bridge_port *port) 
	rtnl_set_sk_err(net, RTNLGRP_LINK, err);

}





/*

 * Dump information about all ports, in response to GETLINK

 */
@@ -809,10 +816,11 @@ static int br_setport(struct net_bridge_port *p, struct nlattr *tb[]) 
/* Change state and parameters on port. */

int br_setlink(struct net_device *dev, struct nlmsghdr *nlh, u16 flags)

{

	struct net_bridge *br = (struct net_bridge *)netdev_priv(dev);

	struct nlattr *tb[IFLA_BRPORT_MAX + 1];

	struct net_bridge_port *p;

	struct nlattr *protinfo;

	struct nlattr *afspec;

	struct net_bridge_port *p;

	struct nlattr *tb[IFLA_BRPORT_MAX + 1];

	bool changed = false;

	int err = 0;
@@ -852,13 +860,11 @@ int br_setlink(struct net_device *dev, struct nlmsghdr *nlh, u16 flags) 
		changed = true;

	}



	if (afspec) {

		err = br_afspec((struct net_bridge *)netdev_priv(dev), p,

				afspec, RTM_SETLINK, &changed);

	}

	if (afspec)

		err = br_afspec(br, p, afspec, RTM_SETLINK, &changed);



	if (changed)

		br_ifinfo_notify(RTM_NEWLINK, p);

		br_ifinfo_notify(RTM_NEWLINK, br, p);

out:

	return err;

}
@@ -866,8 +872,9 @@ int br_setlink(struct net_device *dev, struct nlmsghdr *nlh, u16 flags) 
/* Delete port information */

int br_dellink(struct net_device *dev, struct nlmsghdr *nlh, u16 flags)

{

	struct nlattr *afspec;

	struct net_bridge *br = (struct net_bridge *)netdev_priv(dev);

	struct net_bridge_port *p;

	struct nlattr *afspec;

	bool changed = false;

	int err = 0;
@@ -880,13 +887,12 @@ int br_dellink(struct net_device *dev, struct nlmsghdr *nlh, u16 flags) 
	if (!p && !(dev->priv_flags & IFF_EBRIDGE))

		return -EINVAL;



	err = br_afspec((struct net_bridge *)netdev_priv(dev), p,

			afspec, RTM_DELLINK, &changed);

	err = br_afspec(br, p, afspec, RTM_DELLINK, &changed);

	if (changed)

		/* Send RTM_NEWLINK because userspace

		 * expects RTM_NEWLINK for vlan dels

		 */

		br_ifinfo_notify(RTM_NEWLINK, p);

		br_ifinfo_notify(RTM_NEWLINK, br, p);



	return err;

}

net/bridge/br_private.h

+2 −1
Original line number Diff line number Diff line
@@ -1071,7 +1071,8 @@ extern int (*br_fdb_test_addr_hook)(struct net_device *dev, unsigned char *addr) 
extern struct rtnl_link_ops br_link_ops;

int br_netlink_init(void);

void br_netlink_fini(void);

void br_ifinfo_notify(int event, struct net_bridge_port *port);

void br_ifinfo_notify(int event, const struct net_bridge *br,

		      const struct net_bridge_port *port);

int br_setlink(struct net_device *dev, struct nlmsghdr *nlmsg, u16 flags);

int br_dellink(struct net_device *dev, struct nlmsghdr *nlmsg, u16 flags);

int br_getlink(struct sk_buff *skb, u32 pid, u32 seq, struct net_device *dev,