#include <string.h>
#include <unistd.h>
#include <sys/mman.h>
+#include <sys/eventfd.h>
#include <rte_malloc.h>
#include <rte_errno.h>
int nbytes;
do {
- nbytes = read(virtq->intr_handle.fd, &buf, 8);
+ nbytes = read(rte_intr_fd_get(virtq->intr_handle), &buf,
+ 8);
if (nbytes < 0) {
if (errno == EINTR ||
errno == EWOULDBLOCK ||
break;
} while (1);
rte_write32(virtq->index, priv->virtq_db_addr);
+ if (virtq->notifier_state == MLX5_VDPA_NOTIFIER_STATE_DISABLED) {
+ if (rte_vhost_host_notifier_ctrl(priv->vid, virtq->index, true))
+ virtq->notifier_state = MLX5_VDPA_NOTIFIER_STATE_ERR;
+ else
+ virtq->notifier_state =
+ MLX5_VDPA_NOTIFIER_STATE_ENABLED;
+ DRV_LOG(INFO, "Virtq %u notifier state is %s.", virtq->index,
+ virtq->notifier_state ==
+ MLX5_VDPA_NOTIFIER_STATE_ENABLED ? "enabled" :
+ "disabled");
+ }
DRV_LOG(DEBUG, "Ring virtq %u doorbell.", virtq->index);
}
int retries = MLX5_VDPA_INTR_RETRIES;
int ret = -EAGAIN;
- if (virtq->intr_handle.fd) {
+ if (rte_intr_fd_get(virtq->intr_handle) != -1) {
while (retries-- && ret == -EAGAIN) {
- ret = rte_intr_callback_unregister(&virtq->intr_handle,
+ ret = rte_intr_callback_unregister(virtq->intr_handle,
mlx5_vdpa_virtq_handler,
virtq);
if (ret == -EAGAIN) {
DRV_LOG(DEBUG, "Try again to unregister fd %d "
- "of virtq %d interrupt, retries = %d.",
- virtq->intr_handle.fd,
- (int)virtq->index, retries);
+ "of virtq %d interrupt, retries = %d.",
+ rte_intr_fd_get(virtq->intr_handle),
+ (int)virtq->index, retries);
+
usleep(MLX5_VDPA_INTR_RETRIES_USEC);
}
}
- memset(&virtq->intr_handle, 0, sizeof(virtq->intr_handle));
+ rte_intr_fd_set(virtq->intr_handle, -1);
}
+ rte_intr_instance_free(virtq->intr_handle);
if (virtq->virtq) {
+ ret = mlx5_vdpa_virtq_stop(virtq->priv, virtq->index);
+ if (ret)
+ DRV_LOG(WARNING, "Failed to stop virtq %d.",
+ virtq->index);
claim_zero(mlx5_devx_cmd_destroy(virtq->virtq));
- virtq->virtq = NULL;
}
+ virtq->virtq = NULL;
for (i = 0; i < RTE_DIM(virtq->umems); ++i) {
if (virtq->umems[i].obj)
claim_zero(mlx5_glue->devx_umem_dereg
memset(&virtq->umems, 0, sizeof(virtq->umems));
if (virtq->eqp.fw_qp)
mlx5_vdpa_event_qp_destroy(&virtq->eqp);
+ virtq->notifier_state = MLX5_VDPA_NOTIFIER_STATE_DISABLED;
return 0;
}
void
mlx5_vdpa_virtqs_release(struct mlx5_vdpa_priv *priv)
{
- struct mlx5_vdpa_virtq *entry;
- struct mlx5_vdpa_virtq *next;
-
- entry = SLIST_FIRST(&priv->virtq_list);
- while (entry) {
- next = SLIST_NEXT(entry, next);
- mlx5_vdpa_virtq_unset(entry);
- SLIST_REMOVE(&priv->virtq_list, entry, mlx5_vdpa_virtq, next);
- rte_free(entry);
- entry = next;
- }
- SLIST_INIT(&priv->virtq_list);
- if (priv->tis) {
- claim_zero(mlx5_devx_cmd_destroy(priv->tis));
- priv->tis = NULL;
+ int i;
+ struct mlx5_vdpa_virtq *virtq;
+
+ for (i = 0; i < priv->nr_virtqs; i++) {
+ virtq = &priv->virtqs[i];
+ mlx5_vdpa_virtq_unset(virtq);
+ if (virtq->counters)
+ claim_zero(mlx5_devx_cmd_destroy(virtq->counters));
+ }
+ for (i = 0; i < priv->num_lag_ports; i++) {
+ if (priv->tiss[i]) {
+ claim_zero(mlx5_devx_cmd_destroy(priv->tiss[i]));
+ priv->tiss[i] = NULL;
+ }
}
if (priv->td) {
claim_zero(mlx5_devx_cmd_destroy(priv->td));
claim_zero(munmap(priv->virtq_db_addr, priv->var->length));
priv->virtq_db_addr = NULL;
}
- if (priv->var) {
- mlx5_glue->dv_free_var(priv->var);
- priv->var = NULL;
- }
priv->features = 0;
+ memset(priv->virtqs, 0, sizeof(*virtq) * priv->nr_virtqs);
+ priv->nr_virtqs = 0;
}
-static int
+int
mlx5_vdpa_virtq_modify(struct mlx5_vdpa_virtq *virtq, int state)
{
struct mlx5_devx_virtq_attr attr = {
return mlx5_devx_cmd_modify_virtq(virtq->virtq, &attr);
}
+int
+mlx5_vdpa_virtq_stop(struct mlx5_vdpa_priv *priv, int index)
+{
+ struct mlx5_vdpa_virtq *virtq = &priv->virtqs[index];
+ int ret;
+
+ if (virtq->stopped)
+ return 0;
+ ret = mlx5_vdpa_virtq_modify(virtq, 0);
+ if (ret)
+ return -1;
+ virtq->stopped = true;
+ DRV_LOG(DEBUG, "vid %u virtq %u was stopped.", priv->vid, index);
+ return mlx5_vdpa_virtq_query(priv, index);
+}
+
+int
+mlx5_vdpa_virtq_query(struct mlx5_vdpa_priv *priv, int index)
+{
+ struct mlx5_devx_virtq_attr attr = {0};
+ struct mlx5_vdpa_virtq *virtq = &priv->virtqs[index];
+ int ret;
+
+ if (mlx5_devx_cmd_query_virtq(virtq->virtq, &attr)) {
+ DRV_LOG(ERR, "Failed to query virtq %d.", index);
+ return -1;
+ }
+ DRV_LOG(INFO, "Query vid %d vring %d: hw_available_idx=%d, "
+ "hw_used_index=%d", priv->vid, index,
+ attr.hw_available_index, attr.hw_used_index);
+ ret = rte_vhost_set_vring_base(priv->vid, index,
+ attr.hw_available_index,
+ attr.hw_used_index);
+ if (ret) {
+ DRV_LOG(ERR, "Failed to set virtq %d base.", index);
+ return -1;
+ }
+ if (attr.state == MLX5_VIRTQ_STATE_ERROR)
+ DRV_LOG(WARNING, "vid %d vring %d hw error=%hhu",
+ priv->vid, index, attr.error_type);
+ return 0;
+}
+
static uint64_t
mlx5_vdpa_hva_to_gpa(struct rte_vhost_memory *mem, uint64_t hva)
{
}
static int
-mlx5_vdpa_virtq_setup(struct mlx5_vdpa_priv *priv,
- struct mlx5_vdpa_virtq *virtq, int index)
+mlx5_vdpa_virtq_setup(struct mlx5_vdpa_priv *priv, int index)
{
+ struct mlx5_vdpa_virtq *virtq = &priv->virtqs[index];
struct rte_vhost_vring vq;
struct mlx5_devx_virtq_attr attr = {0};
uint64_t gpa;
unsigned int i;
uint16_t last_avail_idx;
uint16_t last_used_idx;
+ uint16_t event_num = MLX5_EVENT_TYPE_OBJECT_CHANGE;
+ uint64_t cookie;
ret = rte_vhost_get_vhost_vring(priv->vid, index, &vq);
if (ret)
DRV_LOG(INFO, "Virtq %d is, for sure, working by poll mode, no"
" need event QPs and event mechanism.", index);
}
+ if (priv->caps.queue_counters_valid) {
+ if (!virtq->counters)
+ virtq->counters = mlx5_devx_cmd_create_virtio_q_counters
+ (priv->cdev->ctx);
+ if (!virtq->counters) {
+ DRV_LOG(ERR, "Failed to create virtq couners for virtq"
+ " %d.", index);
+ goto error;
+ }
+ attr.counters_obj_id = virtq->counters->id;
+ }
/* Setup 3 UMEMs for each virtq. */
for (i = 0; i < RTE_DIM(virtq->umems); ++i) {
virtq->umems[i].size = priv->caps.umems[i].a * vq.size +
" %u.", i, index);
goto error;
}
- virtq->umems[i].obj = mlx5_glue->devx_umem_reg(priv->ctx,
+ virtq->umems[i].obj = mlx5_glue->devx_umem_reg(priv->cdev->ctx,
virtq->umems[i].buf,
virtq->umems[i].size,
IBV_ACCESS_LOCAL_WRITE);
}
attr.available_addr = gpa;
}
- rte_vhost_get_vring_base(priv->vid, index, &last_avail_idx,
+ ret = rte_vhost_get_vring_base(priv->vid, index, &last_avail_idx,
&last_used_idx);
- DRV_LOG(INFO, "vid %d: Init last_avail_idx=%d, last_used_idx=%d for "
- "virtq %d.", priv->vid, last_avail_idx, last_used_idx, index);
+ if (ret) {
+ last_avail_idx = 0;
+ last_used_idx = 0;
+ DRV_LOG(WARNING, "Couldn't get vring base, idx are set to 0");
+ } else {
+ DRV_LOG(INFO, "vid %d: Init last_avail_idx=%d, last_used_idx=%d for "
+ "virtq %d.", priv->vid, last_avail_idx,
+ last_used_idx, index);
+ }
attr.hw_available_index = last_avail_idx;
attr.hw_used_index = last_used_idx;
attr.q_size = vq.size;
attr.mkey = priv->gpa_mkey_index;
- attr.tis_id = priv->tis->id;
+ attr.tis_id = priv->tiss[(index / 2) % priv->num_lag_ports]->id;
attr.queue_index = index;
- virtq->virtq = mlx5_devx_cmd_create_virtq(priv->ctx, &attr);
+ attr.pd = priv->cdev->pdn;
+ attr.hw_latency_mode = priv->hw_latency_mode;
+ attr.hw_max_latency_us = priv->hw_max_latency_us;
+ attr.hw_max_pending_comp = priv->hw_max_pending_comp;
+ virtq->virtq = mlx5_devx_cmd_create_virtq(priv->cdev->ctx, &attr);
virtq->priv = priv;
if (!virtq->virtq)
goto error;
+ claim_zero(rte_vhost_enable_guest_notification(priv->vid, index, 1));
if (mlx5_vdpa_virtq_modify(virtq, 1))
goto error;
- virtq->enable = 1;
- virtq->intr_handle.fd = vq.kickfd;
- virtq->intr_handle.type = RTE_INTR_HANDLE_EXT;
- if (rte_intr_callback_register(&virtq->intr_handle,
- mlx5_vdpa_virtq_handler, virtq)) {
- virtq->intr_handle.fd = 0;
- DRV_LOG(ERR, "Failed to register virtq %d interrupt.", index);
+ virtq->priv = priv;
+ rte_write32(virtq->index, priv->virtq_db_addr);
+ /* Setup doorbell mapping. */
+ virtq->intr_handle =
+ rte_intr_instance_alloc(RTE_INTR_INSTANCE_F_SHARED);
+ if (virtq->intr_handle == NULL) {
+ DRV_LOG(ERR, "Fail to allocate intr_handle");
+ goto error;
+ }
+
+ if (rte_intr_fd_set(virtq->intr_handle, vq.kickfd))
goto error;
+
+ if (rte_intr_fd_get(virtq->intr_handle) == -1) {
+ DRV_LOG(WARNING, "Virtq %d kickfd is invalid.", index);
} else {
- DRV_LOG(DEBUG, "Register fd %d interrupt for virtq %d.",
- virtq->intr_handle.fd, index);
+ if (rte_intr_type_set(virtq->intr_handle, RTE_INTR_HANDLE_EXT))
+ goto error;
+
+ if (rte_intr_callback_register(virtq->intr_handle,
+ mlx5_vdpa_virtq_handler,
+ virtq)) {
+ rte_intr_fd_set(virtq->intr_handle, -1);
+ DRV_LOG(ERR, "Failed to register virtq %d interrupt.",
+ index);
+ goto error;
+ } else {
+ DRV_LOG(DEBUG, "Register fd %d interrupt for virtq %d.",
+ rte_intr_fd_get(virtq->intr_handle),
+ index);
+ }
}
+ /* Subscribe virtq error event. */
+ virtq->version++;
+ cookie = ((uint64_t)virtq->version << 32) + index;
+ ret = mlx5_glue->devx_subscribe_devx_event(priv->err_chnl,
+ virtq->virtq->obj,
+ sizeof(event_num),
+ &event_num, cookie);
+ if (ret) {
+ DRV_LOG(ERR, "Failed to subscribe device %d virtq %d error event.",
+ priv->vid, index);
+ rte_errno = errno;
+ goto error;
+ }
+ virtq->stopped = false;
+ /* Initial notification to ask Qemu handling completed buffers. */
+ if (virtq->eqp.cq.callfd != -1)
+ eventfd_write(virtq->eqp.cq.callfd, (eventfd_t)1);
+ DRV_LOG(DEBUG, "vid %u virtq %u was created successfully.", priv->vid,
+ index);
return 0;
error:
mlx5_vdpa_virtq_unset(virtq);
mlx5_vdpa_virtqs_prepare(struct mlx5_vdpa_priv *priv)
{
struct mlx5_devx_tis_attr tis_attr = {0};
- struct mlx5_vdpa_virtq *virtq;
+ struct ibv_context *ctx = priv->cdev->ctx;
uint32_t i;
uint16_t nr_vring = rte_vhost_get_vring_num(priv->vid);
int ret = rte_vhost_get_negotiated_features(priv->vid, &priv->features);
DRV_LOG(ERR, "Failed to configure negotiated features.");
return -1;
}
- priv->var = mlx5_glue->dv_alloc_var(priv->ctx, 0);
- if (!priv->var) {
- DRV_LOG(ERR, "Failed to allocate VAR %u.\n", errno);
+ if ((priv->features & (1ULL << VIRTIO_NET_F_CSUM)) == 0 &&
+ ((priv->features & (1ULL << VIRTIO_NET_F_HOST_TSO4)) > 0 ||
+ (priv->features & (1ULL << VIRTIO_NET_F_HOST_TSO6)) > 0)) {
+ /* Packet may be corrupted if TSO is enabled without CSUM. */
+ DRV_LOG(INFO, "TSO is enabled without CSUM, force CSUM.");
+ priv->features |= (1ULL << VIRTIO_NET_F_CSUM);
+ }
+ if (nr_vring > priv->caps.max_num_virtio_queues * 2) {
+ DRV_LOG(ERR, "Do not support more than %d virtqs(%d).",
+ (int)priv->caps.max_num_virtio_queues * 2,
+ (int)nr_vring);
return -1;
}
/* Always map the entire page. */
priv->virtq_db_addr = mmap(NULL, priv->var->length, PROT_READ |
- PROT_WRITE, MAP_SHARED, priv->ctx->cmd_fd,
+ PROT_WRITE, MAP_SHARED, ctx->cmd_fd,
priv->var->mmap_off);
if (priv->virtq_db_addr == MAP_FAILED) {
DRV_LOG(ERR, "Failed to map doorbell page %u.", errno);
DRV_LOG(DEBUG, "VAR address of doorbell mapping is %p.",
priv->virtq_db_addr);
}
- priv->td = mlx5_devx_cmd_create_td(priv->ctx);
+ priv->td = mlx5_devx_cmd_create_td(ctx);
if (!priv->td) {
DRV_LOG(ERR, "Failed to create transport domain.");
return -rte_errno;
}
tis_attr.transport_domain = priv->td->id;
- priv->tis = mlx5_devx_cmd_create_tis(priv->ctx, &tis_attr);
- if (!priv->tis) {
- DRV_LOG(ERR, "Failed to create TIS.");
- goto error;
- }
- for (i = 0; i < nr_vring; i++) {
- virtq = rte_zmalloc(__func__, sizeof(*virtq), 0);
- if (!virtq || mlx5_vdpa_virtq_setup(priv, virtq, i)) {
- if (virtq)
- rte_free(virtq);
+ for (i = 0; i < priv->num_lag_ports; i++) {
+ /* 0 is auto affinity, non-zero value to propose port. */
+ tis_attr.lag_tx_port_affinity = i + 1;
+ priv->tiss[i] = mlx5_devx_cmd_create_tis(ctx, &tis_attr);
+ if (!priv->tiss[i]) {
+ DRV_LOG(ERR, "Failed to create TIS %u.", i);
goto error;
}
- SLIST_INSERT_HEAD(&priv->virtq_list, virtq, next);
}
priv->nr_virtqs = nr_vring;
+ for (i = 0; i < nr_vring; i++)
+ if (priv->virtqs[i].enable && mlx5_vdpa_virtq_setup(priv, i))
+ goto error;
return 0;
error:
mlx5_vdpa_virtqs_release(priv);
return -1;
}
+
+static int
+mlx5_vdpa_virtq_is_modified(struct mlx5_vdpa_priv *priv,
+ struct mlx5_vdpa_virtq *virtq)
+{
+ struct rte_vhost_vring vq;
+ int ret = rte_vhost_get_vhost_vring(priv->vid, virtq->index, &vq);
+
+ if (ret)
+ return -1;
+ if (vq.size != virtq->vq_size || vq.kickfd !=
+ rte_intr_fd_get(virtq->intr_handle))
+ return 1;
+ if (virtq->eqp.cq.cq_obj.cq) {
+ if (vq.callfd != virtq->eqp.cq.callfd)
+ return 1;
+ } else if (vq.callfd != -1) {
+ return 1;
+ }
+ return 0;
+}
+
+int
+mlx5_vdpa_virtq_enable(struct mlx5_vdpa_priv *priv, int index, int enable)
+{
+ struct mlx5_vdpa_virtq *virtq = &priv->virtqs[index];
+ int ret;
+
+ DRV_LOG(INFO, "Update virtq %d status %sable -> %sable.", index,
+ virtq->enable ? "en" : "dis", enable ? "en" : "dis");
+ if (!priv->configured) {
+ virtq->enable = !!enable;
+ return 0;
+ }
+ if (virtq->enable == !!enable) {
+ if (!enable)
+ return 0;
+ ret = mlx5_vdpa_virtq_is_modified(priv, virtq);
+ if (ret < 0) {
+ DRV_LOG(ERR, "Virtq %d modify check failed.", index);
+ return -1;
+ }
+ if (ret == 0)
+ return 0;
+ DRV_LOG(INFO, "Virtq %d was modified, recreate it.", index);
+ }
+ if (virtq->virtq) {
+ virtq->enable = 0;
+ if (is_virtq_recvq(virtq->index, priv->nr_virtqs)) {
+ ret = mlx5_vdpa_steer_update(priv);
+ if (ret)
+ DRV_LOG(WARNING, "Failed to disable steering "
+ "for virtq %d.", index);
+ }
+ mlx5_vdpa_virtq_unset(virtq);
+ }
+ if (enable) {
+ ret = mlx5_vdpa_virtq_setup(priv, index);
+ if (ret) {
+ DRV_LOG(ERR, "Failed to setup virtq %d.", index);
+ return ret;
+ }
+ virtq->enable = 1;
+ if (is_virtq_recvq(virtq->index, priv->nr_virtqs)) {
+ ret = mlx5_vdpa_steer_update(priv);
+ if (ret)
+ DRV_LOG(WARNING, "Failed to enable steering "
+ "for virtq %d.", index);
+ }
+ }
+ return 0;
+}
+
+int
+mlx5_vdpa_virtq_stats_get(struct mlx5_vdpa_priv *priv, int qid,
+ struct rte_vdpa_stat *stats, unsigned int n)
+{
+ struct mlx5_vdpa_virtq *virtq = &priv->virtqs[qid];
+ struct mlx5_devx_virtio_q_couners_attr attr = {0};
+ int ret;
+
+ if (!virtq->counters) {
+ DRV_LOG(ERR, "Failed to read virtq %d statistics - virtq "
+ "is invalid.", qid);
+ return -EINVAL;
+ }
+ ret = mlx5_devx_cmd_query_virtio_q_counters(virtq->counters, &attr);
+ if (ret) {
+ DRV_LOG(ERR, "Failed to read virtq %d stats from HW.", qid);
+ return ret;
+ }
+ ret = (int)RTE_MIN(n, (unsigned int)MLX5_VDPA_STATS_MAX);
+ if (ret == MLX5_VDPA_STATS_RECEIVED_DESCRIPTORS)
+ return ret;
+ stats[MLX5_VDPA_STATS_RECEIVED_DESCRIPTORS] = (struct rte_vdpa_stat) {
+ .id = MLX5_VDPA_STATS_RECEIVED_DESCRIPTORS,
+ .value = attr.received_desc - virtq->reset.received_desc,
+ };
+ if (ret == MLX5_VDPA_STATS_COMPLETED_DESCRIPTORS)
+ return ret;
+ stats[MLX5_VDPA_STATS_COMPLETED_DESCRIPTORS] = (struct rte_vdpa_stat) {
+ .id = MLX5_VDPA_STATS_COMPLETED_DESCRIPTORS,
+ .value = attr.completed_desc - virtq->reset.completed_desc,
+ };
+ if (ret == MLX5_VDPA_STATS_BAD_DESCRIPTOR_ERRORS)
+ return ret;
+ stats[MLX5_VDPA_STATS_BAD_DESCRIPTOR_ERRORS] = (struct rte_vdpa_stat) {
+ .id = MLX5_VDPA_STATS_BAD_DESCRIPTOR_ERRORS,
+ .value = attr.bad_desc_errors - virtq->reset.bad_desc_errors,
+ };
+ if (ret == MLX5_VDPA_STATS_EXCEED_MAX_CHAIN)
+ return ret;
+ stats[MLX5_VDPA_STATS_EXCEED_MAX_CHAIN] = (struct rte_vdpa_stat) {
+ .id = MLX5_VDPA_STATS_EXCEED_MAX_CHAIN,
+ .value = attr.exceed_max_chain - virtq->reset.exceed_max_chain,
+ };
+ if (ret == MLX5_VDPA_STATS_INVALID_BUFFER)
+ return ret;
+ stats[MLX5_VDPA_STATS_INVALID_BUFFER] = (struct rte_vdpa_stat) {
+ .id = MLX5_VDPA_STATS_INVALID_BUFFER,
+ .value = attr.invalid_buffer - virtq->reset.invalid_buffer,
+ };
+ if (ret == MLX5_VDPA_STATS_COMPLETION_ERRORS)
+ return ret;
+ stats[MLX5_VDPA_STATS_COMPLETION_ERRORS] = (struct rte_vdpa_stat) {
+ .id = MLX5_VDPA_STATS_COMPLETION_ERRORS,
+ .value = attr.error_cqes - virtq->reset.error_cqes,
+ };
+ return ret;
+}
+
+int
+mlx5_vdpa_virtq_stats_reset(struct mlx5_vdpa_priv *priv, int qid)
+{
+ struct mlx5_vdpa_virtq *virtq = &priv->virtqs[qid];
+ int ret;
+
+ if (!virtq->counters) {
+ DRV_LOG(ERR, "Failed to read virtq %d statistics - virtq "
+ "is invalid.", qid);
+ return -EINVAL;
+ }
+ ret = mlx5_devx_cmd_query_virtio_q_counters(virtq->counters,
+ &virtq->reset);
+ if (ret)
+ DRV_LOG(ERR, "Failed to read virtq %d reset stats from HW.",
+ qid);
+ return ret;
+}
git.droids-corp.org / dpdk.git / blobdiff