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);
}
}
virtq->intr_handle.fd = -1;
}
- if (virtq->virtq)
+ 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;
for (i = 0; i < RTE_DIM(virtq->umems); ++i) {
if (virtq->umems[i].obj)
rte_free(virtq->umems[i].buf);
}
memset(&virtq->umems, 0, sizeof(virtq->umems));
- if (virtq->counters) {
- claim_zero(mlx5_devx_cmd_destroy(virtq->counters));
- virtq->counters = NULL;
- }
- memset(&virtq->reset, 0, sizeof(virtq->reset));
if (virtq->eqp.fw_qp)
mlx5_vdpa_event_qp_destroy(&virtq->eqp);
+ virtq->notifier_state = MLX5_VDPA_NOTIFIER_STATE_DISABLED;
return 0;
}
mlx5_vdpa_virtqs_release(struct mlx5_vdpa_priv *priv)
{
int i;
+ struct mlx5_vdpa_virtq *virtq;
for (i = 0; i < priv->nr_virtqs; i++) {
- mlx5_vdpa_virtq_unset(&priv->virtqs[i]);
- priv->virtqs[i].enable = 0;
- }
- if (priv->tis) {
- claim_zero(mlx5_devx_cmd_destroy(priv->tis));
- priv->tis = NULL;
+ 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));
priv->virtq_db_addr = NULL;
}
priv->features = 0;
+ memset(priv->virtqs, 0, sizeof(*virtq) * priv->nr_virtqs);
priv->nr_virtqs = 0;
}
int
mlx5_vdpa_virtq_stop(struct mlx5_vdpa_priv *priv, int index)
{
- struct mlx5_devx_virtq_attr attr = {0};
struct mlx5_vdpa_virtq *virtq = &priv->virtqs[index];
- int ret = mlx5_vdpa_virtq_modify(virtq, 0);
+ 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(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;
}
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)
" need event QPs and event mechanism.", index);
}
if (priv->caps.queue_counters_valid) {
- virtq->counters = mlx5_devx_cmd_create_virtio_q_counters
- (priv->ctx);
+ if (!virtq->counters)
+ virtq->counters = mlx5_devx_cmd_create_virtio_q_counters
+ (priv->ctx);
if (!virtq->counters) {
DRV_LOG(ERR, "Failed to create virtq couners for virtq"
" %d.", index);
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;
attr.pd = priv->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->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->priv = priv;
virtq->intr_handle.fd = vq.kickfd;
if (virtq->intr_handle.fd == -1) {
DRV_LOG(WARNING, "Virtq %d kickfd is invalid.", index);
- if (!priv->direct_notifier) {
- DRV_LOG(ERR, "Virtq %d cannot be notified.", index);
- goto error;
- }
} else {
virtq->intr_handle.type = RTE_INTR_HANDLE_EXT;
if (rte_intr_callback_register(&virtq->intr_handle,
virtq->intr_handle.fd, 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;
+ DRV_LOG(DEBUG, "vid %u virtq %u was created successfully.", priv->vid,
+ index);
return 0;
error:
mlx5_vdpa_virtq_unset(virtq);
DRV_LOG(ERR, "Failed to configure negotiated features.");
return -1;
}
+ 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,
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 < 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(priv->ctx, &tis_attr);
+ if (!priv->tiss[i]) {
+ DRV_LOG(ERR, "Failed to create TIS %u.", i);
+ goto error;
+ }
}
priv->nr_virtqs = nr_vring;
- for (i = 0; i < nr_vring; i++) {
- claim_zero(rte_vhost_enable_guest_notification(priv->vid, i,
- 1));
- if (mlx5_vdpa_virtq_setup(priv, i))
+ 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 != virtq->intr_handle.fd)
+ 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)
{
DRV_LOG(INFO, "Update virtq %d status %sable -> %sable.", index,
virtq->enable ? "en" : "dis", enable ? "en" : "dis");
- if (virtq->enable == !!enable)
- return 0;
if (!priv->configured) {
virtq->enable = !!enable;
return 0;
}
- if (enable) {
- /* Configuration might have been updated - reconfigure virtq. */
- if (virtq->virtq) {
- ret = mlx5_vdpa_virtq_stop(priv, index);
+ 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 stop virtq %d.",
- index);
- mlx5_vdpa_virtq_unset(virtq);
+ 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;
- /* The only case virtq can stay invalid. */
}
- }
- virtq->enable = !!enable;
- if (is_virtq_recvq(virtq->index, priv->nr_virtqs)) {
- /* Need to add received virtq to the RQT table of the TIRs. */
- ret = mlx5_vdpa_steer_update(priv);
- if (ret) {
- virtq->enable = !enable;
- 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;
struct mlx5_devx_virtio_q_couners_attr attr = {0};
int ret;
- if (!virtq->virtq || !virtq->enable) {
+ if (!virtq->counters) {
DRV_LOG(ERR, "Failed to read virtq %d statistics - virtq "
"is invalid.", qid);
return -EINVAL;
}
- MLX5_ASSERT(virtq->counters);
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);
struct mlx5_vdpa_virtq *virtq = &priv->virtqs[qid];
int ret;
- if (!virtq->virtq || !virtq->enable) {
+ if (!virtq->counters) {
DRV_LOG(ERR, "Failed to read virtq %d statistics - virtq "
"is invalid.", qid);
return -EINVAL;
}
- MLX5_ASSERT(virtq->counters);
ret = mlx5_devx_cmd_query_virtio_q_counters(virtq->counters,
&virtq->reset);
if (ret)
git.droids-corp.org / dpdk.git / blobdiff