ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bdev/crypto: Add qp_desc_nr to struct vbdev_crypto

Browse Source 
At the moment MLX5 uses different number of qp descriptors than the
other pmd crypto drivers. Adding it to vbdev_crypto on init and re-use
everywhere we need it.

Signed-off-by: Yuriy Umanets <yumanets@nvidia.com>
Change-Id: Iea4d4787fc5fd91f27c4a70cf78c5660f09bc854
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/11878
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <smatsumoto@nvidia.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
This commit is contained in:
Yuriy Umanets 2022-03-10 12:49:46 +02:00 committed by Tomasz Zawadzki
parent 0d857f441c
commit 8ec34933e9
2 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
module/bdev/crypto/vbdev_crypto.c
View File

@ -181,6 +181,7 @@ struct vbdev_crypto {
uint8_t *xts_key; /* key + key 2 */ uint8_t *xts_key; /* key + key 2 */
char *drv_name; /* name of the crypto device driver */ char *drv_name; /* name of the crypto device driver */
char *cipher; /* cipher used */ char *cipher; /* cipher used */
uint32_t qp_desc_nr; /* number of qp descriptors */
struct rte_cryptodev_sym_session *session_encrypt; /* encryption session for this bdev */ struct rte_cryptodev_sym_session *session_encrypt; /* encryption session for this bdev */
struct rte_cryptodev_sym_session *session_decrypt; /* decryption session for this bdev */ struct rte_cryptodev_sym_session *session_decrypt; /* decryption session for this bdev */
struct rte_crypto_sym_xform cipher_xform; /* crypto control struct for this bdev */ struct rte_crypto_sym_xform cipher_xform; /* crypto control struct for this bdev */
@ -250,6 +251,7 @@ create_vbdev_dev(uint8_t index, uint16_t num_lcores)
uint8_t j, cdev_id, cdrv_id; uint8_t j, cdev_id, cdrv_id;
struct device_qp *dev_qp; struct device_qp *dev_qp;
struct device_qp *tmp_qp; struct device_qp *tmp_qp;
uint32_t qp_desc_nr;
int rc; int rc;
TAILQ_HEAD(device_qps, device_qp) *dev_qp_head; TAILQ_HEAD(device_qps, device_qp) *dev_qp_head;
@ -295,8 +297,24 @@ create_vbdev_dev(uint8_t index, uint16_t num_lcores)
goto err; goto err;
} }
/* Select the right device/qp list based on driver name
* or error if it does not exist.
*/
if (strcmp(device->cdev_info.driver_name, QAT) == 0) {
dev_qp_head = (struct device_qps *)&g_device_qp_qat;
qp_desc_nr = CRYPTO_QP_DESCRIPTORS;
} else if (strcmp(device->cdev_info.driver_name, AESNI_MB) == 0) {
dev_qp_head = (struct device_qps *)&g_device_qp_aesni_mb;
qp_desc_nr = CRYPTO_QP_DESCRIPTORS;
} else {
SPDK_ERRLOG("Failed to start device %u. Invalid driver name \"%s\"\n",
cdev_id, device->cdev_info.driver_name);
rc = -EINVAL;
goto err_qp_setup;
}
struct rte_cryptodev_qp_conf qp_conf = { struct rte_cryptodev_qp_conf qp_conf = {
.nb_descriptors = CRYPTO_QP_DESCRIPTORS, .nb_descriptors = qp_desc_nr,
.mp_session = g_session_mp, .mp_session = g_session_mp,
.mp_session_private = g_session_mp_priv, .mp_session_private = g_session_mp_priv,
}; };
@ -324,20 +342,6 @@ create_vbdev_dev(uint8_t index, uint16_t num_lcores)
goto err_dev_start; goto err_dev_start;
} }
/* Select the right device/qp list based on driver name
* or error if it does not exist.
*/
if (strcmp(device->cdev_info.driver_name, QAT) == 0) {
dev_qp_head = (struct device_qps *)&g_device_qp_qat;
} else if (strcmp(device->cdev_info.driver_name, AESNI_MB) == 0) {
dev_qp_head = (struct device_qps *)&g_device_qp_aesni_mb;
} else {
SPDK_ERRLOG("Failed to start device %u. Invalid driver name \"%s\"\n",
cdev_id, device->cdev_info.driver_name);
rc = -EINVAL;
goto err_invalid_drv_name;
}
/* Build up lists of device/qp combinations per PMD */ /* Build up lists of device/qp combinations per PMD */
for (j = 0; j < device->cdev_info.max_nb_queue_pairs; j++) { for (j = 0; j < device->cdev_info.max_nb_queue_pairs; j++) {
dev_qp = calloc(1, sizeof(struct device_qp)); dev_qp = calloc(1, sizeof(struct device_qp));
@ -369,7 +373,6 @@ err_qp_alloc:
} }
free(dev_qp); free(dev_qp);
} }
err_invalid_drv_name:
rte_cryptodev_stop(cdev_id); rte_cryptodev_stop(cdev_id);
err_dev_start: err_dev_start:
err_qp_setup: err_qp_setup:
@ -1044,7 +1047,7 @@ _crypto_operation(struct spdk_bdev_io *bdev_io, enum rte_crypto_cipher_operation
/* Enqueue everything we've got but limit by the max number of descriptors we /* Enqueue everything we've got but limit by the max number of descriptors we
* configured the crypto device for. * configured the crypto device for.
*/ */
burst = spdk_min(cryop_cnt, CRYPTO_QP_DESCRIPTORS); burst = spdk_min(cryop_cnt, io_ctx->crypto_bdev->qp_desc_nr);
num_enqueued_ops = rte_cryptodev_enqueue_burst(cdev_id, crypto_ch->device_qp->qp, num_enqueued_ops = rte_cryptodev_enqueue_burst(cdev_id, crypto_ch->device_qp->qp,
&crypto_ops[0], &crypto_ops[0],
burst); burst);
@ -1934,6 +1937,8 @@ vbdev_crypto_claim(const char *bdev_name)
bdev = spdk_bdev_desc_get_bdev(vbdev->base_desc); bdev = spdk_bdev_desc_get_bdev(vbdev->base_desc);
vbdev->base_bdev = bdev; vbdev->base_bdev = bdev;
vbdev->qp_desc_nr = CRYPTO_QP_DESCRIPTORS;
vbdev->crypto_bdev.write_cache = bdev->write_cache; vbdev->crypto_bdev.write_cache = bdev->write_cache;
vbdev->cipher = AES_CBC; vbdev->cipher = AES_CBC;
if (strcmp(vbdev->drv_name, QAT) == 0) { if (strcmp(vbdev->drv_name, QAT) == 0) {

1
test/unit/lib/bdev/crypto.c/crypto_ut.c
View File

@ -408,6 +408,7 @@ test_setup(void)
g_dev_qp.device = &g_device; g_dev_qp.device = &g_device;
g_io_ctx->crypto_ch = g_crypto_ch; g_io_ctx->crypto_ch = g_crypto_ch;
g_io_ctx->crypto_bdev = &g_crypto_bdev; g_io_ctx->crypto_bdev = &g_crypto_bdev;
g_io_ctx->crypto_bdev->qp_desc_nr = CRYPTO_QP_DESCRIPTORS;
g_crypto_ch->device_qp = &g_dev_qp; g_crypto_ch->device_qp = &g_dev_qp;
TAILQ_INIT(&g_crypto_ch->pending_cry_ios); TAILQ_INIT(&g_crypto_ch->pending_cry_ios);
TAILQ_INIT(&g_crypto_ch->queued_cry_ops); TAILQ_INIT(&g_crypto_ch->queued_cry_ops);