Commit 8e3af978 authored by Jarek Poplawski's avatar Jarek Poplawski Committed by David S. Miller
Browse files

pkt_sched: Add qdisc->ops->peek() implementation. 



Add qdisc->ops->peek() implementation for work-conserving qdiscs.
With feedback from Patrick McHardy.

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

net/sched/sch_atm.c

+10 −0
Original line number Diff line number Diff line
@@ -522,6 +522,15 @@ static struct sk_buff *atm_tc_dequeue(struct Qdisc *sch) 
	return skb;

}



static struct sk_buff *atm_tc_peek(struct Qdisc *sch)

{

	struct atm_qdisc_data *p = qdisc_priv(sch);



	pr_debug("atm_tc_peek(sch %p,[qdisc %p])\n", sch, p);



	return p->link.q->ops->peek(p->link.q);

}



static int atm_tc_requeue(struct sk_buff *skb, struct Qdisc *sch)

{

	struct atm_qdisc_data *p = qdisc_priv(sch);
@@ -694,6 +703,7 @@ static struct Qdisc_ops atm_qdisc_ops __read_mostly = { 
	.priv_size	= sizeof(struct atm_qdisc_data),

	.enqueue	= atm_tc_enqueue,

	.dequeue	= atm_tc_dequeue,

	.peek		= atm_tc_peek,

	.requeue	= atm_tc_requeue,

	.drop		= atm_tc_drop,

	.init		= atm_tc_init,

net/sched/sch_blackhole.c

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ static struct Qdisc_ops blackhole_qdisc_ops __read_mostly = { 
	.priv_size	= 0,

	.enqueue	= blackhole_enqueue,

	.dequeue	= blackhole_dequeue,

	.peek		= blackhole_dequeue,

	.owner		= THIS_MODULE,

};

net/sched/sch_dsmark.c

+10 −0
Original line number Diff line number Diff line
@@ -313,6 +313,15 @@ static struct sk_buff *dsmark_dequeue(struct Qdisc *sch) 
	return skb;

}



static struct sk_buff *dsmark_peek(struct Qdisc *sch)

{

	struct dsmark_qdisc_data *p = qdisc_priv(sch);



	pr_debug("dsmark_peek(sch %p,[qdisc %p])\n", sch, p);



	return p->q->ops->peek(p->q);

}



static int dsmark_requeue(struct sk_buff *skb, struct Qdisc *sch)

{

	struct dsmark_qdisc_data *p = qdisc_priv(sch);
@@ -496,6 +505,7 @@ static struct Qdisc_ops dsmark_qdisc_ops __read_mostly = { 
	.priv_size	=	sizeof(struct dsmark_qdisc_data),

	.enqueue	=	dsmark_enqueue,

	.dequeue	=	dsmark_dequeue,

	.peek		=	dsmark_peek,

	.requeue	=	dsmark_requeue,

	.drop		=	dsmark_drop,

	.init		=	dsmark_init,

net/sched/sch_gred.c

+1 −0
Original line number Diff line number Diff line
@@ -602,6 +602,7 @@ static struct Qdisc_ops gred_qdisc_ops __read_mostly = { 
	.priv_size	=	sizeof(struct gred_sched),

	.enqueue	=	gred_enqueue,

	.dequeue	=	gred_dequeue,

	.peek		=	qdisc_peek_head,

	.requeue	=	gred_requeue,

	.drop		=	gred_drop,

	.init		=	gred_init,

net/sched/sch_multiq.c

+29 −0
Original line number Diff line number Diff line
@@ -155,6 +155,34 @@ static struct sk_buff *multiq_dequeue(struct Qdisc *sch) 


}



static struct sk_buff *multiq_peek(struct Qdisc *sch)

{

	struct multiq_sched_data *q = qdisc_priv(sch);

	unsigned int curband = q->curband;

	struct Qdisc *qdisc;

	struct sk_buff *skb;

	int band;



	for (band = 0; band < q->bands; band++) {

		/* cycle through bands to ensure fairness */

		curband++;

		if (curband >= q->bands)

			curband = 0;



		/* Check that target subqueue is available before

		 * pulling an skb to avoid excessive requeues

		 */

		if (!__netif_subqueue_stopped(qdisc_dev(sch), curband)) {

			qdisc = q->queues[curband];

			skb = qdisc->ops->peek(qdisc);

			if (skb)

				return skb;

		}

	}

	return NULL;



}



static unsigned int multiq_drop(struct Qdisc *sch)

{

	struct multiq_sched_data *q = qdisc_priv(sch);
@@ -451,6 +479,7 @@ static struct Qdisc_ops multiq_qdisc_ops __read_mostly = { 
	.priv_size	=	sizeof(struct multiq_sched_data),

	.enqueue	=	multiq_enqueue,

	.dequeue	=	multiq_dequeue,

	.peek		=	multiq_peek,

	.requeue	=	multiq_requeue,

	.drop		=	multiq_drop,

	.init		=	multiq_init,