OSDN Git Service

vsock: pass sock_rcvlowat to notify_poll_in as target
authorArseniy Krasnov <AVKrasnov@sberdevices.ru>
Fri, 19 Aug 2022 05:33:47 +0000 (05:33 +0000)
committerPaolo Abeni <pabeni@redhat.com>
Tue, 23 Aug 2022 08:43:11 +0000 (10:43 +0200)
Passing 1 as the target to notify_poll_in(), we don't honor
what the user has set via SO_RCVLOWAT, going to set POLLIN
and POLLRDNORM, even if we don't have the amount of bytes
expected by the user.

Let's use sock_rcvlowat() to get the right target to pass to
notify_poll_in();

Signed-off-by: Arseniy Krasnov <AVKrasnov@sberdevices.ru>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
net/vmw_vsock/af_vsock.c

index 07c8f74..15171ba 100644 (file)
@@ -1066,8 +1066,9 @@ static __poll_t vsock_poll(struct file *file, struct socket *sock,
                if (transport && transport->stream_is_active(vsk) &&
                    !(sk->sk_shutdown & RCV_SHUTDOWN)) {
                        bool data_ready_now = false;
+                       int target = sock_rcvlowat(sk, 0, INT_MAX);
                        int ret = transport->notify_poll_in(
-                                       vsk, 1, &data_ready_now);
+                                       vsk, target, &data_ready_now);
                        if (ret < 0) {
                                mask |= EPOLLERR;
                        } else {