From patchwork Fri Jun 15 10:27:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konstantin Khlebnikov X-Patchwork-Id: 929870 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=pass (p=none dis=none) header.from=yandex-team.ru Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=yandex-team.ru header.i=@yandex-team.ru header.b="MdFFIs8l"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 416cBR2XTrz9s19 for ; Fri, 15 Jun 2018 20:27:43 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965602AbeFOK1i (ORCPT ); Fri, 15 Jun 2018 06:27:38 -0400 Received: from forwardcorp1o.cmail.yandex.net ([37.9.109.47]:44253 "EHLO forwardcorp1o.cmail.yandex.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965521AbeFOK1h (ORCPT ); Fri, 15 Jun 2018 06:27: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 A7DFC216B6; Fri, 15 Jun 2018 13:27:34 +0300 (MSK) Received: from smtpcorp1o.mail.yandex.net (localhost.localdomain [127.0.0.1]) by smtpcorp1o.mail.yandex.net (Yandex) with ESMTP id A54FB2440C50; Fri, 15 Jun 2018 13:27:34 +0300 (MSK) Received: from unknown (unknown [2a02:6b8:0:40c:4ca:d5b7:fd37:d72e]) by smtpcorp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id FVeR3w9plN-RYuC5U2H; Fri, 15 Jun 2018 13:27:34 +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=1529058454; bh=J4TaZVyUWA3rUbMJw+KKparkfNdXCyk7dz+I8z+DDE0=; h=Subject:From:To:Cc:Date:Message-ID; b=MdFFIs8lEoYL7mJYK2vTE1Afc8GGrR1xtIM43w8NkiYrUvMFM14f12KCpYJsJltOW QbUqeFA2GKg5uu6pGH8c12dJ5/7q6YErGdaFScjhPdE1WLDDJ/RSeXC+Qehk62xVdp wQsDOGBFDaX7GkhFZ9yUC9moRg64aGSg3QedWWps= Authentication-Results: smtpcorp1o.mail.yandex.net; dkim=pass header.i=@yandex-team.ru Subject: [PATCH] net_sched: blackhole: tell upper qdisc about dropped packets From: Konstantin Khlebnikov To: netdev@vger.kernel.org, "David S. Miller" Cc: Cong Wang , Jiri Pirko , Jamal Hadi Salim Date: Fri, 15 Jun 2018 13:27:31 +0300 Message-ID: <152905845136.88583.6197221349040585517.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 blackhole is used on top of classful qdisc like hfsc it breaks qlen and backlog counters because packets are disappear without notice. In HFSC non-zero qlen while all classes are inactive triggers warning: WARNING: ... at net/sched/sch_hfsc.c:1393 hfsc_dequeue+0xba4/0xe90 [sch_hfsc] and schedules watchdog work endlessly. This patch return __NET_XMIT_BYPASS in addition to NET_XMIT_SUCCESS, this flag tells upper layer: this packet is gone and isn't queued. Signed-off-by: Konstantin Khlebnikov --- net/sched/sch_blackhole.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/sched/sch_blackhole.c b/net/sched/sch_blackhole.c index c98a61e980ba..9c4c2bb547d7 100644 --- a/net/sched/sch_blackhole.c +++ b/net/sched/sch_blackhole.c @@ -21,7 +21,7 @@ static int blackhole_enqueue(struct sk_buff *skb, struct Qdisc *sch, struct sk_buff **to_free) { qdisc_drop(skb, sch, to_free); - return NET_XMIT_SUCCESS; + return NET_XMIT_SUCCESS | __NET_XMIT_BYPASS; } static struct sk_buff *blackhole_dequeue(struct Qdisc *sch)