Thread (13 messages) flat view 13 messages, 3 authors, 2016-12-01

Re: [PATCH net] vhost_net: don't continue to call the recvmsg when meet errors

From: Jason Wang <hidden>
Date: 2016-11-30 13:07:29
Also in: lkml


On 2016年11月30日 20:10, Yunjian Wang wrote:
quoted hunk ↗ jump to hunk
When we meet an error(err=-EBADFD) recvmsg, the error handling in vhost
handle_rx() will continue. This will cause a soft CPU lockup in vhost thread.

Signed-off-by: Yunjian Wang <redacted>
---
  drivers/vhost/net.c | 3 +++
  1 file changed, 3 insertions(+)
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index 5dc128a..edc470b 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -717,6 +717,9 @@ static void handle_rx(struct vhost_net *net)
  			pr_debug("Discarded rx packet: "
  				 " len %d, expected %zd\n", err, sock_len);
  			vhost_discard_vq_desc(vq, headcount);
+			/* Don't continue to do, when meet errors. */
+			if (err < 0)
+				goto out;
  			continue;
  		}
  		/* Supply virtio_net_hdr if VHOST_NET_F_VIRTIO_NET_HDR */
Acked-by: Jason Wang <redacted>

We may want to rename vhost_discard_vq_desc() in the future, since it 
does not discard the desc in fact.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help