forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2023-12-08 01573e231f18eb2d99162747186f59511f56b64d 
 kernel/net/sched/sch_htb.c
....@@ -1,10 +1,6 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
12 /*
23  * net/sched/sch_htb.c	Hierarchical token bucket, feed tree version
3
- *
4
- *		This program is free software; you can redistribute it and/or
5
- *		modify it under the terms of the GNU General Public License
6
- *		as published by the Free Software Foundation; either version
7
- *		2 of the License, or (at your option) any later version.
84  *
95  * Authors:	Martin Devera, <devik@cdi.cz>
106  *
....@@ -132,7 +128,7 @@
132128 		struct htb_class_inner {
133129 			struct htb_prio clprio[TC_HTB_NUMPRIO];
134130 		} inner;
135
-	} un;
131
+	};
136132 	s64			pq_key;
137133 
138134 	int			prio_activity;	/* for which prios are we active */
....@@ -165,7 +161,8 @@
165161 
166162 	/* non shaped skbs; let them go directly thru */
167163 	struct qdisc_skb_head	direct_queue;
168
-	long			direct_pkts;
164
+	u32			direct_pkts;
165
+	u32			overlimits;
169166 
170167 	struct qdisc_watchdog	watchdog;
171168 
....@@ -242,7 +239,7 @@
242239 		case TC_ACT_STOLEN:
243240 		case TC_ACT_TRAP:
244241 			*qerr = NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;
245
-			/* fall through */
242
+			fallthrough;
246243 		case TC_ACT_SHOT:
247244 			return NULL;
248245 		}
....@@ -411,13 +408,13 @@
411408 			int prio = ffz(~m);
412409 			m &= ~(1 << prio);
413410 
414
-			if (p->un.inner.clprio[prio].feed.rb_node)
411
+			if (p->inner.clprio[prio].feed.rb_node)
415412 				/* parent already has its feed in use so that
416413 				 * reset bit in mask as parent is already ok
417414 				 */
418415 				mask &= ~(1 << prio);
419416 
420
-			htb_add_to_id_tree(&p->un.inner.clprio[prio].feed, cl, prio);
417
+			htb_add_to_id_tree(&p->inner.clprio[prio].feed, cl, prio);
421418 		}
422419 		p->prio_activity |= mask;
423420 		cl = p;
....@@ -447,19 +444,19 @@
447444 			int prio = ffz(~m);
448445 			m &= ~(1 << prio);
449446 
450
-			if (p->un.inner.clprio[prio].ptr == cl->node + prio) {
447
+			if (p->inner.clprio[prio].ptr == cl->node + prio) {
451448 				/* we are removing child which is pointed to from
452449 				 * parent feed - forget the pointer but remember
453450 				 * classid
454451 				 */
455
-				p->un.inner.clprio[prio].last_ptr_id = cl->common.classid;
456
-				p->un.inner.clprio[prio].ptr = NULL;
452
+				p->inner.clprio[prio].last_ptr_id = cl->common.classid;
453
+				p->inner.clprio[prio].ptr = NULL;
457454 			}
458455 
459456 			htb_safe_rb_erase(cl->node + prio,
460
-					  &p->un.inner.clprio[prio].feed);
457
+					  &p->inner.clprio[prio].feed);
461458 
462
-			if (!p->un.inner.clprio[prio].feed.rb_node)
459
+			if (!p->inner.clprio[prio].feed.rb_node)
463460 				mask |= 1 << prio;
464461 		}
465462 
....@@ -533,8 +530,10 @@
533530 	if (new_mode == cl->cmode)
534531 		return;
535532 
536
-	if (new_mode == HTB_CANT_SEND)
533
+	if (new_mode == HTB_CANT_SEND) {
537534 		cl->overlimits++;
535
+		q->overlimits++;
536
+	}
538537 
539538 	if (cl->prio_activity) {	/* not necessary: speed optimization */
540539 		if (cl->cmode != HTB_CANT_SEND)
....@@ -555,7 +554,7 @@
555554  */
556555 static inline void htb_activate(struct htb_sched *q, struct htb_class *cl)
557556 {
558
-	WARN_ON(cl->level || !cl->un.leaf.q || !cl->un.leaf.q->q.qlen);
557
+	WARN_ON(cl->level || !cl->leaf.q || !cl->leaf.q->q.qlen);
559558 
560559 	if (!cl->prio_activity) {
561560 		cl->prio_activity = 1 << cl->prio;
....@@ -577,33 +576,18 @@
577576 	cl->prio_activity = 0;
578577 }
579578 
580
-static void htb_enqueue_tail(struct sk_buff *skb, struct Qdisc *sch,
581
-			     struct qdisc_skb_head *qh)
582
-{
583
-	struct sk_buff *last = qh->tail;
584
-
585
-	if (last) {
586
-		skb->next = NULL;
587
-		last->next = skb;
588
-		qh->tail = skb;
589
-	} else {
590
-		qh->tail = skb;
591
-		qh->head = skb;
592
-	}
593
-	qh->qlen++;
594
-}
595
-
596579 static int htb_enqueue(struct sk_buff *skb, struct Qdisc *sch,
597580 		       struct sk_buff **to_free)
598581 {
599
-	int uninitialized_var(ret);
582
+	int ret;
583
+	unsigned int len = qdisc_pkt_len(skb);
600584 	struct htb_sched *q = qdisc_priv(sch);
601585 	struct htb_class *cl = htb_classify(skb, sch, &ret);
602586 
603587 	if (cl == HTB_DIRECT) {
604588 		/* enqueue to helper queue */
605589 		if (q->direct_queue.qlen < q->direct_qlen) {
606
-			htb_enqueue_tail(skb, sch, &q->direct_queue);
590
+			__qdisc_enqueue_tail(skb, &q->direct_queue);
607591 			q->direct_pkts++;
608592 		} else {
609593 			return qdisc_drop(skb, sch, to_free);
....@@ -615,7 +599,7 @@
615599 		__qdisc_drop(skb, to_free);
616600 		return ret;
617601 #endif
618
-	} else if ((ret = qdisc_enqueue(skb, cl->un.leaf.q,
602
+	} else if ((ret = qdisc_enqueue(skb, cl->leaf.q,
619603 					to_free)) != NET_XMIT_SUCCESS) {
620604 		if (net_xmit_drop_count(ret)) {
621605 			qdisc_qstats_drop(sch);
....@@ -626,7 +610,7 @@
626610 		htb_activate(q, cl);
627611 	}
628612 
629
-	qdisc_qstats_backlog_inc(sch, skb);
613
+	sch->qstats.backlog += len;
630614 	sch->q.qlen++;
631615 	return NET_XMIT_SUCCESS;
632616 }
....@@ -823,7 +807,7 @@
823807 			cl = rb_entry(*sp->pptr, struct htb_class, node[prio]);
824808 			if (!cl->level)
825809 				return cl;
826
-			clp = &cl->un.inner.clprio[prio];
810
+			clp = &cl->inner.clprio[prio];
827811 			(++sp)->root = clp->feed.rb_node;
828812 			sp->pptr = &clp->ptr;
829813 			sp->pid = &clp->last_ptr_id;
....@@ -857,7 +841,7 @@
857841 		 * graft operation on the leaf since last dequeue;
858842 		 * simply deactivate and skip such class
859843 		 */
860
-		if (unlikely(cl->un.leaf.q->q.qlen == 0)) {
844
+		if (unlikely(cl->leaf.q->q.qlen == 0)) {
861845 			struct htb_class *next;
862846 			htb_deactivate(q, cl);
863847 
....@@ -873,12 +857,12 @@
873857 			goto next;
874858 		}
875859 
876
-		skb = cl->un.leaf.q->dequeue(cl->un.leaf.q);
860
+		skb = cl->leaf.q->dequeue(cl->leaf.q);
877861 		if (likely(skb != NULL))
878862 			break;
879863 
880
-		qdisc_warn_nonwc("htb", cl->un.leaf.q);
881
-		htb_next_rb_node(level ? &cl->parent->un.inner.clprio[prio].ptr:
864
+		qdisc_warn_nonwc("htb", cl->leaf.q);
865
+		htb_next_rb_node(level ? &cl->parent->inner.clprio[prio].ptr:
882866 					 &q->hlevel[0].hprio[prio].ptr);
883867 		cl = htb_lookup_leaf(hprio, prio);
884868 
....@@ -886,16 +870,16 @@
886870 
887871 	if (likely(skb != NULL)) {
888872 		bstats_update(&cl->bstats, skb);
889
-		cl->un.leaf.deficit[level] -= qdisc_pkt_len(skb);
890
-		if (cl->un.leaf.deficit[level] < 0) {
891
-			cl->un.leaf.deficit[level] += cl->quantum;
892
-			htb_next_rb_node(level ? &cl->parent->un.inner.clprio[prio].ptr :
873
+		cl->leaf.deficit[level] -= qdisc_pkt_len(skb);
874
+		if (cl->leaf.deficit[level] < 0) {
875
+			cl->leaf.deficit[level] += cl->quantum;
876
+			htb_next_rb_node(level ? &cl->parent->inner.clprio[prio].ptr :
893877 						 &q->hlevel[0].hprio[prio].ptr);
894878 		}
895879 		/* this used to be after charge_class but this constelation
896880 		 * gives us slightly better performance
897881 		 */
898
-		if (!cl->un.leaf.q->q.qlen)
882
+		if (!cl->leaf.q->q.qlen)
899883 			htb_deactivate(q, cl);
900884 		htb_charge_class(q, cl, level, skb);
901885 	}
....@@ -952,7 +936,6 @@
952936 				goto ok;
953937 		}
954938 	}
955
-	qdisc_qstats_overlimit(sch);
956939 	if (likely(next_event > q->now))
957940 		qdisc_watchdog_schedule_ns(&q->watchdog, next_event);
958941 	else
....@@ -972,10 +955,10 @@
972955 	for (i = 0; i < q->clhash.hashsize; i++) {
973956 		hlist_for_each_entry(cl, &q->clhash.hash[i], common.hnode) {
974957 			if (cl->level)
975
-				memset(&cl->un.inner, 0, sizeof(cl->un.inner));
958
+				memset(&cl->inner, 0, sizeof(cl->inner));
976959 			else {
977
-				if (cl->un.leaf.q)
978
-					qdisc_reset(cl->un.leaf.q);
960
+				if (cl->leaf.q)
961
+					qdisc_reset(cl->leaf.q);
979962 			}
980963 			cl->prio_activity = 0;
981964 			cl->cmode = HTB_CAN_SEND;
....@@ -983,8 +966,6 @@
983966 	}
984967 	qdisc_watchdog_cancel(&q->watchdog);
985968 	__qdisc_reset_queue(&q->direct_queue);
986
-	sch->q.qlen = 0;
987
-	sch->qstats.backlog = 0;
988969 	memset(q->hlevel, 0, sizeof(q->hlevel));
989970 	memset(q->row_mask, 0, sizeof(q->row_mask));
990971 }
....@@ -1027,7 +1008,8 @@
10271008 	if (err)
10281009 		return err;
10291010 
1030
-	err = nla_parse_nested(tb, TCA_HTB_MAX, opt, htb_policy, NULL);
1011
+	err = nla_parse_nested_deprecated(tb, TCA_HTB_MAX, opt, htb_policy,
1012
+					  NULL);
10311013 	if (err < 0)
10321014 		return err;
10331015 
....@@ -1062,6 +1044,7 @@
10621044 	struct nlattr *nest;
10631045 	struct tc_htb_glob gopt;
10641046 
1047
+	sch->qstats.overlimits = q->overlimits;
10651048 	/* Its safe to not acquire qdisc lock. As we hold RTNL,
10661049 	 * no change can happen on the qdisc parameters.
10671050 	 */
....@@ -1072,7 +1055,7 @@
10721055 	gopt.defcls = q->defcls;
10731056 	gopt.debug = 0;
10741057 
1075
-	nest = nla_nest_start(skb, TCA_OPTIONS);
1058
+	nest = nla_nest_start_noflag(skb, TCA_OPTIONS);
10761059 	if (nest == NULL)
10771060 		goto nla_put_failure;
10781061 	if (nla_put(skb, TCA_HTB_INIT, sizeof(gopt), &gopt) ||
....@@ -1098,10 +1081,10 @@
10981081 	 */
10991082 	tcm->tcm_parent = cl->parent ? cl->parent->common.classid : TC_H_ROOT;
11001083 	tcm->tcm_handle = cl->common.classid;
1101
-	if (!cl->level && cl->un.leaf.q)
1102
-		tcm->tcm_info = cl->un.leaf.q->handle;
1084
+	if (!cl->level && cl->leaf.q)
1085
+		tcm->tcm_info = cl->leaf.q->handle;
11031086 
1104
-	nest = nla_nest_start(skb, TCA_OPTIONS);
1087
+	nest = nla_nest_start_noflag(skb, TCA_OPTIONS);
11051088 	if (nest == NULL)
11061089 		goto nla_put_failure;
11071090 
....@@ -1142,10 +1125,9 @@
11421125 	};
11431126 	__u32 qlen = 0;
11441127 
1145
-	if (!cl->level && cl->un.leaf.q) {
1146
-		qlen = cl->un.leaf.q->q.qlen;
1147
-		qs.backlog = cl->un.leaf.q->qstats.backlog;
1148
-	}
1128
+	if (!cl->level && cl->leaf.q)
1129
+		qdisc_qstats_qlen_backlog(cl->leaf.q, &qlen, &qs.backlog);
1130
+
11491131 	cl->xstats.tokens = clamp_t(s64, PSCHED_NS2TICKS(cl->tokens),
11501132 				    INT_MIN, INT_MAX);
11511133 	cl->xstats.ctokens = clamp_t(s64, PSCHED_NS2TICKS(cl->ctokens),
....@@ -1172,14 +1154,14 @@
11721154 				     cl->common.classid, extack)) == NULL)
11731155 		return -ENOBUFS;
11741156 
1175
-	*old = qdisc_replace(sch, new, &cl->un.leaf.q);
1157
+	*old = qdisc_replace(sch, new, &cl->leaf.q);
11761158 	return 0;
11771159 }
11781160 
11791161 static struct Qdisc *htb_leaf(struct Qdisc *sch, unsigned long arg)
11801162 {
11811163 	struct htb_class *cl = (struct htb_class *)arg;
1182
-	return !cl->level ? cl->un.leaf.q : NULL;
1164
+	return !cl->level ? cl->leaf.q : NULL;
11831165 }
11841166 
11851167 static void htb_qlen_notify(struct Qdisc *sch, unsigned long arg)
....@@ -1205,15 +1187,15 @@
12051187 {
12061188 	struct htb_class *parent = cl->parent;
12071189 
1208
-	WARN_ON(cl->level || !cl->un.leaf.q || cl->prio_activity);
1190
+	WARN_ON(cl->level || !cl->leaf.q || cl->prio_activity);
12091191 
12101192 	if (parent->cmode != HTB_CAN_SEND)
12111193 		htb_safe_rb_erase(&parent->pq_node,
12121194 				  &q->hlevel[parent->level].wait_pq);
12131195 
12141196 	parent->level = 0;
1215
-	memset(&parent->un.inner, 0, sizeof(parent->un.inner));
1216
-	parent->un.leaf.q = new_q ? new_q : &noop_qdisc;
1197
+	memset(&parent->inner, 0, sizeof(parent->inner));
1198
+	parent->leaf.q = new_q ? new_q : &noop_qdisc;
12171199 	parent->tokens = parent->buffer;
12181200 	parent->ctokens = parent->cbuffer;
12191201 	parent->t_c = ktime_get_ns();
....@@ -1223,8 +1205,8 @@
12231205 static void htb_destroy_class(struct Qdisc *sch, struct htb_class *cl)
12241206 {
12251207 	if (!cl->level) {
1226
-		WARN_ON(!cl->un.leaf.q);
1227
-		qdisc_put(cl->un.leaf.q);
1208
+		WARN_ON(!cl->leaf.q);
1209
+		qdisc_put(cl->leaf.q);
12281210 	}
12291211 	gen_kill_estimator(&cl->rate_est);
12301212 	tcf_block_put(cl->block);
....@@ -1285,13 +1267,8 @@
12851267 
12861268 	sch_tree_lock(sch);
12871269 
1288
-	if (!cl->level) {
1289
-		unsigned int qlen = cl->un.leaf.q->q.qlen;
1290
-		unsigned int backlog = cl->un.leaf.q->qstats.backlog;
1291
-
1292
-		qdisc_reset(cl->un.leaf.q);
1293
-		qdisc_tree_reduce_backlog(cl->un.leaf.q, qlen, backlog);
1294
-	}
1270
+	if (!cl->level)
1271
+		qdisc_purge_queue(cl->leaf.q);
12951272 
12961273 	/* delete from hash and active; remainder in destroy_class */
12971274 	qdisc_class_hash_remove(&q->clhash, &cl->common);
....@@ -1323,6 +1300,7 @@
13231300 	struct htb_class *cl = (struct htb_class *)*arg, *parent;
13241301 	struct nlattr *opt = tca[TCA_OPTIONS];
13251302 	struct nlattr *tb[TCA_HTB_MAX + 1];
1303
+	struct Qdisc *parent_qdisc = NULL;
13261304 	struct tc_htb_opt *hopt;
13271305 	u64 rate64, ceil64;
13281306 	int warn = 0;
....@@ -1331,7 +1309,8 @@
13311309 	if (!opt)
13321310 		goto failure;
13331311 
1334
-	err = nla_parse_nested(tb, TCA_HTB_MAX, opt, htb_policy, NULL);
1312
+	err = nla_parse_nested_deprecated(tb, TCA_HTB_MAX, opt, htb_policy,
1313
+					  NULL);
13351314 	if (err < 0)
13361315 		goto failure;
13371316 
....@@ -1419,13 +1398,9 @@
14191398 					  classid, NULL);
14201399 		sch_tree_lock(sch);
14211400 		if (parent && !parent->level) {
1422
-			unsigned int qlen = parent->un.leaf.q->q.qlen;
1423
-			unsigned int backlog = parent->un.leaf.q->qstats.backlog;
1424
-
14251401 			/* turn parent into inner node */
1426
-			qdisc_reset(parent->un.leaf.q);
1427
-			qdisc_tree_reduce_backlog(parent->un.leaf.q, qlen, backlog);
1428
-			qdisc_put(parent->un.leaf.q);
1402
+			qdisc_purge_queue(parent->leaf.q);
1403
+			parent_qdisc = parent->leaf.q;
14291404 			if (parent->prio_activity)
14301405 				htb_deactivate(q, parent);
14311406 
....@@ -1436,10 +1411,10 @@
14361411 			}
14371412 			parent->level = (parent->parent ? parent->parent->level
14381413 					 : TC_HTB_MAXDEPTH) - 1;
1439
-			memset(&parent->un.inner, 0, sizeof(parent->un.inner));
1414
+			memset(&parent->inner, 0, sizeof(parent->inner));
14401415 		}
14411416 		/* leaf (we) needs elementary qdisc */
1442
-		cl->un.leaf.q = new_q ? new_q : &noop_qdisc;
1417
+		cl->leaf.q = new_q ? new_q : &noop_qdisc;
14431418 
14441419 		cl->common.classid = classid;
14451420 		cl->parent = parent;
....@@ -1455,8 +1430,8 @@
14551430 		qdisc_class_hash_insert(&q->clhash, &cl->common);
14561431 		if (parent)
14571432 			parent->children++;
1458
-		if (cl->un.leaf.q != &noop_qdisc)
1459
-			qdisc_hash_add(cl->un.leaf.q, true);
1433
+		if (cl->leaf.q != &noop_qdisc)
1434
+			qdisc_hash_add(cl->leaf.q, true);
14601435 	} else {
14611436 		if (tca[TCA_RATE]) {
14621437 			err = gen_replace_estimator(&cl->bstats, NULL,
....@@ -1478,7 +1453,7 @@
14781453 	psched_ratecfg_precompute(&cl->ceil, &hopt->ceil, ceil64);
14791454 
14801455 	/* it used to be a nasty bug here, we have to check that node
1481
-	 * is really leaf before changing cl->un.leaf !
1456
+	 * is really leaf before changing cl->leaf !
14821457 	 */
14831458 	if (!cl->level) {
14841459 		u64 quantum = cl->rate.rate_bytes_ps;
....@@ -1504,6 +1479,7 @@
15041479 	cl->cbuffer = PSCHED_TICKS2NS(hopt->cbuffer);
15051480 
15061481 	sch_tree_unlock(sch);
1482
+	qdisc_put(parent_qdisc);
15071483 
15081484 	if (warn)
15091485 		pr_warn("HTB: quantum of class %X is %s. Consider r2q change.\n",