summaryrefslogtreecommitdiff
path: root/lib/librte_vhost
diff options
context:
space:
mode:
authorNikolay Nikolaev <nicknickolaev@gmail.com>2018-09-24 23:17:11 +0300
committerFerruh Yigit <ferruh.yigit@intel.com>2018-09-28 01:41:03 +0200
commite951355ffcaece29cfee89cb75afef14afc4428d (patch)
tree34e617a035eb5a3035d990473ea023404dbb1aaf /lib/librte_vhost
parent44eb792f9f645de008c8f902fd40d3d524f3fd71 (diff)
downloaddpdk-e951355ffcaece29cfee89cb75afef14afc4428d.zip
dpdk-e951355ffcaece29cfee89cb75afef14afc4428d.tar.gz
dpdk-e951355ffcaece29cfee89cb75afef14afc4428d.tar.xz
vhost: make message handling functions prepare the reply
As VhostUserMsg structure is reused to generate the reply, move the relevant fields update into the respective message handling functions. Signed-off-by: Nikolay Nikolaev <nicknickolaev@gmail.com> Reviewed-by: Anatoly Burakov <anatoly.burakov@intel.com> Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Diffstat (limited to 'lib/librte_vhost')
-rw-r--r--lib/librte_vhost/vhost_user.c24
1 files changed, 16 insertions, 8 deletions
diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index 505db3b..4ae7b93 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -146,11 +146,15 @@ vhost_user_reset_owner(struct virtio_net *dev)
* The features that we support are requested.
*/
static uint64_t
-vhost_user_get_features(struct virtio_net *dev)
+vhost_user_get_features(struct virtio_net *dev, struct VhostUserMsg *msg)
{
uint64_t features = 0;
rte_vhost_driver_get_features(dev->ifname, &features);
+
+ msg->payload.u64 = features;
+ msg->size = sizeof(msg->payload.u64);
+
return features;
}
@@ -158,11 +162,15 @@ vhost_user_get_features(struct virtio_net *dev)
* The queue number that we support are requested.
*/
static uint32_t
-vhost_user_get_queue_num(struct virtio_net *dev)
+vhost_user_get_queue_num(struct virtio_net *dev, struct VhostUserMsg *msg)
{
uint32_t queue_num = 0;
rte_vhost_driver_get_queue_num(dev->ifname, &queue_num);
+
+ msg->payload.u64 = (uint64_t)queue_num;
+ msg->size = sizeof(msg->payload.u64);
+
return queue_num;
}
@@ -1117,6 +1125,8 @@ vhost_user_get_vring_base(struct virtio_net *dev,
rte_free(vq->batch_copy_elems);
vq->batch_copy_elems = NULL;
+ msg->size = sizeof(msg->payload.state);
+
return 0;
}
@@ -1244,6 +1254,8 @@ vhost_user_set_log_base(struct virtio_net *dev, struct VhostUserMsg *msg)
dev->log_base = dev->log_addr + off;
dev->log_size = size;
+ msg->size = sizeof(msg->payload.u64);
+
return 0;
}
@@ -1658,8 +1670,7 @@ vhost_user_msg_handler(int vid, int fd)
switch (msg.request.master) {
case VHOST_USER_GET_FEATURES:
- msg.payload.u64 = vhost_user_get_features(dev);
- msg.size = sizeof(msg.payload.u64);
+ vhost_user_get_features(dev, &msg);
send_vhost_reply(fd, &msg);
break;
case VHOST_USER_SET_FEATURES:
@@ -1690,7 +1701,6 @@ vhost_user_msg_handler(int vid, int fd)
if (ret)
goto skip_to_reply;
/* it needs a reply */
- msg.size = sizeof(msg.payload.u64);
send_vhost_reply(fd, &msg);
break;
case VHOST_USER_SET_LOG_FD:
@@ -1712,7 +1722,6 @@ vhost_user_msg_handler(int vid, int fd)
ret = vhost_user_get_vring_base(dev, &msg);
if (ret)
goto skip_to_reply;
- msg.size = sizeof(msg.payload.state);
send_vhost_reply(fd, &msg);
break;
@@ -1730,8 +1739,7 @@ vhost_user_msg_handler(int vid, int fd)
break;
case VHOST_USER_GET_QUEUE_NUM:
- msg.payload.u64 = (uint64_t)vhost_user_get_queue_num(dev);
- msg.size = sizeof(msg.payload.u64);
+ vhost_user_get_queue_num(dev, &msg);
send_vhost_reply(fd, &msg);
break;