From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3A4B0C2D0C4 for ; Mon, 9 Dec 2019 16:29:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 11BFD2077B for ; Mon, 9 Dec 2019 16:29:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="eKiT5CKG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726913AbfLIQ3e (ORCPT ); Mon, 9 Dec 2019 11:29:34 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:35896 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726362AbfLIQ3e (ORCPT ); Mon, 9 Dec 2019 11:29:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575908972; 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=NNvyL4Y9eRzqtb2H2E84LxRf2YADQJydGhMMLpn/rvY=; b=eKiT5CKGXYXTNvkjJWre2sGI9xoeT5Kq+kXrhSRxgD55Cw5lGTbtuVg2gmFUkAc0ZYQpf9 ub6AzXx3tu/k9ZUWm44BBpKPmAb3XyUzMSEYke0k5Wa/iY6N1UzL33Km3AJwEZ01CstjgY 6W9NQnHM+n13xyRm15HnhQ5kFr9p3pY= Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-295-vvClyGdEOS6ovMgt9BdY3Q-1; Mon, 09 Dec 2019 11:29:31 -0500 Received: by mail-qv1-f70.google.com with SMTP id d7so4917503qvq.12 for ; Mon, 09 Dec 2019 08:29:31 -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=wQxMVxgAtK5y0CyKs1BCEj6d5vwE3qN67Xvd5FZmfgk=; b=N38PBl7pn1500q+tYwsTyj1K/5D2pRlddeOP9BA5JG4zs7zJhL/ohK9F2GJZq2aRu0 /iY3uExQKh3RAFKeT4MXsQ3CYpPrUEeChPXteqJxJYw928VUUjQsaa8VyNwR+T9sRKpa rEOQWOYYw3837+rp4X2vRwUr6oOOrRnpQRcVE040JbAyjnUFLpayrsYiZ5v7MbJWYwID Xm+ccEvGuRYwedicSxrpqF5MWk97kHrJm+cm34eZitOyhEYIUfRtufSTT86AlAR8ZVcT myaw/vYxhk1iqU9tRRHRqPw1kPuCWL4e2x3d/LuP6UFXCCzyd5VSx2Plfw/Rt5HfYVHR vkFA== X-Gm-Message-State: APjAAAVkDMQmg4nYFRgKh0QYZ4kdMBbExPZ6GULdt/GODy4VsOah0gnk ZY+kbrd9dFOfprdg1DDGroX6FzusnetAigDehGQaogtJRurYqmTkiZqg2UMZLxdW3q23GiSR+1x cfTU0uxjZZq6uDfAd X-Received: by 2002:a05:620a:899:: with SMTP id b25mr6205348qka.197.1575908971022; Mon, 09 Dec 2019 08:29:31 -0800 (PST) X-Google-Smtp-Source: APXvYqwFUcc6D6y2hR3oAFJBLyCpXqAb6UQCleKthwatt7HxCSSIjpA7ZaRTzyQmAILOaUj4yhzSHQ== X-Received: by 2002:a05:620a:899:: with SMTP id b25mr6205322qka.197.1575908970851; Mon, 09 Dec 2019 08:29:30 -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 f19sm420087qkk.69.2019.12.09.08.29.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Dec 2019 08:29:30 -0800 (PST) Date: Mon, 9 Dec 2019 11:29:25 -0500 From: "Michael S. Tsirkin" To: linux-kernel@vger.kernel.org, Julio Faracco Cc: netdev@vger.kernel.org, davem@davemloft.net, mst@redhat.com, jasowang@redhat.com, virtualization@lists.linux-foundation.org, dnmendes76@gmail.com, Jakub Kicinski Subject: [PATCH net-next v9 3/3] netronome: use the new txqueue timeout argument Message-ID: <20191209162727.10113-4-mst@redhat.com> References: <20191209162727.10113-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20191209162727.10113-1-mst@redhat.com> X-Mailer: git-send-email 2.22.0.678.g13338e74b8 X-Mutt-Fcc: =sent X-MC-Unique: vvClyGdEOS6ovMgt9BdY3Q-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Michael S. Tsirkin Acked-by: Jakub Kicinski --- drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/= net/ethernet/netronome/nfp/nfp_net_common.c index bd305fc6ed5a..d4eeb3b3cf35 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c @@ -1324,14 +1324,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 txq= ueue) { =09struct nfp_net *nn =3D netdev_priv(netdev); -=09int i; =20 -=09for (i =3D 0; i < nn->dp.netdev->real_num_tx_queues; i++) { -=09=09if (!netif_tx_queue_stopped(netdev_get_tx_queue(netdev, i))) -=09=09=09continue; -=09=09nn_warn(nn, "TX timeout on ring: %d\n", i); -=09} -=09nn_warn(nn, "TX watchdog timeout\n"); +=09nn_warn(nn, "TX watchdog timeout on ring: %u\n", txqueue); } =20 /* Receive processing --=20 MST From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 99197C2D0BE for ; Mon, 9 Dec 2019 16:29:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 68BF520692 for ; Mon, 9 Dec 2019 16:29:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="OplCVjKr" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726819AbfLIQ3Z (ORCPT ); Mon, 9 Dec 2019 11:29:25 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:53117 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726602AbfLIQ3Z (ORCPT ); Mon, 9 Dec 2019 11:29:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575908963; 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=NNvyL4Y9eRzqtb2H2E84LxRf2YADQJydGhMMLpn/rvY=; b=OplCVjKrQSFLDMx/tmvrPsGWR7m0hGjhyqJ0G5TJ73BOQTEuNV+rxXwF87MkIL0jP46S2S GDltfyvLtnRarPiz42sRnEy0j41hE+ibyd27us4fB+KjX8PowXkqeDgiagb1EAoMsNb39I xeY4GH+iwxjBxDr4s8Qpyuv5XUmh1t0= 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-237-fR8IdduhMmGbI0LAGYKwcQ-1; Mon, 09 Dec 2019 11:29:22 -0500 Received: by mail-qt1-f200.google.com with SMTP id x8so11465121qtq.14 for ; Mon, 09 Dec 2019 08:29:22 -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=wQxMVxgAtK5y0CyKs1BCEj6d5vwE3qN67Xvd5FZmfgk=; b=eCDjLLZ6ugspSPWByy9PARA9gr/m9fVYMasjcdA5ujsQwstNjksBlUZpZ0PqvSoPHy /TWM4E2Y70497pTYdxNWsCexyzHcdEp0fBkVkCFwum0uY3eq9nJ+incWKI646vs6fA9w l2sV+PTob6YUSDgCV9ls5/RpCxLdMvkHy//TnbP1m+HrCRXcPR+hueV/1GdIo8CQKm+C 6NRmi+P/EkcfBjQ0RI8OE9uZN2ecqm24uHpWodF2TzUTLUN/X7NewXsISOfwMAR017RJ PIc36Nle3hbbVyIc2/jfpTs7Wmg1a/4tWqZ9DUU1dloy2eWdo66yty7CShkrOlgM0Hs3 Me/Q== X-Gm-Message-State: APjAAAUBnVfb6D/HDRp0v1y99lqkzFlgt5Malb7iYP1eLyfXxKQP9MbR pQtmaPz29SRPiOC5iSe0+LrR4oC2OVNy6Eo4v871p7vYlceKY6cm8ThscgIPGJ+Doo4jHWieO5e RL6UiQPUc0dYFXy19 X-Received: by 2002:ac8:7699:: with SMTP id g25mr14525703qtr.75.1575908962221; Mon, 09 Dec 2019 08:29:22 -0800 (PST) X-Google-Smtp-Source: APXvYqxBHx4JNZAzW5zOl78IJTl/Z39c+yCCpUqxZ1MccFYIr6NFhza1xXBFpnvMlezVfnTZjFAmuw== X-Received: by 2002:ac8:7699:: with SMTP id g25mr14525689qtr.75.1575908962077; Mon, 09 Dec 2019 08:29:22 -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 x19sm19777qtm.47.2019.12.09.08.29.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Dec 2019 08:29:21 -0800 (PST) Date: Mon, 9 Dec 2019 11:29:16 -0500 From: "Michael S. Tsirkin" To: linux-kernel@vger.kernel.org, Julio Faracco Cc: netdev@vger.kernel.org, davem@davemloft.net, mst@redhat.com, jasowang@redhat.com, virtualization@lists.linux-foundation.org, dnmendes76@gmail.com, Jakub Kicinski Subject: [PATCH net-next v9 3/3] netronome: use the new txqueue timeout argument Message-ID: <20191209162727.10113-4-mst@redhat.com> References: <20191209162727.10113-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20191209162727.10113-1-mst@redhat.com> X-Mailer: git-send-email 2.22.0.678.g13338e74b8 X-Mutt-Fcc: =sent X-MC-Unique: fR8IdduhMmGbI0LAGYKwcQ-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Message-ID: <20191209162916.tAf7O9Z4Yp4kPdxDWggP_GPbBmYx-54RrHKfXESVHEg@z> Signed-off-by: Michael S. Tsirkin Acked-by: Jakub Kicinski --- drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/= net/ethernet/netronome/nfp/nfp_net_common.c index bd305fc6ed5a..d4eeb3b3cf35 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c @@ -1324,14 +1324,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 txq= ueue) { =09struct nfp_net *nn =3D netdev_priv(netdev); -=09int i; =20 -=09for (i =3D 0; i < nn->dp.netdev->real_num_tx_queues; i++) { -=09=09if (!netif_tx_queue_stopped(netdev_get_tx_queue(netdev, i))) -=09=09=09continue; -=09=09nn_warn(nn, "TX timeout on ring: %d\n", i); -=09} -=09nn_warn(nn, "TX watchdog timeout\n"); +=09nn_warn(nn, "TX watchdog timeout on ring: %u\n", txqueue); } =20 /* Receive processing --=20 MST