mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/net/bridge/br_netlink_tunnel.c
..
..
@@ -1,13 +1,9 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  *	Bridge per vlan tunnel port dst_metadata netlink control interface
3
4
  *
4
5
  *	Authors:
5
6
  *	Roopa Prabhu		<roopa@cumulusnetworks.com>
6
- *
7
- *	This program is free software; you can redistribute it and/or
8
- *	modify it under the terms of the GNU General Public License
9
- *	as published by the Free Software Foundation; either version
10
- *	2 of the License, or (at your option) any later version.
11
7
  */
12
8
 
13
9
 #include <linux/kernel.h>
..
..
@@ -30,8 +26,8 @@
30
26
 		  nla_total_size(sizeof(u16)); /* IFLA_BRIDGE_VLAN_TUNNEL_FLAGS */
31
27
 }
32
28
 
33
-static bool vlan_tunid_inrange(struct net_bridge_vlan *v_curr,
34
-			       struct net_bridge_vlan *v_last)
29
+bool vlan_tunid_inrange(const struct net_bridge_vlan *v_curr,
30
+			const struct net_bridge_vlan *v_last)
35
31
 {
36
32
 	__be32 tunid_curr = tunnel_id_to_key32(v_curr->tinfo.tunnel_id);
37
33
 	__be32 tunid_last = tunnel_id_to_key32(v_last->tinfo.tunnel_id);
..
..
@@ -97,7 +93,7 @@
97
93
 	__be32 tid = tunnel_id_to_key32(tunnel_id);
98
94
 	struct nlattr *tmap;
99
95
 
100
-	tmap = nla_nest_start(skb, IFLA_BRIDGE_VLAN_TUNNEL_INFO);
96
+	tmap = nla_nest_start_noflag(skb, IFLA_BRIDGE_VLAN_TUNNEL_INFO);
101
97
 	if (!tmap)
102
98
 		return -EMSGSIZE;
103
99
 	if (nla_put_u32(skb, IFLA_BRIDGE_VLAN_TUNNEL_ID,
..
..
@@ -197,8 +193,8 @@
197
193
 	[IFLA_BRIDGE_VLAN_TUNNEL_FLAGS] = { .type = NLA_U16 },
198
194
 };
199
195
 
200
-static int br_vlan_tunnel_info(struct net_bridge_port *p, int cmd,
201
-			       u16 vid, u32 tun_id, bool *changed)
196
+int br_vlan_tunnel_info(const struct net_bridge_port *p, int cmd,
197
+			u16 vid, u32 tun_id, bool *changed)
202
198
 {
203
199
 	int err = 0;
204
200
 
..
..
@@ -230,8 +226,8 @@
230
226
 
231
227
 	memset(tinfo, 0, sizeof(*tinfo));
232
228
 
233
-	err = nla_parse_nested(tb, IFLA_BRIDGE_VLAN_TUNNEL_MAX, attr,
234
-			       vlan_tunnel_policy, NULL);
229
+	err = nla_parse_nested_deprecated(tb, IFLA_BRIDGE_VLAN_TUNNEL_MAX,
230
+					  attr, vlan_tunnel_policy, NULL);
235
231
 	if (err < 0)
236
232
 		return err;
237
233
 
..
..
@@ -254,8 +250,38 @@
254
250
 	return 0;
255
251
 }
256
252
 
257
-int br_process_vlan_tunnel_info(struct net_bridge *br,
258
-				struct net_bridge_port *p, int cmd,
253
+/* send a notification if v_curr can't enter the range and start a new one */
254
+static void __vlan_tunnel_handle_range(const struct net_bridge_port *p,
255
+				       struct net_bridge_vlan **v_start,
256
+				       struct net_bridge_vlan **v_end,
257
+				       int v_curr, bool curr_change)
258
+{
259
+	struct net_bridge_vlan_group *vg;
260
+	struct net_bridge_vlan *v;
261
+
262
+	vg = nbp_vlan_group(p);
263
+	if (!vg)
264
+		return;
265
+
266
+	v = br_vlan_find(vg, v_curr);
267
+
268
+	if (!*v_start)
269
+		goto out_init;
270
+
271
+	if (v && curr_change && br_vlan_can_enter_range(v, *v_end)) {
272
+		*v_end = v;
273
+		return;
274
+	}
275
+
276
+	br_vlan_notify(p->br, p, (*v_start)->vid, (*v_end)->vid, RTM_NEWVLAN);
277
+out_init:
278
+	/* we start a range only if there are any changes to notify about */
279
+	*v_start = curr_change ? v : NULL;
280
+	*v_end = *v_start;
281
+}
282
+
283
+int br_process_vlan_tunnel_info(const struct net_bridge *br,
284
+				const struct net_bridge_port *p, int cmd,
259
285
 				struct vtunnel_info *tinfo_curr,
260
286
 				struct vtunnel_info *tinfo_last,
261
287
 				bool *changed)
..
..
@@ -267,6 +293,7 @@
267
293
 			return -EINVAL;
268
294
 		memcpy(tinfo_last, tinfo_curr, sizeof(struct vtunnel_info));
269
295
 	} else if (tinfo_curr->flags & BRIDGE_VLAN_INFO_RANGE_END) {
296
+		struct net_bridge_vlan *v_start = NULL, *v_end = NULL;
270
297
 		int t, v;
271
298
 
272
299
 		if (!(tinfo_last->flags & BRIDGE_VLAN_INFO_RANGE_BEGIN))
..
..
@@ -276,11 +303,24 @@
276
303
 			return -EINVAL;
277
304
 		t = tinfo_last->tunid;
278
305
 		for (v = tinfo_last->vid; v <= tinfo_curr->vid; v++) {
279
-			err = br_vlan_tunnel_info(p, cmd, v, t, changed);
306
+			bool curr_change = false;
307
+
308
+			err = br_vlan_tunnel_info(p, cmd, v, t, &curr_change);
280
309
 			if (err)
281
-				return err;
310
+				break;
282
311
 			t++;
312
+
313
+			if (curr_change)
314
+				*changed = curr_change;
315
+			 __vlan_tunnel_handle_range(p, &v_start, &v_end, v,
316
+						    curr_change);
283
317
 		}
318
+		if (v_start && v_end)
319
+			br_vlan_notify(br, p, v_start->vid, v_end->vid,
320
+				       RTM_NEWVLAN);
321
+		if (err)
322
+			return err;
323
+
284
324
 		memset(tinfo_last, 0, sizeof(struct vtunnel_info));
285
325
 		memset(tinfo_curr, 0, sizeof(struct vtunnel_info));
286
326
 	} else {
..
..
@@ -290,6 +330,7 @@
290
330
 					  tinfo_curr->tunid, changed);
291
331
 		if (err)
292
332
 			return err;
333
+		br_vlan_notify(br, p, tinfo_curr->vid, 0, RTM_NEWVLAN);
293
334
 		memset(tinfo_last, 0, sizeof(struct vtunnel_info));
294
335
 		memset(tinfo_curr, 0, sizeof(struct vtunnel_info));
295
336
 	}