From: jcfaracco@gmail.com
To: netdev@vger.kernel.org
Cc: mst@redhat.com, jasowang@redhat.com, davem@davemloft.net,
virtualization@lists.linux-foundation.org,
linux-kernel@vger.kernel.org, dnmendes76@gmail.com
Subject: [PATCH RFC net-next 2/2] drivers: net: virtio_net: Add tx_timeout function
Date: Sun, 6 Oct 2019 15:45:15 -0300 [thread overview]
Message-ID: <20191006184515.23048-3-jcfaracco@gmail.com> (raw)
In-Reply-To: <20191006184515.23048-1-jcfaracco@gmail.com>
From: Julio Faracco <jcfaracco@gmail.com>
To enable dev_watchdog, virtio_net should have a tx_timeout defined
(.ndo_tx_timeout). This is only a skeleton to throw a warn message. It
notifies the event in some specific queue of device. This function
still counts tx_timeout statistic and consider this event as an error
(one error per queue), reporting it.
Signed-off-by: Julio Faracco <jcfaracco@gmail.com>
Signed-off-by: Daiane Mendes <dnmendes76@gmail.com>
Cc: Jason Wang <jasowang@redhat.com>
---
drivers/net/virtio_net.c | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 27f9b212c9f5..4b703b4b9441 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -2585,6 +2585,29 @@ static int virtnet_set_features(struct net_device *dev,
return 0;
}
+static void virtnet_tx_timeout(struct net_device *dev)
+{
+ struct virtnet_info *vi = netdev_priv(dev);
+ u32 i;
+
+ /* find the stopped queue the same way dev_watchdog() does */
+ for (i = 0; i < vi->curr_queue_pairs; i++) {
+ struct send_queue *sq = &vi->sq[i];
+
+ if (!netif_xmit_stopped(netdev_get_tx_queue(dev, i)))
+ continue;
+
+ u64_stats_update_begin(&sq->stats.syncp);
+ sq->stats.tx_timeouts++;
+ u64_stats_update_end(&sq->stats.syncp);
+
+ netdev_warn(dev, "TX timeout on send queue: %d, sq: %s, vq: %d, name: %s\n",
+ i, sq->name, sq->vq->index, sq->vq->name);
+
+ dev->stats.tx_errors++;
+ }
+}
+
static const struct net_device_ops virtnet_netdev = {
.ndo_open = virtnet_open,
.ndo_stop = virtnet_close,
@@ -2600,6 +2623,7 @@ static const struct net_device_ops virtnet_netdev = {
.ndo_features_check = passthru_features_check,
.ndo_get_phys_port_name = virtnet_get_phys_port_name,
.ndo_set_features = virtnet_set_features,
+ .ndo_tx_timeout = virtnet_tx_timeout,
};
static void virtnet_config_changed_work(struct work_struct *work)
@@ -3018,6 +3042,9 @@ static int virtnet_probe(struct virtio_device *vdev)
dev->netdev_ops = &virtnet_netdev;
dev->features = NETIF_F_HIGHDMA;
+ /* Set up dev_watchdog cycle. */
+ dev->watchdog_timeo = 5 * HZ;
+
dev->ethtool_ops = &virtnet_ethtool_ops;
SET_NETDEV_DEV(dev, &vdev->dev);
--
2.21.0
next prev parent reply other threads:[~2019-10-06 18:45 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-06 18:45 [PATCH RFC net-next 0/2] drivers: net: virtio_net: Implement jcfaracco
2019-10-06 18:45 ` [PATCH RFC net-next 1/2] drivers: net: virtio_net: Add tx_timeout stats field jcfaracco
2019-10-07 14:15 ` Julian Wiedmann
2019-10-07 14:55 ` Julio Faracco
2019-10-06 18:45 ` jcfaracco [this message]
2019-10-07 7:51 ` [PATCH RFC net-next 2/2] drivers: net: virtio_net: Add tx_timeout function Michael S. Tsirkin
2019-10-07 14:03 ` Julio Faracco
2019-10-07 16:03 ` Julio Faracco
2019-10-12 12:59 ` Jason Wang
2019-10-12 13:01 ` Jason Wang
2019-10-07 7:43 ` [PATCH RFC net-next 0/2] drivers: net: virtio_net: Implement Michael S. Tsirkin
2019-10-07 13:58 ` Julio Faracco
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191006184515.23048-3-jcfaracco@gmail.com \
--to=jcfaracco@gmail.com \
--cc=davem@davemloft.net \
--cc=dnmendes76@gmail.com \
--cc=jasowang@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=virtualization@lists.linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).