[dpdk-dev] [PATCH] vhost-user: create union to distinguish master and slave requests

[dpdk-dev] [PATCH] vhost-user: create union to distinguish master and slave requests

[Maxime Coquelin]

This patch adds an union in VhostUserMsg to distinguish between
master and slave initiated requests, instead of casting slave
requests as master request.

Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
 lib/librte_vhost/vhost_user.c | 14 +++++++-------
 lib/librte_vhost/vhost_user.h |  5 ++++-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index f63258ca9..9acac6125 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -1142,7 +1142,7 @@ vhost_user_check_and_alloc_queue_pair(struct virtio_net *dev, VhostUserMsg *msg)
 {
 	uint16_t vring_idx;
 
-	switch (msg->request) {
+	switch (msg->request.master) {
 	case VHOST_USER_SET_VRING_KICK:
 	case VHOST_USER_SET_VRING_CALL:
 	case VHOST_USER_SET_VRING_ERR:
@@ -1194,7 +1194,7 @@ vhost_user_msg_handler(int vid, int fd)
 	}
 
 	ret = read_vhost_message(fd, &msg);
-	if (ret <= 0 || msg.request >= VHOST_USER_MAX) {
+	if (ret <= 0 || msg.request.master >= VHOST_USER_MAX) {
 		if (ret < 0)
 			RTE_LOG(ERR, VHOST_CONFIG,
 				"vhost read message failed\n");
@@ -1209,12 +1209,12 @@ vhost_user_msg_handler(int vid, int fd)
 	}
 
 	ret = 0;
-	if (msg.request != VHOST_USER_IOTLB_MSG)
+	if (msg.request.master != VHOST_USER_IOTLB_MSG)
 		RTE_LOG(INFO, VHOST_CONFIG, "read message %s\n",
-			vhost_message_str[msg.request]);
+			vhost_message_str[msg.request.master]);
 	else
 		RTE_LOG(DEBUG, VHOST_CONFIG, "read message %s\n",
-			vhost_message_str[msg.request]);
+			vhost_message_str[msg.request.master]);
 
 	ret = vhost_user_check_and_alloc_queue_pair(dev, &msg);
 	if (ret < 0) {
@@ -1223,7 +1223,7 @@ vhost_user_msg_handler(int vid, int fd)
 		return -1;
 	}
 
-	switch (msg.request) {
+	switch (msg.request.master) {
 	case VHOST_USER_GET_FEATURES:
 		msg.payload.u64 = vhost_user_get_features(dev);
 		msg.size = sizeof(msg.payload.u64);
@@ -1353,7 +1353,7 @@ vhost_user_iotlb_miss(struct virtio_net *dev, uint64_t iova, uint8_t perm)
 {
 	int ret;
 	struct VhostUserMsg msg = {
-		.request = (enum VhostUserRequest)VHOST_USER_SLAVE_IOTLB_MSG,
+		.request.slave = VHOST_USER_SLAVE_IOTLB_MSG,
 		.flags = VHOST_USER_VERSION,
 		.size = sizeof(msg.payload.iotlb),
 		.payload.iotlb = {
diff --git a/lib/librte_vhost/vhost_user.h b/lib/librte_vhost/vhost_user.h
index 46c6ff956..76d9fe2fc 100644
--- a/lib/librte_vhost/vhost_user.h
+++ b/lib/librte_vhost/vhost_user.h
@@ -109,7 +109,10 @@ typedef struct VhostUserLog {
 } VhostUserLog;
 
 typedef struct VhostUserMsg {
-	VhostUserRequest request;
+	union {
+		VhostUserRequest master;
+		VhostUserSlaveRequest slave;
+	} request;
 
 #define VHOST_USER_VERSION_MASK     0x3
 #define VHOST_USER_REPLY_MASK       (0x1 << 2)
-- 
2.13.6

Re: [dpdk-dev] [PATCH] vhost-user: create union to distinguish master and slave requests

[Yuanhan Liu]

On Tue, Oct 10, 2017 at 02:47:54PM +0200, Maxime Coquelin wrote:
> This patch adds an union in VhostUserMsg to distinguish between
> master and slave initiated requests, instead of casting slave
> requests as master request.

Applied to dpdk-next-virtio.

Thanks.

	--yliu