Merge branch 'vsock-return-errors-other-than-enomem-to-socket'

Arseniy Krasnov says:

====================
vsock: return errors other than -ENOMEM to socket

this patchset removes behaviour, where error code returned from any
transport was always switched to ENOMEM. This works in the same way as
patch from Bobby Eshleman:
commit c43170b7e157 ("vsock: return errors other than -ENOMEM to socket"),
but for receive calls. VMCI transport is also updated (both tx and rx
SOCK_STREAM callbacks), because it returns VMCI specific error code to
af_vsock.c (like VMCI_ERROR_*). Tx path is already merged to net, so it
was excluded from patchset in v4. At the same time, virtio and Hyper-V
transports are using general error codes, so there is no need to update
them.

vsock_test suite is also updated.

Link to v1:
https://lore.kernel.org/netdev/97f19214-ba04-c47e-7486-72e8aa16c690@sberdevices.ru/
Link to v2:
https://lore.kernel.org/netdev/60abc0da-0412-6e25-eeb0-8e32e3ec21e7@sberdevices.ru/
Link to v3:
https://lore.kernel.org/netdev/dead4842-333a-015e-028b-302151336ff9@sberdevices.ru/
====================

Link: https://lore.kernel.org/r/0d20e25a-640c-72c1-2dcb-7a53a05e3132@sberdevices.ru
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
index 5f2dda35c98071ab44e07c7ab13ae2959f009acc..413407bb646c19afd77f32090a09439e99f53e56 100644 (file)
--- a/net/vmw_vsock/af_vsock.c
+++ b/net/vmw_vsock/af_vsock.c
@@ -2043,7 +2043,7 @@ static int __vsock_stream_recvmsg(struct sock *sk, struct msghdr *msg,
 
                read = transport->stream_dequeue(vsk, msg, len - copied, flags);
                if (read < 0) {
-                       err = -ENOMEM;
+                       err = read;
                        break;
                }
 
@@ -2094,7 +2094,7 @@ static int __vsock_seqpacket_recvmsg(struct sock *sk, struct msghdr *msg,
        msg_len = transport->seqpacket_dequeue(vsk, msg, flags);
 
        if (msg_len < 0) {
-               err = -ENOMEM;
+               err = msg_len;
                goto out;
        }
 

diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c
index 36eb16a40745d2fc07f3a8dd5c81396c20320843..a5375c97f5b000168d3519c0e5345661ef6cb110 100644 (file)
--- a/net/vmw_vsock/vmci_transport.c
+++ b/net/vmw_vsock/vmci_transport.c
@@ -1831,10 +1831,17 @@ static ssize_t vmci_transport_stream_dequeue(
        size_t len,
        int flags)
 {
+       ssize_t err;
+
        if (flags & MSG_PEEK)
-               return vmci_qpair_peekv(vmci_trans(vsk)->qpair, msg, len, 0);
+               err = vmci_qpair_peekv(vmci_trans(vsk)->qpair, msg, len, 0);
        else
-               return vmci_qpair_dequev(vmci_trans(vsk)->qpair, msg, len, 0);
+               err = vmci_qpair_dequev(vmci_trans(vsk)->qpair, msg, len, 0);
+
+       if (err < 0)
+               err = -ENOMEM;
+
+       return err;
 }
 
 static ssize_t vmci_transport_stream_enqueue(

diff --git a/tools/testing/vsock/vsock_test.c b/tools/testing/vsock/vsock_test.c
index 12b97c92fbb20dcf68adfc5d03eca7dc8dd1c0c4..ac1bd3ac1533a6da7b749dca5a37746993b978e3 100644 (file)
--- a/tools/testing/vsock/vsock_test.c
+++ b/tools/testing/vsock/vsock_test.c
@@ -723,7 +723,7 @@ static void test_seqpacket_invalid_rec_buffer_server(const struct test_opts *opt
                exit(EXIT_FAILURE);
        }
 
-       if (errno != ENOMEM) {
+       if (errno != EFAULT) {
                perror("unexpected errno of 'broken_buf'");
                exit(EXIT_FAILURE);
        }
@@ -887,7 +887,7 @@ static void test_inv_buf_client(const struct test_opts *opts, bool stream)
                exit(EXIT_FAILURE);
        }
 
-       if (errno != ENOMEM) {
+       if (errno != EFAULT) {
                fprintf(stderr, "unexpected recv(2) errno %d\n", errno);
                exit(EXIT_FAILURE);
        }