github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-07-17 17:01:52 +00:00
Code Issues Projects Releases Wiki Activity

DM: handle virtio-console writes when no socket backend is connected

Browse Source 
When virtio-console is used as console port with socket backend,
guest kernel tries to hook it up with hvc console and sets it up.
It doesn't check if a client is connected and can result in ENOTCONN
with virtio-console backend being reset. This will prevent client
connection at a later point. To avoid this, ignore ENOTCONN error.

PS: For Kata, the runtime first launches VM and then proxy which acts
as a client connects to this socket. If this error is not handled,
proxy will never be able to connect as the backend itself will be reset.

Tracked-On: #3189
Signed-off-by: Vijay Dhanraj <vijay.dhanraj@intel.com>
Acked-by: Yu Wang <yu1.wang@intel.com>
This commit is contained in:
Vijay Dhanraj 2019-05-28 17:48:08 -07:00 committed by wenlingz
parent 376fcddff8
commit 19366458f8
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
devicemodel/hw/pci/virtio/virtio_console.c
View File

@ -499,11 +499,22 @@ virtio_console_backend_write(struct virtio_console_port *port, void *arg,
ret = writev(be->fd, iov, niov);
if (ret <= 0) {
/* backend cannot receive more data. For example when pts is
/* Case 1:backend cannot receive more data. For example when pts is
* not connected to any client, its tty buffer will become full.
* In this case we just drop data from guest hvc console.
*
* Case 2: Backend connection not yet setup. For example, when
* virtio-console is used as console port with socket backend, guest
* kernel tries to hook it up with hvc console and sets it up. It
* doesn't check if a client is connected and can result in ENOTCONN
* with virtio-console backend being reset. This will prevent
* client connection at a later point. To avoid this, ignore
* ENOTCONN error.
*
* PS: For Kata, the runtime first launches VM and then proxy which
* acts as a client connects to this socket.
*/
if (ret == -1 && errno == EAGAIN)
if (ret == -1 && (errno == EAGAIN || errno == ENOTCONN))
return;
virtio_console_reset_backend(be);