From patchwork Tue Aug 15 13:39:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konstantin Khlebnikov X-Patchwork-Id: 801601 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="GspXMRzV"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xWtzj0bBzz9t32 for ; Tue, 15 Aug 2017 23:46:09 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751509AbdHONqG (ORCPT ); Tue, 15 Aug 2017 09:46:06 -0400 Received: from forwardcorp1g.cmail.yandex.net ([87.250.241.190]:38089 "EHLO forwardcorp1g.cmail.yandex.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751089AbdHONqF (ORCPT ); Tue, 15 Aug 2017 09:46:05 -0400 X-Greylist: delayed 416 seconds by postgrey-1.27 at vger.kernel.org; Tue, 15 Aug 2017 09:46:05 EDT Received: from smtpcorp1p.mail.yandex.net (smtpcorp1p.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b6:10]) by forwardcorp1g.cmail.yandex.net (Yandex) with ESMTP id 2405E20C16; Tue, 15 Aug 2017 16:39:08 +0300 (MSK) Received: from smtpcorp1p.mail.yandex.net (localhost.localdomain [127.0.0.1]) by smtpcorp1p.mail.yandex.net (Yandex) with ESMTP id 221C26E40DA9; Tue, 15 Aug 2017 16:39:08 +0300 (MSK) Received: from unknown (unknown [2a02:6b8:0:40c:e089:6c68:90e2:42d5]) by smtpcorp1p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id cAVVQjw7Er-d7UC5M0m; Tue, 15 Aug 2017 16:39:08 +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=1502804348; bh=gXR+EeW8TWGoieu+nQQpZzswZooY55c29OBFhRtWDpc=; h=Subject:From:To:Cc:Date:Message-ID; b=GspXMRzVBsYX574uVgZEpU/MR9jefunMWiql/I6gazVltD8NU/opd5DbZOOslI+m8 A55zb3bx/iHkpsdFHt1ZMi+9xHMDgnJRXEsk9K5+nsBSvEzFsvHkQcaiwEXbPeJmNk 7HRfEsPrVrY9envl03KWsfHG93EUp+VxzyMOBo5s= Authentication-Results: smtpcorp1p.mail.yandex.net; dkim=pass header.i=@yandex-team.ru Subject: [PATCH] net_sched: remove warning from qdisc_hash_add From: Konstantin Khlebnikov To: netdev@vger.kernel.org, "David S. Miller" , Cong Wang Cc: Jiri Kosina , Eric Dumazet , Jamal Hadi Salim Date: Tue, 15 Aug 2017 16:39:05 +0300 Message-ID: <150280434474.717808.1684163881218427525.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 It was added in commit e57a784d8cae ("pkt_sched: set root qdisc before change() in attach_default_qdiscs()") to hide duplicates from "tc qdisc show" for incative deivices. After 59cc1f61f ("net: sched: convert qdisc linked list to hashtable") it triggered when classful qdisc is added to inactive device because default qdiscs are added before switching root qdisc. Anyway after commit ea3274695353 ("net: sched: avoid duplicates in qdisc dump") duplicates are filtered right in dumper. Signed-off-by: Konstantin Khlebnikov --- net/sched/sch_api.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index 18da45c0769c..2d2cf539668c 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c @@ -286,9 +286,6 @@ static struct Qdisc *qdisc_match_from_root(struct Qdisc *root, u32 handle) void qdisc_hash_add(struct Qdisc *q, bool invisible) { if ((q->parent != TC_H_ROOT) && !(q->flags & TCQ_F_INGRESS)) { - struct Qdisc *root = qdisc_dev(q)->qdisc; - - WARN_ON_ONCE(root == &noop_qdisc); ASSERT_RTNL(); hash_add_rcu(qdisc_dev(q)->qdisc_hash, &q->hash, q->handle); if (invisible)