9f39076b71
The crypto driver added new fields to the mkey attributes struct:
crypto_en and set_remote_rw.
The entire mkey struct was not initialized, only specific fields in it,
which caused the new added fields not to be initialized resulting in a
mkey creation error.
This is fixed by initializing the entire mkey attributes struct to 0
which will prevent this issue from reoccurring if any fields are added
to the mkey struct in the future.
Fixes: 0111a74e13dd ("common/mlx5: adjust DevX mkey fields for crypto")
Signed-off-by: Shiri Kuzin <shirik@nvidia.com>
Acked-by: Matan Azrad <matan@nvidia.com>
125 lines
3.0 KiB
C
125 lines
3.0 KiB
C
/* SPDX-License-Identifier: BSD-3-Clause
|
|
* Copyright 2019 Mellanox Technologies, Ltd
|
|
*/
|
|
#include <rte_malloc.h>
|
|
#include <rte_errno.h>
|
|
|
|
#include "mlx5_vdpa_utils.h"
|
|
#include "mlx5_vdpa.h"
|
|
|
|
|
|
int
|
|
mlx5_vdpa_logging_enable(struct mlx5_vdpa_priv *priv, int enable)
|
|
{
|
|
struct mlx5_devx_virtq_attr attr = {
|
|
.type = MLX5_VIRTQ_MODIFY_TYPE_DIRTY_BITMAP_DUMP_ENABLE,
|
|
.dirty_bitmap_dump_enable = enable,
|
|
};
|
|
int i;
|
|
|
|
for (i = 0; i < priv->nr_virtqs; ++i) {
|
|
attr.queue_index = i;
|
|
if (!priv->virtqs[i].virtq) {
|
|
DRV_LOG(DEBUG, "virtq %d is invalid for dirty bitmap "
|
|
"enabling.", i);
|
|
} else if (mlx5_devx_cmd_modify_virtq(priv->virtqs[i].virtq,
|
|
&attr)) {
|
|
DRV_LOG(ERR, "Failed to modify virtq %d for dirty "
|
|
"bitmap enabling.", i);
|
|
return -1;
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
mlx5_vdpa_dirty_bitmap_set(struct mlx5_vdpa_priv *priv, uint64_t log_base,
|
|
uint64_t log_size)
|
|
{
|
|
struct mlx5_devx_mkey_attr mkey_attr = {
|
|
.addr = (uintptr_t)log_base,
|
|
.size = log_size,
|
|
.pd = priv->pdn,
|
|
.pg_access = 1,
|
|
};
|
|
struct mlx5_devx_virtq_attr attr = {
|
|
.type = MLX5_VIRTQ_MODIFY_TYPE_DIRTY_BITMAP_PARAMS,
|
|
.dirty_bitmap_addr = log_base,
|
|
.dirty_bitmap_size = log_size,
|
|
};
|
|
struct mlx5_vdpa_query_mr *mr = rte_malloc(__func__, sizeof(*mr), 0);
|
|
int i;
|
|
|
|
if (!mr) {
|
|
DRV_LOG(ERR, "Failed to allocate mem for lm mr.");
|
|
return -1;
|
|
}
|
|
mr->umem = mlx5_glue->devx_umem_reg(priv->ctx,
|
|
(void *)(uintptr_t)log_base,
|
|
log_size, IBV_ACCESS_LOCAL_WRITE);
|
|
if (!mr->umem) {
|
|
DRV_LOG(ERR, "Failed to register umem for lm mr.");
|
|
goto err;
|
|
}
|
|
mkey_attr.umem_id = mr->umem->umem_id;
|
|
mr->mkey = mlx5_devx_cmd_mkey_create(priv->ctx, &mkey_attr);
|
|
if (!mr->mkey) {
|
|
DRV_LOG(ERR, "Failed to create Mkey for lm.");
|
|
goto err;
|
|
}
|
|
attr.dirty_bitmap_mkey = mr->mkey->id;
|
|
for (i = 0; i < priv->nr_virtqs; ++i) {
|
|
attr.queue_index = i;
|
|
if (!priv->virtqs[i].virtq) {
|
|
DRV_LOG(DEBUG, "virtq %d is invalid for LM.", i);
|
|
} else if (mlx5_devx_cmd_modify_virtq(priv->virtqs[i].virtq,
|
|
&attr)) {
|
|
DRV_LOG(ERR, "Failed to modify virtq %d for LM.", i);
|
|
goto err;
|
|
}
|
|
}
|
|
mr->is_indirect = 0;
|
|
SLIST_INSERT_HEAD(&priv->mr_list, mr, next);
|
|
return 0;
|
|
err:
|
|
if (mr->mkey)
|
|
mlx5_devx_cmd_destroy(mr->mkey);
|
|
if (mr->umem)
|
|
mlx5_glue->devx_umem_dereg(mr->umem);
|
|
rte_free(mr);
|
|
return -1;
|
|
}
|
|
|
|
#define MLX5_VDPA_USED_RING_LEN(size) \
|
|
((size) * sizeof(struct vring_used_elem) + sizeof(uint16_t) * 3)
|
|
|
|
int
|
|
mlx5_vdpa_lm_log(struct mlx5_vdpa_priv *priv)
|
|
{
|
|
uint64_t features;
|
|
int ret = rte_vhost_get_negotiated_features(priv->vid, &features);
|
|
int i;
|
|
|
|
if (ret) {
|
|
DRV_LOG(ERR, "Failed to get negotiated features.");
|
|
return -1;
|
|
}
|
|
if (!RTE_VHOST_NEED_LOG(features))
|
|
return 0;
|
|
for (i = 0; i < priv->nr_virtqs; ++i) {
|
|
if (!priv->virtqs[i].virtq) {
|
|
DRV_LOG(DEBUG, "virtq %d is invalid for LM log.", i);
|
|
} else {
|
|
ret = mlx5_vdpa_virtq_stop(priv, i);
|
|
if (ret) {
|
|
DRV_LOG(ERR, "Failed to stop virtq %d for LM "
|
|
"log.", i);
|
|
return -1;
|
|
}
|
|
}
|
|
rte_vhost_log_used_vring(priv->vid, i, 0,
|
|
MLX5_VDPA_USED_RING_LEN(priv->virtqs[i].vq_size));
|
|
}
|
|
return 0;
|
|
}
|