From patchwork Tue Dec 3 07:32:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 11270639 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E07C66C1 for ; Tue, 3 Dec 2019 07:32:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B70DA2073B for ; Tue, 3 Dec 2019 07:32:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="JUCKwY0o" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727453AbfLCHcS (ORCPT ); Tue, 3 Dec 2019 02:32:18 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:32034 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727408AbfLCHcR (ORCPT ); Tue, 3 Dec 2019 02:32:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575358336; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QDZ6zkutNb+UsMTsOrqqbjPx6wHX610gfsQwcSvpFp8=; b=JUCKwY0oa/kjOHpIP1/HUQBZx0isquM9YMIVIYT0eJtsgijzWpNkkg6VwKr5dEJauHm+st WLL0+YCvYGIe8s6Do6RfacyzBJw3uQxY1niuILfucmbVoL8hTNH7CT04dhhEchVCfk0uWO 6UpxLLHhrhs2kN1rVd3+EFdNPsb37Gg= Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-4-AtsIqnAYNmSCtOBpW2lEtw-1; Tue, 03 Dec 2019 02:32:15 -0500 Received: by mail-qk1-f198.google.com with SMTP id d26so1618046qkk.8 for ; Mon, 02 Dec 2019 23:32:15 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=6xKT/ZrBuwY/dROOLKR3Rna6H1BFhaRlBSFPw3pHzCk=; b=TZF3FZvuKq7ueOyV2oZIgI28ztLu1W8nFDuVhOhoPdsqL5M1dCed4/6MnZonT0T/f3 Y1D++LdM6d7kw6dlwxONjgV/OTzwXFvlJ8D2Sh82+F0enD1lHjpMyBAQwTijoDKmaVVq 6Ri3OrWRMEIVFBvE2QQ7wbtYCibUTkpWt7cxKgdXTlLey1dhgw7GAUwrjlkGsjClCvic N7jRa/RhX4SyQI3UfivDHuwigaHtlnyXP+VNf/BmfKfYeW1HbIinQTMgMTFA9AZjkGgN JSqDtRQuPflDuxb0rwku6bVUAQtVl2NjdzLDzbESbYtSvruPheXxwWQDuXV7XYUwxuy3 rLlA== X-Gm-Message-State: APjAAAWTI0v/HnvMLf+rAhLqF4aSvfg5kB75QyaV9d0lfD50pyg23ANH tS9B0fsO6i4S8VqaCenVn/AbMQ7k2YAxIBUrjZRLT4Wy1XjbVSlJdn6ZDiewbXnrlkMsvL2A3An VEBtDEQz9U/cmIoZuIdY1GQ== X-Received: by 2002:a37:4f83:: with SMTP id d125mr3826269qkb.205.1575358334436; Mon, 02 Dec 2019 23:32:14 -0800 (PST) X-Google-Smtp-Source: APXvYqw9SwwNQE59WdoMcrLUQeGGNOBWpqfUZPXMhfa3nkO1AfEgg7+4frtIMTFsaovZ3lKFFAH+BA== X-Received: by 2002:a37:4f83:: with SMTP id d125mr3826243qkb.205.1575358334155; Mon, 02 Dec 2019 23:32:14 -0800 (PST) Received: from redhat.com (bzq-79-181-48-215.red.bezeqint.net. [79.181.48.215]) by smtp.gmail.com with ESMTPSA id q126sm1299731qkd.21.2019.12.02.23.32.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Dec 2019 23:32:13 -0800 (PST) Date: Tue, 3 Dec 2019 02:32:10 -0500 From: "Michael S. Tsirkin" To: linux-kernel@vger.kernel.org Cc: Tariq Toukan , "David S. Miller" , netdev@vger.kernel.org, linux-rdma@vger.kernel.org Subject: [PATCH RFC v7 net-next 2/1] mlx4: use new txqueue timeout argument Message-ID: <20191203072757.429125-1-mst@redhat.com> References: <20191203071101.427592-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20191203071101.427592-1-mst@redhat.com> X-Mailer: git-send-email 2.22.0.678.g13338e74b8 X-Mutt-Fcc: =sent X-MC-Unique: AtsIqnAYNmSCtOBpW2lEtw-1 X-Mimecast-Spam-Score: 0 Content-Disposition: inline Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org Signed-off-by: Michael S. Tsirkin --- untested drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c index d2728933d420..3bcf5f682af5 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c @@ -1363,15 +1363,9 @@ static void mlx4_en_tx_timeout(struct net_device *dev, unsigned int txqueue) if (netif_msg_timer(priv)) en_warn(priv, "Tx timeout called on port:%d\n", priv->port); - for (i = 0; i < priv->tx_ring_num[TX]; i++) { - struct mlx4_en_tx_ring *tx_ring = priv->tx_ring[TX][i]; - - if (!netif_tx_queue_stopped(netdev_get_tx_queue(dev, i))) - continue; - en_warn(priv, "TX timeout on queue: %d, QP: 0x%x, CQ: 0x%x, Cons: 0x%x, Prod: 0x%x\n", - i, tx_ring->qpn, tx_ring->sp_cqn, - tx_ring->cons, tx_ring->prod); - } + en_warn(priv, "TX timeout on queue: %d, QP: 0x%x, CQ: 0x%x, Cons: 0x%x, Prod: 0x%x\n", + txqueue, tx_ring->qpn, tx_ring->sp_cqn, + tx_ring->cons, tx_ring->prod); priv->port_stats.tx_timeout++; en_dbg(DRV, priv, "Scheduling watchdog\n"); From patchwork Tue Dec 3 07:32:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 11270641 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8D909139A for ; Tue, 3 Dec 2019 07:32:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6BBEE2073C for ; Tue, 3 Dec 2019 07:32:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="GpEiArsV" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727472AbfLCHc0 (ORCPT ); Tue, 3 Dec 2019 02:32:26 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:29035 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727501AbfLCHcX (ORCPT ); Tue, 3 Dec 2019 02:32:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575358342; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=I8wShJUZhIPRvHwuVROe4jfsRpfx1Wn6vaFNLNcy50o=; b=GpEiArsVVr0xpm/Ns4SgCv9bIDOP7Oa0Goub0jyQvesAMY2aoUiNzCGhwbxnkA5eWpB9JH x0qgIf7do8ULN+nKwPnOxgXxpb06ePNHmlGmg61IeWaUYIFWnih9TE/E8z4W6yUqp8ZYJ+ dWmVekHb21wXRvhPvu2TIAqaanJgvFc= Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-187-b7c3FKTVOkqrFmZ_7iqKqQ-1; Tue, 03 Dec 2019 02:32:19 -0500 Received: by mail-qt1-f200.google.com with SMTP id j18so1807357qtp.15 for ; Mon, 02 Dec 2019 23:32:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=jwSFHekH13o2QJMVsrxXSIHF6QQ380ubnLoCLySwb1o=; b=l5U/0PP0Jk/6+BQoRjo14noCbCo/3hvto8bVtPZMkiJRUV1qV20+8YUstPOzMowtiO oUAMjuxsybvoY1oCxH4vaWq0/4y30EF+vTkfHBw2fkEnsFS1M5UosZyGmEHXvNUvFr8w 2v+CGJPIVTahlfGduJEcmLj/I4jbGmAcN1EGJUpgeHbgmw998f93ivfA8eVduKWFolHL 3xc8bbfY4yDy0nCAnQA1meKP70tiFLOEcDJ67OB9ZsNsZJ0yoowYRzwGtHavs35b7JWr hOCrAaqFb/nma0an818QPo/LL9Bfz5/8a3k/NBLCwOWaH1E6X3JM6GpDFfsmxI1jgyF9 fJuA== X-Gm-Message-State: APjAAAUx4syFCU6MFFdtCv/zYhq6a/gKcGJX/hWJFBpjSeYD6VUd85e1 P75Qfont5MlHQX4V9jIrdLowigfKMWKZ/jW/2IBDrUbExEQybf+AkoV6nuhOlQygfq1E35Dng1s Kfsl/VeJimP1PYOyHR7zCaA== X-Received: by 2002:a37:404c:: with SMTP id n73mr3711274qka.292.1575358339503; Mon, 02 Dec 2019 23:32:19 -0800 (PST) X-Google-Smtp-Source: APXvYqyPaIxtXBZQ4fHmWb1RYGKoL1DTAUuB7vZrs880mGPQQ0Qr4coSTbpggTuqOoohiw8W26zU9w== X-Received: by 2002:a37:404c:: with SMTP id n73mr3711260qka.292.1575358339311; Mon, 02 Dec 2019 23:32:19 -0800 (PST) Received: from redhat.com (bzq-79-181-48-215.red.bezeqint.net. [79.181.48.215]) by smtp.gmail.com with ESMTPSA id 132sm1285704qkh.14.2019.12.02.23.32.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Dec 2019 23:32:18 -0800 (PST) Date: Tue, 3 Dec 2019 02:32:14 -0500 From: "Michael S. Tsirkin" To: linux-kernel@vger.kernel.org Cc: Tariq Toukan , "David S. Miller" , netdev@vger.kernel.org, linux-rdma@vger.kernel.org, Jakub Kicinski , oss-drivers@netronome.com Subject: [PATCH RFC v7 net-next 3/1] netronome: use the new txqueue timeout argument Message-ID: <20191203072757.429125-2-mst@redhat.com> References: <20191203071101.427592-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20191203072757.429125-1-mst@redhat.com> X-Mailer: git-send-email 2.22.0.678.g13338e74b8 X-Mutt-Fcc: =sent X-MC-Unique: b7c3FKTVOkqrFmZ_7iqKqQ-1 X-Mimecast-Spam-Score: 0 Content-Disposition: inline Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org Signed-off-by: Michael S. Tsirkin Acked-by: Jakub Kicinski --- untested drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c index 41a808b14d76..26f1fb19d0aa 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c @@ -1323,13 +1323,8 @@ nfp_net_tx_ring_reset(struct nfp_net_dp *dp, struct nfp_net_tx_ring *tx_ring) static void nfp_net_tx_timeout(struct net_device *netdev, unsigned int txqueue) { struct nfp_net *nn = netdev_priv(netdev); - int i; - for (i = 0; i < nn->dp.netdev->real_num_tx_queues; i++) { - if (!netif_tx_queue_stopped(netdev_get_tx_queue(netdev, i))) - continue; - nn_warn(nn, "TX timeout on ring: %d\n", i); - } + nn_warn(nn, "TX timeout on ring: %d\n", txqueue); nn_warn(nn, "TX watchdog timeout\n"); }