Commit 387687bb authored by Liu Jian's avatar Liu Jian
Browse files

net: sched: sch_qfq: Use non-work-conserving warning handler 

mainline inclusion
from mainline-v6.7-rc1
commit 6d25d1dc76bf5943a5c1f4bb74d66d5eac58eb77
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8D8S8
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=6d25d1dc76bf5943a5c1f4bb74d66d5eac58eb77



---------------------------

A helper function for printing non-work-conserving alarms is added in
commit b00355db ("pkt_sched: sch_hfsc: sch_htb: Add non-work-conserving
 warning handler."). In this commit, use qdisc_warn_nonwc() instead of
WARN_ONCE() to handle the non-work-conserving warning in qfq Qdisc.

Signed-off-by: default avatarLiu Jian <liujian56@huawei.com>
Link: https://lore.kernel.org/r/20231023064729.370649-1-liujian56@huawei.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarLiu Jian <liujian56@huawei.com>
parent ad44d573

net/sched/sch_qfq.c

+1 −1
Original line number Diff line number Diff line
@@ -1005,7 +1005,7 @@ static inline struct sk_buff *qfq_peek_skb(struct qfq_aggregate *agg, 
	*cl = list_first_entry(&agg->active, struct qfq_class, alist);

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

	if (skb == NULL)

		WARN_ONCE(1, "qfq_dequeue: non-workconserving leaf\n");

		qdisc_warn_nonwc("qfq_dequeue", (*cl)->qdisc);

	else

		*len = qdisc_pkt_len(skb);