Merge branch 'bridge-mcast-tmp-router-port'

Nikolay Aleksandrov says: ==================== bridge: mcast: add support for temp router port This set adds support for temporary router port which doesn't depend only on the incoming queries. It can be refreshed by setting multicast_router to the same value (3). The first two patches are minor changes that prepare the code for the third which adds this new type of router port. In order to be able to dump its information the mdb router port format is changed in patch 04 and extended similar to how mdb entries format was done recently. The related iproute2 changes will be posted if this is accepted. v2: set val first and adjust router type later in patch 01, patch 03 was split in 2 ====================

David S. Miller committed 10 years ago

Commit 4ec62072 parents ec1606c 59f78f93 files · +89 −32Browse files

Unified · Split

3 files

include/uapi/linux/if_bridge.h +21 −1
net/bridge/br_mdb.c +14 −2
net/bridge/br_multicast.c +54 −29

include/uapi/linux/if_bridge.h+21−1

@@ -144,7 +144,10 @@ struct bridge_vlan_info { · 143 unmodified lines
144	144	* }
145	145	* }
146	146	* [MDBA_ROUTER] = {
147		− * [MDBA_ROUTER_PORT]
	147	+ * [MDBA_ROUTER_PORT] = {
	148	+ * u32 ifindex
	149	+ * [MDBA_ROUTER_PATTR attributes]
	150	+ * }
148	151	* }
149	152	*/
150	153	enum {
@@ -177,6 +180,14 @@ enum { · 26 unmodified lines
177	180	};
178	181	#define MDBA_MDB_EATTR_MAX (__MDBA_MDB_EATTR_MAX - 1)
179	182
	183	+/* multicast router types */
	184	+enum {
	185	+ MDB_RTR_TYPE_DISABLED,
	186	+ MDB_RTR_TYPE_TEMP_QUERY,
	187	+ MDB_RTR_TYPE_PERM,
	188	+ MDB_RTR_TYPE_TEMP
	189	+};
	190	+
180	191	enum {
181	192	MDBA_ROUTER_UNSPEC,
182	193	MDBA_ROUTER_PORT,
@@ -184,6 +195,15 @@ enum { · 1 unmodified line
184	195	};
185	196	#define MDBA_ROUTER_MAX (__MDBA_ROUTER_MAX - 1)
186	197
	198	+/* router port attributes */
	199	+enum {
	200	+ MDBA_ROUTER_PATTR_UNSPEC,
	201	+ MDBA_ROUTER_PATTR_TIMER,
	202	+ MDBA_ROUTER_PATTR_TYPE,
	203	+ __MDBA_ROUTER_PATTR_MAX
	204	+};
	205	+#define MDBA_ROUTER_PATTR_MAX (__MDBA_ROUTER_PATTR_MAX - 1)
	206	+
187	207	struct br_port_msg {
188	208	__u8 family;
189	209	__u32 ifindex;

net/bridge/br_mdb.c+14−2

@@ -20,7 +20,7 @@ static int br_rports_fill_info(struct sk_buff skb, struct netlink_callback cb, · 19 unmodified lines
20	20	{
21	21	struct net_bridge *br = netdev_priv(dev);
22	22	struct net_bridge_port *p;
23		− struct nlattr *nest;
	23	+ struct nlattr nest, port_nest;
24	24
25	25	if (!br->multicast_router \|\| hlist_empty(&br->router_list))
26	26	return 0;
@@ -30,8 +30,20 @@ static int br_rports_fill_info(struct sk_buff skb, struct netlink_callback cb, · 3 unmodified lines
30	30	return -EMSGSIZE;
31	31
32	32	hlist_for_each_entry_rcu(p, &br->router_list, rlist) {
33		− if (p && nla_put_u32(skb, MDBA_ROUTER_PORT, p->dev->ifindex))
	33	+ if (!p)
	34	+ continue;
	35	+ port_nest = nla_nest_start(skb, MDBA_ROUTER_PORT);
	36	+ if (!port_nest)
34	37	goto fail;
	38	+ if (nla_put_nohdr(skb, sizeof(u32), &p->dev->ifindex) \|\|
	39	+ nla_put_u32(skb, MDBA_ROUTER_PATTR_TIMER,
	40	+ br_timer_value(&p->multicast_router_timer)) \|\|
	41	+ nla_put_u8(skb, MDBA_ROUTER_PATTR_TYPE,
	42	+ p->multicast_router)) {
	43	+ nla_nest_cancel(skb, port_nest);
	44	+ goto fail;
	45	+ }
	46	+ nla_nest_end(skb, port_nest);
35	47	}
36	48
37	49	nla_nest_end(skb, nest);

net/bridge/br_multicast.c+54−29

@@ -759,13 +759,17 @@ static void br_multicast_router_expired(unsigned long data) · 758 unmodified lines
759	759	struct net_bridge *br = port->br;
760	760
761	761	spin_lock(&br->multicast_lock);
762		− if (port->multicast_router != 1 \|\|
	762	+ if (port->multicast_router == MDB_RTR_TYPE_DISABLED \|\|
	763	+ port->multicast_router == MDB_RTR_TYPE_PERM \|\|
763	764	timer_pending(&port->multicast_router_timer) \|\|
764	765	hlist_unhashed(&port->rlist))
765	766	goto out;
766	767
767	768	hlist_del_init_rcu(&port->rlist);
768	769	br_rtr_notify(br->dev, port, RTM_DELMDB);
	770	+ /* Don't allow timer refresh if the router expired */
	771	+ if (port->multicast_router == MDB_RTR_TYPE_TEMP)
	772	+ port->multicast_router = MDB_RTR_TYPE_TEMP_QUERY;
769	773
770	774	out:
771	775	spin_unlock(&br->multicast_lock);
@@ -912,7 +916,7 @@ static void br_ip6_multicast_port_query_expired(unsigned long data) · 140 unmodified lines
912	916
913	917	void br_multicast_add_port(struct net_bridge_port *port)
914	918	{
915		− port->multicast_router = 1;
	919	+ port->multicast_router = MDB_RTR_TYPE_TEMP_QUERY;
916	920
917	921	setup_timer(&port->multicast_router_timer, br_multicast_router_expired,
918	922	(unsigned long)port);
@@ -959,7 +963,8 @@ void br_multicast_enable_port(struct net_bridge_port *port) · 40 unmodified lines
959	963	#if IS_ENABLED(CONFIG_IPV6)
960	964	br_multicast_enable(&port->ip6_own_query);
961	965	#endif
962		− if (port->multicast_router == 2 && hlist_unhashed(&port->rlist))
	966	+ if (port->multicast_router == MDB_RTR_TYPE_PERM &&
	967	+ hlist_unhashed(&port->rlist))
963	968	br_multicast_add_router(br, port);
964	969
965	970	out:
@@ -980,6 +985,9 @@ void br_multicast_disable_port(struct net_bridge_port *port) · 14 unmodified lines
980	985	if (!hlist_unhashed(&port->rlist)) {
981	986	hlist_del_init_rcu(&port->rlist);
982	987	br_rtr_notify(br->dev, port, RTM_DELMDB);
	988	+ /* Don't allow timer refresh if disabling */
	989	+ if (port->multicast_router == MDB_RTR_TYPE_TEMP)
	990	+ port->multicast_router = MDB_RTR_TYPE_TEMP_QUERY;
983	991	}
984	992	del_timer(&port->multicast_router_timer);
985	993	del_timer(&port->ip4_own_query.timer);
@@ -1227,13 +1235,14 @@ static void br_multicast_mark_router(struct net_bridge *br, · 241 unmodified lines
1227	1235	unsigned long now = jiffies;
1228	1236
1229	1237	if (!port) {
1230		− if (br->multicast_router == 1)
	1238	+ if (br->multicast_router == MDB_RTR_TYPE_TEMP_QUERY)
1231	1239	mod_timer(&br->multicast_router_timer,
1232	1240	now + br->multicast_querier_interval);
1233	1241	return;
1234	1242	}
1235	1243
1236		− if (port->multicast_router != 1)
	1244	+ if (port->multicast_router == MDB_RTR_TYPE_DISABLED \|\|
	1245	+ port->multicast_router == MDB_RTR_TYPE_PERM)
1237	1246	return;
1238	1247
1239	1248	br_multicast_add_router(br, port);
@@ -1713,7 +1722,7 @@ void br_multicast_init(struct net_bridge *br) · 473 unmodified lines
1713	1722	br->hash_elasticity = 4;
1714	1723	br->hash_max = 512;
1715	1724
1716		− br->multicast_router = 1;
	1725	+ br->multicast_router = MDB_RTR_TYPE_TEMP_QUERY;
1717	1726	br->multicast_querier = 0;
1718	1727	br->multicast_query_use_ifaddr = 0;
1719	1728	br->multicast_last_member_count = 2;
@@ -1823,11 +1832,11 @@ int br_multicast_set_router(struct net_bridge *br, unsigned long val) · 103 unmodified lines
1823	1832	spin_lock_bh(&br->multicast_lock);
1824	1833
1825	1834	switch (val) {
1826		− case 0:
1827		− case 2:
	1835	+ case MDB_RTR_TYPE_DISABLED:
	1836	+ case MDB_RTR_TYPE_PERM:
1828	1837	del_timer(&br->multicast_router_timer);
1829	1838	/* fall through */
1830		− case 1:
	1839	+ case MDB_RTR_TYPE_TEMP_QUERY:
1831	1840	br->multicast_router = val;
1832	1841	err = 0;
1833	1842	break;
@@ -1838,37 +1847,53 @@ int br_multicast_set_router(struct net_bridge *br, unsigned long val) · 4 unmodified lines
1838	1847	return err;
1839	1848	}
1840	1849
	1850	+static void __del_port_router(struct net_bridge_port *p)
	1851	+{
	1852	+ if (hlist_unhashed(&p->rlist))
	1853	+ return;
	1854	+ hlist_del_init_rcu(&p->rlist);
	1855	+ br_rtr_notify(p->br->dev, p, RTM_DELMDB);
	1856	+}
	1857	+
1841	1858	int br_multicast_set_port_router(struct net_bridge_port *p, unsigned long val)
1842	1859	{
1843	1860	struct net_bridge *br = p->br;
	1861	+ unsigned long now = jiffies;
1844	1862	int err = -EINVAL;
1845	1863
1846	1864	spin_lock(&br->multicast_lock);
1847		−
1848		− switch (val) {
1849		− case 0:
1850		− case 1:
1851		− case 2:
1852		− p->multicast_router = val;
	1865	+ if (p->multicast_router == val) {
	1866	+ /* Refresh the temp router port timer */
	1867	+ if (p->multicast_router == MDB_RTR_TYPE_TEMP)
	1868	+ mod_timer(&p->multicast_router_timer,
	1869	+ now + br->multicast_querier_interval);
1853	1870	err = 0;
1854		−
1855		− if (val < 2 && !hlist_unhashed(&p->rlist)) {
1856		− hlist_del_init_rcu(&p->rlist);
1857		− br_rtr_notify(br->dev, p, RTM_DELMDB);
1858		− }
1859		−
1860		− if (val == 1)
1861		− break;
1862		−
	1871	+ goto unlock;
	1872	+ }
	1873	+ switch (val) {
	1874	+ case MDB_RTR_TYPE_DISABLED:
	1875	+ p->multicast_router = MDB_RTR_TYPE_DISABLED;
	1876	+ __del_port_router(p);
	1877	+ del_timer(&p->multicast_router_timer);
	1878	+ break;
	1879	+ case MDB_RTR_TYPE_TEMP_QUERY:
	1880	+ p->multicast_router = MDB_RTR_TYPE_TEMP_QUERY;
	1881	+ __del_port_router(p);
	1882	+ break;
	1883	+ case MDB_RTR_TYPE_PERM:
	1884	+ p->multicast_router = MDB_RTR_TYPE_PERM;
1863	1885	del_timer(&p->multicast_router_timer);
1864		−
1865		− if (val == 0)
1866		− break;
1867		−
1868	1886	br_multicast_add_router(br, p);
1869	1887	break;
	1888	+ case MDB_RTR_TYPE_TEMP:
	1889	+ p->multicast_router = MDB_RTR_TYPE_TEMP;
	1890	+ br_multicast_mark_router(br, p);
	1891	+ break;
	1892	+ default:
	1893	+ goto unlock;
1870	1894	}
1871		−
	1895	+ err = 0;
	1896	+unlock:
1872	1897	spin_unlock(&br->multicast_lock);
1873	1898
1874	1899	return err;

Merge branch 'bridge-mcast-tmp-router-port'

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code