From patchwork Wed Sep 20 12:45:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konstantin Khlebnikov X-Patchwork-Id: 816184 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="DCL+85Ux"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xxzxR2yGMz9t2V for ; Wed, 20 Sep 2017 22:45:47 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751748AbdITMpp (ORCPT ); Wed, 20 Sep 2017 08:45:45 -0400 Received: from forwardcorp1j.cmail.yandex.net ([5.255.227.106]:60649 "EHLO forwardcorp1j.cmail.yandex.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751554AbdITMpo (ORCPT ); Wed, 20 Sep 2017 08:45:44 -0400 Received: from smtpcorp1p.mail.yandex.net (smtpcorp1p.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b6:10]) by forwardcorp1j.cmail.yandex.net (Yandex) with ESMTP id 3A3BB206AA; Wed, 20 Sep 2017 15:45:42 +0300 (MSK) Received: from smtpcorp1p.mail.yandex.net (localhost.localdomain [127.0.0.1]) by smtpcorp1p.mail.yandex.net (Yandex) with ESMTP id 377CD6E40B10; Wed, 20 Sep 2017 15:45:42 +0300 (MSK) Received: from unknown (unknown [2a02:6b8:0:40c:95ec:fcac:6acb:d9d9]) by smtpcorp1p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id UbNQZzjCgr-jgs0vpPt; Wed, 20 Sep 2017 15:45:42 +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=1505911542; bh=9KR1lfYHY5cNpwKNCUqa9lWn2YM4svLYokVu9chnQEs=; h=Subject:From:To:Cc:Date:Message-ID; b=DCL+85UxbIXonHDJYyFr4xuFKGQ+0IHd3PSZzQv+xkKilYNNeUSAzEfWXM3/5yeY+ hL0amhMwz0fx/P7gOcyP2sjc7Qr/tU/V5IGyBj/yV1Qe+gBFg1MJX9H2mXvCmX8yEA zSPMG9pjp0ecvXIoDEsttMcyHYD/SrAilUPElN/U= Authentication-Results: smtpcorp1p.mail.yandex.net; dkim=pass header.i=@yandex-team.ru Subject: [PATCH] net_sched: always reset qdisc backlog in qdisc_reset() From: Konstantin Khlebnikov To: netdev@vger.kernel.org, "David S. Miller" Cc: Cong Wang , Jiri Pirko , Jamal Hadi Salim Date: Wed, 20 Sep 2017 15:45:36 +0300 Message-ID: <150591153693.113604.8604505743746410801.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 SKB stored in qdisc->gso_skb also counted into backlog. Some qdiscs don't reset backlog to zero in ->reset(), for example sfq just dequeue and free all queued skb. Signed-off-by: Konstantin Khlebnikov Fixes: 2ccccf5fb43f ("net_sched: update hierarchical backlog too") --- net/sched/sch_generic.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index 92237e75dbbc..bf8c81e07c70 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c @@ -685,6 +685,7 @@ void qdisc_reset(struct Qdisc *qdisc) qdisc->gso_skb = NULL; } qdisc->q.qlen = 0; + qdisc->qstats.backlog = 0; } EXPORT_SYMBOL(qdisc_reset);