2017-12-19 15:49:03 +00:00
|
|
|
/* SPDX-License-Identifier: BSD-3-Clause
|
2018-04-05 16:01:30 +00:00
|
|
|
* Copyright(c) 2010-2017 Intel Corporation
|
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
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/vhost.h>
|
|
|
|
#include <linux/virtio_net.h>
|
|
|
|
#include <stddef.h>
|
|
|
|
#include <stdint.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#ifdef RTE_LIBRTE_VHOST_NUMA
|
2018-08-10 07:24:54 +00:00
|
|
|
#include <numa.h>
|
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
|
|
|
#include <numaif.h>
|
|
|
|
#endif
|
|
|
|
|
2017-07-06 13:30:43 +00:00
|
|
|
#include <rte_errno.h>
|
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
|
|
|
#include <rte_ethdev.h>
|
|
|
|
#include <rte_log.h>
|
|
|
|
#include <rte_string_fns.h>
|
|
|
|
#include <rte_memory.h>
|
|
|
|
#include <rte_malloc.h>
|
2017-04-01 07:22:57 +00:00
|
|
|
#include <rte_vhost.h>
|
2017-10-05 08:36:19 +00:00
|
|
|
#include <rte_rwlock.h>
|
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
|
|
|
|
2017-10-05 08:36:17 +00:00
|
|
|
#include "iotlb.h"
|
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
|
|
|
#include "vhost.h"
|
2017-10-05 08:36:19 +00:00
|
|
|
#include "vhost_user.h"
|
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
|
|
|
|
|
|
|
struct virtio_net *vhost_devices[MAX_VHOST_DEVICE];
|
2021-02-01 08:48:44 +00:00
|
|
|
pthread_mutex_t vhost_dev_lock = PTHREAD_MUTEX_INITIALIZER;
|
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
|
|
|
|
2017-10-12 15:38:49 +00:00
|
|
|
/* Called with iotlb_lock read-locked */
|
2017-10-05 08:36:19 +00:00
|
|
|
uint64_t
|
|
|
|
__vhost_iova_to_vva(struct virtio_net *dev, struct vhost_virtqueue *vq,
|
2018-01-23 13:26:02 +00:00
|
|
|
uint64_t iova, uint64_t *size, uint8_t perm)
|
2017-10-05 08:36:19 +00:00
|
|
|
{
|
|
|
|
uint64_t vva, tmp_size;
|
|
|
|
|
2018-01-23 13:26:02 +00:00
|
|
|
if (unlikely(!*size))
|
2017-10-05 08:36:19 +00:00
|
|
|
return 0;
|
|
|
|
|
2018-01-23 13:26:02 +00:00
|
|
|
tmp_size = *size;
|
2017-10-05 08:36:19 +00:00
|
|
|
|
|
|
|
vva = vhost_user_iotlb_cache_find(vq, iova, &tmp_size, perm);
|
2018-01-23 13:26:02 +00:00
|
|
|
if (tmp_size == *size)
|
2017-10-05 08:36:19 +00:00
|
|
|
return vva;
|
|
|
|
|
2018-02-05 15:04:57 +00:00
|
|
|
iova += tmp_size;
|
|
|
|
|
|
|
|
if (!vhost_user_iotlb_pending_miss(vq, iova, perm)) {
|
2017-10-12 15:38:49 +00:00
|
|
|
/*
|
|
|
|
* iotlb_lock is read-locked for a full burst,
|
|
|
|
* but it only protects the iotlb cache.
|
|
|
|
* In case of IOTLB miss, we might block on the socket,
|
|
|
|
* which could cause a deadlock with QEMU if an IOTLB update
|
|
|
|
* is being handled. We can safely unlock here to avoid it.
|
|
|
|
*/
|
|
|
|
vhost_user_iotlb_rd_unlock(vq);
|
|
|
|
|
2018-02-05 15:04:57 +00:00
|
|
|
vhost_user_iotlb_pending_insert(vq, iova, perm);
|
|
|
|
if (vhost_user_iotlb_miss(dev, iova, perm)) {
|
2019-12-04 15:07:29 +00:00
|
|
|
VHOST_LOG_CONFIG(ERR,
|
2018-02-05 15:04:57 +00:00
|
|
|
"IOTLB miss req failed for IOVA 0x%" PRIx64 "\n",
|
|
|
|
iova);
|
|
|
|
vhost_user_iotlb_pending_remove(vq, iova, 1, perm);
|
|
|
|
}
|
2017-10-12 15:38:49 +00:00
|
|
|
|
|
|
|
vhost_user_iotlb_rd_lock(vq);
|
2017-10-05 08:36:19 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2019-05-29 13:04:16 +00:00
|
|
|
#define VHOST_LOG_PAGE 4096
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Atomically set a bit in memory.
|
|
|
|
*/
|
|
|
|
static __rte_always_inline void
|
|
|
|
vhost_set_bit(unsigned int nr, volatile uint8_t *addr)
|
|
|
|
{
|
|
|
|
#if defined(RTE_TOOLCHAIN_GCC) && (GCC_VERSION < 70100)
|
|
|
|
/*
|
|
|
|
* __sync_ built-ins are deprecated, but __atomic_ ones
|
|
|
|
* are sub-optimized in older GCC versions.
|
|
|
|
*/
|
|
|
|
__sync_fetch_and_or_1(addr, (1U << nr));
|
|
|
|
#else
|
|
|
|
__atomic_fetch_or(addr, (1U << nr), __ATOMIC_RELAXED);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
static __rte_always_inline void
|
|
|
|
vhost_log_page(uint8_t *log_base, uint64_t page)
|
|
|
|
{
|
|
|
|
vhost_set_bit(page % 8, &log_base[page / 8]);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
__vhost_log_write(struct virtio_net *dev, uint64_t addr, uint64_t len)
|
|
|
|
{
|
|
|
|
uint64_t page;
|
|
|
|
|
|
|
|
if (unlikely(!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 */
|
2020-12-21 15:50:33 +00:00
|
|
|
rte_atomic_thread_fence(__ATOMIC_RELEASE);
|
2019-05-29 13:04:16 +00:00
|
|
|
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-10-09 11:54:31 +00:00
|
|
|
void
|
|
|
|
__vhost_log_write_iova(struct virtio_net *dev, struct vhost_virtqueue *vq,
|
|
|
|
uint64_t iova, uint64_t len)
|
|
|
|
{
|
|
|
|
uint64_t hva, gpa, map_len;
|
|
|
|
map_len = len;
|
|
|
|
|
|
|
|
hva = __vhost_iova_to_vva(dev, vq, iova, &map_len, VHOST_ACCESS_RW);
|
|
|
|
if (map_len != len) {
|
2019-12-04 15:07:29 +00:00
|
|
|
VHOST_LOG_DATA(ERR,
|
2019-10-09 11:54:31 +00:00
|
|
|
"Failed to write log for IOVA 0x%" PRIx64 ". No IOTLB entry found\n",
|
|
|
|
iova);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
gpa = hva_to_gpa(dev, hva, len);
|
|
|
|
if (gpa)
|
|
|
|
__vhost_log_write(dev, gpa, len);
|
|
|
|
}
|
|
|
|
|
2019-05-29 13:04:16 +00:00
|
|
|
void
|
|
|
|
__vhost_log_cache_sync(struct virtio_net *dev, struct vhost_virtqueue *vq)
|
|
|
|
{
|
|
|
|
unsigned long *log_base;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (unlikely(!dev->log_base))
|
|
|
|
return;
|
|
|
|
|
2021-03-23 09:02:18 +00:00
|
|
|
/* No cache, nothing to sync */
|
|
|
|
if (unlikely(!vq->log_cache))
|
|
|
|
return;
|
|
|
|
|
2020-12-21 15:50:33 +00:00
|
|
|
rte_atomic_thread_fence(__ATOMIC_RELEASE);
|
2019-05-29 13:04:16 +00:00
|
|
|
|
|
|
|
log_base = (unsigned long *)(uintptr_t)dev->log_base;
|
|
|
|
|
|
|
|
for (i = 0; i < vq->log_cache_nb_elem; i++) {
|
|
|
|
struct log_cache_entry *elem = vq->log_cache + i;
|
|
|
|
|
|
|
|
#if defined(RTE_TOOLCHAIN_GCC) && (GCC_VERSION < 70100)
|
|
|
|
/*
|
|
|
|
* '__sync' builtins are deprecated, but '__atomic' ones
|
|
|
|
* are sub-optimized in older GCC versions.
|
|
|
|
*/
|
|
|
|
__sync_fetch_and_or(log_base + elem->offset, elem->val);
|
|
|
|
#else
|
|
|
|
__atomic_fetch_or(log_base + elem->offset, elem->val,
|
|
|
|
__ATOMIC_RELAXED);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2020-12-21 15:50:33 +00:00
|
|
|
rte_atomic_thread_fence(__ATOMIC_RELEASE);
|
2019-05-29 13:04:16 +00:00
|
|
|
|
|
|
|
vq->log_cache_nb_elem = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static __rte_always_inline void
|
|
|
|
vhost_log_cache_page(struct virtio_net *dev, struct vhost_virtqueue *vq,
|
|
|
|
uint64_t page)
|
|
|
|
{
|
|
|
|
uint32_t bit_nr = page % (sizeof(unsigned long) << 3);
|
|
|
|
uint32_t offset = page / (sizeof(unsigned long) << 3);
|
|
|
|
int i;
|
|
|
|
|
2021-03-23 09:02:18 +00:00
|
|
|
if (unlikely(!vq->log_cache)) {
|
|
|
|
/* No logging cache allocated, write dirty log map directly */
|
|
|
|
rte_atomic_thread_fence(__ATOMIC_RELEASE);
|
|
|
|
vhost_log_page((uint8_t *)(uintptr_t)dev->log_base, page);
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2019-05-29 13:04:16 +00:00
|
|
|
for (i = 0; i < vq->log_cache_nb_elem; i++) {
|
|
|
|
struct log_cache_entry *elem = vq->log_cache + i;
|
|
|
|
|
|
|
|
if (elem->offset == offset) {
|
|
|
|
elem->val |= (1UL << bit_nr);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (unlikely(i >= VHOST_LOG_CACHE_NR)) {
|
|
|
|
/*
|
|
|
|
* No more room for a new log cache entry,
|
|
|
|
* so write the dirty log map directly.
|
|
|
|
*/
|
2020-12-21 15:50:33 +00:00
|
|
|
rte_atomic_thread_fence(__ATOMIC_RELEASE);
|
2019-05-29 13:04:16 +00:00
|
|
|
vhost_log_page((uint8_t *)(uintptr_t)dev->log_base, page);
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
vq->log_cache[i].offset = offset;
|
|
|
|
vq->log_cache[i].val = (1UL << bit_nr);
|
|
|
|
vq->log_cache_nb_elem++;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
__vhost_log_cache_write(struct virtio_net *dev, struct vhost_virtqueue *vq,
|
|
|
|
uint64_t addr, uint64_t len)
|
|
|
|
{
|
|
|
|
uint64_t page;
|
|
|
|
|
|
|
|
if (unlikely(!dev->log_base || !len))
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (unlikely(dev->log_size <= ((addr + len - 1) / VHOST_LOG_PAGE / 8)))
|
|
|
|
return;
|
|
|
|
|
|
|
|
page = addr / VHOST_LOG_PAGE;
|
|
|
|
while (page * VHOST_LOG_PAGE < addr + len) {
|
|
|
|
vhost_log_cache_page(dev, vq, page);
|
|
|
|
page += 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-10-09 11:54:31 +00:00
|
|
|
void
|
|
|
|
__vhost_log_cache_write_iova(struct virtio_net *dev, struct vhost_virtqueue *vq,
|
|
|
|
uint64_t iova, uint64_t len)
|
|
|
|
{
|
|
|
|
uint64_t hva, gpa, map_len;
|
|
|
|
map_len = len;
|
|
|
|
|
|
|
|
hva = __vhost_iova_to_vva(dev, vq, iova, &map_len, VHOST_ACCESS_RW);
|
|
|
|
if (map_len != len) {
|
2019-12-04 15:07:29 +00:00
|
|
|
VHOST_LOG_DATA(ERR,
|
2019-10-09 11:54:31 +00:00
|
|
|
"Failed to write log for IOVA 0x%" PRIx64 ". No IOTLB entry found\n",
|
|
|
|
iova);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
gpa = hva_to_gpa(dev, hva, len);
|
|
|
|
if (gpa)
|
|
|
|
__vhost_log_cache_write(dev, vq, gpa, len);
|
|
|
|
}
|
|
|
|
|
2019-05-29 13:04:18 +00:00
|
|
|
void *
|
|
|
|
vhost_alloc_copy_ind_table(struct virtio_net *dev, struct vhost_virtqueue *vq,
|
|
|
|
uint64_t desc_addr, uint64_t desc_len)
|
|
|
|
{
|
|
|
|
void *idesc;
|
|
|
|
uint64_t src, dst;
|
|
|
|
uint64_t len, remain = desc_len;
|
|
|
|
|
|
|
|
idesc = rte_malloc(__func__, desc_len, 0);
|
|
|
|
if (unlikely(!idesc))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
dst = (uint64_t)(uintptr_t)idesc;
|
|
|
|
|
|
|
|
while (remain) {
|
|
|
|
len = remain;
|
|
|
|
src = vhost_iova_to_vva(dev, vq, desc_addr, &len,
|
|
|
|
VHOST_ACCESS_RO);
|
|
|
|
if (unlikely(!src || !len)) {
|
|
|
|
rte_free(idesc);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
rte_memcpy((void *)(uintptr_t)dst, (void *)(uintptr_t)src, len);
|
|
|
|
|
|
|
|
remain -= len;
|
|
|
|
dst += len;
|
|
|
|
desc_addr += len;
|
|
|
|
}
|
|
|
|
|
|
|
|
return idesc;
|
|
|
|
}
|
|
|
|
|
2017-12-13 08:51:08 +00:00
|
|
|
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
|
|
|
cleanup_vq(struct vhost_virtqueue *vq, int destroy)
|
|
|
|
{
|
|
|
|
if ((vq->callfd >= 0) && (destroy != 0))
|
|
|
|
close(vq->callfd);
|
|
|
|
if (vq->kickfd >= 0)
|
|
|
|
close(vq->kickfd);
|
|
|
|
}
|
|
|
|
|
2019-10-09 20:48:33 +00:00
|
|
|
void
|
|
|
|
cleanup_vq_inflight(struct virtio_net *dev, struct vhost_virtqueue *vq)
|
|
|
|
{
|
|
|
|
if (!(dev->protocol_features &
|
|
|
|
(1ULL << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD)))
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (vq_is_packed(dev)) {
|
|
|
|
if (vq->inflight_packed)
|
|
|
|
vq->inflight_packed = NULL;
|
|
|
|
} else {
|
|
|
|
if (vq->inflight_split)
|
|
|
|
vq->inflight_split = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (vq->resubmit_inflight) {
|
|
|
|
if (vq->resubmit_inflight->resubmit_list) {
|
|
|
|
free(vq->resubmit_inflight->resubmit_list);
|
|
|
|
vq->resubmit_inflight->resubmit_list = NULL;
|
|
|
|
}
|
|
|
|
free(vq->resubmit_inflight);
|
|
|
|
vq->resubmit_inflight = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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
|
|
|
/*
|
|
|
|
* Unmap any memory, close any file descriptors and
|
|
|
|
* free any memory owned by a device.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
cleanup_device(struct virtio_net *dev, int destroy)
|
|
|
|
{
|
|
|
|
uint32_t i;
|
|
|
|
|
|
|
|
vhost_backend_cleanup(dev);
|
|
|
|
|
2019-10-09 20:48:33 +00:00
|
|
|
for (i = 0; i < dev->nr_vring; i++) {
|
2017-04-01 07:22:47 +00:00
|
|
|
cleanup_vq(dev->virtqueue[i], destroy);
|
2019-10-09 20:48:33 +00:00
|
|
|
cleanup_vq_inflight(dev, dev->virtqueue[i]);
|
|
|
|
}
|
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
|
|
|
}
|
|
|
|
|
2020-10-13 01:45:44 +00:00
|
|
|
static void
|
|
|
|
vhost_free_async_mem(struct vhost_virtqueue *vq)
|
|
|
|
{
|
2021-04-27 08:03:33 +00:00
|
|
|
rte_free(vq->async_pkts_info);
|
2020-10-13 01:45:44 +00:00
|
|
|
|
2021-04-27 08:03:33 +00:00
|
|
|
rte_free(vq->async_buffers_packed);
|
|
|
|
vq->async_buffers_packed = NULL;
|
|
|
|
rte_free(vq->async_descs_split);
|
2021-01-11 12:16:27 +00:00
|
|
|
vq->async_descs_split = NULL;
|
2021-04-27 08:03:33 +00:00
|
|
|
|
|
|
|
rte_free(vq->it_pool);
|
|
|
|
rte_free(vq->vec_pool);
|
|
|
|
|
|
|
|
vq->async_pkts_info = NULL;
|
2020-10-13 01:45:44 +00:00
|
|
|
vq->it_pool = NULL;
|
|
|
|
vq->vec_pool = NULL;
|
|
|
|
}
|
|
|
|
|
2017-12-13 08:51:08 +00:00
|
|
|
void
|
2018-07-06 07:07:16 +00:00
|
|
|
free_vq(struct virtio_net *dev, struct vhost_virtqueue *vq)
|
2017-12-13 08:51:08 +00:00
|
|
|
{
|
2018-07-06 07:07:16 +00:00
|
|
|
if (vq_is_packed(dev))
|
|
|
|
rte_free(vq->shadow_used_packed);
|
2021-04-27 08:03:33 +00:00
|
|
|
else
|
2018-07-06 07:07:16 +00:00
|
|
|
rte_free(vq->shadow_used_split);
|
2021-04-27 08:03:33 +00:00
|
|
|
|
|
|
|
vhost_free_async_mem(vq);
|
2017-12-13 08:51:08 +00:00
|
|
|
rte_free(vq->batch_copy_elems);
|
2021-05-17 08:59:51 +00:00
|
|
|
rte_mempool_free(vq->iotlb_pool);
|
2021-03-23 09:02:18 +00:00
|
|
|
rte_free(vq->log_cache);
|
2017-12-13 08:51:08 +00:00
|
|
|
rte_free(vq);
|
|
|
|
}
|
|
|
|
|
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
|
|
|
/*
|
|
|
|
* Release virtqueues and device memory.
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
free_device(struct virtio_net *dev)
|
|
|
|
{
|
|
|
|
uint32_t i;
|
2016-10-14 09:34:36 +00:00
|
|
|
|
2017-12-13 08:51:08 +00:00
|
|
|
for (i = 0; i < dev->nr_vring; i++)
|
2018-07-06 07:07:16 +00:00
|
|
|
free_vq(dev, dev->virtqueue[i]);
|
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
|
|
|
|
|
|
|
rte_free(dev);
|
|
|
|
}
|
|
|
|
|
2020-02-13 10:04:58 +00:00
|
|
|
static __rte_always_inline int
|
|
|
|
log_translate(struct virtio_net *dev, struct vhost_virtqueue *vq)
|
|
|
|
{
|
|
|
|
if (likely(!(vq->ring_addrs.flags & (1 << VHOST_VRING_F_LOG))))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
vq->log_guest_addr = translate_log_addr(dev, vq,
|
|
|
|
vq->ring_addrs.log_guest_addr);
|
|
|
|
if (vq->log_guest_addr == 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Converts vring log address to GPA
|
|
|
|
* If IOMMU is enabled, the log address is IOVA
|
|
|
|
* If IOMMU not enabled, the log address is already GPA
|
|
|
|
*
|
|
|
|
* Caller should have iotlb_lock read-locked
|
|
|
|
*/
|
|
|
|
uint64_t
|
|
|
|
translate_log_addr(struct virtio_net *dev, struct vhost_virtqueue *vq,
|
|
|
|
uint64_t log_addr)
|
|
|
|
{
|
|
|
|
if (dev->features & (1ULL << VIRTIO_F_IOMMU_PLATFORM)) {
|
|
|
|
const uint64_t exp_size = sizeof(uint64_t);
|
|
|
|
uint64_t hva, gpa;
|
|
|
|
uint64_t size = exp_size;
|
|
|
|
|
|
|
|
hva = vhost_iova_to_vva(dev, vq, log_addr,
|
|
|
|
&size, VHOST_ACCESS_RW);
|
|
|
|
|
|
|
|
if (size != exp_size)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
gpa = hva_to_gpa(dev, hva, exp_size);
|
|
|
|
if (!gpa) {
|
|
|
|
VHOST_LOG_CONFIG(ERR,
|
|
|
|
"VQ: Failed to find GPA for log_addr: 0x%"
|
|
|
|
PRIx64 " hva: 0x%" PRIx64 "\n",
|
|
|
|
log_addr, hva);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return gpa;
|
|
|
|
|
|
|
|
} else
|
|
|
|
return log_addr;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Caller should have iotlb_lock read-locked */
|
2018-07-06 07:07:10 +00:00
|
|
|
static int
|
|
|
|
vring_translate_split(struct virtio_net *dev, struct vhost_virtqueue *vq)
|
2017-10-05 08:36:25 +00:00
|
|
|
{
|
2018-01-23 13:26:02 +00:00
|
|
|
uint64_t req_size, size;
|
2017-10-05 08:36:25 +00:00
|
|
|
|
2018-01-23 13:26:02 +00:00
|
|
|
req_size = sizeof(struct vring_desc) * vq->size;
|
|
|
|
size = req_size;
|
2017-10-05 08:36:25 +00:00
|
|
|
vq->desc = (struct vring_desc *)(uintptr_t)vhost_iova_to_vva(dev, vq,
|
|
|
|
vq->ring_addrs.desc_user_addr,
|
2018-01-23 13:26:02 +00:00
|
|
|
&size, VHOST_ACCESS_RW);
|
|
|
|
if (!vq->desc || size != req_size)
|
2017-10-05 08:36:25 +00:00
|
|
|
return -1;
|
|
|
|
|
2018-01-23 13:26:02 +00:00
|
|
|
req_size = sizeof(struct vring_avail);
|
|
|
|
req_size += sizeof(uint16_t) * vq->size;
|
|
|
|
if (dev->features & (1ULL << VIRTIO_RING_F_EVENT_IDX))
|
|
|
|
req_size += sizeof(uint16_t);
|
|
|
|
size = req_size;
|
2017-10-05 08:36:25 +00:00
|
|
|
vq->avail = (struct vring_avail *)(uintptr_t)vhost_iova_to_vva(dev, vq,
|
|
|
|
vq->ring_addrs.avail_user_addr,
|
2018-01-23 13:26:02 +00:00
|
|
|
&size, VHOST_ACCESS_RW);
|
|
|
|
if (!vq->avail || size != req_size)
|
2017-10-05 08:36:25 +00:00
|
|
|
return -1;
|
|
|
|
|
2018-01-23 13:26:02 +00:00
|
|
|
req_size = sizeof(struct vring_used);
|
|
|
|
req_size += sizeof(struct vring_used_elem) * vq->size;
|
|
|
|
if (dev->features & (1ULL << VIRTIO_RING_F_EVENT_IDX))
|
|
|
|
req_size += sizeof(uint16_t);
|
|
|
|
size = req_size;
|
2017-10-05 08:36:25 +00:00
|
|
|
vq->used = (struct vring_used *)(uintptr_t)vhost_iova_to_vva(dev, vq,
|
|
|
|
vq->ring_addrs.used_user_addr,
|
2018-01-23 13:26:02 +00:00
|
|
|
&size, VHOST_ACCESS_RW);
|
|
|
|
if (!vq->used || size != req_size)
|
2017-10-05 08:36:25 +00:00
|
|
|
return -1;
|
|
|
|
|
2018-07-06 07:07:10 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2020-02-13 10:04:58 +00:00
|
|
|
/* Caller should have iotlb_lock read-locked */
|
2018-07-06 07:07:10 +00:00
|
|
|
static int
|
|
|
|
vring_translate_packed(struct virtio_net *dev, struct vhost_virtqueue *vq)
|
|
|
|
{
|
|
|
|
uint64_t req_size, size;
|
|
|
|
|
|
|
|
req_size = sizeof(struct vring_packed_desc) * vq->size;
|
|
|
|
size = req_size;
|
2018-07-06 07:07:21 +00:00
|
|
|
vq->desc_packed = (struct vring_packed_desc *)(uintptr_t)
|
|
|
|
vhost_iova_to_vva(dev, vq, vq->ring_addrs.desc_user_addr,
|
|
|
|
&size, VHOST_ACCESS_RW);
|
2018-07-06 07:07:10 +00:00
|
|
|
if (!vq->desc_packed || size != req_size)
|
|
|
|
return -1;
|
|
|
|
|
2018-07-06 07:07:21 +00:00
|
|
|
req_size = sizeof(struct vring_packed_desc_event);
|
|
|
|
size = req_size;
|
|
|
|
vq->driver_event = (struct vring_packed_desc_event *)(uintptr_t)
|
|
|
|
vhost_iova_to_vva(dev, vq, vq->ring_addrs.avail_user_addr,
|
|
|
|
&size, VHOST_ACCESS_RW);
|
|
|
|
if (!vq->driver_event || size != req_size)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
req_size = sizeof(struct vring_packed_desc_event);
|
|
|
|
size = req_size;
|
|
|
|
vq->device_event = (struct vring_packed_desc_event *)(uintptr_t)
|
|
|
|
vhost_iova_to_vva(dev, vq, vq->ring_addrs.used_user_addr,
|
|
|
|
&size, VHOST_ACCESS_RW);
|
|
|
|
if (!vq->device_event || size != req_size)
|
|
|
|
return -1;
|
|
|
|
|
2018-07-06 07:07:10 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
vring_translate(struct virtio_net *dev, struct vhost_virtqueue *vq)
|
|
|
|
{
|
|
|
|
|
|
|
|
if (!(dev->features & (1ULL << VIRTIO_F_IOMMU_PLATFORM)))
|
2019-08-19 11:34:56 +00:00
|
|
|
return -1;
|
2018-07-06 07:07:10 +00:00
|
|
|
|
|
|
|
if (vq_is_packed(dev)) {
|
|
|
|
if (vring_translate_packed(dev, vq) < 0)
|
|
|
|
return -1;
|
|
|
|
} else {
|
|
|
|
if (vring_translate_split(dev, vq) < 0)
|
|
|
|
return -1;
|
|
|
|
}
|
2020-02-13 10:04:58 +00:00
|
|
|
|
|
|
|
if (log_translate(dev, vq) < 0)
|
|
|
|
return -1;
|
|
|
|
|
2021-03-23 09:02:19 +00:00
|
|
|
vq->access_ok = true;
|
2017-10-05 08:36:25 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-10-05 08:36:26 +00:00
|
|
|
void
|
|
|
|
vring_invalidate(struct virtio_net *dev, struct vhost_virtqueue *vq)
|
|
|
|
{
|
|
|
|
if (dev->features & (1ULL << VIRTIO_F_IOMMU_PLATFORM))
|
|
|
|
vhost_user_iotlb_wr_lock(vq);
|
|
|
|
|
2021-03-23 09:02:19 +00:00
|
|
|
vq->access_ok = false;
|
2017-10-05 08:36:26 +00:00
|
|
|
vq->desc = NULL;
|
|
|
|
vq->avail = NULL;
|
|
|
|
vq->used = NULL;
|
2019-10-09 11:54:30 +00:00
|
|
|
vq->log_guest_addr = 0;
|
2017-10-05 08:36:26 +00:00
|
|
|
|
|
|
|
if (dev->features & (1ULL << VIRTIO_F_IOMMU_PLATFORM))
|
|
|
|
vhost_user_iotlb_wr_unlock(vq);
|
|
|
|
}
|
|
|
|
|
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
|
|
|
static void
|
2017-10-05 08:36:17 +00:00
|
|
|
init_vring_queue(struct virtio_net *dev, uint32_t vring_idx)
|
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
|
|
|
{
|
2017-10-05 08:36:17 +00:00
|
|
|
struct vhost_virtqueue *vq;
|
|
|
|
|
|
|
|
if (vring_idx >= VHOST_MAX_VRING) {
|
2019-12-04 15:07:29 +00:00
|
|
|
VHOST_LOG_CONFIG(ERR,
|
2017-10-05 08:36:17 +00:00
|
|
|
"Failed not init vring, out of bound (%d)\n",
|
|
|
|
vring_idx);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
vq = dev->virtqueue[vring_idx];
|
2020-10-19 17:34:15 +00:00
|
|
|
if (!vq) {
|
|
|
|
VHOST_LOG_CONFIG(ERR, "Virtqueue not allocated (%d)\n",
|
|
|
|
vring_idx);
|
|
|
|
return;
|
|
|
|
}
|
2017-10-05 08:36:17 +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
|
|
|
memset(vq, 0, sizeof(struct vhost_virtqueue));
|
|
|
|
|
|
|
|
vq->kickfd = VIRTIO_UNINITIALIZED_EVENTFD;
|
|
|
|
vq->callfd = VIRTIO_UNINITIALIZED_EVENTFD;
|
2020-07-23 13:08:53 +00:00
|
|
|
vq->notif_enable = VIRTIO_UNINITIALIZED_NOTIF;
|
2021-05-17 08:59:51 +00:00
|
|
|
|
|
|
|
vhost_user_iotlb_init(dev, vring_idx);
|
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
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2017-10-05 08:36:17 +00:00
|
|
|
reset_vring_queue(struct virtio_net *dev, uint32_t vring_idx)
|
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
|
|
|
{
|
2017-10-05 08:36:17 +00:00
|
|
|
struct vhost_virtqueue *vq;
|
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
|
|
|
int callfd;
|
|
|
|
|
2017-10-05 08:36:17 +00:00
|
|
|
if (vring_idx >= VHOST_MAX_VRING) {
|
2019-12-04 15:07:29 +00:00
|
|
|
VHOST_LOG_CONFIG(ERR,
|
2017-10-05 08:36:17 +00:00
|
|
|
"Failed not init vring, out of bound (%d)\n",
|
|
|
|
vring_idx);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
vq = dev->virtqueue[vring_idx];
|
2020-10-19 17:34:15 +00:00
|
|
|
if (!vq) {
|
|
|
|
VHOST_LOG_CONFIG(ERR, "Virtqueue not allocated (%d)\n",
|
|
|
|
vring_idx);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
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
|
|
|
callfd = vq->callfd;
|
2017-10-05 08:36:17 +00:00
|
|
|
init_vring_queue(dev, vring_idx);
|
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
|
|
|
vq->callfd = callfd;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2017-04-01 07:22:47 +00:00
|
|
|
alloc_vring_queue(struct virtio_net *dev, uint32_t vring_idx)
|
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
|
|
|
{
|
2017-04-01 07:22:47 +00:00
|
|
|
struct vhost_virtqueue *vq;
|
2020-10-19 17:34:09 +00:00
|
|
|
uint32_t i;
|
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
|
|
|
|
2020-10-19 17:34:09 +00:00
|
|
|
/* Also allocate holes, if any, up to requested vring index. */
|
|
|
|
for (i = 0; i <= vring_idx; i++) {
|
|
|
|
if (dev->virtqueue[i])
|
|
|
|
continue;
|
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
|
|
|
|
2021-04-20 08:57:43 +00:00
|
|
|
vq = rte_zmalloc(NULL, sizeof(struct vhost_virtqueue), 0);
|
2020-10-19 17:34:09 +00:00
|
|
|
if (vq == NULL) {
|
|
|
|
VHOST_LOG_CONFIG(ERR,
|
|
|
|
"Failed to allocate memory for vring:%u.\n", i);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
dev->virtqueue[i] = vq;
|
2020-11-06 14:47:44 +00:00
|
|
|
init_vring_queue(dev, i);
|
2020-10-19 17:34:09 +00:00
|
|
|
rte_spinlock_init(&vq->access_lock);
|
|
|
|
vq->avail_wrap_counter = 1;
|
|
|
|
vq->used_wrap_counter = 1;
|
|
|
|
vq->signalled_used_valid = false;
|
|
|
|
}
|
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
|
|
|
|
2020-10-19 17:34:09 +00:00
|
|
|
dev->nr_vring = RTE_MAX(dev->nr_vring, vring_idx + 1);
|
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
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Reset some variables in device structure, while keeping few
|
2017-04-01 07:22:47 +00:00
|
|
|
* others untouched, such as vid, ifname, nr_vring: they
|
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
|
|
|
* should be same unless the device is removed.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
reset_device(struct virtio_net *dev)
|
|
|
|
{
|
|
|
|
uint32_t i;
|
|
|
|
|
|
|
|
dev->features = 0;
|
|
|
|
dev->protocol_features = 0;
|
2018-01-31 17:46:50 +00:00
|
|
|
dev->flags &= VIRTIO_DEV_BUILTIN_VIRTIO_NET;
|
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
|
|
|
|
2017-04-01 07:22:47 +00:00
|
|
|
for (i = 0; i < dev->nr_vring; i++)
|
2017-10-05 08:36:17 +00:00
|
|
|
reset_vring_queue(dev, i);
|
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
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2016-11-02 03:15:01 +00:00
|
|
|
* Invoked when there is a new vhost-user connection established (when
|
|
|
|
* there is a new virtio device being attached).
|
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
|
|
|
*/
|
|
|
|
int
|
|
|
|
vhost_new_device(void)
|
|
|
|
{
|
|
|
|
struct virtio_net *dev;
|
|
|
|
int i;
|
|
|
|
|
2021-02-01 08:48:44 +00:00
|
|
|
pthread_mutex_lock(&vhost_dev_lock);
|
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
|
|
|
for (i = 0; i < MAX_VHOST_DEVICE; i++) {
|
|
|
|
if (vhost_devices[i] == NULL)
|
|
|
|
break;
|
|
|
|
}
|
2018-06-08 09:18:04 +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
|
|
|
if (i == MAX_VHOST_DEVICE) {
|
2019-12-04 15:07:29 +00:00
|
|
|
VHOST_LOG_CONFIG(ERR,
|
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
|
|
|
"Failed to find a free slot for new device.\n");
|
2021-02-01 08:48:44 +00:00
|
|
|
pthread_mutex_unlock(&vhost_dev_lock);
|
2018-06-08 09:18:04 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
dev = rte_zmalloc(NULL, sizeof(struct virtio_net), 0);
|
|
|
|
if (dev == NULL) {
|
2019-12-04 15:07:29 +00:00
|
|
|
VHOST_LOG_CONFIG(ERR,
|
2018-06-08 09:18:04 +00:00
|
|
|
"Failed to allocate memory for new dev.\n");
|
2021-02-01 08:48:44 +00:00
|
|
|
pthread_mutex_unlock(&vhost_dev_lock);
|
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
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
vhost_devices[i] = dev;
|
2021-02-01 08:48:44 +00:00
|
|
|
pthread_mutex_unlock(&vhost_dev_lock);
|
|
|
|
|
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
|
|
|
dev->vid = i;
|
2018-01-31 17:46:50 +00:00
|
|
|
dev->flags = VIRTIO_DEV_BUILTIN_VIRTIO_NET;
|
2017-10-05 08:36:12 +00:00
|
|
|
dev->slave_req_fd = -1;
|
2018-10-24 09:39:48 +00:00
|
|
|
dev->postcopy_ufd = -1;
|
2018-06-08 03:22:23 +00:00
|
|
|
rte_spinlock_init(&dev->slave_req_lock);
|
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
|
|
|
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
|
2018-06-13 11:54:18 +00:00
|
|
|
void
|
|
|
|
vhost_destroy_device_notify(struct virtio_net *dev)
|
|
|
|
{
|
|
|
|
struct rte_vdpa_device *vdpa_dev;
|
|
|
|
|
|
|
|
if (dev->flags & VIRTIO_DEV_RUNNING) {
|
2020-06-26 14:04:33 +00:00
|
|
|
vdpa_dev = dev->vdpa_dev;
|
2020-07-06 11:24:47 +00:00
|
|
|
if (vdpa_dev)
|
2018-06-13 11:54:18 +00:00
|
|
|
vdpa_dev->ops->dev_close(dev->vid);
|
|
|
|
dev->flags &= ~VIRTIO_DEV_RUNNING;
|
|
|
|
dev->notify_ops->destroy_device(dev->vid);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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
|
|
|
/*
|
2016-11-02 03:15:01 +00:00
|
|
|
* Invoked when there is the vhost-user connection is broken (when
|
|
|
|
* the virtio device is being detached).
|
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_destroy_device(int vid)
|
|
|
|
{
|
|
|
|
struct virtio_net *dev = get_device(vid);
|
|
|
|
|
|
|
|
if (dev == NULL)
|
|
|
|
return;
|
|
|
|
|
2018-06-13 11:54:18 +00:00
|
|
|
vhost_destroy_device_notify(dev);
|
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
|
|
|
|
|
|
|
cleanup_device(dev, 1);
|
|
|
|
free_device(dev);
|
|
|
|
|
|
|
|
vhost_devices[vid] = NULL;
|
|
|
|
}
|
|
|
|
|
2018-04-02 11:46:54 +00:00
|
|
|
void
|
2020-06-26 14:04:33 +00:00
|
|
|
vhost_attach_vdpa_device(int vid, struct rte_vdpa_device *vdpa_dev)
|
2018-04-02 11:46:54 +00:00
|
|
|
{
|
|
|
|
struct virtio_net *dev = get_device(vid);
|
|
|
|
|
|
|
|
if (dev == NULL)
|
|
|
|
return;
|
|
|
|
|
2020-06-26 14:04:33 +00:00
|
|
|
dev->vdpa_dev = vdpa_dev;
|
2018-04-02 11:46:54 +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 vid, const char *if_name, unsigned int if_len)
|
|
|
|
{
|
|
|
|
struct virtio_net *dev;
|
|
|
|
unsigned int len;
|
|
|
|
|
|
|
|
dev = get_device(vid);
|
|
|
|
if (dev == NULL)
|
|
|
|
return;
|
|
|
|
|
|
|
|
len = if_len > sizeof(dev->ifname) ?
|
|
|
|
sizeof(dev->ifname) : if_len;
|
|
|
|
|
|
|
|
strncpy(dev->ifname, if_name, len);
|
|
|
|
dev->ifname[sizeof(dev->ifname) - 1] = '\0';
|
|
|
|
}
|
|
|
|
|
2018-01-31 17:46:50 +00:00
|
|
|
void
|
2021-05-03 16:43:44 +00:00
|
|
|
vhost_setup_virtio_net(int vid, bool enable, bool compliant_ol_flags)
|
2018-01-31 17:46:50 +00:00
|
|
|
{
|
|
|
|
struct virtio_net *dev = get_device(vid);
|
|
|
|
|
|
|
|
if (dev == NULL)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (enable)
|
|
|
|
dev->flags |= VIRTIO_DEV_BUILTIN_VIRTIO_NET;
|
|
|
|
else
|
|
|
|
dev->flags &= ~VIRTIO_DEV_BUILTIN_VIRTIO_NET;
|
2021-05-03 16:43:44 +00:00
|
|
|
if (!compliant_ol_flags)
|
|
|
|
dev->flags |= VIRTIO_DEV_LEGACY_OL_FLAGS;
|
|
|
|
else
|
|
|
|
dev->flags &= ~VIRTIO_DEV_LEGACY_OL_FLAGS;
|
2018-01-31 17:46:50 +00:00
|
|
|
}
|
|
|
|
|
2019-10-15 18:59:51 +00:00
|
|
|
void
|
|
|
|
vhost_enable_extbuf(int vid)
|
|
|
|
{
|
|
|
|
struct virtio_net *dev = get_device(vid);
|
|
|
|
|
|
|
|
if (dev == NULL)
|
|
|
|
return;
|
|
|
|
|
|
|
|
dev->extbuf = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
vhost_enable_linearbuf(int vid)
|
|
|
|
{
|
|
|
|
struct virtio_net *dev = get_device(vid);
|
|
|
|
|
|
|
|
if (dev == NULL)
|
|
|
|
return;
|
|
|
|
|
|
|
|
dev->linearbuf = 1;
|
|
|
|
}
|
|
|
|
|
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
|
|
|
int
|
2017-03-12 16:34:01 +00:00
|
|
|
rte_vhost_get_mtu(int vid, uint16_t *mtu)
|
|
|
|
{
|
|
|
|
struct virtio_net *dev = get_device(vid);
|
|
|
|
|
2019-04-11 14:48:40 +00:00
|
|
|
if (dev == NULL || mtu == NULL)
|
2017-03-12 16:34:01 +00:00
|
|
|
return -ENODEV;
|
|
|
|
|
|
|
|
if (!(dev->flags & VIRTIO_DEV_READY))
|
|
|
|
return -EAGAIN;
|
|
|
|
|
2017-06-29 07:58:10 +00:00
|
|
|
if (!(dev->features & (1ULL << VIRTIO_NET_F_MTU)))
|
2017-03-12 16:34:01 +00:00
|
|
|
return -ENOTSUP;
|
|
|
|
|
|
|
|
*mtu = dev->mtu;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
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
|
|
|
rte_vhost_get_numa_node(int vid)
|
|
|
|
{
|
|
|
|
#ifdef RTE_LIBRTE_VHOST_NUMA
|
|
|
|
struct virtio_net *dev = get_device(vid);
|
|
|
|
int numa_node;
|
|
|
|
int ret;
|
|
|
|
|
2018-08-10 07:24:54 +00:00
|
|
|
if (dev == NULL || numa_available() != 0)
|
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
|
|
|
return -1;
|
|
|
|
|
|
|
|
ret = get_mempolicy(&numa_node, NULL, 0, dev,
|
|
|
|
MPOL_F_NODE | MPOL_F_ADDR);
|
|
|
|
if (ret < 0) {
|
2019-12-04 15:07:29 +00:00
|
|
|
VHOST_LOG_CONFIG(ERR,
|
2017-07-06 13:30:43 +00:00
|
|
|
"(%d) failed to query numa node: %s\n",
|
|
|
|
vid, rte_strerror(errno));
|
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
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return numa_node;
|
|
|
|
#else
|
|
|
|
RTE_SET_USED(vid);
|
|
|
|
return -1;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
uint32_t
|
|
|
|
rte_vhost_get_queue_num(int vid)
|
|
|
|
{
|
|
|
|
struct virtio_net *dev = get_device(vid);
|
|
|
|
|
|
|
|
if (dev == NULL)
|
|
|
|
return 0;
|
|
|
|
|
2017-04-01 07:22:47 +00:00
|
|
|
return dev->nr_vring / 2;
|
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
|
|
|
}
|
|
|
|
|
2017-04-01 07:22:48 +00:00
|
|
|
uint16_t
|
|
|
|
rte_vhost_get_vring_num(int vid)
|
|
|
|
{
|
|
|
|
struct virtio_net *dev = get_device(vid);
|
|
|
|
|
|
|
|
if (dev == NULL)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
return dev->nr_vring;
|
|
|
|
}
|
|
|
|
|
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
|
|
|
int
|
|
|
|
rte_vhost_get_ifname(int vid, char *buf, size_t len)
|
|
|
|
{
|
|
|
|
struct virtio_net *dev = get_device(vid);
|
|
|
|
|
2019-04-11 14:48:40 +00:00
|
|
|
if (dev == NULL || buf == NULL)
|
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
|
|
|
return -1;
|
|
|
|
|
|
|
|
len = RTE_MIN(len, sizeof(dev->ifname));
|
|
|
|
|
|
|
|
strncpy(buf, dev->ifname, len);
|
|
|
|
buf[len - 1] = '\0';
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-04-01 07:22:44 +00:00
|
|
|
int
|
|
|
|
rte_vhost_get_negotiated_features(int vid, uint64_t *features)
|
|
|
|
{
|
|
|
|
struct virtio_net *dev;
|
|
|
|
|
|
|
|
dev = get_device(vid);
|
2019-04-11 14:48:40 +00:00
|
|
|
if (dev == NULL || features == NULL)
|
2017-04-01 07:22:44 +00:00
|
|
|
return -1;
|
|
|
|
|
|
|
|
*features = dev->features;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2021-03-22 07:22:56 +00:00
|
|
|
int
|
|
|
|
rte_vhost_get_negotiated_protocol_features(int vid,
|
|
|
|
uint64_t *protocol_features)
|
|
|
|
{
|
|
|
|
struct virtio_net *dev;
|
|
|
|
|
|
|
|
dev = get_device(vid);
|
|
|
|
if (dev == NULL || protocol_features == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
*protocol_features = dev->protocol_features;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-04-01 07:22:43 +00:00
|
|
|
int
|
|
|
|
rte_vhost_get_mem_table(int vid, struct rte_vhost_memory **mem)
|
|
|
|
{
|
|
|
|
struct virtio_net *dev;
|
|
|
|
struct rte_vhost_memory *m;
|
|
|
|
size_t size;
|
|
|
|
|
|
|
|
dev = get_device(vid);
|
2019-04-11 14:48:40 +00:00
|
|
|
if (dev == NULL || mem == NULL)
|
2017-04-01 07:22:43 +00:00
|
|
|
return -1;
|
|
|
|
|
|
|
|
size = dev->mem->nregions * sizeof(struct rte_vhost_mem_region);
|
2017-05-26 11:59:13 +00:00
|
|
|
m = malloc(sizeof(struct rte_vhost_memory) + size);
|
2017-04-01 07:22:43 +00:00
|
|
|
if (!m)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
m->nregions = dev->mem->nregions;
|
|
|
|
memcpy(m->regions, dev->mem->regions, size);
|
|
|
|
*mem = m;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-04-01 07:22:45 +00:00
|
|
|
int
|
|
|
|
rte_vhost_get_vhost_vring(int vid, uint16_t vring_idx,
|
|
|
|
struct rte_vhost_vring *vring)
|
|
|
|
{
|
|
|
|
struct virtio_net *dev;
|
|
|
|
struct vhost_virtqueue *vq;
|
|
|
|
|
|
|
|
dev = get_device(vid);
|
2019-04-11 14:48:40 +00:00
|
|
|
if (dev == NULL || vring == NULL)
|
2017-04-01 07:22:45 +00:00
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (vring_idx >= VHOST_MAX_VRING)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
vq = dev->virtqueue[vring_idx];
|
|
|
|
if (!vq)
|
|
|
|
return -1;
|
|
|
|
|
2019-10-09 20:48:36 +00:00
|
|
|
if (vq_is_packed(dev)) {
|
|
|
|
vring->desc_packed = vq->desc_packed;
|
|
|
|
vring->driver_event = vq->driver_event;
|
|
|
|
vring->device_event = vq->device_event;
|
|
|
|
} else {
|
|
|
|
vring->desc = vq->desc;
|
|
|
|
vring->avail = vq->avail;
|
|
|
|
vring->used = vq->used;
|
|
|
|
}
|
2017-04-01 07:22:45 +00:00
|
|
|
vring->log_guest_addr = vq->log_guest_addr;
|
|
|
|
|
|
|
|
vring->callfd = vq->callfd;
|
|
|
|
vring->kickfd = vq->kickfd;
|
|
|
|
vring->size = vq->size;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2019-10-09 20:48:35 +00:00
|
|
|
int
|
|
|
|
rte_vhost_get_vhost_ring_inflight(int vid, uint16_t vring_idx,
|
|
|
|
struct rte_vhost_ring_inflight *vring)
|
|
|
|
{
|
|
|
|
struct virtio_net *dev;
|
|
|
|
struct vhost_virtqueue *vq;
|
|
|
|
|
|
|
|
dev = get_device(vid);
|
|
|
|
if (unlikely(!dev))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (vring_idx >= VHOST_MAX_VRING)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
vq = dev->virtqueue[vring_idx];
|
|
|
|
if (unlikely(!vq))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (vq_is_packed(dev)) {
|
|
|
|
if (unlikely(!vq->inflight_packed))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
vring->inflight_packed = vq->inflight_packed;
|
|
|
|
} else {
|
|
|
|
if (unlikely(!vq->inflight_split))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
vring->inflight_split = vq->inflight_split;
|
|
|
|
}
|
|
|
|
|
|
|
|
vring->resubmit_inflight = vq->resubmit_inflight;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2019-10-09 20:48:34 +00:00
|
|
|
int
|
|
|
|
rte_vhost_set_inflight_desc_split(int vid, uint16_t vring_idx,
|
|
|
|
uint16_t idx)
|
|
|
|
{
|
|
|
|
struct vhost_virtqueue *vq;
|
|
|
|
struct virtio_net *dev;
|
|
|
|
|
|
|
|
dev = get_device(vid);
|
|
|
|
if (unlikely(!dev))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (unlikely(!(dev->protocol_features &
|
|
|
|
(1ULL << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD))))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (unlikely(vq_is_packed(dev)))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (unlikely(vring_idx >= VHOST_MAX_VRING))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
vq = dev->virtqueue[vring_idx];
|
|
|
|
if (unlikely(!vq))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (unlikely(!vq->inflight_split))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (unlikely(idx >= vq->size))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
vq->inflight_split->desc[idx].counter = vq->global_counter++;
|
|
|
|
vq->inflight_split->desc[idx].inflight = 1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
rte_vhost_set_inflight_desc_packed(int vid, uint16_t vring_idx,
|
|
|
|
uint16_t head, uint16_t last,
|
|
|
|
uint16_t *inflight_entry)
|
|
|
|
{
|
|
|
|
struct rte_vhost_inflight_info_packed *inflight_info;
|
|
|
|
struct virtio_net *dev;
|
|
|
|
struct vhost_virtqueue *vq;
|
|
|
|
struct vring_packed_desc *desc;
|
|
|
|
uint16_t old_free_head, free_head;
|
|
|
|
|
|
|
|
dev = get_device(vid);
|
|
|
|
if (unlikely(!dev))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (unlikely(!(dev->protocol_features &
|
|
|
|
(1ULL << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD))))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (unlikely(!vq_is_packed(dev)))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (unlikely(vring_idx >= VHOST_MAX_VRING))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
vq = dev->virtqueue[vring_idx];
|
|
|
|
if (unlikely(!vq))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
inflight_info = vq->inflight_packed;
|
|
|
|
if (unlikely(!inflight_info))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (unlikely(head >= vq->size))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
desc = vq->desc_packed;
|
|
|
|
old_free_head = inflight_info->old_free_head;
|
|
|
|
if (unlikely(old_free_head >= vq->size))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
free_head = old_free_head;
|
|
|
|
|
|
|
|
/* init header descriptor */
|
|
|
|
inflight_info->desc[old_free_head].num = 0;
|
|
|
|
inflight_info->desc[old_free_head].counter = vq->global_counter++;
|
|
|
|
inflight_info->desc[old_free_head].inflight = 1;
|
|
|
|
|
|
|
|
/* save desc entry in flight entry */
|
|
|
|
while (head != ((last + 1) % vq->size)) {
|
|
|
|
inflight_info->desc[old_free_head].num++;
|
|
|
|
inflight_info->desc[free_head].addr = desc[head].addr;
|
|
|
|
inflight_info->desc[free_head].len = desc[head].len;
|
|
|
|
inflight_info->desc[free_head].flags = desc[head].flags;
|
|
|
|
inflight_info->desc[free_head].id = desc[head].id;
|
|
|
|
|
|
|
|
inflight_info->desc[old_free_head].last = free_head;
|
|
|
|
free_head = inflight_info->desc[free_head].next;
|
|
|
|
inflight_info->free_head = free_head;
|
|
|
|
head = (head + 1) % vq->size;
|
|
|
|
}
|
|
|
|
|
|
|
|
inflight_info->old_free_head = free_head;
|
|
|
|
*inflight_entry = old_free_head;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
rte_vhost_clr_inflight_desc_split(int vid, uint16_t vring_idx,
|
|
|
|
uint16_t last_used_idx, uint16_t idx)
|
|
|
|
{
|
|
|
|
struct virtio_net *dev;
|
|
|
|
struct vhost_virtqueue *vq;
|
|
|
|
|
|
|
|
dev = get_device(vid);
|
|
|
|
if (unlikely(!dev))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (unlikely(!(dev->protocol_features &
|
|
|
|
(1ULL << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD))))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (unlikely(vq_is_packed(dev)))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (unlikely(vring_idx >= VHOST_MAX_VRING))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
vq = dev->virtqueue[vring_idx];
|
|
|
|
if (unlikely(!vq))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (unlikely(!vq->inflight_split))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (unlikely(idx >= vq->size))
|
|
|
|
return -1;
|
|
|
|
|
2020-12-21 15:50:33 +00:00
|
|
|
rte_atomic_thread_fence(__ATOMIC_SEQ_CST);
|
2019-10-09 20:48:34 +00:00
|
|
|
|
|
|
|
vq->inflight_split->desc[idx].inflight = 0;
|
|
|
|
|
2020-12-21 15:50:33 +00:00
|
|
|
rte_atomic_thread_fence(__ATOMIC_SEQ_CST);
|
2019-10-09 20:48:34 +00:00
|
|
|
|
|
|
|
vq->inflight_split->used_idx = last_used_idx;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
rte_vhost_clr_inflight_desc_packed(int vid, uint16_t vring_idx,
|
|
|
|
uint16_t head)
|
|
|
|
{
|
|
|
|
struct rte_vhost_inflight_info_packed *inflight_info;
|
|
|
|
struct virtio_net *dev;
|
|
|
|
struct vhost_virtqueue *vq;
|
|
|
|
|
|
|
|
dev = get_device(vid);
|
|
|
|
if (unlikely(!dev))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (unlikely(!(dev->protocol_features &
|
|
|
|
(1ULL << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD))))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (unlikely(!vq_is_packed(dev)))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (unlikely(vring_idx >= VHOST_MAX_VRING))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
vq = dev->virtqueue[vring_idx];
|
|
|
|
if (unlikely(!vq))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
inflight_info = vq->inflight_packed;
|
|
|
|
if (unlikely(!inflight_info))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (unlikely(head >= vq->size))
|
|
|
|
return -1;
|
|
|
|
|
2020-12-21 15:50:33 +00:00
|
|
|
rte_atomic_thread_fence(__ATOMIC_SEQ_CST);
|
2019-10-09 20:48:34 +00:00
|
|
|
|
|
|
|
inflight_info->desc[head].inflight = 0;
|
|
|
|
|
2020-12-21 15:50:33 +00:00
|
|
|
rte_atomic_thread_fence(__ATOMIC_SEQ_CST);
|
2019-10-09 20:48:34 +00:00
|
|
|
|
|
|
|
inflight_info->old_free_head = inflight_info->free_head;
|
|
|
|
inflight_info->old_used_idx = inflight_info->used_idx;
|
|
|
|
inflight_info->old_used_wrap_counter = inflight_info->used_wrap_counter;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
rte_vhost_set_last_inflight_io_split(int vid, uint16_t vring_idx,
|
|
|
|
uint16_t idx)
|
|
|
|
{
|
|
|
|
struct virtio_net *dev;
|
|
|
|
struct vhost_virtqueue *vq;
|
|
|
|
|
|
|
|
dev = get_device(vid);
|
|
|
|
if (unlikely(!dev))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (unlikely(!(dev->protocol_features &
|
|
|
|
(1ULL << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD))))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (unlikely(vq_is_packed(dev)))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (unlikely(vring_idx >= VHOST_MAX_VRING))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
vq = dev->virtqueue[vring_idx];
|
|
|
|
if (unlikely(!vq))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (unlikely(!vq->inflight_split))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
vq->inflight_split->last_inflight_io = idx;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
rte_vhost_set_last_inflight_io_packed(int vid, uint16_t vring_idx,
|
|
|
|
uint16_t head)
|
|
|
|
{
|
|
|
|
struct rte_vhost_inflight_info_packed *inflight_info;
|
|
|
|
struct virtio_net *dev;
|
|
|
|
struct vhost_virtqueue *vq;
|
|
|
|
uint16_t last;
|
|
|
|
|
|
|
|
dev = get_device(vid);
|
|
|
|
if (unlikely(!dev))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (unlikely(!(dev->protocol_features &
|
|
|
|
(1ULL << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD))))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (unlikely(!vq_is_packed(dev)))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (unlikely(vring_idx >= VHOST_MAX_VRING))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
vq = dev->virtqueue[vring_idx];
|
|
|
|
if (unlikely(!vq))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
inflight_info = vq->inflight_packed;
|
|
|
|
if (unlikely(!inflight_info))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (unlikely(head >= vq->size))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
last = inflight_info->desc[head].last;
|
|
|
|
if (unlikely(last >= vq->size))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
inflight_info->desc[last].next = inflight_info->free_head;
|
|
|
|
inflight_info->free_head = head;
|
|
|
|
inflight_info->used_idx += inflight_info->desc[head].num;
|
|
|
|
if (inflight_info->used_idx >= inflight_info->desc_num) {
|
|
|
|
inflight_info->used_idx -= inflight_info->desc_num;
|
|
|
|
inflight_info->used_wrap_counter =
|
|
|
|
!inflight_info->used_wrap_counter;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-01-02 09:31:36 +00:00
|
|
|
int
|
|
|
|
rte_vhost_vring_call(int vid, uint16_t vring_idx)
|
|
|
|
{
|
|
|
|
struct virtio_net *dev;
|
|
|
|
struct vhost_virtqueue *vq;
|
|
|
|
|
|
|
|
dev = get_device(vid);
|
|
|
|
if (!dev)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (vring_idx >= VHOST_MAX_VRING)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
vq = dev->virtqueue[vring_idx];
|
|
|
|
if (!vq)
|
|
|
|
return -1;
|
|
|
|
|
2018-07-06 07:07:21 +00:00
|
|
|
if (vq_is_packed(dev))
|
|
|
|
vhost_vring_call_packed(dev, vq);
|
|
|
|
else
|
|
|
|
vhost_vring_call_split(dev, vq);
|
|
|
|
|
2018-01-02 09:31:36 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
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
|
|
|
uint16_t
|
|
|
|
rte_vhost_avail_entries(int vid, uint16_t queue_id)
|
|
|
|
{
|
|
|
|
struct virtio_net *dev;
|
|
|
|
struct vhost_virtqueue *vq;
|
2019-08-19 11:34:57 +00:00
|
|
|
uint16_t ret = 0;
|
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
|
|
|
|
|
|
|
dev = get_device(vid);
|
|
|
|
if (!dev)
|
|
|
|
return 0;
|
|
|
|
|
2020-10-19 17:34:10 +00:00
|
|
|
if (queue_id >= VHOST_MAX_VRING)
|
|
|
|
return 0;
|
|
|
|
|
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
|
|
|
vq = dev->virtqueue[queue_id];
|
2020-10-19 17:34:10 +00:00
|
|
|
if (!vq)
|
|
|
|
return 0;
|
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
|
|
|
|
2019-08-19 11:34:57 +00:00
|
|
|
rte_spinlock_lock(&vq->access_lock);
|
|
|
|
|
|
|
|
if (unlikely(!vq->enabled || vq->avail == NULL))
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
ret = *(volatile uint16_t *)&vq->avail->idx - vq->last_used_idx;
|
|
|
|
|
|
|
|
out:
|
|
|
|
rte_spinlock_unlock(&vq->access_lock);
|
|
|
|
return ret;
|
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
|
|
|
}
|
|
|
|
|
2019-08-19 11:34:57 +00:00
|
|
|
static inline int
|
2018-09-04 23:55:55 +00:00
|
|
|
vhost_enable_notify_split(struct virtio_net *dev,
|
|
|
|
struct vhost_virtqueue *vq, int enable)
|
2018-07-06 07:07:21 +00:00
|
|
|
{
|
2019-08-19 11:34:57 +00:00
|
|
|
if (vq->used == NULL)
|
|
|
|
return -1;
|
|
|
|
|
2018-09-04 23:55:55 +00:00
|
|
|
if (!(dev->features & (1ULL << VIRTIO_RING_F_EVENT_IDX))) {
|
|
|
|
if (enable)
|
|
|
|
vq->used->flags &= ~VRING_USED_F_NO_NOTIFY;
|
|
|
|
else
|
|
|
|
vq->used->flags |= VRING_USED_F_NO_NOTIFY;
|
|
|
|
} else {
|
|
|
|
if (enable)
|
|
|
|
vhost_avail_event(vq) = vq->last_avail_idx;
|
|
|
|
}
|
2019-08-19 11:34:57 +00:00
|
|
|
return 0;
|
2018-07-06 07:07:21 +00:00
|
|
|
}
|
|
|
|
|
2019-08-19 11:34:57 +00:00
|
|
|
static inline int
|
2018-07-06 07:07:21 +00:00
|
|
|
vhost_enable_notify_packed(struct virtio_net *dev,
|
|
|
|
struct vhost_virtqueue *vq, int enable)
|
|
|
|
{
|
|
|
|
uint16_t flags;
|
|
|
|
|
2019-08-19 11:34:57 +00:00
|
|
|
if (vq->device_event == NULL)
|
|
|
|
return -1;
|
|
|
|
|
2018-10-11 14:22:34 +00:00
|
|
|
if (!enable) {
|
2018-07-06 07:07:21 +00:00
|
|
|
vq->device_event->flags = VRING_EVENT_F_DISABLE;
|
2019-08-19 11:34:57 +00:00
|
|
|
return 0;
|
2018-10-11 14:22:34 +00:00
|
|
|
}
|
2018-07-06 07:07:21 +00:00
|
|
|
|
|
|
|
flags = VRING_EVENT_F_ENABLE;
|
|
|
|
if (dev->features & (1ULL << VIRTIO_RING_F_EVENT_IDX)) {
|
|
|
|
flags = VRING_EVENT_F_DESC;
|
|
|
|
vq->device_event->off_wrap = vq->last_avail_idx |
|
|
|
|
vq->avail_wrap_counter << 15;
|
|
|
|
}
|
|
|
|
|
2020-12-21 15:50:33 +00:00
|
|
|
rte_atomic_thread_fence(__ATOMIC_RELEASE);
|
2018-07-06 07:07:21 +00:00
|
|
|
|
|
|
|
vq->device_event->flags = flags;
|
2019-08-19 11:34:57 +00:00
|
|
|
return 0;
|
2018-07-06 07:07:21 +00:00
|
|
|
}
|
|
|
|
|
2020-07-23 13:08:53 +00:00
|
|
|
int
|
|
|
|
vhost_enable_guest_notification(struct virtio_net *dev,
|
|
|
|
struct vhost_virtqueue *vq, int enable)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* If the virtqueue is not ready yet, it will be applied
|
|
|
|
* when it will become ready.
|
|
|
|
*/
|
|
|
|
if (!vq->ready)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (vq_is_packed(dev))
|
|
|
|
return vhost_enable_notify_packed(dev, vq, enable);
|
|
|
|
else
|
|
|
|
return vhost_enable_notify_split(dev, vq, enable);
|
|
|
|
}
|
|
|
|
|
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
|
|
|
int
|
|
|
|
rte_vhost_enable_guest_notification(int vid, uint16_t queue_id, int enable)
|
|
|
|
{
|
|
|
|
struct virtio_net *dev = get_device(vid);
|
2018-07-06 07:07:21 +00:00
|
|
|
struct vhost_virtqueue *vq;
|
2019-08-19 11:34:57 +00:00
|
|
|
int ret;
|
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
|
|
|
|
2018-04-12 16:28:34 +00:00
|
|
|
if (!dev)
|
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
|
|
|
return -1;
|
|
|
|
|
2020-10-19 17:34:11 +00:00
|
|
|
if (queue_id >= VHOST_MAX_VRING)
|
|
|
|
return -1;
|
|
|
|
|
2018-07-06 07:07:21 +00:00
|
|
|
vq = dev->virtqueue[queue_id];
|
2020-10-19 17:34:11 +00:00
|
|
|
if (!vq)
|
|
|
|
return -1;
|
2018-07-06 07:07:21 +00:00
|
|
|
|
2019-08-19 11:34:57 +00:00
|
|
|
rte_spinlock_lock(&vq->access_lock);
|
|
|
|
|
2020-07-23 13:08:53 +00:00
|
|
|
vq->notif_enable = enable;
|
|
|
|
ret = vhost_enable_guest_notification(dev, vq, enable);
|
2018-07-06 07:07:21 +00:00
|
|
|
|
2019-08-19 11:34:57 +00:00
|
|
|
rte_spinlock_unlock(&vq->access_lock);
|
|
|
|
|
|
|
|
return ret;
|
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
|
|
|
}
|
2017-04-01 07:22:55 +00:00
|
|
|
|
|
|
|
void
|
|
|
|
rte_vhost_log_write(int vid, uint64_t addr, uint64_t len)
|
|
|
|
{
|
|
|
|
struct virtio_net *dev = get_device(vid);
|
|
|
|
|
|
|
|
if (dev == NULL)
|
|
|
|
return;
|
|
|
|
|
|
|
|
vhost_log_write(dev, addr, len);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
rte_vhost_log_used_vring(int vid, uint16_t vring_idx,
|
|
|
|
uint64_t offset, uint64_t len)
|
|
|
|
{
|
|
|
|
struct virtio_net *dev;
|
|
|
|
struct vhost_virtqueue *vq;
|
|
|
|
|
|
|
|
dev = get_device(vid);
|
|
|
|
if (dev == NULL)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (vring_idx >= VHOST_MAX_VRING)
|
|
|
|
return;
|
|
|
|
vq = dev->virtqueue[vring_idx];
|
|
|
|
if (!vq)
|
|
|
|
return;
|
|
|
|
|
|
|
|
vhost_log_used_vring(dev, vq, offset, len);
|
|
|
|
}
|
2017-05-26 17:18:02 +00:00
|
|
|
|
|
|
|
uint32_t
|
|
|
|
rte_vhost_rx_queue_count(int vid, uint16_t qid)
|
|
|
|
{
|
|
|
|
struct virtio_net *dev;
|
|
|
|
struct vhost_virtqueue *vq;
|
2019-08-19 11:34:57 +00:00
|
|
|
uint32_t ret = 0;
|
2017-05-26 17:18:02 +00:00
|
|
|
|
|
|
|
dev = get_device(vid);
|
|
|
|
if (dev == NULL)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (unlikely(qid >= dev->nr_vring || (qid & 1) == 0)) {
|
2019-12-04 15:07:29 +00:00
|
|
|
VHOST_LOG_DATA(ERR, "(%d) %s: invalid virtqueue idx %d.\n",
|
2017-05-26 17:18:02 +00:00
|
|
|
dev->vid, __func__, qid);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
vq = dev->virtqueue[qid];
|
|
|
|
if (vq == NULL)
|
|
|
|
return 0;
|
|
|
|
|
2019-08-19 11:34:57 +00:00
|
|
|
rte_spinlock_lock(&vq->access_lock);
|
|
|
|
|
2021-03-23 09:02:19 +00:00
|
|
|
if (unlikely(!vq->enabled || vq->avail == NULL))
|
2019-08-19 11:34:57 +00:00
|
|
|
goto out;
|
|
|
|
|
|
|
|
ret = *((volatile uint16_t *)&vq->avail->idx) - vq->last_avail_idx;
|
2017-05-26 17:18:02 +00:00
|
|
|
|
2019-08-19 11:34:57 +00:00
|
|
|
out:
|
|
|
|
rte_spinlock_unlock(&vq->access_lock);
|
|
|
|
return ret;
|
2017-05-26 17:18:02 +00:00
|
|
|
}
|
2018-04-02 11:46:54 +00:00
|
|
|
|
2020-06-26 14:04:33 +00:00
|
|
|
struct rte_vdpa_device *
|
|
|
|
rte_vhost_get_vdpa_device(int vid)
|
2018-04-02 11:46:54 +00:00
|
|
|
{
|
|
|
|
struct virtio_net *dev = get_device(vid);
|
|
|
|
|
|
|
|
if (dev == NULL)
|
2020-06-26 14:04:33 +00:00
|
|
|
return NULL;
|
2018-04-02 11:46:54 +00:00
|
|
|
|
2020-06-26 14:04:33 +00:00
|
|
|
return dev->vdpa_dev;
|
2018-04-02 11:46:54 +00:00
|
|
|
}
|
2018-04-02 11:46:56 +00:00
|
|
|
|
|
|
|
int rte_vhost_get_log_base(int vid, uint64_t *log_base,
|
|
|
|
uint64_t *log_size)
|
|
|
|
{
|
|
|
|
struct virtio_net *dev = get_device(vid);
|
|
|
|
|
2019-04-11 14:48:40 +00:00
|
|
|
if (dev == NULL || log_base == NULL || log_size == NULL)
|
2018-04-02 11:46:56 +00:00
|
|
|
return -1;
|
|
|
|
|
|
|
|
*log_base = dev->log_base;
|
|
|
|
*log_size = dev->log_size;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int rte_vhost_get_vring_base(int vid, uint16_t queue_id,
|
|
|
|
uint16_t *last_avail_idx, uint16_t *last_used_idx)
|
|
|
|
{
|
2019-10-09 20:48:36 +00:00
|
|
|
struct vhost_virtqueue *vq;
|
2018-04-02 11:46:56 +00:00
|
|
|
struct virtio_net *dev = get_device(vid);
|
|
|
|
|
2019-04-11 14:48:40 +00:00
|
|
|
if (dev == NULL || last_avail_idx == NULL || last_used_idx == NULL)
|
2018-04-02 11:46:56 +00:00
|
|
|
return -1;
|
|
|
|
|
2020-10-19 17:34:12 +00:00
|
|
|
if (queue_id >= VHOST_MAX_VRING)
|
|
|
|
return -1;
|
|
|
|
|
2019-10-09 20:48:36 +00:00
|
|
|
vq = dev->virtqueue[queue_id];
|
|
|
|
if (!vq)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (vq_is_packed(dev)) {
|
|
|
|
*last_avail_idx = (vq->avail_wrap_counter << 15) |
|
|
|
|
vq->last_avail_idx;
|
|
|
|
*last_used_idx = (vq->used_wrap_counter << 15) |
|
|
|
|
vq->last_used_idx;
|
|
|
|
} else {
|
|
|
|
*last_avail_idx = vq->last_avail_idx;
|
|
|
|
*last_used_idx = vq->last_used_idx;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int rte_vhost_set_vring_base(int vid, uint16_t queue_id,
|
|
|
|
uint16_t last_avail_idx, uint16_t last_used_idx)
|
|
|
|
{
|
|
|
|
struct vhost_virtqueue *vq;
|
|
|
|
struct virtio_net *dev = get_device(vid);
|
|
|
|
|
|
|
|
if (!dev)
|
|
|
|
return -1;
|
|
|
|
|
2020-10-19 17:34:12 +00:00
|
|
|
if (queue_id >= VHOST_MAX_VRING)
|
|
|
|
return -1;
|
|
|
|
|
2019-10-09 20:48:36 +00:00
|
|
|
vq = dev->virtqueue[queue_id];
|
|
|
|
if (!vq)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (vq_is_packed(dev)) {
|
|
|
|
vq->last_avail_idx = last_avail_idx & 0x7fff;
|
|
|
|
vq->avail_wrap_counter = !!(last_avail_idx & (1 << 15));
|
|
|
|
vq->last_used_idx = last_used_idx & 0x7fff;
|
|
|
|
vq->used_wrap_counter = !!(last_used_idx & (1 << 15));
|
|
|
|
} else {
|
|
|
|
vq->last_avail_idx = last_avail_idx;
|
|
|
|
vq->last_used_idx = last_used_idx;
|
|
|
|
}
|
2018-04-02 11:46:56 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2019-10-09 20:48:35 +00:00
|
|
|
int
|
|
|
|
rte_vhost_get_vring_base_from_inflight(int vid,
|
|
|
|
uint16_t queue_id,
|
|
|
|
uint16_t *last_avail_idx,
|
|
|
|
uint16_t *last_used_idx)
|
|
|
|
{
|
|
|
|
struct rte_vhost_inflight_info_packed *inflight_info;
|
2020-10-19 17:34:13 +00:00
|
|
|
struct vhost_virtqueue *vq;
|
2019-10-09 20:48:35 +00:00
|
|
|
struct virtio_net *dev = get_device(vid);
|
|
|
|
|
|
|
|
if (dev == NULL || last_avail_idx == NULL || last_used_idx == NULL)
|
|
|
|
return -1;
|
|
|
|
|
2020-10-19 17:34:13 +00:00
|
|
|
if (queue_id >= VHOST_MAX_VRING)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
vq = dev->virtqueue[queue_id];
|
|
|
|
if (!vq)
|
|
|
|
return -1;
|
|
|
|
|
2019-10-09 20:48:35 +00:00
|
|
|
if (!vq_is_packed(dev))
|
|
|
|
return -1;
|
|
|
|
|
2020-10-19 17:34:13 +00:00
|
|
|
inflight_info = vq->inflight_packed;
|
2019-10-09 20:48:35 +00:00
|
|
|
if (!inflight_info)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
*last_avail_idx = (inflight_info->old_used_wrap_counter << 15) |
|
|
|
|
inflight_info->old_used_idx;
|
|
|
|
*last_used_idx = *last_avail_idx;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2019-01-17 15:32:26 +00:00
|
|
|
int rte_vhost_extern_callback_register(int vid,
|
|
|
|
struct rte_vhost_user_extern_ops const * const ops, void *ctx)
|
|
|
|
{
|
|
|
|
struct virtio_net *dev = get_device(vid);
|
|
|
|
|
2019-04-11 14:48:40 +00:00
|
|
|
if (dev == NULL || ops == NULL)
|
2019-01-17 15:32:26 +00:00
|
|
|
return -1;
|
|
|
|
|
|
|
|
dev->extern_ops = *ops;
|
|
|
|
dev->extern_data = ctx;
|
|
|
|
return 0;
|
|
|
|
}
|
2019-12-04 15:07:29 +00:00
|
|
|
|
2020-07-07 05:07:08 +00:00
|
|
|
int rte_vhost_async_channel_register(int vid, uint16_t queue_id,
|
|
|
|
uint32_t features,
|
|
|
|
struct rte_vhost_async_channel_ops *ops)
|
|
|
|
{
|
|
|
|
struct vhost_virtqueue *vq;
|
|
|
|
struct virtio_net *dev = get_device(vid);
|
|
|
|
struct rte_vhost_async_features f;
|
2020-10-13 01:45:44 +00:00
|
|
|
int node;
|
2020-07-07 05:07:08 +00:00
|
|
|
|
|
|
|
if (dev == NULL || ops == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
f.intval = features;
|
|
|
|
|
2020-10-19 17:34:14 +00:00
|
|
|
if (queue_id >= VHOST_MAX_VRING)
|
|
|
|
return -1;
|
|
|
|
|
2020-07-07 05:07:08 +00:00
|
|
|
vq = dev->virtqueue[queue_id];
|
|
|
|
|
|
|
|
if (unlikely(vq == NULL || !dev->async_copy))
|
|
|
|
return -1;
|
|
|
|
|
2021-04-27 08:03:33 +00:00
|
|
|
if (unlikely(!f.async_inorder)) {
|
2020-07-07 05:07:08 +00:00
|
|
|
VHOST_LOG_CONFIG(ERR,
|
2021-04-27 08:03:33 +00:00
|
|
|
"async copy is not supported on non-inorder mode "
|
2020-07-07 05:07:08 +00:00
|
|
|
"(vid %d, qid: %d)\n", vid, queue_id);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (unlikely(ops->check_completed_copies == NULL ||
|
|
|
|
ops->transfer_data == NULL))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
rte_spinlock_lock(&vq->access_lock);
|
|
|
|
|
|
|
|
if (unlikely(vq->async_registered)) {
|
|
|
|
VHOST_LOG_CONFIG(ERR,
|
|
|
|
"async register failed: channel already registered "
|
|
|
|
"(vid %d, qid: %d)\n", vid, queue_id);
|
|
|
|
goto reg_out;
|
|
|
|
}
|
|
|
|
|
2020-10-13 01:45:44 +00:00
|
|
|
#ifdef RTE_LIBRTE_VHOST_NUMA
|
|
|
|
if (get_mempolicy(&node, NULL, 0, vq, MPOL_F_NODE | MPOL_F_ADDR)) {
|
|
|
|
VHOST_LOG_CONFIG(ERR,
|
|
|
|
"unable to get numa information in async register. "
|
|
|
|
"allocating async buffer memory on the caller thread node\n");
|
|
|
|
node = SOCKET_ID_ANY;
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
node = SOCKET_ID_ANY;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
vq->async_pkts_info = rte_malloc_socket(NULL,
|
2020-10-13 01:45:43 +00:00
|
|
|
vq->size * sizeof(struct async_inflight_info),
|
2020-10-13 01:45:44 +00:00
|
|
|
RTE_CACHE_LINE_SIZE, node);
|
2021-04-27 08:03:33 +00:00
|
|
|
if (!vq->async_pkts_info) {
|
|
|
|
vhost_free_async_mem(vq);
|
|
|
|
VHOST_LOG_CONFIG(ERR,
|
|
|
|
"async register failed: cannot allocate memory for async_pkts_info "
|
|
|
|
"(vid %d, qid: %d)\n", vid, queue_id);
|
|
|
|
goto reg_out;
|
|
|
|
}
|
|
|
|
|
2020-10-13 01:45:44 +00:00
|
|
|
vq->it_pool = rte_malloc_socket(NULL,
|
|
|
|
VHOST_MAX_ASYNC_IT * sizeof(struct rte_vhost_iov_iter),
|
|
|
|
RTE_CACHE_LINE_SIZE, node);
|
2021-04-27 08:03:33 +00:00
|
|
|
if (!vq->it_pool) {
|
|
|
|
vhost_free_async_mem(vq);
|
|
|
|
VHOST_LOG_CONFIG(ERR,
|
|
|
|
"async register failed: cannot allocate memory for it_pool "
|
|
|
|
"(vid %d, qid: %d)\n", vid, queue_id);
|
|
|
|
goto reg_out;
|
|
|
|
}
|
|
|
|
|
2020-10-13 01:45:44 +00:00
|
|
|
vq->vec_pool = rte_malloc_socket(NULL,
|
|
|
|
VHOST_MAX_ASYNC_VEC * sizeof(struct iovec),
|
|
|
|
RTE_CACHE_LINE_SIZE, node);
|
2021-04-27 08:03:33 +00:00
|
|
|
if (!vq->vec_pool) {
|
2020-10-13 01:45:44 +00:00
|
|
|
vhost_free_async_mem(vq);
|
2020-07-07 05:07:08 +00:00
|
|
|
VHOST_LOG_CONFIG(ERR,
|
2021-04-27 08:03:33 +00:00
|
|
|
"async register failed: cannot allocate memory for vec_pool "
|
|
|
|
"(vid %d, qid: %d)\n", vid, queue_id);
|
2020-07-07 05:07:08 +00:00
|
|
|
goto reg_out;
|
|
|
|
}
|
|
|
|
|
2021-04-27 08:03:33 +00:00
|
|
|
if (vq_is_packed(dev)) {
|
|
|
|
vq->async_buffers_packed = rte_malloc_socket(NULL,
|
|
|
|
vq->size * sizeof(struct vring_used_elem_packed),
|
|
|
|
RTE_CACHE_LINE_SIZE, node);
|
|
|
|
if (!vq->async_buffers_packed) {
|
|
|
|
vhost_free_async_mem(vq);
|
|
|
|
VHOST_LOG_CONFIG(ERR,
|
|
|
|
"async register failed: cannot allocate memory for async buffers "
|
|
|
|
"(vid %d, qid: %d)\n", vid, queue_id);
|
|
|
|
goto reg_out;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
vq->async_descs_split = rte_malloc_socket(NULL,
|
|
|
|
vq->size * sizeof(struct vring_used_elem),
|
|
|
|
RTE_CACHE_LINE_SIZE, node);
|
|
|
|
if (!vq->async_descs_split) {
|
|
|
|
vhost_free_async_mem(vq);
|
|
|
|
VHOST_LOG_CONFIG(ERR,
|
|
|
|
"async register failed: cannot allocate memory for async descs "
|
|
|
|
"(vid %d, qid: %d)\n", vid, queue_id);
|
|
|
|
goto reg_out;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-07-07 05:07:08 +00:00
|
|
|
vq->async_ops.check_completed_copies = ops->check_completed_copies;
|
|
|
|
vq->async_ops.transfer_data = ops->transfer_data;
|
|
|
|
|
|
|
|
vq->async_inorder = f.async_inorder;
|
|
|
|
vq->async_threshold = f.async_threshold;
|
|
|
|
|
|
|
|
vq->async_registered = true;
|
|
|
|
|
|
|
|
reg_out:
|
|
|
|
rte_spinlock_unlock(&vq->access_lock);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int rte_vhost_async_channel_unregister(int vid, uint16_t queue_id)
|
|
|
|
{
|
|
|
|
struct vhost_virtqueue *vq;
|
|
|
|
struct virtio_net *dev = get_device(vid);
|
|
|
|
int ret = -1;
|
|
|
|
|
|
|
|
if (dev == NULL)
|
|
|
|
return ret;
|
|
|
|
|
2020-10-19 17:34:14 +00:00
|
|
|
if (queue_id >= VHOST_MAX_VRING)
|
|
|
|
return ret;
|
|
|
|
|
2020-07-07 05:07:08 +00:00
|
|
|
vq = dev->virtqueue[queue_id];
|
|
|
|
|
|
|
|
if (vq == NULL)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
ret = 0;
|
|
|
|
|
|
|
|
if (!vq->async_registered)
|
2020-10-13 01:45:46 +00:00
|
|
|
return ret;
|
|
|
|
|
|
|
|
if (!rte_spinlock_trylock(&vq->access_lock)) {
|
|
|
|
VHOST_LOG_CONFIG(ERR, "Failed to unregister async channel. "
|
|
|
|
"virt queue busy.\n");
|
|
|
|
return -1;
|
|
|
|
}
|
2020-07-07 05:07:08 +00:00
|
|
|
|
|
|
|
if (vq->async_pkts_inflight_n) {
|
|
|
|
VHOST_LOG_CONFIG(ERR, "Failed to unregister async channel. "
|
|
|
|
"async inflight packets must be completed before unregistration.\n");
|
|
|
|
ret = -1;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2020-10-13 01:45:44 +00:00
|
|
|
vhost_free_async_mem(vq);
|
2020-07-07 05:07:08 +00:00
|
|
|
|
|
|
|
vq->async_ops.transfer_data = NULL;
|
|
|
|
vq->async_ops.check_completed_copies = NULL;
|
|
|
|
vq->async_registered = false;
|
|
|
|
|
|
|
|
out:
|
|
|
|
rte_spinlock_unlock(&vq->access_lock);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
log: register with standardized names
Let's try to enforce the convention where most drivers use a pmd. logtype
with their class reflected in it, and libraries use a lib. logtype.
Introduce two new macros:
- RTE_LOG_REGISTER_DEFAULT can be used when a single logtype is
used in a component. It is associated to the default name provided
by the build system,
- RTE_LOG_REGISTER_SUFFIX can be used when multiple logtypes are used,
and then the passed name is appended to the default name,
RTE_LOG_REGISTER is left untouched for existing external users
and for components that do not comply with the convention.
There is a new Meson variable log_prefix to adapt the default name
for baseband (pmd.bb.), bus (no pmd.) and mempool (no pmd.) classes.
Note: achieved with below commands + reverted change on net/bonding +
edits on crypto/virtio, compress/mlx5, regex/mlx5
$ git grep -l RTE_LOG_REGISTER drivers/ |
while read file; do
pattern=${file##drivers/};
class=${pattern%%/*};
pattern=${pattern#$class/};
drv=${pattern%%/*};
case "$class" in
baseband) pattern=pmd.bb.$drv;;
bus) pattern=bus.$drv;;
mempool) pattern=mempool.$drv;;
*) pattern=pmd.$class.$drv;;
esac
sed -i -e 's/RTE_LOG_REGISTER(\(.*\), '$pattern',/RTE_LOG_REGISTER_DEFAULT(\1,/' $file;
sed -i -e 's/RTE_LOG_REGISTER(\(.*\), '$pattern'\.\(.*\),/RTE_LOG_REGISTER_SUFFIX(\1, \2,/' $file;
done
$ git grep -l RTE_LOG_REGISTER lib/ |
while read file; do
pattern=${file##lib/};
pattern=lib.${pattern%%/*};
sed -i -e 's/RTE_LOG_REGISTER(\(.*\), '$pattern',/RTE_LOG_REGISTER_DEFAULT(\1,/' $file;
sed -i -e 's/RTE_LOG_REGISTER(\(.*\), '$pattern'\.\(.*\),/RTE_LOG_REGISTER_SUFFIX(\1, \2,/' $file;
done
Signed-off-by: David Marchand <david.marchand@redhat.com>
Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
2021-04-26 12:51:08 +00:00
|
|
|
RTE_LOG_REGISTER_SUFFIX(vhost_config_log_level, config, INFO);
|
|
|
|
RTE_LOG_REGISTER_SUFFIX(vhost_data_log_level, data, WARNING);
|