* [PATCH RFC v7 net-next 2/1] mlx4: use new txqueue timeout argument [not found] <20191203071101.427592-1-mst@redhat.com> @ 2019-12-03 7:32 ` Michael S. Tsirkin 2019-12-03 7:32 ` [PATCH RFC v7 net-next 3/1] netronome: use the " Michael S. Tsirkin 0 siblings, 1 reply; 3+ messages in thread From: Michael S. Tsirkin @ 2019-12-03 7:32 UTC (permalink / raw) To: linux-kernel; +Cc: Tariq Toukan, David S. Miller, netdev, linux-rdma Signed-off-by: Michael S. Tsirkin <mst@redhat.com> --- 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"); -- MST ^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH RFC v7 net-next 3/1] netronome: use the new txqueue timeout argument 2019-12-03 7:32 ` [PATCH RFC v7 net-next 2/1] mlx4: use new txqueue timeout argument Michael S. Tsirkin @ 2019-12-03 7:32 ` Michael S. Tsirkin 2019-12-03 18:09 ` Jakub Kicinski 0 siblings, 1 reply; 3+ messages in thread From: Michael S. Tsirkin @ 2019-12-03 7:32 UTC (permalink / raw) To: linux-kernel Cc: Tariq Toukan, David S. Miller, netdev, linux-rdma, Jakub Kicinski, oss-drivers Signed-off-by: Michael S. Tsirkin <mst@redhat.com> --- 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"); } -- MST ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH RFC v7 net-next 3/1] netronome: use the new txqueue timeout argument 2019-12-03 7:32 ` [PATCH RFC v7 net-next 3/1] netronome: use the " Michael S. Tsirkin @ 2019-12-03 18:09 ` Jakub Kicinski 0 siblings, 0 replies; 3+ messages in thread From: Jakub Kicinski @ 2019-12-03 18:09 UTC (permalink / raw) To: Michael S. Tsirkin Cc: linux-kernel, Tariq Toukan, David S. Miller, netdev, linux-rdma, oss-drivers On Tue, 3 Dec 2019 02:32:14 -0500, Michael S. Tsirkin wrote: > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > --- > > 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); %u > nn_warn(nn, "TX watchdog timeout\n"); I think we can drop this warning now. With that: Acked-by: Jakub Kicinski <jakub.kicinski@netronome.com> Thanks! ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-12-03 18:09 UTC | newest] Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- [not found] <20191203071101.427592-1-mst@redhat.com> 2019-12-03 7:32 ` [PATCH RFC v7 net-next 2/1] mlx4: use new txqueue timeout argument Michael S. Tsirkin 2019-12-03 7:32 ` [PATCH RFC v7 net-next 3/1] netronome: use the " Michael S. Tsirkin 2019-12-03 18:09 ` Jakub Kicinski
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).