rtl88x2CE_WiFi_linux add concurrent mode

hc

2024-09-20 cf4ce59b3b70238352c7f1729f0f7223214828ad

 kernel/net/sched/act_vlan.c
..
..
@@ -1,10 +1,6 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  * Copyright (c) 2014 Jiri Pirko <jiri@resnulli.us>
3
- *
4
- * This program is free software; you can redistribute it and/or modify
5
- * it under the terms of the GNU General Public License as published by
6
- * the Free Software Foundation; either version 2 of the License, or
7
- * (at your option) any later version.
8
4
  */
9
5
 
10
6
 #include <linux/module.h>
..
..
@@ -15,6 +11,7 @@
15
11
 #include <linux/if_vlan.h>
16
12
 #include <net/netlink.h>
17
13
 #include <net/pkt_sched.h>
14
+#include <net/pkt_cls.h>
18
15
 
19
16
 #include <linux/tc_act/tc_vlan.h>
20
17
 #include <net/tc_act/tc_vlan.h>
..
..
@@ -32,7 +29,7 @@
32
29
 	u16 tci;
33
30
 
34
31
 	tcf_lastuse_update(&v->tcf_tm);
35
-	bstats_cpu_update(this_cpu_ptr(v->common.cpu_bstats), skb);
32
+	tcf_action_update_bstats(&v->common, skb);
36
33
 
37
34
 	/* Ensure 'data' points at mac_header prior calling vlan manipulating
38
35
 	 * functions.
..
..
@@ -63,7 +60,7 @@
63
60
 		/* extract existing tag (and guarantee no hw-accel tag) */
64
61
 		if (skb_vlan_tag_present(skb)) {
65
62
 			tci = skb_vlan_tag_get(skb);
66
-			skb->vlan_tci = 0;
63
+			__vlan_hwaccel_clear_tag(skb);
67
64
 		} else {
68
65
 			/* in-payload vlan tag, pop it */
69
66
 			err = __skb_vlan_pop(skb, &tci);
..
..
@@ -73,12 +70,22 @@
73
70
 		/* replace the vid */
74
71
 		tci = (tci & ~VLAN_VID_MASK) | p->tcfv_push_vid;
75
72
 		/* replace prio bits, if tcfv_push_prio specified */
76
-		if (p->tcfv_push_prio) {
73
+		if (p->tcfv_push_prio_exists) {
77
74
 			tci &= ~VLAN_PRIO_MASK;
78
75
 			tci |= p->tcfv_push_prio << VLAN_PRIO_SHIFT;
79
76
 		}
80
77
 		/* put updated tci as hwaccel tag */
81
78
 		__vlan_hwaccel_put_tag(skb, p->tcfv_push_proto, tci);
79
+		break;
80
+	case TCA_VLAN_ACT_POP_ETH:
81
+		err = skb_eth_pop(skb);
82
+		if (err)
83
+			goto drop;
84
+		break;
85
+	case TCA_VLAN_ACT_PUSH_ETH:
86
+		err = skb_eth_push(skb, p->tcfv_push_dst, p->tcfv_push_src);
87
+		if (err)
88
+			goto drop;
82
89
 		break;
83
90
 	default:
84
91
 		BUG();
..
..
@@ -91,24 +98,30 @@
91
98
 	return action;
92
99
 
93
100
 drop:
94
-	qstats_drop_inc(this_cpu_ptr(v->common.cpu_qstats));
101
+	tcf_action_inc_drop_qstats(&v->common);
95
102
 	return TC_ACT_SHOT;
96
103
 }
97
104
 
98
105
 static const struct nla_policy vlan_policy[TCA_VLAN_MAX + 1] = {
106
+	[TCA_VLAN_UNSPEC]		= { .strict_start_type = TCA_VLAN_PUSH_ETH_DST },
99
107
 	[TCA_VLAN_PARMS]		= { .len = sizeof(struct tc_vlan) },
100
108
 	[TCA_VLAN_PUSH_VLAN_ID]		= { .type = NLA_U16 },
101
109
 	[TCA_VLAN_PUSH_VLAN_PROTOCOL]	= { .type = NLA_U16 },
102
110
 	[TCA_VLAN_PUSH_VLAN_PRIORITY]	= { .type = NLA_U8 },
111
+	[TCA_VLAN_PUSH_ETH_DST]		= NLA_POLICY_ETH_ADDR,
112
+	[TCA_VLAN_PUSH_ETH_SRC]		= NLA_POLICY_ETH_ADDR,
103
113
 };
104
114
 
105
115
 static int tcf_vlan_init(struct net *net, struct nlattr *nla,
106
116
 			 struct nlattr *est, struct tc_action **a,
107
117
 			 int ovr, int bind, bool rtnl_held,
118
+			 struct tcf_proto *tp, u32 flags,
108
119
 			 struct netlink_ext_ack *extack)
109
120
 {
110
121
 	struct tc_action_net *tn = net_generic(net, vlan_net_id);
111
122
 	struct nlattr *tb[TCA_VLAN_MAX + 1];
123
+	struct tcf_chain *goto_ch = NULL;
124
+	bool push_prio_exists = false;
112
125
 	struct tcf_vlan_params *p;
113
126
 	struct tc_vlan *parm;
114
127
 	struct tcf_vlan *v;
..
..
@@ -123,7 +136,8 @@
123
136
 	if (!nla)
124
137
 		return -EINVAL;
125
138
 
126
-	err = nla_parse_nested(tb, TCA_VLAN_MAX, nla, vlan_policy, NULL);
139
+	err = nla_parse_nested_deprecated(tb, TCA_VLAN_MAX, nla, vlan_policy,
140
+					  NULL);
127
141
 	if (err < 0)
128
142
 		return err;
129
143
 
..
..
@@ -176,8 +190,20 @@
176
190
 			push_proto = htons(ETH_P_8021Q);
177
191
 		}
178
192
 
179
-		if (tb[TCA_VLAN_PUSH_VLAN_PRIORITY])
193
+		push_prio_exists = !!tb[TCA_VLAN_PUSH_VLAN_PRIORITY];
194
+		if (push_prio_exists)
180
195
 			push_prio = nla_get_u8(tb[TCA_VLAN_PUSH_VLAN_PRIORITY]);
196
+		break;
197
+	case TCA_VLAN_ACT_POP_ETH:
198
+		break;
199
+	case TCA_VLAN_ACT_PUSH_ETH:
200
+		if (!tb[TCA_VLAN_PUSH_ETH_DST] || !tb[TCA_VLAN_PUSH_ETH_SRC]) {
201
+			if (exists)
202
+				tcf_idr_release(*a, bind);
203
+			else
204
+				tcf_idr_cleanup(tn, index);
205
+			return -EINVAL;
206
+		}
181
207
 		break;
182
208
 	default:
183
209
 		if (exists)
..
..
@@ -189,8 +215,8 @@
189
215
 	action = parm->v_action;
190
216
 
191
217
 	if (!exists) {
192
-		ret = tcf_idr_create(tn, index, est, a,
193
-				     &act_vlan_ops, bind, true);
218
+		ret = tcf_idr_create_from_flags(tn, index, est, a,
219
+						&act_vlan_ops, bind, flags);
194
220
 		if (ret) {
195
221
 			tcf_idr_cleanup(tn, index);
196
222
 			return ret;
..
..
@@ -202,30 +228,48 @@
202
228
 		return -EEXIST;
203
229
 	}
204
230
 
231
+	err = tcf_action_check_ctrlact(parm->action, tp, &goto_ch, extack);
232
+	if (err < 0)
233
+		goto release_idr;
234
+
205
235
 	v = to_vlan(*a);
206
236
 
207
237
 	p = kzalloc(sizeof(*p), GFP_KERNEL);
208
238
 	if (!p) {
209
-		tcf_idr_release(*a, bind);
210
-		return -ENOMEM;
239
+		err = -ENOMEM;
240
+		goto put_chain;
211
241
 	}
212
242
 
213
243
 	p->tcfv_action = action;
214
244
 	p->tcfv_push_vid = push_vid;
215
245
 	p->tcfv_push_prio = push_prio;
246
+	p->tcfv_push_prio_exists = push_prio_exists || action == TCA_VLAN_ACT_PUSH;
216
247
 	p->tcfv_push_proto = push_proto;
217
248
 
249
+	if (action == TCA_VLAN_ACT_PUSH_ETH) {
250
+		nla_memcpy(&p->tcfv_push_dst, tb[TCA_VLAN_PUSH_ETH_DST],
251
+			   ETH_ALEN);
252
+		nla_memcpy(&p->tcfv_push_src, tb[TCA_VLAN_PUSH_ETH_SRC],
253
+			   ETH_ALEN);
254
+	}
255
+
218
256
 	spin_lock_bh(&v->tcf_lock);
219
-	v->tcf_action = parm->action;
220
-	rcu_swap_protected(v->vlan_p, p, lockdep_is_held(&v->tcf_lock));
257
+	goto_ch = tcf_action_set_ctrlact(*a, parm->action, goto_ch);
258
+	p = rcu_replace_pointer(v->vlan_p, p, lockdep_is_held(&v->tcf_lock));
221
259
 	spin_unlock_bh(&v->tcf_lock);
222
260
 
261
+	if (goto_ch)
262
+		tcf_chain_put_by_act(goto_ch);
223
263
 	if (p)
224
264
 		kfree_rcu(p, rcu);
225
265
 
226
-	if (ret == ACT_P_CREATED)
227
-		tcf_idr_insert(tn, *a);
228
266
 	return ret;
267
+put_chain:
268
+	if (goto_ch)
269
+		tcf_chain_put_by_act(goto_ch);
270
+release_idr:
271
+	tcf_idr_release(*a, bind);
272
+	return err;
229
273
 }
230
274
 
231
275
 static void tcf_vlan_cleanup(struct tc_action *a)
..
..
@@ -267,6 +311,15 @@
267
311
 					      p->tcfv_push_prio))))
268
312
 		goto nla_put_failure;
269
313
 
314
+	if (p->tcfv_action == TCA_VLAN_ACT_PUSH_ETH) {
315
+		if (nla_put(skb, TCA_VLAN_PUSH_ETH_DST, ETH_ALEN,
316
+			    p->tcfv_push_dst))
317
+			goto nla_put_failure;
318
+		if (nla_put(skb, TCA_VLAN_PUSH_ETH_SRC, ETH_ALEN,
319
+			    p->tcfv_push_src))
320
+			goto nla_put_failure;
321
+	}
322
+
270
323
 	tcf_tm_dump(&t, &v->tcf_tm);
271
324
 	if (nla_put_64bit(skb, TCA_VLAN_TM, sizeof(t), &t, TCA_VLAN_PAD))
272
325
 		goto nla_put_failure;
..
..
@@ -290,8 +343,17 @@
290
343
 	return tcf_generic_walker(tn, skb, cb, type, ops, extack);
291
344
 }
292
345
 
293
-static int tcf_vlan_search(struct net *net, struct tc_action **a, u32 index,
294
-			   struct netlink_ext_ack *extack)
346
+static void tcf_vlan_stats_update(struct tc_action *a, u64 bytes, u64 packets,
347
+				  u64 drops, u64 lastuse, bool hw)
348
+{
349
+	struct tcf_vlan *v = to_vlan(a);
350
+	struct tcf_t *tm = &v->tcf_tm;
351
+
352
+	tcf_action_update_stats(a, bytes, packets, drops, hw);
353
+	tm->lastuse = max_t(u64, tm->lastuse, lastuse);
354
+}
355
+
356
+static int tcf_vlan_search(struct net *net, struct tc_action **a, u32 index)
295
357
 {
296
358
 	struct tc_action_net *tn = net_generic(net, vlan_net_id);
297
359
 
..
..
@@ -308,13 +370,14 @@
308
370
 
309
371
 static struct tc_action_ops act_vlan_ops = {
310
372
 	.kind		=	"vlan",
311
-	.type		=	TCA_ACT_VLAN,
373
+	.id		=	TCA_ID_VLAN,
312
374
 	.owner		=	THIS_MODULE,
313
375
 	.act		=	tcf_vlan_act,
314
376
 	.dump		=	tcf_vlan_dump,
315
377
 	.init		=	tcf_vlan_init,
316
378
 	.cleanup	=	tcf_vlan_cleanup,
317
379
 	.walk		=	tcf_vlan_walker,
380
+	.stats_update	=	tcf_vlan_stats_update,
318
381
 	.get_fill_size	=	tcf_vlan_get_fill_size,
319
382
 	.lookup		=	tcf_vlan_search,
320
383
 	.size		=	sizeof(struct tcf_vlan),