From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.bufferbloat.net (Postfix) with ESMTPS id F18963B29D for ; Thu, 25 Jun 2020 16:12:15 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593115935; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AceQv1Pht73uByJy0LhtnWLO52xwnez23HLgovVp0cg=; b=Qmki3JWlG2RBaCZh2AnMqlNkIG+YxJnb/rZyNCHcT4KoiRgN2xsK2A44m/+m+/GXtNoEFw QhFH1ICjHYFb2pMLAOE0WgDABfr9apHaIfEXTWDTsyXk+pWIKWEG5v24CAU0nKZjAHNE1t iQRe6GPRrgGgONsGdTzdOfxh9kkE8lk= Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-317-GUt1ceS1PvmH9lwRWk68iA-1; Thu, 25 Jun 2020 16:12:12 -0400 X-MC-Unique: GUt1ceS1PvmH9lwRWk68iA-1 Received: by mail-qk1-f199.google.com with SMTP id k1so1688565qko.14 for ; Thu, 25 Jun 2020 13:12:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=AceQv1Pht73uByJy0LhtnWLO52xwnez23HLgovVp0cg=; b=IOfhjqaCB0GTHKXRaMzwLu1YiYqyIL4R9NuSOB3NF0abZuR98Sc2URS+ILOoFZ4dpJ wHednhw4rLT8EYqTpygSk5jBq8c4l4qK94CGAHGnu65UbwHh5pKpo6FBe39Ex8hvjFeZ ZUfqSB3ZTUQWUTWhF/4nwXHuwhIxlhFPiiUtZVZ6kgkB30ZT73IFI5t1EVehIIIOPuE0 gtZWqu7PPDXDl01Wg23/0Q2cXh9Nm95Slt9wfG7bXd589XrPa7b8ibHkjp71QzswFhy6 6pdmeDYxvoXZ6OBgKQyOf4jYN+hJR03R0ryxhk3SUWaQijwCuIWPn7Ihf/Jxk7pPgP1k ADTw== X-Gm-Message-State: AOAM532xPb8zmcJs+hrzxmsaF8+OW97F58YF8O6qMQ7UCTWgk3wHT15P sD79bYo2W9JJxfa8yPOqTmbKKARU1IHYJnLLnchwUrV1J2r/hcHGklYve65DNdfZlqNPyzXOGD2 u/HzxY5XsziM9H7dnL1g1ew== X-Received: by 2002:a37:5b81:: with SMTP id p123mr23554532qkb.150.1593115930885; Thu, 25 Jun 2020 13:12:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxPSz4rD1cTkLTiDYIIsSKKfe4VQ60Qil8ZXRoEPj1gtJkYL675rJPfUDZFJRUNU3/jkr84Dg== X-Received: by 2002:a37:5b81:: with SMTP id p123mr23554510qkb.150.1593115930658; Thu, 25 Jun 2020 13:12:10 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk ([45.145.92.2]) by smtp.gmail.com with ESMTPSA id v12sm7126493qtj.32.2020.06.25.13.12.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jun 2020 13:12:09 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 50D7C1814FC; Thu, 25 Jun 2020 22:12:08 +0200 (CEST) From: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= To: David Miller Cc: netdev@vger.kernel.org, cake@lists.bufferbloat.net Date: Thu, 25 Jun 2020 22:12:08 +0200 Message-ID: <159311592823.207748.268914285724823456.stgit@toke.dk> In-Reply-To: <159311592607.207748.5904268231642411759.stgit@toke.dk> References: <159311592607.207748.5904268231642411759.stgit@toke.dk> User-Agent: StGit/0.23 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Subject: [Cake] [PATCH net 2/3] sch_cake: don't call diffserv parsing code when it is not needed X-BeenThere: cake@lists.bufferbloat.net X-Mailman-Version: 2.1.20 Precedence: list List-Id: Cake - FQ_codel the next generation List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2020 20:12:16 -0000 From: Toke Høiland-Jørgensen 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 --- net/sched/sch_cake.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/net/sched/sch_cake.c b/net/sched/sch_cake.c index cae006bef565..094d6e652deb 100644 --- a/net/sched/sch_cake.c +++ b/net/sched/sch_cake.c @@ -1551,7 +1551,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_; @@ -1612,14 +1612,17 @@ static struct cake_tin_data *cake_select_tin(struct Qdisc *sch, { struct cake_sched_data *q = qdisc_priv(sch); u32 tin, mark; + 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); mark = (skb->mark & q->fwmark_mask) >> q->fwmark_shft; + wash = !!(q->rate_flags & CAKE_FLAG_WASH); + if (wash) + dscp = cake_handle_diffserv(skb, wash); if (q->tin_mode == CAKE_DIFFSERV_BESTEFFORT) tin = 0; @@ -1633,6 +1636,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))