change system file

hc

2024-10-09 244b2c5ca8b14627e4a17755e5922221e121c771

 kernel/net/bridge/br_device.c
..
..
@@ -1,14 +1,10 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  *	Device handling code
3
4
  *	Linux ethernet bridge
4
5
  *
5
6
  *	Authors:
6
7
  *	Lennert Buytenhek		<buytenh@gnu.org>
7
- *
8
- *	This program is free software; you can redistribute it and/or
9
- *	modify it under the terms of the GNU General Public License
10
- *	as published by the Free Software Foundation; either version
11
- *	2 of the License, or (at your option) any later version.
12
8
  */
13
9
 
14
10
 #include <linux/kernel.h>
..
..
@@ -28,8 +24,6 @@
28
24
 const struct nf_br_ops __rcu *nf_br_ops __read_mostly;
29
25
 EXPORT_SYMBOL_GPL(nf_br_ops);
30
26
 
31
-static struct lock_class_key bridge_netdev_addr_lock_key;
32
-
33
27
 /* net device transmit always called with BH disabled */
34
28
 netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev)
35
29
 {
..
..
@@ -38,6 +32,7 @@
38
32
 	struct net_bridge_mdb_entry *mdst;
39
33
 	struct pcpu_sw_netstats *brstats = this_cpu_ptr(br->stats);
40
34
 	const struct nf_br_ops *nf_ops;
35
+	u8 state = BR_STATE_FORWARDING;
41
36
 	const unsigned char *dest;
42
37
 	u16 vid = 0;
43
38
 
..
..
@@ -57,21 +52,22 @@
57
52
 
58
53
 	br_switchdev_frame_unmark(skb);
59
54
 	BR_INPUT_SKB_CB(skb)->brdev = dev;
55
+	BR_INPUT_SKB_CB(skb)->frag_max_size = 0;
60
56
 
61
57
 	skb_reset_mac_header(skb);
62
58
 	skb_pull(skb, ETH_HLEN);
63
59
 
64
-	if (!br_allowed_ingress(br, br_vlan_group_rcu(br), skb, &vid))
60
+	if (!br_allowed_ingress(br, br_vlan_group_rcu(br), skb, &vid, &state))
65
61
 		goto out;
66
62
 
67
63
 	if (IS_ENABLED(CONFIG_INET) &&
68
64
 	    (eth_hdr(skb)->h_proto == htons(ETH_P_ARP) ||
69
65
 	     eth_hdr(skb)->h_proto == htons(ETH_P_RARP)) &&
70
-	    br->neigh_suppress_enabled) {
66
+	    br_opt_get(br, BROPT_NEIGH_SUPPRESS_ENABLED)) {
71
67
 		br_do_proxy_suppress_arp(skb, br, vid, NULL);
72
68
 	} else if (IS_ENABLED(CONFIG_IPV6) &&
73
69
 		   skb->protocol == htons(ETH_P_IPV6) &&
74
-		   br->neigh_suppress_enabled &&
70
+		   br_opt_get(br, BROPT_NEIGH_SUPPRESS_ENABLED) &&
75
71
 		   pskb_may_pull(skb, sizeof(struct ipv6hdr) +
76
72
 				 sizeof(struct nd_msg)) &&
77
73
 		   ipv6_hdr(skb)->nexthdr == IPPROTO_ICMPV6) {
..
..
@@ -111,6 +107,8 @@
111
107
 	return NETDEV_TX_OK;
112
108
 }
113
109
 
110
+static struct lock_class_key bridge_netdev_addr_lock_key;
111
+
114
112
 static void br_set_lockdep_class(struct net_device *dev)
115
113
 {
116
114
 	lockdep_set_class(&dev->addr_list_lock, &bridge_netdev_addr_lock_key);
..
..
@@ -131,9 +129,17 @@
131
129
 		return err;
132
130
 	}
133
131
 
132
+	err = br_mdb_hash_init(br);
133
+	if (err) {
134
+		free_percpu(br->stats);
135
+		br_fdb_hash_fini(br);
136
+		return err;
137
+	}
138
+
134
139
 	err = br_vlan_init(br);
135
140
 	if (err) {
136
141
 		free_percpu(br->stats);
142
+		br_mdb_hash_fini(br);
137
143
 		br_fdb_hash_fini(br);
138
144
 		return err;
139
145
 	}
..
..
@@ -142,10 +148,11 @@
142
148
 	if (err) {
143
149
 		free_percpu(br->stats);
144
150
 		br_vlan_flush(br);
151
+		br_mdb_hash_fini(br);
145
152
 		br_fdb_hash_fini(br);
146
153
 	}
147
-	br_set_lockdep_class(dev);
148
154
 
155
+	br_set_lockdep_class(dev);
149
156
 	return err;
150
157
 }
151
158
 
..
..
@@ -156,6 +163,7 @@
156
163
 	br_multicast_dev_del(br);
157
164
 	br_multicast_uninit_stats(br);
158
165
 	br_vlan_flush(br);
166
+	br_mdb_hash_fini(br);
159
167
 	br_fdb_hash_fini(br);
160
168
 	free_percpu(br->stats);
161
169
 }
..
..
@@ -168,6 +176,9 @@
168
176
 	netif_start_queue(dev);
169
177
 	br_stp_enable_bridge(br);
170
178
 	br_multicast_open(br);
179
+
180
+	if (br_opt_get(br, BROPT_MULTICAST_ENABLED))
181
+		br_multicast_join_snoopers(br);
171
182
 
172
183
 	return 0;
173
184
 }
..
..
@@ -189,6 +200,9 @@
189
200
 	br_stp_disable_bridge(br);
190
201
 	br_multicast_stop(br);
191
202
 
203
+	if (br_opt_get(br, BROPT_MULTICAST_ENABLED))
204
+		br_multicast_leave_snoopers(br);
205
+
192
206
 	netif_stop_queue(dev);
193
207
 
194
208
 	return 0;
..
..
@@ -198,28 +212,9 @@
198
212
 			   struct rtnl_link_stats64 *stats)
199
213
 {
200
214
 	struct net_bridge *br = netdev_priv(dev);
201
-	struct pcpu_sw_netstats tmp, sum = { 0 };
202
-	unsigned int cpu;
203
-
204
-	for_each_possible_cpu(cpu) {
205
-		unsigned int start;
206
-		const struct pcpu_sw_netstats *bstats
207
-			= per_cpu_ptr(br->stats, cpu);
208
-		do {
209
-			start = u64_stats_fetch_begin_irq(&bstats->syncp);
210
-			memcpy(&tmp, bstats, sizeof(tmp));
211
-		} while (u64_stats_fetch_retry_irq(&bstats->syncp, start));
212
-		sum.tx_bytes   += tmp.tx_bytes;
213
-		sum.tx_packets += tmp.tx_packets;
214
-		sum.rx_bytes   += tmp.rx_bytes;
215
-		sum.rx_packets += tmp.rx_packets;
216
-	}
217
215
 
218
216
 	netdev_stats_to_stats64(stats, &dev->stats);
219
-	stats->tx_bytes   = sum.tx_bytes;
220
-	stats->tx_packets = sum.tx_packets;
221
-	stats->rx_bytes   = sum.rx_bytes;
222
-	stats->rx_packets = sum.rx_packets;
217
+	dev_fetch_sw_netstats(stats, br->stats);
223
218
 }
224
219
 
225
220
 static int br_change_mtu(struct net_device *dev, int new_mtu)
..
..
@@ -229,7 +224,7 @@
229
224
 	dev->mtu = new_mtu;
230
225
 
231
226
 	/* this flag will be cleared if the MTU was automatically adjusted */
232
-	br->mtu_set_by_user = true;
227
+	br_opt_toggle(br, BROPT_MTU_SET_BY_USER, true);
233
228
 #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
234
229
 	/* remember the MTU in the rtable for PMTU */
235
230
 	dst_metric_set(&br->fake_rtable.dst, RTAX_MTU, new_mtu);
..
..
@@ -269,6 +264,37 @@
269
264
 	strlcpy(info->version, BR_VERSION, sizeof(info->version));
270
265
 	strlcpy(info->fw_version, "N/A", sizeof(info->fw_version));
271
266
 	strlcpy(info->bus_info, "N/A", sizeof(info->bus_info));
267
+}
268
+
269
+static int br_get_link_ksettings(struct net_device *dev,
270
+				 struct ethtool_link_ksettings *cmd)
271
+{
272
+	struct net_bridge *br = netdev_priv(dev);
273
+	struct net_bridge_port *p;
274
+
275
+	cmd->base.duplex = DUPLEX_UNKNOWN;
276
+	cmd->base.port = PORT_OTHER;
277
+	cmd->base.speed = SPEED_UNKNOWN;
278
+
279
+	list_for_each_entry(p, &br->port_list, list) {
280
+		struct ethtool_link_ksettings ecmd;
281
+		struct net_device *pdev = p->dev;
282
+
283
+		if (!netif_running(pdev) || !netif_oper_up(pdev))
284
+			continue;
285
+
286
+		if (__ethtool_get_link_ksettings(pdev, &ecmd))
287
+			continue;
288
+
289
+		if (ecmd.base.speed == (__u32)SPEED_UNKNOWN)
290
+			continue;
291
+
292
+		if (cmd->base.speed == (__u32)SPEED_UNKNOWN ||
293
+		    cmd->base.speed < ecmd.base.speed)
294
+			cmd->base.speed = ecmd.base.speed;
295
+	}
296
+
297
+	return 0;
272
298
 }
273
299
 
274
300
 static netdev_features_t br_fix_features(struct net_device *dev,
..
..
@@ -351,7 +377,7 @@
351
377
 
352
378
 	p->np = NULL;
353
379
 
354
-	__netpoll_free_async(np);
380
+	__netpoll_free(np);
355
381
 }
356
382
 
357
383
 #endif
..
..
@@ -373,8 +399,9 @@
373
399
 }
374
400
 
375
401
 static const struct ethtool_ops br_ethtool_ops = {
376
-	.get_drvinfo    = br_getinfo,
377
-	.get_link	= ethtool_op_get_link,
402
+	.get_drvinfo		 = br_getinfo,
403
+	.get_link		 = ethtool_op_get_link,
404
+	.get_link_ksettings	 = br_get_link_ksettings,
378
405
 };
379
406
 
380
407
 static const struct net_device_ops br_netdev_ops = {
..
..
@@ -400,6 +427,7 @@
400
427
 	.ndo_fdb_add		 = br_fdb_add,
401
428
 	.ndo_fdb_del		 = br_fdb_delete,
402
429
 	.ndo_fdb_dump		 = br_fdb_dump,
430
+	.ndo_fdb_get		 = br_fdb_get,
403
431
 	.ndo_bridge_getlink	 = br_getlink,
404
432
 	.ndo_bridge_setlink	 = br_setlink,
405
433
 	.ndo_bridge_dellink	 = br_dellink,
..
..
@@ -433,6 +461,9 @@
433
461
 	spin_lock_init(&br->lock);
434
462
 	INIT_LIST_HEAD(&br->port_list);
435
463
 	INIT_HLIST_HEAD(&br->fdb_list);
464
+#if IS_ENABLED(CONFIG_BRIDGE_MRP)
465
+	INIT_LIST_HEAD(&br->mrp_list);
466
+#endif
436
467
 	spin_lock_init(&br->hash_lock);
437
468
 
438
469
 	br->bridge_id.prio[0] = 0x80;