hc
2024-12-19 9370bb92b2d16684ee45cf24e879c93c509162da
kernel/net/dsa/dsa_priv.h
....@@ -1,16 +1,13 @@
1
+/* SPDX-License-Identifier: GPL-2.0-or-later */
12 /*
23 * net/dsa/dsa_priv.h - Hardware switch handling
34 * Copyright (c) 2008-2009 Marvell Semiconductor
4
- *
5
- * This program is free software; you can redistribute it and/or modify
6
- * it under the terms of the GNU General Public License as published by
7
- * the Free Software Foundation; either version 2 of the License, or
8
- * (at your option) any later version.
95 */
106
117 #ifndef __DSA_PRIV_H
128 #define __DSA_PRIV_H
139
10
+#include <linux/if_bridge.h>
1411 #include <linux/phy.h>
1512 #include <linux/netdevice.h>
1613 #include <linux/netpoll.h>
....@@ -27,6 +24,7 @@
2724 DSA_NOTIFIER_MDB_DEL,
2825 DSA_NOTIFIER_VLAN_ADD,
2926 DSA_NOTIFIER_VLAN_DEL,
27
+ DSA_NOTIFIER_MTU,
3028 };
3129
3230 /* DSA_NOTIFIER_AGEING_TIME */
....@@ -38,6 +36,7 @@
3836 /* DSA_NOTIFIER_BRIDGE_* */
3937 struct dsa_notifier_bridge_info {
4038 struct net_device *br;
39
+ int tree_index;
4140 int sw_index;
4241 int port;
4342 };
....@@ -66,12 +65,20 @@
6665 int port;
6766 };
6867
68
+/* DSA_NOTIFIER_MTU */
69
+struct dsa_notifier_mtu_info {
70
+ bool propagate_upstream;
71
+ int sw_index;
72
+ int port;
73
+ int mtu;
74
+};
75
+
6976 struct dsa_slave_priv {
7077 /* Copy of CPU port xmit for faster access in slave transmit hot path */
7178 struct sk_buff * (*xmit)(struct sk_buff *skb,
7279 struct net_device *dev);
7380
74
- struct pcpu_sw_netstats *stats64;
81
+ struct pcpu_sw_netstats __percpu *stats64;
7582
7683 struct gro_cells gcells;
7784
....@@ -87,25 +94,17 @@
8794 };
8895
8996 /* dsa.c */
90
-const struct dsa_device_ops *dsa_resolve_tag_protocol(int tag_protocol);
97
+const struct dsa_device_ops *dsa_tag_driver_get(int tag_protocol);
98
+void dsa_tag_driver_put(const struct dsa_device_ops *ops);
99
+
91100 bool dsa_schedule_work(struct work_struct *work);
101
+const char *dsa_tag_protocol_to_str(const struct dsa_device_ops *ops);
92102
93
-/* legacy.c */
94
-#if IS_ENABLED(CONFIG_NET_DSA_LEGACY)
95
-int dsa_legacy_register(void);
96
-void dsa_legacy_unregister(void);
97
-#else
98
-static inline int dsa_legacy_register(void)
99
-{
100
- return 0;
101
-}
102
-
103
-static inline void dsa_legacy_unregister(void) { }
104
-#endif
105103 int dsa_legacy_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
106104 struct net_device *dev,
107105 const unsigned char *addr, u16 vid,
108
- u16 flags);
106
+ u16 flags,
107
+ struct netlink_ext_ack *extack);
109108 int dsa_legacy_fdb_del(struct ndmsg *ndm, struct nlattr *tb[],
110109 struct net_device *dev,
111110 const unsigned char *addr, u16 vid);
....@@ -119,38 +118,32 @@
119118 {
120119 struct dsa_port *cpu_dp = dev->dsa_ptr;
121120 struct dsa_switch_tree *dst = cpu_dp->dst;
122
- struct dsa_switch *ds;
123
- struct dsa_port *slave_port;
121
+ struct dsa_port *dp;
124122
125
- if (device < 0 || device >= DSA_MAX_SWITCHES)
126
- return NULL;
123
+ list_for_each_entry(dp, &dst->ports, list)
124
+ if (dp->ds->index == device && dp->index == port &&
125
+ dp->type == DSA_PORT_TYPE_USER)
126
+ return dp->slave;
127127
128
- ds = dst->ds[device];
129
- if (!ds)
130
- return NULL;
131
-
132
- if (port < 0 || port >= ds->num_ports)
133
- return NULL;
134
-
135
- slave_port = &ds->ports[port];
136
-
137
- if (unlikely(slave_port->type != DSA_PORT_TYPE_USER))
138
- return NULL;
139
-
140
- return slave_port->slave;
128
+ return NULL;
141129 }
142130
143131 /* port.c */
144132 int dsa_port_set_state(struct dsa_port *dp, u8 state,
145133 struct switchdev_trans *trans);
134
+int dsa_port_enable_rt(struct dsa_port *dp, struct phy_device *phy);
146135 int dsa_port_enable(struct dsa_port *dp, struct phy_device *phy);
147
-void dsa_port_disable(struct dsa_port *dp, struct phy_device *phy);
136
+void dsa_port_disable_rt(struct dsa_port *dp);
137
+void dsa_port_disable(struct dsa_port *dp);
148138 int dsa_port_bridge_join(struct dsa_port *dp, struct net_device *br);
149139 void dsa_port_bridge_leave(struct dsa_port *dp, struct net_device *br);
150140 int dsa_port_vlan_filtering(struct dsa_port *dp, bool vlan_filtering,
151141 struct switchdev_trans *trans);
142
+bool dsa_port_skip_vlan_configuration(struct dsa_port *dp);
152143 int dsa_port_ageing_time(struct dsa_port *dp, clock_t ageing_clock,
153144 struct switchdev_trans *trans);
145
+int dsa_port_mtu_change(struct dsa_port *dp, int new_mtu,
146
+ bool propagate_upstream);
154147 int dsa_port_fdb_add(struct dsa_port *dp, const unsigned char *addr,
155148 u16 vid);
156149 int dsa_port_fdb_del(struct dsa_port *dp, const unsigned char *addr,
....@@ -161,6 +154,12 @@
161154 struct switchdev_trans *trans);
162155 int dsa_port_mdb_del(const struct dsa_port *dp,
163156 const struct switchdev_obj_port_mdb *mdb);
157
+int dsa_port_pre_bridge_flags(const struct dsa_port *dp, unsigned long flags,
158
+ struct switchdev_trans *trans);
159
+int dsa_port_bridge_flags(const struct dsa_port *dp, unsigned long flags,
160
+ struct switchdev_trans *trans);
161
+int dsa_port_mrouter(struct dsa_port *dp, bool mrouter,
162
+ struct switchdev_trans *trans);
164163 int dsa_port_vlan_add(struct dsa_port *dp,
165164 const struct switchdev_obj_port_vlan *vlan,
166165 struct switchdev_trans *trans);
....@@ -168,12 +167,14 @@
168167 const struct switchdev_obj_port_vlan *vlan);
169168 int dsa_port_link_register_of(struct dsa_port *dp);
170169 void dsa_port_link_unregister_of(struct dsa_port *dp);
170
+extern const struct phylink_mac_ops dsa_port_phylink_mac_ops;
171171
172172 /* slave.c */
173173 extern const struct dsa_device_ops notag_netdev_ops;
174174 void dsa_slave_mii_bus_init(struct dsa_switch *ds);
175175 int dsa_slave_create(struct dsa_port *dp);
176176 void dsa_slave_destroy(struct net_device *slave_dev);
177
+bool dsa_slave_dev_check(const struct net_device *dev);
177178 int dsa_slave_suspend(struct net_device *slave_dev);
178179 int dsa_slave_resume(struct net_device *slave_dev);
179180 int dsa_slave_register_notifier(void);
....@@ -194,33 +195,70 @@
194195 return dp->cpu_dp->master;
195196 }
196197
198
+/* If under a bridge with vlan_filtering=0, make sure to send pvid-tagged
199
+ * frames as untagged, since the bridge will not untag them.
200
+ */
201
+static inline struct sk_buff *dsa_untag_bridge_pvid(struct sk_buff *skb)
202
+{
203
+ struct dsa_port *dp = dsa_slave_to_port(skb->dev);
204
+ struct net_device *br = dp->bridge_dev;
205
+ struct net_device *dev = skb->dev;
206
+ struct net_device *upper_dev;
207
+ u16 vid, pvid, proto;
208
+ int err;
209
+
210
+ if (!br || br_vlan_enabled(br))
211
+ return skb;
212
+
213
+ err = br_vlan_get_proto(br, &proto);
214
+ if (err)
215
+ return skb;
216
+
217
+ /* Move VLAN tag from data to hwaccel */
218
+ if (!skb_vlan_tag_present(skb) && skb->protocol == htons(proto)) {
219
+ skb = skb_vlan_untag(skb);
220
+ if (!skb)
221
+ return NULL;
222
+ }
223
+
224
+ if (!skb_vlan_tag_present(skb))
225
+ return skb;
226
+
227
+ vid = skb_vlan_tag_get_id(skb);
228
+
229
+ /* We already run under an RCU read-side critical section since
230
+ * we are called from netif_receive_skb_list_internal().
231
+ */
232
+ err = br_vlan_get_pvid_rcu(dev, &pvid);
233
+ if (err)
234
+ return skb;
235
+
236
+ if (vid != pvid)
237
+ return skb;
238
+
239
+ /* The sad part about attempting to untag from DSA is that we
240
+ * don't know, unless we check, if the skb will end up in
241
+ * the bridge's data path - br_allowed_ingress() - or not.
242
+ * For example, there might be an 8021q upper for the
243
+ * default_pvid of the bridge, which will steal VLAN-tagged traffic
244
+ * from the bridge's data path. This is a configuration that DSA
245
+ * supports because vlan_filtering is 0. In that case, we should
246
+ * definitely keep the tag, to make sure it keeps working.
247
+ */
248
+ upper_dev = __vlan_find_dev_deep_rcu(br, htons(proto), vid);
249
+ if (upper_dev)
250
+ return skb;
251
+
252
+ __vlan_hwaccel_clear_tag(skb);
253
+
254
+ return skb;
255
+}
256
+
197257 /* switch.c */
198258 int dsa_switch_register_notifier(struct dsa_switch *ds);
199259 void dsa_switch_unregister_notifier(struct dsa_switch *ds);
200260
201
-/* tag_brcm.c */
202
-extern const struct dsa_device_ops brcm_netdev_ops;
203
-extern const struct dsa_device_ops brcm_prepend_netdev_ops;
204
-
205
-/* tag_dsa.c */
206
-extern const struct dsa_device_ops dsa_netdev_ops;
207
-
208
-/* tag_edsa.c */
209
-extern const struct dsa_device_ops edsa_netdev_ops;
210
-
211
-/* tag_ksz.c */
212
-extern const struct dsa_device_ops ksz_netdev_ops;
213
-
214
-/* tag_lan9303.c */
215
-extern const struct dsa_device_ops lan9303_netdev_ops;
216
-
217
-/* tag_mtk.c */
218
-extern const struct dsa_device_ops mtk_netdev_ops;
219
-
220
-/* tag_qca.c */
221
-extern const struct dsa_device_ops qca_netdev_ops;
222
-
223
-/* tag_trailer.c */
224
-extern const struct dsa_device_ops trailer_netdev_ops;
261
+/* dsa2.c */
262
+extern struct list_head dsa_tree_list;
225263
226264 #endif