vmci/vsock: use 'target' in notify_poll_in callback

This callback controls setting of POLLIN, POLLRDNORM output bits of poll()
syscall, but in some cases, it is incorrectly to set it, when socket has
at least 1 bytes of available data. Use 'target' which is already exists.

Signed-off-by: Arseniy Krasnov <AVKrasnov@sberdevices.ru>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Vishnu Dasa <vdasa@vmware.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/net/vmw_vsock/vmci_transport_notify.c b/net/vmw_vsock/vmci_transport_notify.c
index d69fc4b595ad42b2784698ea1e8e2b7b60632343..852097e2b9e6d38d3453c7702c49d181656af72a 100644 (file)
--- a/net/vmw_vsock/vmci_transport_notify.c
+++ b/net/vmw_vsock/vmci_transport_notify.c
@@ -340,12 +340,12 @@ vmci_transport_notify_pkt_poll_in(struct sock *sk,
 {
        struct vsock_sock *vsk = vsock_sk(sk);
 
-       if (vsock_stream_has_data(vsk)) {
+       if (vsock_stream_has_data(vsk) >= target) {
                *data_ready_now = true;
        } else {
-               /* We can't read right now because there is nothing in the
-                * queue. Ask for notifications when there is something to
-                * read.
+               /* We can't read right now because there is not enough data
+                * in the queue. Ask for notifications when there is something
+                * to read.
                 */
                if (sk->sk_state == TCP_ESTABLISHED) {
                        if (!send_waiting_read(sk, 1))

diff --git a/net/vmw_vsock/vmci_transport_notify_qstate.c b/net/vmw_vsock/vmci_transport_notify_qstate.c
index 0f36d7c45db3933f25add3a3e15f6f5fb8c242f7..12f0cb8fe99886430a0855d59e3eaadd44ab1b6b 100644 (file)
--- a/net/vmw_vsock/vmci_transport_notify_qstate.c
+++ b/net/vmw_vsock/vmci_transport_notify_qstate.c
@@ -161,12 +161,12 @@ vmci_transport_notify_pkt_poll_in(struct sock *sk,
 {
        struct vsock_sock *vsk = vsock_sk(sk);
 
-       if (vsock_stream_has_data(vsk)) {
+       if (vsock_stream_has_data(vsk) >= target) {
                *data_ready_now = true;
        } else {
-               /* We can't read right now because there is nothing in the
-                * queue. Ask for notifications when there is something to
-                * read.
+               /* We can't read right now because there is not enough data
+                * in the queue. Ask for notifications when there is something
+                * to read.
                 */
                if (sk->sk_state == TCP_ESTABLISHED)
                        vsock_block_update_write_window(sk);