d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

virtio_console: handle short writes to an Unix domain socket gracefully.

Browse Source 
writev() can do a short write.  Retrying it results in a very convoluted
and complex code, so we iterate over iovec and do regular stream_write()
instead.

Approved by:	trasz
Sponsored by:	iXsystems, Inc.
This commit is contained in:
jceel 2016-11-24 22:16:18 +00:00
parent 5673d8fe28
commit 65feaeaf88
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usr.sbin/bhyve/pci_virtio_console.c
View File

@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$");
#include "pci_emul.h"
#include "virtio.h"
#include "mevent.h"
#include "sockstream.h"
#define VTCON_RINGSZ 64
#define VTCON_MAXPORTS 16
@ -425,16 +426,21 @@ pci_vtcon_sock_tx(struct pci_vtcon_port *port, void *arg, struct iovec *iov,
int niov)
{
struct pci_vtcon_sock *sock;
int ret;
int i, ret;
sock = (struct pci_vtcon_sock *)arg;
if (sock->vss_conn_fd == -1)
return;
ret = writev(sock->vss_conn_fd, iov, niov);
for (i = 0; i < niov; i++) {
ret = stream_write(sock->vss_conn_fd, iov[i].iov_base,
iov[i].iov_len);
if (ret <= 0)
break;
}
if (ret < 0 && errno != EWOULDBLOCK) {
if (ret <= 0) {
mevent_delete_close(sock->vss_conn_evp);
sock->vss_conn_fd = -1;
sock->vss_open = false;