[dpdk-dev] [PATCH] lib/librte_vhost: exchange kickfd and callfd to avoid confusion

[Tetsuya Mukawa]

On 2015/03/06 19:39, Huawei Xie wrote:
> Previous vhost implementation wrongly name kickfd as callfd and callfd as kickfd.
> It is functional correct, but causes confusion.
>
> Signed-off-by: Huawei Xie <huawei.xie at intel.com>
> ---
>  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 | 12 ++++++------
>  lib/librte_vhost/virtio-net.c                 | 12 ++++++------
>  5 files changed, 20 insertions(+), 20 deletions(-)
>
> diff --git a/examples/vhost/main.c b/examples/vhost/main.c
> index 334e2fe..61ea671 100644
> --- a/examples/vhost/main.c
> +++ b/examples/vhost/main.c
> @@ -1434,7 +1434,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->kickfd, 1);
> +		eventfd_write((int)vq->callfd, 1);
>  }
>  
>  /*
> @@ -1627,7 +1627,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->kickfd, 1);
> +		eventfd_write((int)vq->callfd, 1);
>  
>  	return 0;
>  }
> @@ -1775,7 +1775,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->kickfd, 1);
> +		eventfd_write((int)vq->callfd, 1);
>  
>  	return count;
>  }
> diff --git a/lib/librte_vhost/rte_virtio_net.h b/lib/librte_vhost/rte_virtio_net.h
> index 611a3d4..2fc1c44 100644
> --- a/lib/librte_vhost/rte_virtio_net.h
> +++ b/lib/librte_vhost/rte_virtio_net.h
> @@ -86,8 +86,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;			/**< Currently unused as polling mode is enabled. */
> -	eventfd_t		kickfd;			/**< Used to notify the guest (trigger interrupt). */
> +	eventfd_t		callfd;			/**< Used to notify the guest (trigger interrupt). */
> +	eventfd_t		kickfd;			/**< Currently unused as polling mode is enabled. */
>  	struct buf_vector	buf_vec[BUF_VECTOR_MAX];	/**< for scatter RX. */
>  } __rte_cache_aligned;
>  
> diff --git a/lib/librte_vhost/vhost_rxtx.c b/lib/librte_vhost/vhost_rxtx.c
> index c7c9550..535c7a1 100644
> --- a/lib/librte_vhost/vhost_rxtx.c
> +++ b/lib/librte_vhost/vhost_rxtx.c
> @@ -180,7 +180,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->kickfd, 1);
> +		eventfd_write((int)vq->callfd, 1);
>  	return count;
>  }
>  
> @@ -507,7 +507,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->kickfd, 1);
> +			eventfd_write((int)vq->callfd, 1);
>  	}
>  
>  	return count;
> @@ -725,6 +725,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->kickfd, 1);
> +		eventfd_write((int)vq->callfd, 1);
>  	return entry_success;
>  }
> diff --git a/lib/librte_vhost/vhost_user/virtio-net-user.c b/lib/librte_vhost/vhost_user/virtio-net-user.c
> index 97c5177..e0c7394 100644
> --- a/lib/librte_vhost/vhost_user/virtio-net-user.c
> +++ b/lib/librte_vhost/vhost_user/virtio-net-user.c
> @@ -286,13 +286,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]->callfd) >= 0) {
> -		close(dev->virtqueue[VIRTIO_RXQ]->callfd);
> -		dev->virtqueue[VIRTIO_RXQ]->callfd = (eventfd_t)-1;
> +	if (((int)dev->virtqueue[VIRTIO_RXQ]->kickfd) >= 0) {
> +		close(dev->virtqueue[VIRTIO_RXQ]->kickfd);
> +		dev->virtqueue[VIRTIO_RXQ]->kickfd = (eventfd_t)-1;
>  	}
> -	if (((int)dev->virtqueue[VIRTIO_TXQ]->callfd) >= 0) {
> -		close(dev->virtqueue[VIRTIO_TXQ]->callfd);
> -		dev->virtqueue[VIRTIO_TXQ]->callfd = (eventfd_t)-1;
> +	if (((int)dev->virtqueue[VIRTIO_TXQ]->kickfd) >= 0) {
> +		close(dev->virtqueue[VIRTIO_TXQ]->kickfd);
> +		dev->virtqueue[VIRTIO_TXQ]->kickfd = (eventfd_t)-1;
>  	}
>  
>  	return 0;
> diff --git a/lib/librte_vhost/virtio-net.c b/lib/librte_vhost/virtio-net.c
> index 20567ff..6917fcf 100644
> --- a/lib/librte_vhost/virtio-net.c
> +++ b/lib/librte_vhost/virtio-net.c
> @@ -595,10 +595,10 @@ 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->kickfd >= 0)
> -		close((int)vq->kickfd);
> +	if ((int)vq->callfd >= 0)
> +		close((int)vq->callfd);
>  
> -	vq->kickfd = file->fd;
> +	vq->callfd = file->fd;
>  
>  	return 0;
>  }
> @@ -621,10 +621,10 @@ 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->callfd >= 0)
> -		close((int)vq->callfd);
> +	if ((int)vq->kickfd >= 0)
> +		close((int)vq->kickfd);
>  
> -	vq->callfd = file->fd;
> +	vq->kickfd = file->fd;
>  
>  	return 0;
>  }

Acked-by: Tetsuya Mukawa <mukawa at igel.co.jp>