X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fdevices%2Fvirtio%2Fvhost_user.c;h=c61828eb6c0cb20c8e12d6daeff02b6d40eee8e0;hb=61b8ba69f7a9540ed00576504528ce439f0286f5;hp=a18313b203845cf86985f5e742939ecf90004c40;hpb=0471cdbd3fe04a88a8b70b5f0eff0c378e19abf7;p=vpp.git

diff --git a/src/vnet/devices/virtio/vhost_user.c b/src/vnet/devices/virtio/vhost_user.c
index a18313b2038..c61828eb6c0 100644
--- a/src/vnet/devices/virtio/vhost_user.c
+++ b/src/vnet/devices/virtio/vhost_user.c
@@ -557,6 +557,24 @@ vhost_user_socket_read (clib_file_t * uf)
 
 	  vui->nregions++;
 	}
+
+      /*
+       * Re-compute desc, used, and avail descriptor table if vring address
+       * is set.
+       */
+      for (q = 0; q < VHOST_VRING_MAX_N; q++)
+	{
+	  if (vui->vrings[q].desc_user_addr &&
+	      vui->vrings[q].used_user_addr && vui->vrings[q].avail_user_addr)
+	    {
+	      vui->vrings[q].desc =
+		map_user_mem (vui, vui->vrings[q].desc_user_addr);
+	      vui->vrings[q].used =
+		map_user_mem (vui, vui->vrings[q].used_user_addr);
+	      vui->vrings[q].avail =
+		map_user_mem (vui, vui->vrings[q].avail_user_addr);
+	    }
+	}
       vlib_worker_thread_barrier_release (vm);
       break;
 
@@ -600,6 +618,10 @@ vhost_user_socket_read (clib_file_t * uf)
 	  goto close_socket;
 	}
 
+      vui->vrings[msg.state.index].desc_user_addr = msg.addr.desc_user_addr;
+      vui->vrings[msg.state.index].used_user_addr = msg.addr.used_user_addr;
+      vui->vrings[msg.state.index].avail_user_addr = msg.addr.avail_user_addr;
+
       vlib_worker_thread_barrier_sync (vm);
       vui->vrings[msg.state.index].desc = desc;
       vui->vrings[msg.state.index].used = used;