From patchwork Tue May 29 07:15:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10434489 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 52F54601E9 for ; Tue, 29 May 2018 07:15:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3E0C62811E for ; Tue, 29 May 2018 07:15:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 32C512818E; Tue, 29 May 2018 07:15:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BAF072811E for ; Tue, 29 May 2018 07:15:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1FEAD6E30E; Tue, 29 May 2018 07:15:32 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0DBBD6E30E for ; Tue, 29 May 2018 07:15:29 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id m129-v6so37463623wmb.3 for ; Tue, 29 May 2018 00:15:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=52k7kP5EOpmScmFBIL8nrYnBznTDKn3kuEGe3VDNMDI=; b=TbIXpy6csuATZHmYccLdxAwm60SNsGZcRQuYfc6THW2J40APZPMV0SN0ruUnjXpOb3 3pmZhEbkKoTdJOQ/hgpZ5Y5QwydpOIYz3DoPwv/I/HMcoIDq9tkuZ3/ZK5b3T10skDVc 5HJxg/mzXGGsXcupheS3IU1f1YXLzyEA8URG4xwb5MFIIbP3fQHyI0GCIHhgnk4Uhppd Jb28i7qIFWlc3C5yvXb9g2j1WnUfNmJ64UtEAbghZ/KdTOMneeiiN1PugPibfOPh86ZC JPB1PvcIVyFF3fIuOSGK/uAx3PyEmWqEFvgtTQO0qW8ZIiIT/0CKIgDfLdWrtQFOuRF1 lF6A== X-Gm-Message-State: ALKqPwdtm9xRBrm19oOcOG75n9Tz4sQQgGv2FhrZCV/IrUeVGApmpUcG GbAe+z5J/GeUAXRM0EUeIgAev+k3 X-Google-Smtp-Source: ADUXVKJSMLGXNxL2hOUgG3qimw8b1HcX7xwjlUrxswFWUXeSQ+QdYCNtrdmiLiZD3WRdJyQ7Wj+ZKg== X-Received: by 2002:a50:b52a:: with SMTP id y39-v6mr13049038edd.195.1527578128308; Tue, 29 May 2018 00:15:28 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:5628:0:d0c7:bcda:eea:9e5d]) by smtp.gmail.com with ESMTPSA id b22-v6sm18263942edn.44.2018.05.29.00.15.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 May 2018 00:15:27 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Tue, 29 May 2018 09:15:22 +0200 Message-Id: <20180529071522.31147-1-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.17.0 Subject: [Intel-gfx] [PATCH] Revert "net/sch_generic: Shut up noise" X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Daniel Vetter MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP This reverts commit c5cab0d5fc9aa1cf14c7bc7ea88c80155e46e22f. Jani believes the noise is gone, so let's see whether it's really gone, before we drop this hack. Cc: "Saarinen, Jani" Cc: Martin Peres Signed-off-by: Daniel Vetter --- net/sched/sch_generic.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index aef2582badc5..39c144b6ff98 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c @@ -468,12 +468,7 @@ static void dev_watchdog(struct timer_list *t) } } - /* The noise is pissing off our CI and upstream doesn't - * move on the bug report: - * - * https://bugzilla.kernel.org/show_bug.cgi?id=196399 - */ - if (some_queue_timedout && 0) { + if (some_queue_timedout) { WARN_ONCE(1, KERN_INFO "NETDEV WATCHDOG: %s (%s): transmit queue %u timed out\n", dev->name, netdev_drivername(dev), i); dev->netdev_ops->ndo_tx_timeout(dev);