Commit 2f23cd42 authored by Dust Li's avatar Dust Li Committed by David S. Miller
Browse files

net: sched: fix dump qlen for sch_mq/sch_mqprio with NOLOCK subqueues 



sch->q.len hasn't been set if the subqueue is a NOLOCK qdisc
 in mq_dump() and mqprio_dump().

Fixes: ce679e8d ("net: sched: add support for TCQ_F_NOLOCK subqueues to sch_mqprio")
Signed-off-by: default avatarDust Li <dust.li@linux.alibaba.com>
Signed-off-by: default avatarTony Lu <tonylu@linux.alibaba.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0d580fbd

net/sched/sch_mq.c

+1 −0
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ static int mq_dump(struct Qdisc *sch, struct sk_buff *skb) 
			__gnet_stats_copy_queue(&sch->qstats,

						qdisc->cpu_qstats,

						&qdisc->qstats, qlen);

			sch->q.qlen		+= qlen;

		} else {

			sch->q.qlen		+= qdisc->q.qlen;

			sch->bstats.bytes	+= qdisc->bstats.bytes;

net/sched/sch_mqprio.c

+1 −0
Original line number Diff line number Diff line
@@ -411,6 +411,7 @@ static int mqprio_dump(struct Qdisc *sch, struct sk_buff *skb) 
			__gnet_stats_copy_queue(&sch->qstats,

						qdisc->cpu_qstats,

						&qdisc->qstats, qlen);

			sch->q.qlen		+= qlen;

		} else {

			sch->q.qlen		+= qdisc->q.qlen;

			sch->bstats.bytes	+= qdisc->bstats.bytes;

CRA Git | Maintained and supported by SUSTech CRA and CCSE