Merge tag 'drm-next-2020-12-18' of git://anongit.freedesktop.org/drm/drm

[linux-2.6-microblaze.git] / net / vmw_vsock / af_vsock.c

diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
index d10916a..b12d3a3 100644 (file)
--- a/net/vmw_vsock/af_vsock.c
+++ b/net/vmw_vsock/af_vsock.c
@@ -421,7 +421,8 @@ static void vsock_deassign_transport(struct vsock_sock *vsk)
  * The vsk->remote_addr is used to decide which transport to use:
  *  - remote CID == VMADDR_CID_LOCAL or g2h->local_cid or VMADDR_CID_HOST if
  *    g2h is not loaded, will use local transport;
- *  - remote CID <= VMADDR_CID_HOST will use guest->host transport;
+ *  - remote CID <= VMADDR_CID_HOST or h2g is not loaded or remote flags field
+ *    includes VMADDR_FLAG_TO_HOST flag value, will use guest->host transport;
  *  - remote CID > VMADDR_CID_HOST will use host->guest transport;
  */
 int vsock_assign_transport(struct vsock_sock *vsk, struct vsock_sock *psk)
@@ -429,8 +430,23 @@ int vsock_assign_transport(struct vsock_sock *vsk, struct vsock_sock *psk)
        const struct vsock_transport *new_transport;
        struct sock *sk = sk_vsock(vsk);
        unsigned int remote_cid = vsk->remote_addr.svm_cid;
+       __u8 remote_flags;
        int ret;
 
+       /* If the packet is coming with the source and destination CIDs higher
+        * than VMADDR_CID_HOST, then a vsock channel where all the packets are
+        * forwarded to the host should be established. Then the host will
+        * need to forward the packets to the guest.
+        *
+        * The flag is set on the (listen) receive path (psk is not NULL). On
+        * the connect path the flag can be set by the user space application.
+        */
+       if (psk && vsk->local_addr.svm_cid > VMADDR_CID_HOST &&
+           vsk->remote_addr.svm_cid > VMADDR_CID_HOST)
+               vsk->remote_addr.svm_flags |= VMADDR_FLAG_TO_HOST;
+
+       remote_flags = vsk->remote_addr.svm_flags;
+
        switch (sk->sk_type) {
        case SOCK_DGRAM:
                new_transport = transport_dgram;
@@ -438,7 +454,8 @@ int vsock_assign_transport(struct vsock_sock *vsk, struct vsock_sock *psk)
        case SOCK_STREAM:
                if (vsock_use_local_transport(remote_cid))
                        new_transport = transport_local;
-               else if (remote_cid <= VMADDR_CID_HOST || !transport_h2g)
+               else if (remote_cid <= VMADDR_CID_HOST || !transport_h2g ||
+                        (remote_flags & VMADDR_FLAG_TO_HOST))
                        new_transport = transport_g2h;
                else
                        new_transport = transport_h2g;
@@ -2072,8 +2089,7 @@ static long vsock_dev_do_ioctl(struct file *filp,
                break;
 
        default:
-               pr_err("Unknown ioctl %d\n", cmd);
-               retval = -EINVAL;
+               retval = -ENOIOCTLCMD;
        }
 
        return retval;