From: Xianting Tian <xianting_tian@126.com>
To: mst@redhat.com, jasowang@redhat.com, davem@davemloft.net,
kuba@kernel.org, linux-kernel@vger.kernel.org
Cc: virtualization@lists.linux-foundation.org,
netdev@vger.kernel.org,
Xianting Tian <xianting.tian@linux.alibaba.com>
Subject: [PATCH] [v2] virtio_net: Remove BUG() to avoid machine dead
Date: Sat, 5 Jun 2021 11:31:00 -0400 [thread overview]
Message-ID: <1622907060-8417-1-git-send-email-xianting_tian@126.com> (raw)
From: Xianting Tian <xianting.tian@linux.alibaba.com>
We should not directly BUG() when there is hdr error, it is
better to output a print when such error happens. Currently,
the caller of xmit_skb() already did it.
Signed-off-by: Xianting Tian <xianting.tian@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 9b6a4a8..7f11ea4 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -1623,7 +1623,7 @@ static int xmit_skb(struct send_queue *sq, struct sk_buff *skb)
if (virtio_net_hdr_from_skb(skb, &hdr->hdr,
virtio_is_little_endian(vi->vdev), false,
0))
- BUG();
+ return -EPROTO;
if (vi->mergeable_rx_bufs)
hdr->num_buffers = 0;
--
1.8.3.1
next reply other threads:[~2021-06-05 16:02 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-05 15:31 Xianting Tian [this message]
2021-06-06 4:48 ` [PATCH] [v2] virtio_net: Remove BUG() to avoid machine dead Leon Romanovsky
2021-06-07 20:10 ` patchwork-bot+netdevbpf
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=1622907060-8417-1-git-send-email-xianting_tian@126.com \
--to=xianting_tian@126.com \
--cc=davem@davemloft.net \
--cc=jasowang@redhat.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=virtualization@lists.linux-foundation.org \
--cc=xianting.tian@linux.alibaba.com \
/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).