From patchwork Wed Jun 1 23:15:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cong Wang X-Patchwork-Id: 628890 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3rKmRz1sLfz9t5g for ; Thu, 2 Jun 2016 09:15:43 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=PKcG+JHD; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751259AbcFAXPk (ORCPT ); Wed, 1 Jun 2016 19:15:40 -0400 Received: from mail-pa0-f68.google.com ([209.85.220.68]:33259 "EHLO mail-pa0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750926AbcFAXPi (ORCPT ); Wed, 1 Jun 2016 19:15:38 -0400 Received: by mail-pa0-f68.google.com with SMTP id di3so1593861pab.0 for ; Wed, 01 Jun 2016 16:15:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qnhfy/YFGlIZo4Vvu56FbWdbHa1gzRPdxDJTnm9uFMo=; b=PKcG+JHDfu/9toz2mI/TVGwQxwjOPheLYNwL3jKh5P/TisiXL2iw6a7CDb74Hv3i8+ obokhpSdzl/mxwel5bkKhDvE6iW/M7E03vDJSAuqwXAFhBG0qRHtkCZ/LMv1/SS273wS ecNdqMhCNFTkN9i/vG6jka2Ue7zpQ1z/gRAbzAnJVV9z1oOwYQB3ecX167abaMVDoCSF fBKmULD+a8CeY6S013mttmxF91qwv3T9C4JzwIhqH2pdq38CUSeq/0KZ7r4ct5B/frLP ZHKYSkOuhfel273PyVfivUsp1oQrQFPUkkREqH3NmwmvA7sdOfHu3gm9nkf5zFmvjcnl QGhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=qnhfy/YFGlIZo4Vvu56FbWdbHa1gzRPdxDJTnm9uFMo=; b=eP40nKfIWDB5YKQtsOa4xlfYsv+ByrAAetkdSCU2dO1MhTYblDoW5jUZngVl7x0sTe yseOwrxAaPGlOO7aJjNIGvnu57TRa924ErGke3MMPiyUymTZmTpcEBFN+gQEFxkY3N8d DVUYoWRuGSfWi+9jKkf0gFJ0qYWBoFAJgD9CgtyXP9altrkd7QD4Ngo73XpI+h6j6DHJ 8Dbyoq5u3b7ZhPE9GSJF88MrJbB0C9MM/8mqKct5h5z/6mS5sARNZf6RO+duvH2xxgFZ fFfXAB3wn1ilG8Y+r4is9lV8OJi4P+BbPdTHCGuh1BWOebzbaGoa870CNmm6amoePQhk SmkA== X-Gm-Message-State: ALyK8tIKlDYEhnl9KuTSCWofVL97902jC65VsjaqchMfuC3+yppF0OvbQTsIVIezUE3V0A== X-Received: by 10.66.166.78 with SMTP id ze14mr1014324pab.149.1464822938191; Wed, 01 Jun 2016 16:15:38 -0700 (PDT) Received: from localhost.net ([8.25.197.26]) by smtp.gmail.com with ESMTPSA id l67sm50551800pfi.10.2016.06.01.16.15.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Jun 2016 16:15:37 -0700 (PDT) From: Cong Wang To: netdev@vger.kernel.org Cc: stasn77@gmail.com, Cong Wang , Jamal Hadi Salim Subject: [Patch net] sch_red: update backlog as well Date: Wed, 1 Jun 2016 16:15:18 -0700 Message-Id: <1464822920-14205-4-git-send-email-xiyou.wangcong@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1464822920-14205-1-git-send-email-xiyou.wangcong@gmail.com> References: <1464822920-14205-1-git-send-email-xiyou.wangcong@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fixes: 2ccccf5fb43f ("net_sched: update hierarchical backlog too") Cc: Jamal Hadi Salim Signed-off-by: Cong Wang --- net/sched/sch_red.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/sched/sch_red.c b/net/sched/sch_red.c index 8c0508c..91578bd 100644 --- a/net/sched/sch_red.c +++ b/net/sched/sch_red.c @@ -97,6 +97,7 @@ static int red_enqueue(struct sk_buff *skb, struct Qdisc *sch) ret = qdisc_enqueue(skb, child); if (likely(ret == NET_XMIT_SUCCESS)) { + qdisc_qstats_backlog_inc(sch, skb); sch->q.qlen++; } else if (net_xmit_drop_count(ret)) { q->stats.pdrop++; @@ -118,6 +119,7 @@ static struct sk_buff *red_dequeue(struct Qdisc *sch) skb = child->dequeue(child); if (skb) { qdisc_bstats_update(sch, skb); + qdisc_qstats_backlog_dec(sch, skb); sch->q.qlen--; } else { if (!red_is_idling(&q->vars)) @@ -143,6 +145,7 @@ static unsigned int red_drop(struct Qdisc *sch) if (child->ops->drop && (len = child->ops->drop(child)) > 0) { q->stats.other++; qdisc_qstats_drop(sch); + sch->qstats.backlog -= len; sch->q.qlen--; return len; } @@ -158,6 +161,7 @@ static void red_reset(struct Qdisc *sch) struct red_sched_data *q = qdisc_priv(sch); qdisc_reset(q->qdisc); + sch->qstats.backlog = 0; sch->q.qlen = 0; red_restart(&q->vars); }