diff options
| author | Toke Høiland-Jørgensen <toke@redhat.com> | 2020-06-25 22:12:08 +0200 |
|---|---|---|
| committer | Sasha Levin <sashal@kernel.org> | 2020-06-30 23:17:06 -0400 |
| commit | 90814e33ff3299bf9ee8f9c3c01b21b9310517b3 (patch) | |
| tree | 396dd86e5ce5ea36ea5e92b34a26922d41b0aa79 /net | |
| parent | 98e4a3407566f8e7dbd89b1d522eb894b1fefaa3 (diff) | |
| download | linux-stable-90814e33ff3299bf9ee8f9c3c01b21b9310517b3.tar.gz linux-stable-90814e33ff3299bf9ee8f9c3c01b21b9310517b3.tar.bz2 linux-stable-90814e33ff3299bf9ee8f9c3c01b21b9310517b3.zip | |
sch_cake: don't call diffserv parsing code when it is not needed
[ Upstream commit 8c95eca0bb8c4bd2231a0d581f1ad0d50c90488c ]
As a further optimisation of the diffserv parsing codepath, we can skip it
entirely if CAKE is configured to neither use diffserv-based
classification, nor to zero out the diffserv bits.
Fixes: c87b4ecdbe8d ("sch_cake: Make sure we can write the IP header before changing DSCP bits")
Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/sched/sch_cake.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/net/sched/sch_cake.c b/net/sched/sch_cake.c index d8064cb521c4..d03f843647ae 100644 --- a/net/sched/sch_cake.c +++ b/net/sched/sch_cake.c @@ -1508,7 +1508,7 @@ static unsigned int cake_drop(struct Qdisc *sch, struct sk_buff **to_free) return idx + (tin << 16); } -static u8 cake_handle_diffserv(struct sk_buff *skb, u16 wash) +static u8 cake_handle_diffserv(struct sk_buff *skb, bool wash) { const int offset = skb_network_offset(skb); u16 *buf, buf_; @@ -1569,13 +1569,16 @@ static struct cake_tin_data *cake_select_tin(struct Qdisc *sch, { struct cake_sched_data *q = qdisc_priv(sch); u32 tin; + bool wash; u8 dscp; /* Tin selection: Default to diffserv-based selection, allow overriding - * using firewall marks or skb->priority. + * using firewall marks or skb->priority. Call DSCP parsing early if + * wash is enabled, otherwise defer to below to skip unneeded parsing. */ - dscp = cake_handle_diffserv(skb, - q->rate_flags & CAKE_FLAG_WASH); + wash = !!(q->rate_flags & CAKE_FLAG_WASH); + if (wash) + dscp = cake_handle_diffserv(skb, wash); if (q->tin_mode == CAKE_DIFFSERV_BESTEFFORT) tin = 0; @@ -1586,6 +1589,8 @@ static struct cake_tin_data *cake_select_tin(struct Qdisc *sch, tin = q->tin_order[TC_H_MIN(skb->priority) - 1]; else { + if (!wash) + dscp = cake_handle_diffserv(skb, wash); tin = q->tin_index[dscp]; if (unlikely(tin >= q->tin_cnt)) |