Commit 25331d6c authored by John Fastabend's avatar John Fastabend Committed by David S. Miller
Browse files

net: sched: implement qstat helper routines 



This adds helpers to manipulate qstats logic and replaces locations
that touch the counters directly. This simplifies future patches
to push qstats onto per cpu counters.

Signed-off-by: default avatarJohn Fastabend <john.r.fastabend@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 22e0f8b9

include/net/sch_generic.h

+33 −6
Original line number Diff line number Diff line
@@ -521,11 +521,38 @@ static inline void qdisc_bstats_update(struct Qdisc *sch, 
	bstats_update(&sch->bstats, skb);

}



static inline void qdisc_qstats_backlog_dec(struct Qdisc *sch,

					    const struct sk_buff *skb)

{

	sch->qstats.backlog -= qdisc_pkt_len(skb);

}



static inline void qdisc_qstats_backlog_inc(struct Qdisc *sch,

					    const struct sk_buff *skb)

{

	sch->qstats.backlog += qdisc_pkt_len(skb);

}



static inline void __qdisc_qstats_drop(struct Qdisc *sch, int count)

{

	sch->qstats.drops += count;

}



static inline void qdisc_qstats_drop(struct Qdisc *sch)

{

	sch->qstats.drops++;

}



static inline void qdisc_qstats_overlimit(struct Qdisc *sch)

{

	sch->qstats.overlimits++;

}



static inline int __qdisc_enqueue_tail(struct sk_buff *skb, struct Qdisc *sch,

				       struct sk_buff_head *list)

{

	__skb_queue_tail(list, skb);

	sch->qstats.backlog += qdisc_pkt_len(skb);

	qdisc_qstats_backlog_inc(sch, skb);



	return NET_XMIT_SUCCESS;

}
@@ -541,7 +568,7 @@ static inline struct sk_buff *__qdisc_dequeue_head(struct Qdisc *sch, 
	struct sk_buff *skb = __skb_dequeue(list);



	if (likely(skb != NULL)) {

		sch->qstats.backlog -= qdisc_pkt_len(skb);

		qdisc_qstats_backlog_dec(sch, skb);

		qdisc_bstats_update(sch, skb);

	}
@@ -560,7 +587,7 @@ static inline unsigned int __qdisc_queue_drop_head(struct Qdisc *sch, 


	if (likely(skb != NULL)) {

		unsigned int len = qdisc_pkt_len(skb);

		sch->qstats.backlog -= len;

		qdisc_qstats_backlog_dec(sch, skb);

		kfree_skb(skb);

		return len;

	}
@@ -579,7 +606,7 @@ static inline struct sk_buff *__qdisc_dequeue_tail(struct Qdisc *sch, 
	struct sk_buff *skb = __skb_dequeue_tail(list);



	if (likely(skb != NULL))

		sch->qstats.backlog -= qdisc_pkt_len(skb);

		qdisc_qstats_backlog_dec(sch, skb);



	return skb;

}
@@ -661,14 +688,14 @@ static inline unsigned int qdisc_queue_drop(struct Qdisc *sch) 
static inline int qdisc_drop(struct sk_buff *skb, struct Qdisc *sch)

{

	kfree_skb(skb);

	sch->qstats.drops++;

	qdisc_qstats_drop(sch);



	return NET_XMIT_DROP;

}



static inline int qdisc_reshape_fail(struct sk_buff *skb, struct Qdisc *sch)

{

	sch->qstats.drops++;

	qdisc_qstats_drop(sch);



#ifdef CONFIG_NET_CLS_ACT

	if (sch->reshape_fail == NULL || sch->reshape_fail(skb, sch))

net/sched/sch_api.c

+1 −1
Original line number Diff line number Diff line
@@ -763,7 +763,7 @@ void qdisc_tree_decrease_qlen(struct Qdisc *sch, unsigned int n) 
			cops->put(sch, cl);

		}

		sch->q.qlen -= n;

		sch->qstats.drops += drops;

		__qdisc_qstats_drop(sch, drops);

	}

}

EXPORT_SYMBOL(qdisc_tree_decrease_qlen);

net/sched/sch_atm.c

+1 −1
Original line number Diff line number Diff line
@@ -417,7 +417,7 @@ static int atm_tc_enqueue(struct sk_buff *skb, struct Qdisc *sch) 
	if (ret != NET_XMIT_SUCCESS) {

drop: __maybe_unused

		if (net_xmit_drop_count(ret)) {

			sch->qstats.drops++;

			qdisc_qstats_drop(sch);

			if (flow)

				flow->qstats.drops++;

		}

net/sched/sch_cbq.c

+5 −5
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ cbq_enqueue(struct sk_buff *skb, struct Qdisc *sch) 
#endif

	if (cl == NULL) {

		if (ret & __NET_XMIT_BYPASS)

			sch->qstats.drops++;

			qdisc_qstats_drop(sch);

		kfree_skb(skb);

		return ret;

	}
@@ -395,7 +395,7 @@ cbq_enqueue(struct sk_buff *skb, struct Qdisc *sch) 
	}



	if (net_xmit_drop_count(ret)) {

		sch->qstats.drops++;

		qdisc_qstats_drop(sch);

		cbq_mark_toplevel(q, cl);

		cl->qstats.drops++;

	}
@@ -650,11 +650,11 @@ static int cbq_reshape_fail(struct sk_buff *skb, struct Qdisc *child) 
			return 0;

		}

		if (net_xmit_drop_count(ret))

			sch->qstats.drops++;

			qdisc_qstats_drop(sch);

		return 0;

	}



	sch->qstats.drops++;

	qdisc_qstats_drop(sch);

	return -1;

}

#endif
@@ -995,7 +995,7 @@ cbq_dequeue(struct Qdisc *sch) 
	 */



	if (sch->q.qlen) {

		sch->qstats.overlimits++;

		qdisc_qstats_overlimit(sch);

		if (q->wd_expires)

			qdisc_watchdog_schedule(&q->watchdog,

						now + q->wd_expires);

net/sched/sch_choke.c

+7 −7
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ static void choke_drop_by_idx(struct Qdisc *sch, unsigned int idx) 
	if (idx == q->tail)

		choke_zap_tail_holes(q);



	sch->qstats.backlog -= qdisc_pkt_len(skb);

	qdisc_qstats_backlog_dec(sch, skb);

	qdisc_drop(skb, sch);

	qdisc_tree_decrease_qlen(sch, 1);

	--sch->q.qlen;
@@ -302,7 +302,7 @@ static int choke_enqueue(struct sk_buff *skb, struct Qdisc *sch) 
		if (q->vars.qavg > p->qth_max) {

			q->vars.qcount = -1;



			sch->qstats.overlimits++;

			qdisc_qstats_overlimit(sch);

			if (use_harddrop(q) || !use_ecn(q) ||

			    !INET_ECN_set_ce(skb)) {

				q->stats.forced_drop++;
@@ -315,7 +315,7 @@ static int choke_enqueue(struct sk_buff *skb, struct Qdisc *sch) 
				q->vars.qcount = 0;

				q->vars.qR = red_random(p);



				sch->qstats.overlimits++;

				qdisc_qstats_overlimit(sch);

				if (!use_ecn(q) || !INET_ECN_set_ce(skb)) {

					q->stats.prob_drop++;

					goto congestion_drop;
@@ -332,7 +332,7 @@ static int choke_enqueue(struct sk_buff *skb, struct Qdisc *sch) 
		q->tab[q->tail] = skb;

		q->tail = (q->tail + 1) & q->tab_mask;

		++sch->q.qlen;

		sch->qstats.backlog += qdisc_pkt_len(skb);

		qdisc_qstats_backlog_inc(sch, skb);

		return NET_XMIT_SUCCESS;

	}
@@ -345,7 +345,7 @@ static int choke_enqueue(struct sk_buff *skb, struct Qdisc *sch) 


other_drop:

	if (ret & __NET_XMIT_BYPASS)

		sch->qstats.drops++;

		qdisc_qstats_drop(sch);

	kfree_skb(skb);

	return ret;

}
@@ -365,7 +365,7 @@ static struct sk_buff *choke_dequeue(struct Qdisc *sch) 
	q->tab[q->head] = NULL;

	choke_zap_head_holes(q);

	--sch->q.qlen;

	sch->qstats.backlog -= qdisc_pkt_len(skb);

	qdisc_qstats_backlog_dec(sch, skb);

	qdisc_bstats_update(sch, skb);



	return skb;
@@ -460,7 +460,7 @@ static int choke_change(struct Qdisc *sch, struct nlattr *opt) 
					ntab[tail++] = skb;

					continue;

				}

				sch->qstats.backlog -= qdisc_pkt_len(skb);

				qdisc_qstats_backlog_dec(sch, skb);

				--sch->q.qlen;

				qdisc_drop(skb, sch);

			}