Skip to contentSkip to conversation

vhost: remove redundant ;

PATCH New Yuanhan Liu 3 participants 11 messages Sep 9, 2015 – Oct 8, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 vhost: remove redundant ;

---
 lib/librte_vhost/vhost_rxtx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
lib/librte_vhost/vhost_rxtx.c +1 -1
index 0d07338..d412293 100644
@@ -185,7 +185,7 @@ virtio_dev_rx(struct virtio_net *dev, uint16_t queue_id,
 				}
 			}
 			len_to_cpy = RTE_MIN(data_len - offset, desc->len - vb_offset);
-		};
+		}
 
 		/* Update used ring with desc information */
 		vq->used->ring[res_cur_idx & (vq->size - 1)].id =
Signature · 1 line
1.9.0
#1 lore raw

PATCH 2/4 vhost: fix typo

_det => _dev

---
 lib/librte_vhost/virtio-net.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
lib/librte_vhost/virtio-net.c +1 -1
index b520ec5..b670992 100644
@@ -485,7 +485,7 @@ set_vring_num(struct vhost_device_ctx ctx, struct vhost_vring_state *state)
 }
 
 /*
- * Reallocate virtio_det and vhost_virtqueue data structure to make them on the
+ * Reallocate virtio_dev and vhost_virtqueue data structure to make them on the
  * same numa node as the memory of vring descriptor.
  */
 #ifdef RTE_LIBRTE_VHOST_NUMA
Signature · 1 line
1.9.0
#2 lore raw

PATCH 3/4 vhost: get rid of duplicate code

In reply to Yuanhan Liu
---
 lib/librte_vhost/vhost_user/vhost-net-user.c | 36 ++++++++--------------------
 1 file changed, 10 insertions(+), 26 deletions(-)
lib/librte_vhost/vhost_user/vhost-net-user.c +10 -26
index f406a94..d1f8877 100644
@@ -329,32 +329,16 @@ vserver_message_handler(int connfd, void *dat, int *remove)
 
 	ctx.fh = cfd_ctx->fh;
 	ret = read_vhost_message(connfd, &msg);
-	if (ret < 0) {
-		RTE_LOG(ERR, VHOST_CONFIG,
-			"vhost read message failed\n");
-
-		close(connfd);
-		*remove = 1;
-		free(cfd_ctx);
-		user_destroy_device(ctx);
-		ops->destroy_device(ctx);
-
-		return;
-	} else if (ret == 0) {
-		RTE_LOG(INFO, VHOST_CONFIG,
-			"vhost peer closed\n");
-
-		close(connfd);
-		*remove = 1;
-		free(cfd_ctx);
-		user_destroy_device(ctx);
-		ops->destroy_device(ctx);
-
-		return;
-	}
-	if (msg.request > VHOST_USER_MAX) {
-		RTE_LOG(ERR, VHOST_CONFIG,
-			"vhost read incorrect message\n");
+	if (ret <= 0 || msg.request > VHOST_USER_MAX) {
+		if (ret < 0)
+			RTE_LOG(ERR, VHOST_CONFIG,
+				"vhost read message failed\n");
+		else if (ret == 0)
+			RTE_LOG(INFO, VHOST_CONFIG,
+				"vhost peer closed\n");
+		else
+			RTE_LOG(ERR, VHOST_CONFIG,
+				"vhost read incorrect message\n");
 
 		close(connfd);
 		*remove = 1;
Signature · 1 line
1.9.0
#3 lore raw

PATCH v2 4/4 vhost: fix wrong usage of eventfd_t

In reply to Yuanhan Liu

According to eventfd man page:

    typedef uint64_t eventfd_t;

    int eventfd_read(int fd, eventfd_t *value);
    int eventfd_write(int fd, eventfd_t value);

eventfd_t is defined for the second arg(value), but not for fd.

Here I redefine those fd fields to `int' type, which also removes the redundant (int) cast. And as the man page stated, we should cast 1 to eventfd_t type for eventfd_write().

v2: cast 1 with `eventfd_t' type.

---
 examples/vhost/main.c                         |  6 ++---
 lib/librte_vhost/rte_virtio_net.h             |  4 ++--
 lib/librte_vhost/vhost_rxtx.c                 |  6 ++---
 lib/librte_vhost/vhost_user/virtio-net-user.c | 16 +++++++-------
 lib/librte_vhost/virtio-net.c                 | 32 +++++++++++++--------------
 5 files changed, 32 insertions(+), 32 deletions(-)
examples/vhost/main.c +3 -3
index 1b137b9..9eac2d0 100644
@@ -1433,7 +1433,7 @@ put_desc_to_used_list_zcp(struct vhost_virtqueue *vq, uint16_t desc_idx)
 
 	/* Kick the guest if necessary. */
 	if (!(vq->avail->flags & VRING_AVAIL_F_NO_INTERRUPT))
-		eventfd_write((int)vq->callfd, 1);
+		eventfd_write(vq->callfd, (eventfd_t)1);
 }
 
 /*
@@ -1626,7 +1626,7 @@ txmbuf_clean_zcp(struct virtio_net *dev, struct vpool *vpool)
 
 	/* Kick guest if required. */
 	if (!(vq->avail->flags & VRING_AVAIL_F_NO_INTERRUPT))
-		eventfd_write((int)vq->callfd, 1);
+		eventfd_write(vq->callfd, (eventfd_t)1);
 
 	return 0;
 }
@@ -1774,7 +1774,7 @@ virtio_dev_rx_zcp(struct virtio_net *dev, struct rte_mbuf **pkts,
 
 	/* Kick the guest if necessary. */
 	if (!(vq->avail->flags & VRING_AVAIL_F_NO_INTERRUPT))
-		eventfd_write((int)vq->callfd, 1);
+		eventfd_write(vq->callfd, (eventfd_t)1);
 
 	return count;
 }
lib/librte_vhost/rte_virtio_net.h +2 -2
index b9bf320..a037c15 100644
@@ -87,8 +87,8 @@ struct vhost_virtqueue {
 	uint16_t		vhost_hlen;		/**< Vhost header length (varies depending on RX merge buffers. */
 	volatile uint16_t	last_used_idx;		/**< Last index used on the available ring */
 	volatile uint16_t	last_used_idx_res;	/**< Used for multiple devices reserving buffers. */
-	eventfd_t		callfd;			/**< Used to notify the guest (trigger interrupt). */
-	eventfd_t		kickfd;			/**< Currently unused as polling mode is enabled. */
+	int			callfd;			/**< Used to notify the guest (trigger interrupt). */
+	int			kickfd;			/**< Currently unused as polling mode is enabled. */
 	struct buf_vector	buf_vec[BUF_VECTOR_MAX];	/**< for scatter RX. */
 } __rte_cache_aligned;
 
lib/librte_vhost/vhost_rxtx.c +3 -3
index d412293..b2b2bcc 100644
@@ -230,7 +230,7 @@ virtio_dev_rx(struct virtio_net *dev, uint16_t queue_id,
 
 	/* Kick the guest if necessary. */
 	if (!(vq->avail->flags & VRING_AVAIL_F_NO_INTERRUPT))
-		eventfd_write((int)vq->callfd, 1);
+		eventfd_write(vq->callfd, (eventfd_t)1);
 	return count;
 }
 
@@ -529,7 +529,7 @@ virtio_dev_merge_rx(struct virtio_net *dev, uint16_t queue_id,
 
 		/* Kick the guest if necessary. */
 		if (!(vq->avail->flags & VRING_AVAIL_F_NO_INTERRUPT))
-			eventfd_write((int)vq->callfd, 1);
+			eventfd_write(vq->callfd, (eventfd_t)1);
 	}
 
 	return count;
@@ -752,6 +752,6 @@ rte_vhost_dequeue_burst(struct virtio_net *dev, uint16_t queue_id,
 	vq->used->idx += entry_success;
 	/* Kick guest if required. */
 	if (!(vq->avail->flags & VRING_AVAIL_F_NO_INTERRUPT))
-		eventfd_write((int)vq->callfd, 1);
+		eventfd_write(vq->callfd, (eventfd_t)1);
 	return entry_success;
 }
lib/librte_vhost/vhost_user/virtio-net-user.c +8 -8
index c1ffc38..4689927 100644
@@ -214,10 +214,10 @@ virtio_is_ready(struct virtio_net *dev)
 	rvq = dev->virtqueue[VIRTIO_RXQ];
 	tvq = dev->virtqueue[VIRTIO_TXQ];
 	if (rvq && tvq && rvq->desc && tvq->desc &&
-		(rvq->kickfd != (eventfd_t)-1) &&
-		(rvq->callfd != (eventfd_t)-1) &&
-		(tvq->kickfd != (eventfd_t)-1) &&
-		(tvq->callfd != (eventfd_t)-1)) {
+		(rvq->kickfd != -1) &&
+		(rvq->callfd != -1) &&
+		(tvq->kickfd != -1) &&
+		(tvq->callfd != -1)) {
 		RTE_LOG(INFO, VHOST_CONFIG,
 			"virtio is now ready for processing.\n");
 		return 1;
@@ -290,13 +290,13 @@ user_get_vring_base(struct vhost_device_ctx ctx,
 	 * sent and only sent in vhost_vring_stop.
 	 * TODO: cleanup the vring, it isn't usable since here.
 	 */
-	if (((int)dev->virtqueue[VIRTIO_RXQ]->kickfd) >= 0) {
+	if ((dev->virtqueue[VIRTIO_RXQ]->kickfd) >= 0) {
 		close(dev->virtqueue[VIRTIO_RXQ]->kickfd);
-		dev->virtqueue[VIRTIO_RXQ]->kickfd = (eventfd_t)-1;
+		dev->virtqueue[VIRTIO_RXQ]->kickfd = -1;
 	}
-	if (((int)dev->virtqueue[VIRTIO_TXQ]->kickfd) >= 0) {
+	if ((dev->virtqueue[VIRTIO_TXQ]->kickfd) >= 0) {
 		close(dev->virtqueue[VIRTIO_TXQ]->kickfd);
-		dev->virtqueue[VIRTIO_TXQ]->kickfd = (eventfd_t)-1;
+		dev->virtqueue[VIRTIO_TXQ]->kickfd = -1;
 	}
 
 	return 0;
lib/librte_vhost/virtio-net.c +16 -16
index b670992..d0f1764 100644
@@ -190,14 +190,14 @@ cleanup_device(struct virtio_net *dev)
 	}
 
 	/* Close any event notifiers opened by device. */
-	if ((int)dev->virtqueue[VIRTIO_RXQ]->callfd >= 0)
-		close((int)dev->virtqueue[VIRTIO_RXQ]->callfd);
-	if ((int)dev->virtqueue[VIRTIO_RXQ]->kickfd >= 0)
-		close((int)dev->virtqueue[VIRTIO_RXQ]->kickfd);
-	if ((int)dev->virtqueue[VIRTIO_TXQ]->callfd >= 0)
-		close((int)dev->virtqueue[VIRTIO_TXQ]->callfd);
-	if ((int)dev->virtqueue[VIRTIO_TXQ]->kickfd >= 0)
-		close((int)dev->virtqueue[VIRTIO_TXQ]->kickfd);
+	if (dev->virtqueue[VIRTIO_RXQ]->callfd >= 0)
+		close(dev->virtqueue[VIRTIO_RXQ]->callfd);
+	if (dev->virtqueue[VIRTIO_RXQ]->kickfd >= 0)
+		close(dev->virtqueue[VIRTIO_RXQ]->kickfd);
+	if (dev->virtqueue[VIRTIO_TXQ]->callfd >= 0)
+		close(dev->virtqueue[VIRTIO_TXQ]->callfd);
+	if (dev->virtqueue[VIRTIO_TXQ]->kickfd >= 0)
+		close(dev->virtqueue[VIRTIO_TXQ]->kickfd);
 }
 
 /*
@@ -261,10 +261,10 @@ init_device(struct virtio_net *dev)
 	memset(dev->virtqueue[VIRTIO_RXQ], 0, sizeof(struct vhost_virtqueue));
 	memset(dev->virtqueue[VIRTIO_TXQ], 0, sizeof(struct vhost_virtqueue));
 
-	dev->virtqueue[VIRTIO_RXQ]->kickfd = (eventfd_t)-1;
-	dev->virtqueue[VIRTIO_RXQ]->callfd = (eventfd_t)-1;
-	dev->virtqueue[VIRTIO_TXQ]->kickfd = (eventfd_t)-1;
-	dev->virtqueue[VIRTIO_TXQ]->callfd = (eventfd_t)-1;
+	dev->virtqueue[VIRTIO_RXQ]->kickfd = -1;
+	dev->virtqueue[VIRTIO_RXQ]->callfd = -1;
+	dev->virtqueue[VIRTIO_TXQ]->kickfd = -1;
+	dev->virtqueue[VIRTIO_TXQ]->callfd = -1;
 
 	/* Backends are set to -1 indicating an inactive device. */
 	dev->virtqueue[VIRTIO_RXQ]->backend = VIRTIO_DEV_STOPPED;
@@ -685,8 +685,8 @@ set_vring_call(struct vhost_device_ctx ctx, struct vhost_vring_file *file)
 	/* file->index refers to the queue index. The txq is 1, rxq is 0. */
 	vq = dev->virtqueue[file->index];
 
-	if ((int)vq->callfd >= 0)
-		close((int)vq->callfd);
+	if (vq->callfd >= 0)
+		close(vq->callfd);
 
 	vq->callfd = file->fd;
 
@@ -711,8 +711,8 @@ set_vring_kick(struct vhost_device_ctx ctx, struct vhost_vring_file *file)
 	/* file->index refers to the queue index. The txq is 1, rxq is 0. */
 	vq = dev->virtqueue[file->index];
 
-	if ((int)vq->kickfd >= 0)
-		close((int)vq->kickfd);
+	if (vq->kickfd >= 0)
+		close(vq->kickfd);
 
 	vq->kickfd = file->fd;
 
Signature · 1 line
1.9.0
Acked-by on v2 4/4
#4 lore raw

Re: [PATCH 4/4 v2] vhost: fix wrong usage of eventfd_t

Thanks for fixing this.

Quoted 24 lines · Yuanhan Liu

According to eventfd man page:

    typedef uint64_t eventfd_t;

    int eventfd_read(int fd, eventfd_t *value);
    int eventfd_write(int fd, eventfd_t value);

eventfd_t is defined for the second arg(value), but not for fd.

Here I redefine those fd fields to `int' type, which also removes the redundant (int) cast. And as the man page stated, we should cast 1 to eventfd_t type for eventfd_write().

v2: cast 1 with `eventfd_t' type.

---
 examples/vhost/main.c                         |  6 ++---
 lib/librte_vhost/rte_virtio_net.h             |  4 ++--
 lib/librte_vhost/vhost_rxtx.c                 |  6 ++---
 lib/librte_vhost/vhost_user/virtio-net-user.c | 16 +++++++-------
 lib/librte_vhost/virtio-net.c                 | 32 +++++++++++++--------------
 5 files changed, 32 insertions(+), 32 deletions(-)
#5 lore raw

Re: [PATCH 4/4 v2] vhost: fix wrong usage of eventfd_t

Hi Thomas,

Would you consider to apply these 4 patches please? The 4th patch affects quite many lines of code, and the sooner we apply it, the fewer chance it will introduce conflicts for later patches.

Thanks.

	--yliu
Quoted 30 lines · Huawei

Thanks for fixing this.

Quoted 24 lines · Yuanhan Liu

According to eventfd man page:

    typedef uint64_t eventfd_t;

    int eventfd_read(int fd, eventfd_t *value);
    int eventfd_write(int fd, eventfd_t value);

eventfd_t is defined for the second arg(value), but not for fd.

Here I redefine those fd fields to `int' type, which also removes the redundant (int) cast. And as the man page stated, we should cast 1 to eventfd_t type for eventfd_write().

v2: cast 1 with `eventfd_t' type.

---
 examples/vhost/main.c                         |  6 ++---
 lib/librte_vhost/rte_virtio_net.h             |  4 ++--
 lib/librte_vhost/vhost_rxtx.c                 |  6 ++---
 lib/librte_vhost/vhost_user/virtio-net-user.c | 16 +++++++-------
 lib/librte_vhost/virtio-net.c                 | 32 +++++++++++++--------------
 5 files changed, 32 insertions(+), 32 deletions(-)
#6 lore raw

Re: [PATCH 4/4 v2] vhost: fix wrong usage of eventfd_t

2015-09-24 22:01, Yuanhan Liu:

Quoted 3 lines

Would you consider to apply these 4 patches please? The 4th patch affects quite many lines of code, and the sooner we apply it, the fewer chance it will introduce conflicts for later patches.

Yes, I'm checking it.

The patch 4/4 is v2. Other ones have no version. When you'll send a new version of a new patchset, please
- increment version number of every patches to the same number
- make the first email the child of the previous version Thanks

#7 lore raw

Re: [PATCH 4/4 v2] vhost: fix wrong usage of eventfd_t

2015-09-25 14:44, Thomas Monjalon:

Quoted 6 lines

2015-09-24 22:01, Yuanhan Liu:

Quoted 3 lines

Would you consider to apply these 4 patches please? The 4th patch affects quite many lines of code, and the sooner we apply it, the fewer chance it will introduce conflicts for later patches.

Yes, I'm checking it.

Applied, thanks

#8 lore raw

Re: [PATCH 4/4 v2] vhost: fix wrong usage of eventfd_t

In reply to Thomas Monjalon
Quoted 8 lines · Thomas Monjalon

2015-09-24 22:01, Yuanhan Liu:

Quoted 3 lines

Would you consider to apply these 4 patches please? The 4th patch affects quite many lines of code, and the sooner we apply it, the fewer chance it will introduce conflicts for later patches.

Yes, I'm checking it.

The patch 4/4 is v2. Other ones have no version.

Which means no changes for others in this version.

Quoted 2 lines

When you'll send a new version of a new patchset, please
- increment version number of every patches to the same number

And, I can do that.

Quoted 1 line

- make the first email the child of the previous version

I'm wondering how could you do that, with git-send-email.

	--yliu
#9 lore raw

Re: [PATCH 4/4 v2] vhost: fix wrong usage of eventfd_t

2015-09-27 08:17, Yuanhan Liu:

Quoted 4 lines · Thomas Monjalon
Quoted 1 line

- make the first email the child of the previous version

I'm wondering how could you do that, with git-send-email.

It can be checked in http://dpdk.org/dev#send:
--in-reply-to <Message-ID of the previous patch>

The message id is in the mail headers.

#10 lore raw

Re: [PATCH 4/4 v2] vhost: fix wrong usage of eventfd_t

Quoted 8 lines · Thomas Monjalon

2015-09-27 08:17, Yuanhan Liu:

Quoted 4 lines · Thomas Monjalon
Quoted 1 line

- make the first email the child of the previous version

I'm wondering how could you do that, with git-send-email.

It can be checked in http://dpdk.org/dev#send:
--in-reply-to <Message-ID of the previous patch>

Thanks for the tip (and sorry for the late reply).

I see that it might be helpful, especially when it's a single patch or small patch set. But I doubt it's helpful if it's a large patch set, and especially when there are quite many comments. Linking a large thread to another huge thread will make it messy, making it harder for review, IMO. Or, am I wrong?

	--yliu
Quoted 2 lines

The message id is in the mail headers.