2014-02-10 13:57:48 +00:00
|
|
|
/*-
|
|
|
|
* BSD LICENSE
|
2014-06-03 23:42:50 +00:00
|
|
|
*
|
2014-02-10 13:57:48 +00:00
|
|
|
* Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
|
|
|
|
* All rights reserved.
|
2014-06-03 23:42:50 +00:00
|
|
|
*
|
2014-02-10 13:57:48 +00:00
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
2014-06-03 23:42:50 +00:00
|
|
|
*
|
2014-02-10 13:57:48 +00:00
|
|
|
* * Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
* * Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in
|
|
|
|
* the documentation and/or other materials provided with the
|
|
|
|
* distribution.
|
|
|
|
* * Neither the name of Intel Corporation nor the names of its
|
|
|
|
* contributors may be used to endorse or promote products derived
|
|
|
|
* from this software without specific prior written permission.
|
2014-06-03 23:42:50 +00:00
|
|
|
*
|
2014-02-10 13:57:48 +00:00
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
|
|
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
|
|
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
|
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
|
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef _VHOST_NET_CDEV_H_
|
|
|
|
#define _VHOST_NET_CDEV_H_
|
2014-10-08 18:54:54 +00:00
|
|
|
#include <stdint.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <sys/types.h>
|
vhost: add dequeue zero copy
The basic idea of dequeue zero copy is, instead of copying data from
the desc buf, here we let the mbuf reference the desc buf addr directly.
Doing so, however, has one major issue: we can't update the used ring
at the end of rte_vhost_dequeue_burst. Because we don't do the copy
here, an update of the used ring would let the driver to reclaim the
desc buf. As a result, DPDK might reference a stale memory region.
To update the used ring properly, this patch does several tricks:
- when mbuf references a desc buf, refcnt is added by 1.
This is to pin lock the mbuf, so that a mbuf free from the DPDK
won't actually free it, instead, refcnt is subtracted by 1.
- We chain all those mbuf together (by tailq)
And we check it every time on the rte_vhost_dequeue_burst entrance,
to see if the mbuf is freed (when refcnt equals to 1). If that
happens, it means we are the last user of this mbuf and we are
safe to update the used ring.
- "struct zcopy_mbuf" is introduced, to associate an mbuf with the
right desc idx.
Dequeue zero copy is introduced for performance reason, and some rough
tests show about 50% perfomance boost for packet size 1500B. For small
packets, (e.g. 64B), it actually slows a bit down (well, it could up to
15%). That is expected because this patch introduces some extra works,
and it outweighs the benefit from saving few bytes copy.
Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Tested-by: Qian Xu <qian.q.xu@intel.com>
2016-10-09 07:27:57 +00:00
|
|
|
#include <sys/queue.h>
|
2014-10-08 18:54:54 +00:00
|
|
|
#include <unistd.h>
|
2014-02-10 13:57:48 +00:00
|
|
|
#include <linux/vhost.h>
|
2017-04-01 07:22:51 +00:00
|
|
|
#include <linux/virtio_net.h>
|
|
|
|
#include <sys/socket.h>
|
|
|
|
#include <linux/if.h>
|
2014-02-10 13:57:48 +00:00
|
|
|
|
2014-10-08 18:54:54 +00:00
|
|
|
#include <rte_log.h>
|
2017-04-01 07:22:51 +00:00
|
|
|
#include <rte_ether.h>
|
2017-10-05 08:36:14 +00:00
|
|
|
#include <rte_rwlock.h>
|
2014-10-08 18:54:54 +00:00
|
|
|
|
2017-04-01 07:22:57 +00:00
|
|
|
#include "rte_vhost.h"
|
2015-02-23 17:36:31 +00:00
|
|
|
|
2016-04-30 05:11:19 +00:00
|
|
|
/* Used to indicate that the device is running on a data core */
|
|
|
|
#define VIRTIO_DEV_RUNNING 1
|
2017-03-12 16:34:00 +00:00
|
|
|
/* Used to indicate that the device is ready to operate */
|
|
|
|
#define VIRTIO_DEV_READY 2
|
2016-04-30 05:11:19 +00:00
|
|
|
|
|
|
|
/* Backend value set by guest. */
|
|
|
|
#define VIRTIO_DEV_STOPPED -1
|
|
|
|
|
|
|
|
#define BUF_VECTOR_MAX 256
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Structure contains buffer address, length and descriptor index
|
|
|
|
* from vring to do scatter RX.
|
|
|
|
*/
|
|
|
|
struct buf_vector {
|
|
|
|
uint64_t buf_addr;
|
|
|
|
uint32_t buf_len;
|
|
|
|
uint32_t desc_idx;
|
|
|
|
};
|
|
|
|
|
vhost: add dequeue zero copy
The basic idea of dequeue zero copy is, instead of copying data from
the desc buf, here we let the mbuf reference the desc buf addr directly.
Doing so, however, has one major issue: we can't update the used ring
at the end of rte_vhost_dequeue_burst. Because we don't do the copy
here, an update of the used ring would let the driver to reclaim the
desc buf. As a result, DPDK might reference a stale memory region.
To update the used ring properly, this patch does several tricks:
- when mbuf references a desc buf, refcnt is added by 1.
This is to pin lock the mbuf, so that a mbuf free from the DPDK
won't actually free it, instead, refcnt is subtracted by 1.
- We chain all those mbuf together (by tailq)
And we check it every time on the rte_vhost_dequeue_burst entrance,
to see if the mbuf is freed (when refcnt equals to 1). If that
happens, it means we are the last user of this mbuf and we are
safe to update the used ring.
- "struct zcopy_mbuf" is introduced, to associate an mbuf with the
right desc idx.
Dequeue zero copy is introduced for performance reason, and some rough
tests show about 50% perfomance boost for packet size 1500B. For small
packets, (e.g. 64B), it actually slows a bit down (well, it could up to
15%). That is expected because this patch introduces some extra works,
and it outweighs the benefit from saving few bytes copy.
Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Tested-by: Qian Xu <qian.q.xu@intel.com>
2016-10-09 07:27:57 +00:00
|
|
|
/*
|
|
|
|
* A structure to hold some fields needed in zero copy code path,
|
|
|
|
* mainly for associating an mbuf with the right desc_idx.
|
|
|
|
*/
|
|
|
|
struct zcopy_mbuf {
|
|
|
|
struct rte_mbuf *mbuf;
|
|
|
|
uint32_t desc_idx;
|
|
|
|
uint16_t in_use;
|
|
|
|
|
|
|
|
TAILQ_ENTRY(zcopy_mbuf) next;
|
|
|
|
};
|
|
|
|
TAILQ_HEAD(zcopy_mbuf_list, zcopy_mbuf);
|
|
|
|
|
2017-09-08 12:50:46 +00:00
|
|
|
/*
|
|
|
|
* Structure contains the info for each batched memory copy.
|
|
|
|
*/
|
|
|
|
struct batch_copy_elem {
|
|
|
|
void *dst;
|
|
|
|
void *src;
|
|
|
|
uint32_t len;
|
|
|
|
uint64_t log_addr;
|
|
|
|
};
|
|
|
|
|
2016-04-30 05:11:19 +00:00
|
|
|
/**
|
|
|
|
* Structure contains variables relevant to RX/TX virtqueues.
|
|
|
|
*/
|
|
|
|
struct vhost_virtqueue {
|
|
|
|
struct vring_desc *desc;
|
|
|
|
struct vring_avail *avail;
|
|
|
|
struct vring_used *used;
|
|
|
|
uint32_t size;
|
|
|
|
|
2016-10-09 07:27:56 +00:00
|
|
|
uint16_t last_avail_idx;
|
2016-10-14 09:34:32 +00:00
|
|
|
uint16_t last_used_idx;
|
2016-04-30 05:11:19 +00:00
|
|
|
#define VIRTIO_INVALID_EVENTFD (-1)
|
|
|
|
#define VIRTIO_UNINITIALIZED_EVENTFD (-2)
|
|
|
|
|
|
|
|
/* Backend value to determine if device should started/stopped */
|
|
|
|
int backend;
|
|
|
|
/* Used to notify the guest (trigger interrupt) */
|
|
|
|
int callfd;
|
|
|
|
/* Currently unused as polling mode is enabled */
|
|
|
|
int kickfd;
|
|
|
|
int enabled;
|
|
|
|
|
|
|
|
/* Physical address of used ring, for logging */
|
|
|
|
uint64_t log_guest_addr;
|
vhost: add dequeue zero copy
The basic idea of dequeue zero copy is, instead of copying data from
the desc buf, here we let the mbuf reference the desc buf addr directly.
Doing so, however, has one major issue: we can't update the used ring
at the end of rte_vhost_dequeue_burst. Because we don't do the copy
here, an update of the used ring would let the driver to reclaim the
desc buf. As a result, DPDK might reference a stale memory region.
To update the used ring properly, this patch does several tricks:
- when mbuf references a desc buf, refcnt is added by 1.
This is to pin lock the mbuf, so that a mbuf free from the DPDK
won't actually free it, instead, refcnt is subtracted by 1.
- We chain all those mbuf together (by tailq)
And we check it every time on the rte_vhost_dequeue_burst entrance,
to see if the mbuf is freed (when refcnt equals to 1). If that
happens, it means we are the last user of this mbuf and we are
safe to update the used ring.
- "struct zcopy_mbuf" is introduced, to associate an mbuf with the
right desc idx.
Dequeue zero copy is introduced for performance reason, and some rough
tests show about 50% perfomance boost for packet size 1500B. For small
packets, (e.g. 64B), it actually slows a bit down (well, it could up to
15%). That is expected because this patch introduces some extra works,
and it outweighs the benefit from saving few bytes copy.
Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Tested-by: Qian Xu <qian.q.xu@intel.com>
2016-10-09 07:27:57 +00:00
|
|
|
|
|
|
|
uint16_t nr_zmbuf;
|
|
|
|
uint16_t zmbuf_size;
|
|
|
|
uint16_t last_zmbuf_idx;
|
|
|
|
struct zcopy_mbuf *zmbufs;
|
|
|
|
struct zcopy_mbuf_list zmbuf_list;
|
2016-10-14 09:34:36 +00:00
|
|
|
|
|
|
|
struct vring_used_elem *shadow_used_ring;
|
|
|
|
uint16_t shadow_used_idx;
|
2017-09-08 12:50:46 +00:00
|
|
|
|
|
|
|
struct batch_copy_elem *batch_copy_elems;
|
|
|
|
uint16_t batch_copy_nb_elems;
|
2017-10-05 08:36:14 +00:00
|
|
|
|
|
|
|
rte_rwlock_t iotlb_lock;
|
2017-10-05 08:36:15 +00:00
|
|
|
rte_rwlock_t iotlb_pending_lock;
|
2017-10-05 08:36:14 +00:00
|
|
|
struct rte_mempool *iotlb_pool;
|
|
|
|
TAILQ_HEAD(, vhost_iotlb_entry) iotlb_list;
|
|
|
|
int iotlb_cache_nr;
|
2017-10-05 08:36:15 +00:00
|
|
|
TAILQ_HEAD(, vhost_iotlb_entry) iotlb_pending_list;
|
2016-04-30 05:11:19 +00:00
|
|
|
} __rte_cache_aligned;
|
|
|
|
|
2017-03-01 10:41:59 +00:00
|
|
|
/* Old kernels have no such macros defined */
|
2016-04-30 05:11:19 +00:00
|
|
|
#ifndef VIRTIO_NET_F_GUEST_ANNOUNCE
|
|
|
|
#define VIRTIO_NET_F_GUEST_ANNOUNCE 21
|
|
|
|
#endif
|
|
|
|
|
2017-03-01 10:41:59 +00:00
|
|
|
#ifndef VIRTIO_NET_F_MQ
|
2017-03-01 10:41:58 +00:00
|
|
|
#define VIRTIO_NET_F_MQ 22
|
2016-04-30 05:11:19 +00:00
|
|
|
#endif
|
2017-04-01 07:22:45 +00:00
|
|
|
|
|
|
|
#define VHOST_MAX_VRING 0x100
|
2017-03-01 10:41:59 +00:00
|
|
|
#define VHOST_MAX_QUEUE_PAIRS 0x80
|
2016-04-30 05:11:19 +00:00
|
|
|
|
2017-03-12 16:33:58 +00:00
|
|
|
#ifndef VIRTIO_NET_F_MTU
|
|
|
|
#define VIRTIO_NET_F_MTU 3
|
|
|
|
#endif
|
|
|
|
|
2017-10-05 08:36:13 +00:00
|
|
|
/* Declare IOMMU related bits for older kernels */
|
|
|
|
#ifndef VIRTIO_F_IOMMU_PLATFORM
|
|
|
|
|
|
|
|
#define VIRTIO_F_IOMMU_PLATFORM 33
|
|
|
|
|
|
|
|
struct vhost_iotlb_msg {
|
|
|
|
__u64 iova;
|
|
|
|
__u64 size;
|
|
|
|
__u64 uaddr;
|
|
|
|
#define VHOST_ACCESS_RO 0x1
|
|
|
|
#define VHOST_ACCESS_WO 0x2
|
|
|
|
#define VHOST_ACCESS_RW 0x3
|
|
|
|
__u8 perm;
|
|
|
|
#define VHOST_IOTLB_MISS 1
|
|
|
|
#define VHOST_IOTLB_UPDATE 2
|
|
|
|
#define VHOST_IOTLB_INVALIDATE 3
|
|
|
|
#define VHOST_IOTLB_ACCESS_FAIL 4
|
|
|
|
__u8 type;
|
|
|
|
};
|
|
|
|
|
|
|
|
#define VHOST_IOTLB_MSG 0x1
|
|
|
|
|
|
|
|
struct vhost_msg {
|
|
|
|
int type;
|
|
|
|
union {
|
|
|
|
struct vhost_iotlb_msg iotlb;
|
|
|
|
__u8 padding[64];
|
|
|
|
};
|
|
|
|
};
|
|
|
|
#endif
|
|
|
|
|
2016-04-30 05:11:19 +00:00
|
|
|
/*
|
|
|
|
* Define virtio 1.0 for older kernels
|
|
|
|
*/
|
|
|
|
#ifndef VIRTIO_F_VERSION_1
|
|
|
|
#define VIRTIO_F_VERSION_1 32
|
|
|
|
#endif
|
|
|
|
|
2017-04-01 07:22:41 +00:00
|
|
|
#define VHOST_USER_F_PROTOCOL_FEATURES 30
|
|
|
|
|
|
|
|
/* Features supported by this builtin vhost-user net driver. */
|
|
|
|
#define VIRTIO_NET_SUPPORTED_FEATURES ((1ULL << VIRTIO_NET_F_MRG_RXBUF) | \
|
|
|
|
(1ULL << VIRTIO_NET_F_CTRL_VQ) | \
|
|
|
|
(1ULL << VIRTIO_NET_F_CTRL_RX) | \
|
|
|
|
(1ULL << VIRTIO_NET_F_GUEST_ANNOUNCE) | \
|
|
|
|
(1ULL << VIRTIO_NET_F_MQ) | \
|
|
|
|
(1ULL << VIRTIO_F_VERSION_1) | \
|
|
|
|
(1ULL << VHOST_F_LOG_ALL) | \
|
|
|
|
(1ULL << VHOST_USER_F_PROTOCOL_FEATURES) | \
|
|
|
|
(1ULL << VIRTIO_NET_F_HOST_TSO4) | \
|
|
|
|
(1ULL << VIRTIO_NET_F_HOST_TSO6) | \
|
|
|
|
(1ULL << VIRTIO_NET_F_CSUM) | \
|
|
|
|
(1ULL << VIRTIO_NET_F_GUEST_CSUM) | \
|
|
|
|
(1ULL << VIRTIO_NET_F_GUEST_TSO4) | \
|
|
|
|
(1ULL << VIRTIO_NET_F_GUEST_TSO6) | \
|
|
|
|
(1ULL << VIRTIO_RING_F_INDIRECT_DESC) | \
|
|
|
|
(1ULL << VIRTIO_NET_F_MTU))
|
|
|
|
|
|
|
|
|
2016-10-09 07:27:55 +00:00
|
|
|
struct guest_page {
|
|
|
|
uint64_t guest_phys_addr;
|
|
|
|
uint64_t host_phys_addr;
|
|
|
|
uint64_t size;
|
|
|
|
};
|
|
|
|
|
2016-04-30 05:11:19 +00:00
|
|
|
/**
|
|
|
|
* Device structure contains all configuration information relating
|
|
|
|
* to the device.
|
|
|
|
*/
|
|
|
|
struct virtio_net {
|
|
|
|
/* Frontend (QEMU) memory and memory region information */
|
2017-04-01 07:22:43 +00:00
|
|
|
struct rte_vhost_memory *mem;
|
2016-04-30 05:11:19 +00:00
|
|
|
uint64_t features;
|
|
|
|
uint64_t protocol_features;
|
|
|
|
int vid;
|
|
|
|
uint32_t flags;
|
2016-05-01 23:58:52 +00:00
|
|
|
uint16_t vhost_hlen;
|
2016-05-03 00:46:18 +00:00
|
|
|
/* to tell if we need broadcast rarp packet */
|
|
|
|
rte_atomic16_t broadcast_rarp;
|
2017-04-01 07:22:47 +00:00
|
|
|
uint32_t nr_vring;
|
vhost: add dequeue zero copy
The basic idea of dequeue zero copy is, instead of copying data from
the desc buf, here we let the mbuf reference the desc buf addr directly.
Doing so, however, has one major issue: we can't update the used ring
at the end of rte_vhost_dequeue_burst. Because we don't do the copy
here, an update of the used ring would let the driver to reclaim the
desc buf. As a result, DPDK might reference a stale memory region.
To update the used ring properly, this patch does several tricks:
- when mbuf references a desc buf, refcnt is added by 1.
This is to pin lock the mbuf, so that a mbuf free from the DPDK
won't actually free it, instead, refcnt is subtracted by 1.
- We chain all those mbuf together (by tailq)
And we check it every time on the rte_vhost_dequeue_burst entrance,
to see if the mbuf is freed (when refcnt equals to 1). If that
happens, it means we are the last user of this mbuf and we are
safe to update the used ring.
- "struct zcopy_mbuf" is introduced, to associate an mbuf with the
right desc idx.
Dequeue zero copy is introduced for performance reason, and some rough
tests show about 50% perfomance boost for packet size 1500B. For small
packets, (e.g. 64B), it actually slows a bit down (well, it could up to
15%). That is expected because this patch introduces some extra works,
and it outweighs the benefit from saving few bytes copy.
Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Tested-by: Qian Xu <qian.q.xu@intel.com>
2016-10-09 07:27:57 +00:00
|
|
|
int dequeue_zero_copy;
|
2016-05-03 00:46:18 +00:00
|
|
|
struct vhost_virtqueue *virtqueue[VHOST_MAX_QUEUE_PAIRS * 2];
|
2016-04-30 05:11:19 +00:00
|
|
|
#define IF_NAME_SZ (PATH_MAX > IFNAMSIZ ? PATH_MAX : IFNAMSIZ)
|
|
|
|
char ifname[IF_NAME_SZ];
|
|
|
|
uint64_t log_size;
|
|
|
|
uint64_t log_base;
|
2016-06-16 09:16:37 +00:00
|
|
|
uint64_t log_addr;
|
2016-04-30 05:11:19 +00:00
|
|
|
struct ether_addr mac;
|
2017-03-12 16:33:59 +00:00
|
|
|
uint16_t mtu;
|
2016-04-30 05:11:19 +00:00
|
|
|
|
2017-04-01 07:22:52 +00:00
|
|
|
struct vhost_device_ops const *notify_ops;
|
2017-04-01 07:22:42 +00:00
|
|
|
|
2016-10-09 07:27:55 +00:00
|
|
|
uint32_t nr_guest_pages;
|
|
|
|
uint32_t max_guest_pages;
|
|
|
|
struct guest_page *guest_pages;
|
2017-10-05 08:36:12 +00:00
|
|
|
|
|
|
|
int slave_req_fd;
|
2016-04-30 05:11:19 +00:00
|
|
|
} __rte_cache_aligned;
|
|
|
|
|
2017-04-01 07:22:55 +00:00
|
|
|
|
|
|
|
#define VHOST_LOG_PAGE 4096
|
|
|
|
|
2017-08-01 09:01:21 +00:00
|
|
|
/*
|
|
|
|
* Atomically set a bit in memory.
|
|
|
|
*/
|
|
|
|
static __rte_always_inline void
|
|
|
|
vhost_set_bit(unsigned int nr, volatile uint8_t *addr)
|
|
|
|
{
|
|
|
|
__sync_fetch_and_or_8(addr, (1U << nr));
|
|
|
|
}
|
|
|
|
|
2017-05-13 09:27:25 +00:00
|
|
|
static __rte_always_inline void
|
2017-04-01 07:22:55 +00:00
|
|
|
vhost_log_page(uint8_t *log_base, uint64_t page)
|
|
|
|
{
|
2017-08-01 09:01:21 +00:00
|
|
|
vhost_set_bit(page % 8, &log_base[page / 8]);
|
2017-04-01 07:22:55 +00:00
|
|
|
}
|
|
|
|
|
2017-05-13 09:27:25 +00:00
|
|
|
static __rte_always_inline void
|
2017-04-01 07:22:55 +00:00
|
|
|
vhost_log_write(struct virtio_net *dev, uint64_t addr, uint64_t len)
|
|
|
|
{
|
|
|
|
uint64_t page;
|
|
|
|
|
|
|
|
if (likely(((dev->features & (1ULL << VHOST_F_LOG_ALL)) == 0) ||
|
|
|
|
!dev->log_base || !len))
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (unlikely(dev->log_size <= ((addr + len - 1) / VHOST_LOG_PAGE / 8)))
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* To make sure guest memory updates are committed before logging */
|
|
|
|
rte_smp_wmb();
|
|
|
|
|
|
|
|
page = addr / VHOST_LOG_PAGE;
|
|
|
|
while (page * VHOST_LOG_PAGE < addr + len) {
|
|
|
|
vhost_log_page((uint8_t *)(uintptr_t)dev->log_base, page);
|
|
|
|
page += 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-05-13 09:27:25 +00:00
|
|
|
static __rte_always_inline void
|
2017-04-01 07:22:55 +00:00
|
|
|
vhost_log_used_vring(struct virtio_net *dev, struct vhost_virtqueue *vq,
|
|
|
|
uint64_t offset, uint64_t len)
|
|
|
|
{
|
|
|
|
vhost_log_write(dev, vq->log_guest_addr + offset, len);
|
|
|
|
}
|
|
|
|
|
2014-10-08 18:54:52 +00:00
|
|
|
/* Macros for printing using RTE_LOG */
|
|
|
|
#define RTE_LOGTYPE_VHOST_CONFIG RTE_LOGTYPE_USER1
|
|
|
|
#define RTE_LOGTYPE_VHOST_DATA RTE_LOGTYPE_USER1
|
|
|
|
|
|
|
|
#ifdef RTE_LIBRTE_VHOST_DEBUG
|
|
|
|
#define VHOST_MAX_PRINT_BUFF 6072
|
|
|
|
#define LOG_LEVEL RTE_LOG_DEBUG
|
|
|
|
#define LOG_DEBUG(log_type, fmt, args...) RTE_LOG(DEBUG, log_type, fmt, ##args)
|
|
|
|
#define PRINT_PACKET(device, addr, size, header) do { \
|
|
|
|
char *pkt_addr = (char *)(addr); \
|
|
|
|
unsigned int index; \
|
|
|
|
char packet[VHOST_MAX_PRINT_BUFF]; \
|
|
|
|
\
|
|
|
|
if ((header)) \
|
2016-05-23 08:36:33 +00:00
|
|
|
snprintf(packet, VHOST_MAX_PRINT_BUFF, "(%d) Header size %d: ", (device->vid), (size)); \
|
2014-10-08 18:54:52 +00:00
|
|
|
else \
|
2016-05-23 08:36:33 +00:00
|
|
|
snprintf(packet, VHOST_MAX_PRINT_BUFF, "(%d) Packet size %d: ", (device->vid), (size)); \
|
2014-10-08 18:54:52 +00:00
|
|
|
for (index = 0; index < (size); index++) { \
|
|
|
|
snprintf(packet + strnlen(packet, VHOST_MAX_PRINT_BUFF), VHOST_MAX_PRINT_BUFF - strnlen(packet, VHOST_MAX_PRINT_BUFF), \
|
|
|
|
"%02hhx ", pkt_addr[index]); \
|
|
|
|
} \
|
|
|
|
snprintf(packet + strnlen(packet, VHOST_MAX_PRINT_BUFF), VHOST_MAX_PRINT_BUFF - strnlen(packet, VHOST_MAX_PRINT_BUFF), "\n"); \
|
|
|
|
\
|
|
|
|
LOG_DEBUG(VHOST_DATA, "%s", packet); \
|
|
|
|
} while (0)
|
|
|
|
#else
|
|
|
|
#define LOG_LEVEL RTE_LOG_INFO
|
|
|
|
#define LOG_DEBUG(log_type, fmt, args...) do {} while (0)
|
|
|
|
#define PRINT_PACKET(device, addr, size, header) do {} while (0)
|
|
|
|
#endif
|
|
|
|
|
vhost: refactor code structure
The code structure is a bit messy now. For example, vhost-user message
handling is spread to three different files:
vhost-net-user.c virtio-net.c virtio-net-user.c
Where, vhost-net-user.c is the entrance to handle all those messages
and then invoke the right method for a specific message. Some of them
are stored at virtio-net.c, while others are stored at virtio-net-user.c.
The truth is all of them should be in one file, vhost_user.c.
So this patch refactors the source code structure: mainly on renaming
files and moving code from one file to another file that is more suitable
for storing it. Thus, no functional changes are made.
After the refactor, the code structure becomes to:
- socket.c handles all vhost-user socket file related stuff, such
as, socket file creation for server mode, reconnection
for client mode.
- vhost.c mainly on stuff like vhost device creation/destroy/reset.
Most of the vhost API implementation are there, too.
- vhost_user.c all stuff about vhost-user messages handling goes there.
- virtio_net.c all stuff about virtio-net should go there. It has virtio
net Rx/Tx implementation only so far: it's just a rename
from vhost_rxtx.c
Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
2016-08-18 08:48:39 +00:00
|
|
|
extern uint64_t VHOST_FEATURES;
|
|
|
|
#define MAX_VHOST_DEVICE 1024
|
|
|
|
extern struct virtio_net *vhost_devices[MAX_VHOST_DEVICE];
|
|
|
|
|
2016-10-09 07:27:55 +00:00
|
|
|
/* Convert guest physical address to host physical address */
|
2017-05-13 09:27:25 +00:00
|
|
|
static __rte_always_inline phys_addr_t
|
2016-10-09 07:27:55 +00:00
|
|
|
gpa_to_hpa(struct virtio_net *dev, uint64_t gpa, uint64_t size)
|
|
|
|
{
|
|
|
|
uint32_t i;
|
|
|
|
struct guest_page *page;
|
|
|
|
|
|
|
|
for (i = 0; i < dev->nr_guest_pages; i++) {
|
|
|
|
page = &dev->guest_pages[i];
|
|
|
|
|
|
|
|
if (gpa >= page->guest_phys_addr &&
|
|
|
|
gpa + size < page->guest_phys_addr + page->size) {
|
|
|
|
return gpa - page->guest_phys_addr +
|
|
|
|
page->host_phys_addr;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-04-30 05:25:42 +00:00
|
|
|
struct virtio_net *get_device(int vid);
|
|
|
|
|
2016-04-29 23:24:27 +00:00
|
|
|
int vhost_new_device(void);
|
vhost: refactor code structure
The code structure is a bit messy now. For example, vhost-user message
handling is spread to three different files:
vhost-net-user.c virtio-net.c virtio-net-user.c
Where, vhost-net-user.c is the entrance to handle all those messages
and then invoke the right method for a specific message. Some of them
are stored at virtio-net.c, while others are stored at virtio-net-user.c.
The truth is all of them should be in one file, vhost_user.c.
So this patch refactors the source code structure: mainly on renaming
files and moving code from one file to another file that is more suitable
for storing it. Thus, no functional changes are made.
After the refactor, the code structure becomes to:
- socket.c handles all vhost-user socket file related stuff, such
as, socket file creation for server mode, reconnection
for client mode.
- vhost.c mainly on stuff like vhost device creation/destroy/reset.
Most of the vhost API implementation are there, too.
- vhost_user.c all stuff about vhost-user messages handling goes there.
- virtio_net.c all stuff about virtio-net should go there. It has virtio
net Rx/Tx implementation only so far: it's just a rename
from vhost_rxtx.c
Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
2016-08-18 08:48:39 +00:00
|
|
|
void cleanup_device(struct virtio_net *dev, int destroy);
|
|
|
|
void reset_device(struct virtio_net *dev);
|
2016-04-29 23:24:27 +00:00
|
|
|
void vhost_destroy_device(int);
|
2014-02-10 13:57:48 +00:00
|
|
|
|
2017-04-01 07:22:47 +00:00
|
|
|
int alloc_vring_queue(struct virtio_net *dev, uint32_t vring_idx);
|
2014-02-10 13:57:48 +00:00
|
|
|
|
vhost: refactor code structure
The code structure is a bit messy now. For example, vhost-user message
handling is spread to three different files:
vhost-net-user.c virtio-net.c virtio-net-user.c
Where, vhost-net-user.c is the entrance to handle all those messages
and then invoke the right method for a specific message. Some of them
are stored at virtio-net.c, while others are stored at virtio-net-user.c.
The truth is all of them should be in one file, vhost_user.c.
So this patch refactors the source code structure: mainly on renaming
files and moving code from one file to another file that is more suitable
for storing it. Thus, no functional changes are made.
After the refactor, the code structure becomes to:
- socket.c handles all vhost-user socket file related stuff, such
as, socket file creation for server mode, reconnection
for client mode.
- vhost.c mainly on stuff like vhost device creation/destroy/reset.
Most of the vhost API implementation are there, too.
- vhost_user.c all stuff about vhost-user messages handling goes there.
- virtio_net.c all stuff about virtio-net should go there. It has virtio
net Rx/Tx implementation only so far: it's just a rename
from vhost_rxtx.c
Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
2016-08-18 08:48:39 +00:00
|
|
|
void vhost_set_ifname(int, const char *if_name, unsigned int if_len);
|
2016-10-09 07:27:58 +00:00
|
|
|
void vhost_enable_dequeue_zero_copy(int vid);
|
2016-02-10 18:40:55 +00:00
|
|
|
|
2017-04-01 07:22:52 +00:00
|
|
|
struct vhost_device_ops const *vhost_driver_callback_get(const char *path);
|
2017-04-01 07:22:42 +00:00
|
|
|
|
2016-02-10 18:40:55 +00:00
|
|
|
/*
|
2016-11-02 03:15:01 +00:00
|
|
|
* Backend-specific cleanup.
|
|
|
|
*
|
|
|
|
* TODO: fix it; we have one backend now
|
2016-02-10 18:40:55 +00:00
|
|
|
*/
|
|
|
|
void vhost_backend_cleanup(struct virtio_net *dev);
|
|
|
|
|
2014-02-10 13:57:48 +00:00
|
|
|
#endif /* _VHOST_NET_CDEV_H_ */
|