virtualization.lists.linux-foundation.org archive mirror
 help / color / mirror / Atom feed
From: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
To: virtualization@lists.linux-foundation.org, netdev@vger.kernel.org
Cc: Jesper Dangaard Brouer <hawk@kernel.org>,
	Daniel Borkmann <daniel@iogearbox.net>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	John Fastabend <john.fastabend@gmail.com>,
	Alexei Starovoitov <ast@kernel.org>,
	Jakub Kicinski <kuba@kernel.org>,
	bpf@vger.kernel.org, "David S. Miller" <davem@davemloft.net>
Subject: [PATCH v2 10/12] virtio_net: virtnet_tx_timeout() stop ref sq->vq
Date: Thu, 20 Jan 2022 14:43:01 +0800	[thread overview]
Message-ID: <20220120064303.106639-11-xuanzhuo@linux.alibaba.com> (raw)
In-Reply-To: <20220120064303.106639-1-xuanzhuo@linux.alibaba.com>

Make virtnet_tx_timeout() no longer refer to vq directly. Because sq->vq
may be equal to NULL after implementing rx/tx queue disable/enable.

Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
---
 drivers/net/virtio_net.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 97eb4dddba1f..2add7fe749b8 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -2692,7 +2692,7 @@ static void virtnet_tx_timeout(struct net_device *dev, unsigned int txqueue)
 	u64_stats_update_end(&sq->stats.syncp);
 
 	netdev_err(dev, "TX timeout on queue: %u, sq: %s, vq: 0x%x, name: %s, %u usecs ago\n",
-		   txqueue, sq->name, sq->vq->index, sq->vq->name,
+		   txqueue, sq->name, txq2vq(sq - vi->sq), sq->name,
 		   jiffies_to_usecs(jiffies - READ_ONCE(txq->trans_start)));
 }
 
-- 
2.31.0

_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization

  parent reply	other threads:[~2022-01-20  6:43 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-20  6:42 [PATCH v2 00/12] virtio pci support VIRTIO_F_RING_RESET Xuan Zhuo
2022-01-20  6:42 ` [PATCH v2 01/12] virtio: pci: struct virtio_pci_common_cfg add queue_notify_data Xuan Zhuo
2022-01-20  6:42 ` [PATCH v2 02/12] virtio: queue_reset: add VIRTIO_F_RING_RESET Xuan Zhuo
2022-01-20  6:42 ` [PATCH v2 03/12] virtio: queue_reset: struct virtio_config_ops add callbacks for queue_reset Xuan Zhuo
2022-01-20  6:42 ` [PATCH v2 04/12] virtio: queue_reset: pci: update struct virtio_pci_common_cfg and option functions Xuan Zhuo
2022-01-20  6:42 ` [PATCH v2 05/12] virito: queue_reset: pci: move the per queue irq logic from vp_del_vqs to vp_del_vq Xuan Zhuo
2022-01-20  6:42 ` [PATCH v2 06/12] virtio: queue_reset: pci: add independent function to enable msix vq Xuan Zhuo
2022-01-20  6:42 ` [PATCH v2 07/12] virtio: queue_reset: pci: support VIRTIO_F_RING_RESET Xuan Zhuo
2022-01-20 10:55   ` Michael S. Tsirkin
2022-01-20 11:46     ` Xuan Zhuo
2022-01-20 15:03       ` Michael S. Tsirkin
2022-01-21  2:22         ` Xuan Zhuo
2022-01-21 10:22           ` Michael S. Tsirkin
2022-01-21 10:22             ` Michael S. Tsirkin
2022-01-21 10:26               ` Xuan Zhuo
2022-01-21 13:19                 ` Michael S. Tsirkin
2022-01-21 14:09                   ` Xuan Zhuo
2022-01-21 15:28                     ` Michael S. Tsirkin
2022-01-21 15:34                       ` Xuan Zhuo
2022-01-21 15:45                         ` Michael S. Tsirkin
2022-01-21 15:49                           ` Xuan Zhuo
2022-01-20  6:42 ` [PATCH v2 08/12] virtio: queue_reset: add helper Xuan Zhuo
2022-01-20  6:43 ` [PATCH v2 09/12] virtio_net: virtnet_tx_timeout() fix style Xuan Zhuo
2022-01-20  6:43 ` Xuan Zhuo [this message]
2022-01-20  6:43 ` [PATCH v2 11/12] virtio_net: split free_unused_bufs() Xuan Zhuo
2022-01-20  6:43 ` [PATCH v2 12/12] virtio-net: support pair disable/enable Xuan Zhuo

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=20220120064303.106639-11-xuanzhuo@linux.alibaba.com \
    --to=xuanzhuo@linux.alibaba.com \
    --cc=ast@kernel.org \
    --cc=bpf@vger.kernel.org \
    --cc=daniel@iogearbox.net \
    --cc=davem@davemloft.net \
    --cc=hawk@kernel.org \
    --cc=john.fastabend@gmail.com \
    --cc=kuba@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).