From patchwork Mon Aug 21 08:12:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konstantin Khlebnikov X-Patchwork-Id: 803884 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=yandex-team.ru header.i=@yandex-team.ru header.b="lbB5v3ze"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xbRJC58BQz9s7M for ; Mon, 21 Aug 2017 18:12:43 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752566AbdHUIMk (ORCPT ); Mon, 21 Aug 2017 04:12:40 -0400 Received: from forwardcorp1o.cmail.yandex.net ([37.9.109.47]:55231 "EHLO forwardcorp1o.cmail.yandex.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751750AbdHUIMh (ORCPT ); Mon, 21 Aug 2017 04:12:37 -0400 Received: from smtpcorp1o.mail.yandex.net (smtpcorp1o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::30]) by forwardcorp1o.cmail.yandex.net (Yandex) with ESMTP id 88FC920781; Mon, 21 Aug 2017 11:12:35 +0300 (MSK) Received: from smtpcorp1o.mail.yandex.net (localhost.localdomain [127.0.0.1]) by smtpcorp1o.mail.yandex.net (Yandex) with ESMTP id 84EF72440C28; Mon, 21 Aug 2017 11:12:35 +0300 (MSK) Received: from unknown (unknown [2a02:6b8:0:6::1:c]) by smtpcorp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id e3se3SePGZ-CZQefNPv; Mon, 21 Aug 2017 11:12:35 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client certificate not present) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1503303155; bh=XBNI0i38f07iOwg7p11PpxKsyFeDxY3BtQAy/PeN72M=; h=Subject:From:To:Cc:Date:Message-ID; b=lbB5v3zeycEBKz8SHojoyLUpy2TMPLAZ4+L0l9RPqdNI8XylcX21bpyoIU1RUFK3p 4G45F3t+x3aMh9EdrYFLQ0ZbANMpKoyjiwyZINMkz1JQSZc5vsAhM81jk8U8dKRl3L DkWSJFSN8aaoqDdeypbOGizdxFdi9wjFZFRy61qc= Authentication-Results: smtpcorp1o.mail.yandex.net; dkim=pass header.i=@yandex-team.ru Subject: [PATCH] net_sched/hhf: update hierarchical backlog when drop packet From: Konstantin Khlebnikov To: netdev@vger.kernel.org, "David S. Miller" Cc: Cong Wang , Jiri Pirko Date: Mon, 21 Aug 2017 11:12:31 +0300 Message-ID: <150330315167.155003.1998024290510727078.stgit@buzz> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When hhf_enqueue() drops packet from another bucket it have to update backlog at upper qdiscs too. Signed-off-by: Konstantin Khlebnikov Fixes: 2ccccf5fb43f ("net_sched: update hierarchical backlog too") --- net/sched/sch_hhf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/net/sched/sch_hhf.c b/net/sched/sch_hhf.c index 51d3ba682af9..c8d84436e427 100644 --- a/net/sched/sch_hhf.c +++ b/net/sched/sch_hhf.c @@ -406,8 +406,11 @@ static int hhf_enqueue(struct sk_buff *skb, struct Qdisc *sch, /* Return Congestion Notification only if we dropped a packet from this * bucket. */ - if (hhf_drop(sch, to_free) == idx) + if (hhf_drop(sch, to_free) == idx) { + qdisc_tree_reduce_backlog(sch, 0, + prev_backlog - sch->qstats.backlog); return NET_XMIT_CN; + } /* As we dropped a packet, better let upper stack know this. */ qdisc_tree_reduce_backlog(sch, 1, prev_backlog - sch->qstats.backlog);