All of lore.kernel.org
 help / color / mirror / Atom feed
* PATCH: virtio_console: Fix poll blocking even though there is data to read (version 2)
@ 2010-09-15 15:18 Hans de Goede
  0 siblings, 0 replies; 4+ messages in thread
From: Hans de Goede @ 2010-09-15 15:18 UTC (permalink / raw)
  To: virtualization; +Cc: amit.shah, spice-devel, kvm

[-- Attachment #1: Type: text/plain, Size: 912 bytes --]

Hi All,

I found this while working on a Linux agent for spice, the symptom I was
seeing was select blocking on the spice vdagent virtio serial port even
though there were messages queued up there.

I found this while working on a Linux agent for spice, the symptom I was
seeing was select blocking on the spice vdagent virtio serial port even
though there were messages queued up there.

virtio_console's port_fops_poll checks port->inbuf != NULL to determine if
read won't block. However if an application reads enough bytes from inbuf
through port_fops_read, to empty the current port->inbuf, port->inbuf
will be NULL even though there may be buffers left in the virtqueue.

This causes poll() to block even though there is data ready to be read, this
patch fixes this by using port_has_data(port) instead of the
port->inbuf != NULL check.

Signed-off-By: Hans de Goede <hdegoede@redhat.com>

Regards,

Hans


[-- Attachment #2: linux-2.6.35.4-virtio_console-fix-poll.patch --]
[-- Type: text/plain, Size: 1363 bytes --]

Subject: virtio_console: Fix poll blocking even though there is data to read (version 2)
From: Hans de Goede <hdegoede@redhat.com>

I found this while working on a Linux agent for spice, the symptom I was
seeing was select blocking on the spice vdagent virtio serial port even
though there were messages queued up there.

virtio_console's port_fops_poll checks port->inbuf != NULL to determine if
read won't block. However if an application reads enough bytes from inbuf
through port_fops_read, to empty the current port->inbuf, port->inbuf
will be NULL even though there may be buffers left in the virtqueue.

This causes poll() to block even though there is data ready to be read, this
patch fixes this by using port_has_data(port) instead of the
port->inbuf != NULL check.

Signed-off-By: Hans de Goede <hdegoede@redhat.com>
diff -up linux-2.6.35.x86_64/drivers/char/virtio_console.c~ linux-2.6.35.x86_64/drivers/char/virtio_console.c
--- linux-2.6.35.x86_64/drivers/char/virtio_console.c~	2010-08-02 00:11:14.000000000 +0200
+++ linux-2.6.35.x86_64/drivers/char/virtio_console.c	2010-09-15 13:39:29.043505000 +0200
@@ -642,7 +642,7 @@ static unsigned int port_fops_poll(struc
 	poll_wait(filp, &port->waitqueue, wait);
 
 	ret = 0;
-	if (port->inbuf)
+	if (port_has_data(port))
 		ret |= POLLIN | POLLRDNORM;
 	if (!will_write_block(port))
 		ret |= POLLOUT;

[-- Attachment #3: Type: text/plain, Size: 184 bytes --]

_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/virtualization

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: PATCH: virtio_console: Fix poll blocking even though there is data to read (version 2)
  2010-09-15 15:18 Hans de Goede
@ 2010-09-16  5:16 ` Amit Shah
  2010-09-16  5:16 ` Amit Shah
  1 sibling, 0 replies; 4+ messages in thread
From: Amit Shah @ 2010-09-16  5:16 UTC (permalink / raw)
  To: Hans de Goede; +Cc: spice-devel, rusty, kvm, virtualization

On (Wed) Sep 15 2010 [17:18:23], Hans de Goede wrote:
> diff -up linux-2.6.35.x86_64/drivers/char/virtio_console.c~ linux-2.6.35.x86_64/drivers/char/virtio_console.c
> --- linux-2.6.35.x86_64/drivers/char/virtio_console.c~	2010-08-02 00:11:14.000000000 +0200
> +++ linux-2.6.35.x86_64/drivers/char/virtio_console.c	2010-09-15 13:39:29.043505000 +0200
> @@ -642,7 +642,7 @@ static unsigned int port_fops_poll(struc
>  	poll_wait(filp, &port->waitqueue, wait);
>  
>  	ret = 0;
> -	if (port->inbuf)
> +	if (port_has_data(port))
>  		ret |= POLLIN | POLLRDNORM;
>  	if (!will_write_block(port))
>  		ret |= POLLOUT;

Thanks, this works.

I'll send a git-formatted patch to Rusty.

		Amit

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: PATCH: virtio_console: Fix poll blocking even though there is data to read (version 2)
  2010-09-15 15:18 Hans de Goede
  2010-09-16  5:16 ` Amit Shah
@ 2010-09-16  5:16 ` Amit Shah
  1 sibling, 0 replies; 4+ messages in thread
From: Amit Shah @ 2010-09-16  5:16 UTC (permalink / raw)
  To: Hans de Goede; +Cc: spice-devel, kvm, virtualization

On (Wed) Sep 15 2010 [17:18:23], Hans de Goede wrote:
> diff -up linux-2.6.35.x86_64/drivers/char/virtio_console.c~ linux-2.6.35.x86_64/drivers/char/virtio_console.c
> --- linux-2.6.35.x86_64/drivers/char/virtio_console.c~	2010-08-02 00:11:14.000000000 +0200
> +++ linux-2.6.35.x86_64/drivers/char/virtio_console.c	2010-09-15 13:39:29.043505000 +0200
> @@ -642,7 +642,7 @@ static unsigned int port_fops_poll(struc
>  	poll_wait(filp, &port->waitqueue, wait);
>  
>  	ret = 0;
> -	if (port->inbuf)
> +	if (port_has_data(port))
>  		ret |= POLLIN | POLLRDNORM;
>  	if (!will_write_block(port))
>  		ret |= POLLOUT;

Thanks, this works.

I'll send a git-formatted patch to Rusty.

		Amit

^ permalink raw reply	[flat|nested] 4+ messages in thread

* PATCH: virtio_console: Fix poll blocking even though there is data to read (version 2)
@ 2010-09-15 15:18 Hans de Goede
  2010-09-16  5:16 ` Amit Shah
  2010-09-16  5:16 ` Amit Shah
  0 siblings, 2 replies; 4+ messages in thread
From: Hans de Goede @ 2010-09-15 15:18 UTC (permalink / raw)
  To: virtualization; +Cc: amit.shah, spice-devel, rusty, kvm

[-- Attachment #1: Type: text/plain, Size: 912 bytes --]

Hi All,

I found this while working on a Linux agent for spice, the symptom I was
seeing was select blocking on the spice vdagent virtio serial port even
though there were messages queued up there.

I found this while working on a Linux agent for spice, the symptom I was
seeing was select blocking on the spice vdagent virtio serial port even
though there were messages queued up there.

virtio_console's port_fops_poll checks port->inbuf != NULL to determine if
read won't block. However if an application reads enough bytes from inbuf
through port_fops_read, to empty the current port->inbuf, port->inbuf
will be NULL even though there may be buffers left in the virtqueue.

This causes poll() to block even though there is data ready to be read, this
patch fixes this by using port_has_data(port) instead of the
port->inbuf != NULL check.

Signed-off-By: Hans de Goede <hdegoede@redhat.com>

Regards,

Hans


[-- Attachment #2: linux-2.6.35.4-virtio_console-fix-poll.patch --]
[-- Type: text/plain, Size: 1363 bytes --]

Subject: virtio_console: Fix poll blocking even though there is data to read (version 2)
From: Hans de Goede <hdegoede@redhat.com>

I found this while working on a Linux agent for spice, the symptom I was
seeing was select blocking on the spice vdagent virtio serial port even
though there were messages queued up there.

virtio_console's port_fops_poll checks port->inbuf != NULL to determine if
read won't block. However if an application reads enough bytes from inbuf
through port_fops_read, to empty the current port->inbuf, port->inbuf
will be NULL even though there may be buffers left in the virtqueue.

This causes poll() to block even though there is data ready to be read, this
patch fixes this by using port_has_data(port) instead of the
port->inbuf != NULL check.

Signed-off-By: Hans de Goede <hdegoede@redhat.com>
diff -up linux-2.6.35.x86_64/drivers/char/virtio_console.c~ linux-2.6.35.x86_64/drivers/char/virtio_console.c
--- linux-2.6.35.x86_64/drivers/char/virtio_console.c~	2010-08-02 00:11:14.000000000 +0200
+++ linux-2.6.35.x86_64/drivers/char/virtio_console.c	2010-09-15 13:39:29.043505000 +0200
@@ -642,7 +642,7 @@ static unsigned int port_fops_poll(struc
 	poll_wait(filp, &port->waitqueue, wait);
 
 	ret = 0;
-	if (port->inbuf)
+	if (port_has_data(port))
 		ret |= POLLIN | POLLRDNORM;
 	if (!will_write_block(port))
 		ret |= POLLOUT;

[-- Attachment #3: Type: text/plain, Size: 0 bytes --]



^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2010-09-16  5:16 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-09-15 15:18 PATCH: virtio_console: Fix poll blocking even though there is data to read (version 2) Hans de Goede
  -- strict thread matches above, loose matches on Subject: below --
2010-09-15 15:18 Hans de Goede
2010-09-16  5:16 ` Amit Shah
2010-09-16  5:16 ` Amit Shah

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.