From mboxrd@z Thu Jan 1 00:00:00 1970 From: Harry Mason Subject: [PATCH v2] sch_htb: let skb->priority refer to non-leaf class Date: Fri, 17 Jan 2014 10:19:59 +0000 Message-ID: <1389953999.4698.18.camel@azathoth.dev.smoothwall.net> References: <1389883519.4703.5.camel@azathoth.dev.smoothwall.net> <1389889520.31367.403.camel@edumazet-glaptop2.roam.corp.google.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Cc: linux-netdev To: Eric Dumazet , Jamal Hadi Salim Return-path: Received: from exprod7og127.obsmtp.com ([64.18.2.210]:36601 "HELO exprod7og127.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751395AbaAQKUP (ORCPT ); Fri, 17 Jan 2014 05:20:15 -0500 Received: by mail-wi0-f174.google.com with SMTP id g10so481933wiw.13 for ; Fri, 17 Jan 2014 02:20:10 -0800 (PST) In-Reply-To: <1389889520.31367.403.camel@edumazet-glaptop2.roam.corp.google.com> Sender: netdev-owner@vger.kernel.org List-ID: If the class in skb->priority is not a leaf, apply filters from the selected class, not the qdisc. This lets netfilter or user space partially classify the packet. Signed-off-by: Harry Mason --- On Thu, 2014-01-16 at 08:25 -0800, Eric Dumazet wrote: > On Thu, 2014-01-16 at 14:45 +0000, Harry Mason wrote: > >> + /* Start with inner filter chain if a non-leaf class is selected */ >> + if (cl) >> + tcf = cl->filter_list; >> + else >> + tcf = q->filter_list; > > Could this break some existing htb setups ? I think it is unlikely. Setting skb->priority to a non-leaf class would be equivalent to setting it to the base qdisc. In theory an application might rely on this if it expects the classes to be dynamic, but adding a filter could restore the old behaviour. To me this is intuitively how it should behave, and reproduces what would happen if a tc filter instead of netfilter had first assigned the non-leaf class. > Also we test cl being NULL at line 222, it would be nice to not > test it again... Updated below. net/sched/sch_htb.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c index 717b210..8073d92 100644 --- a/net/sched/sch_htb.c +++ b/net/sched/sch_htb.c @@ -219,11 +219,15 @@ static struct htb_class *htb_classify(struct sk_buff *skb, struct Qdisc *sch, if (skb->priority == sch->handle) return HTB_DIRECT; /* X:0 (direct flow) selected */ cl = htb_find(skb->priority, sch); - if (cl && cl->level == 0) - return cl; + if (cl) { + if (cl->level == 0) + return cl; + /* Start with inner filter chain if a non-leaf class is selected */ + tcf = cl->filter_list; + } else + tcf = q->filter_list; *qerr = NET_XMIT_SUCCESS | __NET_XMIT_BYPASS; - tcf = q->filter_list; while (tcf && (result = tc_classify(skb, tcf, &res)) >= 0) { #ifdef CONFIG_NET_CLS_ACT switch (result) { -- 1.7.10.4