#include <stdbool.h>
+#include <rte_class.h>
#include <rte_malloc.h>
#include "rte_vdpa.h"
#include "vhost.h"
-static struct rte_vdpa_device *vdpa_devices[MAX_VHOST_DEVICE];
+static struct rte_vdpa_device vdpa_devices[MAX_VHOST_DEVICE];
static uint32_t vdpa_device_num;
-static bool
-is_same_vdpa_device(struct rte_vdpa_dev_addr *a,
- struct rte_vdpa_dev_addr *b)
-{
- bool ret = true;
-
- if (a->type != b->type)
- return false;
-
- switch (a->type) {
- case PCI_ADDR:
- if (a->pci_addr.domain != b->pci_addr.domain ||
- a->pci_addr.bus != b->pci_addr.bus ||
- a->pci_addr.devid != b->pci_addr.devid ||
- a->pci_addr.function != b->pci_addr.function)
- ret = false;
- break;
- default:
- break;
- }
-
- return ret;
-}
int
-rte_vdpa_register_device(struct rte_vdpa_dev_addr *addr,
- struct rte_vdpa_dev_ops *ops)
+rte_vdpa_find_device_id(struct rte_vdpa_device *dev)
{
- struct rte_vdpa_device *dev;
- char device_name[MAX_VDPA_NAME_LEN];
+ struct rte_vdpa_device *tmp_dev;
int i;
- if (vdpa_device_num >= MAX_VHOST_DEVICE)
+ if (dev == NULL)
return -1;
- for (i = 0; i < MAX_VHOST_DEVICE; i++) {
- dev = vdpa_devices[i];
- if (dev && is_same_vdpa_device(&dev->addr, addr))
- return -1;
- }
+ for (i = 0; i < MAX_VHOST_DEVICE; ++i) {
+ tmp_dev = &vdpa_devices[i];
+ if (tmp_dev->ops == NULL)
+ continue;
- for (i = 0; i < MAX_VHOST_DEVICE; i++) {
- if (vdpa_devices[i] == NULL)
- break;
+ if (tmp_dev == dev)
+ return i;
}
- if (i == MAX_VHOST_DEVICE)
- return -1;
-
- sprintf(device_name, "vdpa-dev-%d", i);
- dev = rte_zmalloc(device_name, sizeof(struct rte_vdpa_device),
- RTE_CACHE_LINE_SIZE);
- if (!dev)
- return -1;
-
- memcpy(&dev->addr, addr, sizeof(struct rte_vdpa_dev_addr));
- dev->ops = ops;
- vdpa_devices[i] = dev;
- vdpa_device_num++;
-
- return i;
-}
-
-int
-rte_vdpa_unregister_device(int did)
-{
- if (did < 0 || did >= MAX_VHOST_DEVICE || vdpa_devices[did] == NULL)
- return -1;
-
- rte_free(vdpa_devices[did]);
- vdpa_devices[did] = NULL;
- vdpa_device_num--;
-
- return did;
+ return -1;
}
-int
-rte_vdpa_find_device_id(struct rte_vdpa_dev_addr *addr)
+struct rte_vdpa_device *
+rte_vdpa_find_device_by_name(const char *name)
{
struct rte_vdpa_device *dev;
int i;
+ if (name == NULL)
+ return NULL;
+
for (i = 0; i < MAX_VHOST_DEVICE; ++i) {
- dev = vdpa_devices[i];
- if (dev && is_same_vdpa_device(&dev->addr, addr))
- return i;
+ dev = &vdpa_devices[i];
+ if (dev->ops == NULL)
+ continue;
+
+ if (strncmp(dev->device->name, name, RTE_DEV_NAME_MAX_LEN) == 0)
+ return dev;
}
- return -1;
+ return NULL;
+}
+
+struct rte_device *
+rte_vdpa_get_rte_device(struct rte_vdpa_device *vdpa_dev)
+{
+ if (vdpa_dev == NULL)
+ return NULL;
+
+ return vdpa_dev->device;
}
struct rte_vdpa_device *
if (did < 0 || did >= MAX_VHOST_DEVICE)
return NULL;
- return vdpa_devices[did];
+ return &vdpa_devices[did];
}
-int
-rte_vdpa_get_device_num(void)
+struct rte_vdpa_device *
+rte_vdpa_register_device(struct rte_device *rte_dev,
+ struct rte_vdpa_dev_ops *ops)
{
- return vdpa_device_num;
-}
+ struct rte_vdpa_device *dev;
+ int i;
-static bool
-invalid_desc_check(struct virtio_net *dev, struct vhost_virtqueue *vq,
- uint64_t desc_iova, uint64_t desc_len, uint8_t perm)
-{
- uint64_t desc_addr, desc_chunck_len;
+ if (vdpa_device_num >= MAX_VHOST_DEVICE || ops == NULL)
+ return NULL;
- while (desc_len) {
- desc_chunck_len = desc_len;
- desc_addr = vhost_iova_to_vva(dev, vq,
- desc_iova,
- &desc_chunck_len,
- perm);
+ for (i = 0; i < MAX_VHOST_DEVICE; i++) {
+ dev = &vdpa_devices[i];
+ if (dev->ops == NULL)
+ continue;
- if (!desc_addr)
- return true;
+ if (dev->device == rte_dev)
+ return NULL;
+ }
- desc_len -= desc_chunck_len;
- desc_iova += desc_chunck_len;
+ for (i = 0; i < MAX_VHOST_DEVICE; i++) {
+ if (vdpa_devices[i].ops == NULL)
+ break;
}
- return false;
-}
+ if (i == MAX_VHOST_DEVICE)
+ return NULL;
-int __rte_experimental
-rte_vdpa_relay_vring_avail(int vid, uint16_t qid, void *vring_m)
-{
- struct virtio_net *dev = get_device(vid);
- uint16_t idx, idx_m, desc_id;
- struct vring_desc desc;
- struct vhost_virtqueue *vq;
- struct vring_desc *desc_ring;
- struct vring_desc *idesc = NULL;
- struct vring *s_vring;
- uint64_t dlen;
- int ret;
- uint8_t perm;
+ dev = &vdpa_devices[i];
+ dev->device = rte_dev;
+ dev->ops = ops;
+ vdpa_device_num++;
- if (!dev || !vring_m)
- return -1;
+ return dev;
+}
- if (qid >= dev->nr_vring)
- return -1;
+int
+rte_vdpa_unregister_device(struct rte_vdpa_device *vdev)
+{
+ int did = rte_vdpa_find_device_id(vdev);
- if (vq_is_packed(dev))
+ if (did < 0 || vdpa_devices[did].ops == NULL)
return -1;
- s_vring = (struct vring *)vring_m;
- vq = dev->virtqueue[qid];
- idx = vq->avail->idx;
- idx_m = s_vring->avail->idx;
- ret = (uint16_t)(idx - idx_m);
-
- while (idx_m != idx) {
- /* avail entry copy */
- desc_id = vq->avail->ring[idx_m & (vq->size - 1)];
- s_vring->avail->ring[idx_m & (vq->size - 1)] = desc_id;
- desc_ring = vq->desc;
-
- if (vq->desc[desc_id].flags & VRING_DESC_F_INDIRECT) {
- dlen = vq->desc[desc_id].len;
- desc_ring = (struct vring_desc *)(uintptr_t)
- vhost_iova_to_vva(dev, vq,
- vq->desc[desc_id].addr, &dlen,
- VHOST_ACCESS_RO);
- if (unlikely(!desc_ring))
- return -1;
-
- if (unlikely(dlen < vq->desc[idx].len)) {
- idesc = alloc_copy_ind_table(dev, vq,
- vq->desc[idx].addr,
- vq->desc[idx].len);
- if (unlikely(!idesc))
- return -1;
-
- desc_ring = idesc;
- }
-
- desc_id = 0;
- }
-
- /* check if the buf addr is within the guest memory */
- do {
- desc = desc_ring[desc_id];
- perm = desc.flags & VRING_DESC_F_WRITE ?
- VHOST_ACCESS_WO : VHOST_ACCESS_RO;
- if (invalid_desc_check(dev, vq, desc.addr, desc.len,
- perm)) {
- if (unlikely(idesc))
- free_ind_table(idesc);
- return -1;
- }
- desc_id = desc.next;
- } while (desc.flags & VRING_DESC_F_NEXT);
-
- if (unlikely(idesc)) {
- free_ind_table(idesc);
- idesc = NULL;
- }
-
- idx_m++;
- }
-
- rte_smp_wmb();
- s_vring->avail->idx = idx;
+ memset(&vdpa_devices[did], 0, sizeof(struct rte_vdpa_device));
+ vdpa_device_num--;
- if (dev->features & (1ULL << VIRTIO_RING_F_EVENT_IDX))
- vhost_avail_event(vq) = idx;
+ return 0;
+}
- return ret;
+int
+rte_vdpa_get_device_num(void)
+{
+ return vdpa_device_num;
}
-int __rte_experimental
+int
rte_vdpa_relay_vring_used(int vid, uint16_t qid, void *vring_m)
{
struct virtio_net *dev = get_device(vid);
struct vring_desc *idesc = NULL;
struct vring *s_vring;
uint64_t dlen;
+ uint32_t nr_descs;
int ret;
if (!dev || !vring_m)
desc_id = vq->used->ring[idx & (vq->size - 1)].id;
desc_ring = vq->desc;
+ nr_descs = vq->size;
+
+ if (unlikely(desc_id >= vq->size))
+ return -1;
if (vq->desc[desc_id].flags & VRING_DESC_F_INDIRECT) {
dlen = vq->desc[desc_id].len;
+ nr_descs = dlen / sizeof(struct vring_desc);
+ if (unlikely(nr_descs > vq->size))
+ return -1;
+
desc_ring = (struct vring_desc *)(uintptr_t)
vhost_iova_to_vva(dev, vq,
vq->desc[desc_id].addr, &dlen,
if (unlikely(!desc_ring))
return -1;
- if (unlikely(dlen < vq->desc[idx].len)) {
- idesc = alloc_copy_ind_table(dev, vq,
- vq->desc[idx].addr,
- vq->desc[idx].len);
+ if (unlikely(dlen < vq->desc[desc_id].len)) {
+ idesc = vhost_alloc_copy_ind_table(dev, vq,
+ vq->desc[desc_id].addr,
+ vq->desc[desc_id].len);
if (unlikely(!idesc))
return -1;
/* dirty page logging for DMA writeable buffer */
do {
+ if (unlikely(desc_id >= vq->size))
+ goto fail;
+ if (unlikely(nr_descs-- == 0))
+ goto fail;
desc = desc_ring[desc_id];
if (desc.flags & VRING_DESC_F_WRITE)
- vhost_log_write(dev, desc.addr, desc.len);
+ vhost_log_write_iova(dev, vq, desc.addr,
+ desc.len);
desc_id = desc.next;
} while (desc.flags & VRING_DESC_F_NEXT);
vring_used_event(s_vring) = idx_m;
return ret;
+
+fail:
+ if (unlikely(idesc))
+ free_ind_table(idesc);
+ return -1;
}
+
+int
+rte_vdpa_get_stats_names(struct rte_vdpa_device *dev,
+ struct rte_vdpa_stat_name *stats_names,
+ unsigned int size)
+{
+ if (!dev)
+ return -EINVAL;
+
+ RTE_FUNC_PTR_OR_ERR_RET(dev->ops->get_stats_names, -ENOTSUP);
+
+ return dev->ops->get_stats_names(dev, stats_names, size);
+}
+
+int
+rte_vdpa_get_stats(struct rte_vdpa_device *dev, uint16_t qid,
+ struct rte_vdpa_stat *stats, unsigned int n)
+{
+ if (!dev || !stats || !n)
+ return -EINVAL;
+
+ RTE_FUNC_PTR_OR_ERR_RET(dev->ops->get_stats, -ENOTSUP);
+
+ return dev->ops->get_stats(dev, qid, stats, n);
+}
+
+int
+rte_vdpa_reset_stats(struct rte_vdpa_device *dev, uint16_t qid)
+{
+ if (!dev)
+ return -EINVAL;
+
+ RTE_FUNC_PTR_OR_ERR_RET(dev->ops->reset_stats, -ENOTSUP);
+
+ return dev->ops->reset_stats(dev, qid);
+}
+
+static uint16_t
+vdpa_dev_to_id(const struct rte_vdpa_device *dev)
+{
+ if (dev == NULL)
+ return MAX_VHOST_DEVICE;
+
+ if (dev < &vdpa_devices[0] ||
+ dev >= &vdpa_devices[MAX_VHOST_DEVICE])
+ return MAX_VHOST_DEVICE;
+
+ return (uint16_t)(dev - vdpa_devices);
+}
+
+static int
+vdpa_dev_match(struct rte_vdpa_device *dev,
+ const struct rte_device *rte_dev)
+{
+ if (dev->device == rte_dev)
+ return 0;
+
+ return -1;
+}
+
+/* Generic rte_vdpa_dev comparison function. */
+typedef int (*rte_vdpa_cmp_t)(struct rte_vdpa_device *,
+ const struct rte_device *rte_dev);
+
+static struct rte_vdpa_device *
+vdpa_find_device(const struct rte_vdpa_device *start, rte_vdpa_cmp_t cmp,
+ struct rte_device *rte_dev)
+{
+ struct rte_vdpa_device *dev;
+ uint16_t idx;
+
+ if (start != NULL)
+ idx = vdpa_dev_to_id(start) + 1;
+ else
+ idx = 0;
+ for (; idx < MAX_VHOST_DEVICE; idx++) {
+ dev = &vdpa_devices[idx];
+ /*
+ * ToDo: Certainly better to introduce a state field,
+ * but rely on ops being set for now.
+ */
+ if (dev->ops == NULL)
+ continue;
+ if (cmp(dev, rte_dev) == 0)
+ return dev;
+ }
+ return NULL;
+}
+
+static void *
+vdpa_dev_iterate(const void *start,
+ const char *str,
+ const struct rte_dev_iterator *it)
+{
+ struct rte_vdpa_device *vdpa_dev = NULL;
+
+ RTE_SET_USED(str);
+
+ vdpa_dev = vdpa_find_device(start, vdpa_dev_match, it->device);
+
+ return vdpa_dev;
+}
+
+static struct rte_class rte_class_vdpa = {
+ .dev_iterate = vdpa_dev_iterate,
+};
+
+RTE_REGISTER_CLASS(vdpa, rte_class_vdpa);
git.droids-corp.org / dpdk.git / blobdiff