Commit 378a2f09 authored by Jarek Poplawski's avatar Jarek Poplawski Committed by David S. Miller
Browse files

net_sched: Add qdisc __NET_XMIT_STOLEN flag 



Patrick McHardy <kaber@trash.net> noticed:
"The other problem that affects all qdiscs supporting actions is
TC_ACT_QUEUED/TC_ACT_STOLEN getting mapped to NET_XMIT_SUCCESS
even though the packet is not queued, corrupting upper qdiscs'
qlen counters."

and later explained:
"The reason why it translates it at all seems to be to not increase
the drops counter. Within a single qdisc this could be avoided by
other means easily, upper qdiscs would still increase the counter
when we return anything besides NET_XMIT_SUCCESS though.

This means we need a new NET_XMIT return value to indicate this to
the upper qdiscs. So I'd suggest to introduce NET_XMIT_STOLEN,
return that to upper qdiscs and translate it to NET_XMIT_SUCCESS
in dev_queue_xmit, similar to NET_XMIT_BYPASS."

David Miller <davem@davemloft.net> noticed:
"Maybe these NET_XMIT_* values being passed around should be a set of
bits. They could be composed of base meanings, combined with specific
attributes.

So you could say "NET_XMIT_DROP | __NET_XMIT_NO_DROP_COUNT"

The attributes get masked out by the top-level ->enqueue() caller,
such that the base meanings are the only thing that make their
way up into the stack. If it's only about communication within the
qdisc tree, let's simply code it that way."

This patch is trying to realize these ideas.

Signed-off-by: default avatarJarek Poplawski <jarkao2@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6e583ce5

include/linux/netdevice.h

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ struct wireless_dev; 
#define NET_XMIT_BYPASS		4	/* packet does not leave via dequeue;

					   (TC use only - dev_queue_xmit

					   returns this as NET_XMIT_SUCCESS) */

#define NET_XMIT_MASK		0xFFFF	/* qdisc flags in net/sch_generic.h */



/* Backlog congestion levels */

#define NET_RX_SUCCESS		0   /* keep 'em coming, baby */

include/net/sch_generic.h

+13 −1
Original line number Diff line number Diff line
@@ -343,6 +343,18 @@ static inline unsigned int qdisc_pkt_len(struct sk_buff *skb) 
	return qdisc_skb_cb(skb)->pkt_len;

}



#ifdef CONFIG_NET_CLS_ACT

/* additional qdisc xmit flags */

enum net_xmit_qdisc_t {

	__NET_XMIT_STOLEN = 0x00010000,

};



#define net_xmit_drop_count(e)	((e) & __NET_XMIT_STOLEN ? 0 : 1)



#else

#define net_xmit_drop_count(e)	(1)

#endif



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

{

#ifdef CONFIG_NET_SCHED
@@ -355,7 +367,7 @@ static inline int qdisc_enqueue(struct sk_buff *skb, struct Qdisc *sch) 
static inline int qdisc_enqueue_root(struct sk_buff *skb, struct Qdisc *sch)

{

	qdisc_skb_cb(skb)->pkt_len = skb->len;

	return qdisc_enqueue(skb, sch);

	return qdisc_enqueue(skb, sch) & NET_XMIT_MASK;

}



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

net/sched/sch_atm.c

+7 −5
Original line number Diff line number Diff line
@@ -415,7 +415,7 @@ static int atm_tc_enqueue(struct sk_buff *skb, struct Qdisc *sch) 
		case TC_ACT_QUEUED:

		case TC_ACT_STOLEN:

			kfree_skb(skb);

			return NET_XMIT_SUCCESS;

			return NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;

		case TC_ACT_SHOT:

			kfree_skb(skb);

			goto drop;
@@ -432,9 +432,11 @@ static int atm_tc_enqueue(struct sk_buff *skb, struct Qdisc *sch) 
	ret = qdisc_enqueue(skb, flow->q);

	if (ret != 0) {

drop: __maybe_unused

		if (net_xmit_drop_count(ret)) {

			sch->qstats.drops++;

			if (flow)

				flow->qstats.drops++;

		}

		return ret;

	}

	sch->bstats.bytes += qdisc_pkt_len(skb);
@@ -530,7 +532,7 @@ static int atm_tc_requeue(struct sk_buff *skb, struct Qdisc *sch) 
	if (!ret) {

		sch->q.qlen++;

		sch->qstats.requeues++;

	} else {

	} else if (net_xmit_drop_count(ret)) {

		sch->qstats.drops++;

		p->link.qstats.drops++;

	}

net/sched/sch_cbq.c

+15 −8
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ cbq_classify(struct sk_buff *skb, struct Qdisc *sch, int *qerr) 
		switch (result) {

		case TC_ACT_QUEUED:

		case TC_ACT_STOLEN:

			*qerr = NET_XMIT_SUCCESS;

			*qerr = NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;

		case TC_ACT_SHOT:

			return NULL;

		case TC_ACT_RECLASSIFY:
@@ -397,9 +397,11 @@ cbq_enqueue(struct sk_buff *skb, struct Qdisc *sch) 
		return ret;

	}



	if (net_xmit_drop_count(ret)) {

		sch->qstats.drops++;

		cbq_mark_toplevel(q, cl);

		cl->qstats.drops++;

	}

	return ret;

}
@@ -430,8 +432,10 @@ cbq_requeue(struct sk_buff *skb, struct Qdisc *sch) 
			cbq_activate_class(cl);

		return 0;

	}

	if (net_xmit_drop_count(ret)) {

		sch->qstats.drops++;

		cl->qstats.drops++;

	}

	return ret;

}
@@ -664,13 +668,15 @@ static int cbq_reshape_fail(struct sk_buff *skb, struct Qdisc *child) 
	q->rx_class = NULL;



	if (cl && (cl = cbq_reclassify(skb, cl)) != NULL) {

		int ret;



		cbq_mark_toplevel(q, cl);



		q->rx_class = cl;

		cl->q->__parent = sch;



		if (qdisc_enqueue(skb, cl->q) == 0) {

		ret = qdisc_enqueue(skb, cl->q);

		if (ret == NET_XMIT_SUCCESS) {

			sch->q.qlen++;

			sch->bstats.packets++;

			sch->bstats.bytes += qdisc_pkt_len(skb);
@@ -678,6 +684,7 @@ static int cbq_reshape_fail(struct sk_buff *skb, struct Qdisc *child) 
				cbq_activate_class(cl);

			return 0;

		}

		if (net_xmit_drop_count(ret))

			sch->qstats.drops++;

		return 0;

	}

net/sched/sch_dsmark.c

+5 −3
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ static int dsmark_enqueue(struct sk_buff *skb, struct Qdisc *sch) 
		case TC_ACT_QUEUED:

		case TC_ACT_STOLEN:

			kfree_skb(skb);

			return NET_XMIT_SUCCESS;

			return NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;



		case TC_ACT_SHOT:

			goto drop;
@@ -254,6 +254,7 @@ static int dsmark_enqueue(struct sk_buff *skb, struct Qdisc *sch) 


	err = qdisc_enqueue(skb, p->q);

	if (err != NET_XMIT_SUCCESS) {

		if (net_xmit_drop_count(err))

			sch->qstats.drops++;

		return err;

	}
@@ -321,6 +322,7 @@ static int dsmark_requeue(struct sk_buff *skb, struct Qdisc *sch) 


	err = p->q->ops->requeue(skb, p->q);

	if (err != NET_XMIT_SUCCESS) {

		if (net_xmit_drop_count(err))

			sch->qstats.drops++;

		return err;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE