From: Xianting Tian <xianting.tian@linux.alibaba.com>
To: mst@redhat.com, jasowang@redhat.com, davem@davemloft.net,
kuba@kernel.org
Cc: virtualization@lists.linux-foundation.org,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] virtio_net: Remove BUG() to aviod machine dead
Date: Tue, 18 May 2021 17:46:56 +0800 [thread overview]
Message-ID: <a351fbe1-0233-8515-2927-adc826a7fb94@linux.alibaba.com> (raw)
When met error, we output a print to avoid a BUG().
Signed-off-by: Xianting Tian <xianting.tian@linux.alibaba.com>
---
drivers/net/virtio_net.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index c921ebf3ae82..a66174d13e81 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -1647,9 +1647,8 @@ static int xmit_skb(struct send_queue *sq, struct
sk_buff *skb)
hdr = skb_vnet_hdr(skb);
if (virtio_net_hdr_from_skb(skb, &hdr->hdr,
- virtio_is_little_endian(vi->vdev), false,
- 0))
- BUG();
+ virtio_is_little_endian(vi->vdev), false, 0))
+ return -EPROTO;
if (vi->mergeable_rx_bufs)
hdr->num_buffers = 0;
--
2.17.1
next reply other threads:[~2021-05-18 9:47 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-18 9:46 Xianting Tian [this message]
2021-05-18 9:54 ` Michael S. Tsirkin
2021-05-19 14:18 ` Xianting Tian
2021-05-25 6:19 ` Jason Wang
2021-06-02 5:59 ` Leon Romanovsky
2021-06-02 7:14 ` Jason Wang
2021-06-02 12:54 ` Leon Romanovsky
2021-05-20 7:35 ` Stefano Garzarella
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=a351fbe1-0233-8515-2927-adc826a7fb94@linux.alibaba.com \
--to=xianting.tian@linux.alibaba.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 \
/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
all inboxes | Powered by JetHome®