* [PATCH 0/2] uadk: realize async mode
@ 2025-05-08 7:41 Zhangfei Gao
2025-05-08 7:41 ` [PATCH 1/2] compress/uadk: use async mode to replace sync mode Zhangfei Gao
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Zhangfei Gao @ 2025-05-08 7:41 UTC (permalink / raw)
To: Akhil Goyal, Fan Zhang, Ashish Gupta; +Cc: dev, Zhangfei Gao
Realize async mode to replace sync mode for better performance
Zhangfei Gao (2):
compress/uadk: use async mode to replace sync mode
crypto/uadk: use async mode to replace sync mode
drivers/compress/uadk/uadk_compress_pmd.c | 107 ++++--
.../compress/uadk/uadk_compress_pmd_private.h | 2 +-
drivers/crypto/uadk/uadk_crypto_pmd.c | 321 +++++++++++++-----
drivers/crypto/uadk/uadk_crypto_pmd_private.h | 8 +-
4 files changed, 318 insertions(+), 120 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/2] compress/uadk: use async mode to replace sync mode
2025-05-08 7:41 [PATCH 0/2] uadk: realize async mode Zhangfei Gao
@ 2025-05-08 7:41 ` Zhangfei Gao
2025-05-08 7:41 ` [PATCH 2/2] crypto/uadk: " Zhangfei Gao
2025-05-21 12:39 ` [EXTERNAL] [PATCH 0/2] uadk: realize async mode Akhil Goyal
2 siblings, 0 replies; 6+ messages in thread
From: Zhangfei Gao @ 2025-05-08 7:41 UTC (permalink / raw)
To: Akhil Goyal, Fan Zhang, Ashish Gupta; +Cc: dev, Zhangfei Gao
To get better performance, using async mode to replace sync mode
Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
---
drivers/compress/uadk/uadk_compress_pmd.c | 107 +++++++++++++-----
.../compress/uadk/uadk_compress_pmd_private.h | 2 +-
2 files changed, 82 insertions(+), 27 deletions(-)
diff --git a/drivers/compress/uadk/uadk_compress_pmd.c b/drivers/compress/uadk/uadk_compress_pmd.c
index 1f4c4cfd00..1d87208d0b 100644
--- a/drivers/compress/uadk/uadk_compress_pmd.c
+++ b/drivers/compress/uadk/uadk_compress_pmd.c
@@ -12,6 +12,9 @@
#include "uadk_compress_pmd_private.h"
+#define UADK_COMP_DEF_CTXS 2
+static char alg_name[8] = "deflate";
+
static const struct
rte_compressdev_capabilities uadk_compress_pmd_capabilities[] = {
{ /* Deflate */
@@ -29,16 +32,49 @@ uadk_compress_pmd_config(struct rte_compressdev *dev,
struct rte_compressdev_config *config __rte_unused)
{
struct uadk_compress_priv *priv = dev->data->dev_private;
+ struct wd_ctx_params cparams = {0};
+ struct wd_ctx_nums *ctx_set_num;
int ret;
- if (!priv->env_init) {
- ret = wd_comp_env_init(NULL);
- if (ret < 0)
- return -EINVAL;
- priv->env_init = true;
+ if (priv->init)
+ return 0;
+
+ ctx_set_num = calloc(WD_DIR_MAX, sizeof(*ctx_set_num));
+ if (!ctx_set_num) {
+ UADK_LOG(ERR, "failed to alloc ctx_set_size!");
+ return -WD_ENOMEM;
+ }
+
+ cparams.op_type_num = WD_DIR_MAX;
+ cparams.ctx_set_num = ctx_set_num;
+ cparams.bmp = numa_allocate_nodemask();
+ if (!cparams.bmp) {
+ UADK_LOG(ERR, "failed to create nodemask!");
+ ret = -WD_ENOMEM;
+ goto out_freectx;
}
+ numa_bitmask_setall(cparams.bmp);
+
+ for (int i = 0; i < WD_DIR_MAX; i++)
+ ctx_set_num[i].async_ctx_num = UADK_COMP_DEF_CTXS;
+
+ ret = wd_comp_init2_(alg_name, SCHED_POLICY_RR, TASK_HW, &cparams);
+ numa_free_nodemask(cparams.bmp);
+ free(ctx_set_num);
+
+ if (ret) {
+ UADK_LOG(ERR, "failed to do comp init2!");
+ return ret;
+ }
+
+ priv->init = true;
+
return 0;
+
+out_freectx:
+ free(ctx_set_num);
+ return ret;
}
static int
@@ -57,9 +93,9 @@ uadk_compress_pmd_close(struct rte_compressdev *dev)
{
struct uadk_compress_priv *priv = dev->data->dev_private;
- if (priv->env_init) {
- wd_comp_env_uninit();
- priv->env_init = false;
+ if (priv->init) {
+ wd_comp_uninit2();
+ priv->init = false;
}
return 0;
@@ -291,9 +327,25 @@ static struct rte_compressdev_ops uadk_compress_pmd_ops = {
.private_xform_free = uadk_compress_pmd_xform_free,
};
+static void *uadk_compress_pmd_async_cb(struct wd_comp_req *req,
+ void *data __rte_unused)
+{
+ struct rte_comp_op *op = req->cb_param;
+ uint16_t dst_len = rte_pktmbuf_data_len(op->m_dst);
+
+ if (req->dst_len <= dst_len) {
+ op->produced += req->dst_len;
+ op->status = RTE_COMP_OP_STATUS_SUCCESS;
+ } else {
+ op->status = RTE_COMP_OP_STATUS_OUT_OF_SPACE_TERMINATED;
+ }
+
+ return NULL;
+}
+
static uint16_t
-uadk_compress_pmd_enqueue_burst_sync(void *queue_pair,
- struct rte_comp_op **ops, uint16_t nb_ops)
+uadk_compress_pmd_enqueue_burst_async(void *queue_pair,
+ struct rte_comp_op **ops, uint16_t nb_ops)
{
struct uadk_compress_qp *qp = queue_pair;
struct uadk_compress_xform *xform;
@@ -318,21 +370,15 @@ uadk_compress_pmd_enqueue_burst_sync(void *queue_pair,
req.dst = rte_pktmbuf_mtod(op->m_dst, uint8_t *);
req.dst_len = dst_len;
req.op_type = (enum wd_comp_op_type)xform->type;
- req.cb = NULL;
+ req.cb = uadk_compress_pmd_async_cb;
+ req.cb_param = op;
req.data_fmt = WD_FLAT_BUF;
do {
- ret = wd_do_comp_sync(xform->handle, &req);
+ ret = wd_do_comp_async(xform->handle, &req);
} while (ret == -WD_EBUSY);
op->consumed += req.src_len;
- if (req.dst_len <= dst_len) {
- op->produced += req.dst_len;
- op->status = RTE_COMP_OP_STATUS_SUCCESS;
- } else {
- op->status = RTE_COMP_OP_STATUS_OUT_OF_SPACE_TERMINATED;
- }
-
if (ret) {
op->status = RTE_COMP_OP_STATUS_ERROR;
break;
@@ -361,18 +407,27 @@ uadk_compress_pmd_enqueue_burst_sync(void *queue_pair,
}
static uint16_t
-uadk_compress_pmd_dequeue_burst_sync(void *queue_pair,
- struct rte_comp_op **ops,
- uint16_t nb_ops)
+uadk_compress_pmd_dequeue_burst_async(void *queue_pair,
+ struct rte_comp_op **ops,
+ uint16_t nb_ops)
{
struct uadk_compress_qp *qp = queue_pair;
unsigned int nb_dequeued = 0;
+ unsigned int recv = 0;
+ int ret;
nb_dequeued = rte_ring_dequeue_burst(qp->processed_pkts,
(void **)ops, nb_ops, NULL);
+ if (nb_dequeued == 0)
+ return 0;
+
+ do {
+ ret = wd_comp_poll(nb_dequeued, &recv);
+ } while (ret == -WD_EAGAIN);
+
qp->qp_stats.dequeued_count += nb_dequeued;
- return nb_dequeued;
+ return recv;
}
static int
@@ -386,7 +441,7 @@ uadk_compress_probe(struct rte_vdev_device *vdev)
struct uacce_dev *udev;
const char *name;
- udev = wd_get_accel_dev("deflate");
+ udev = wd_get_accel_dev(alg_name);
if (!udev)
return -ENODEV;
@@ -402,8 +457,8 @@ uadk_compress_probe(struct rte_vdev_device *vdev)
}
compressdev->dev_ops = &uadk_compress_pmd_ops;
- compressdev->dequeue_burst = uadk_compress_pmd_dequeue_burst_sync;
- compressdev->enqueue_burst = uadk_compress_pmd_enqueue_burst_sync;
+ compressdev->dequeue_burst = uadk_compress_pmd_dequeue_burst_async;
+ compressdev->enqueue_burst = uadk_compress_pmd_enqueue_burst_async;
compressdev->feature_flags = RTE_COMPDEV_FF_HW_ACCELERATED;
return 0;
diff --git a/drivers/compress/uadk/uadk_compress_pmd_private.h b/drivers/compress/uadk/uadk_compress_pmd_private.h
index 6db53744fd..1b8708889d 100644
--- a/drivers/compress/uadk/uadk_compress_pmd_private.h
+++ b/drivers/compress/uadk/uadk_compress_pmd_private.h
@@ -7,7 +7,7 @@
#define _UADK_COMPRESS_PMD_PRIVATE_H_
struct uadk_compress_priv {
- bool env_init;
+ bool init;
};
struct __rte_cache_aligned uadk_compress_qp {
--
2.25.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/2] crypto/uadk: use async mode to replace sync mode
2025-05-08 7:41 [PATCH 0/2] uadk: realize async mode Zhangfei Gao
2025-05-08 7:41 ` [PATCH 1/2] compress/uadk: use async mode to replace sync mode Zhangfei Gao
@ 2025-05-08 7:41 ` Zhangfei Gao
2025-05-21 12:39 ` [EXTERNAL] [PATCH 0/2] uadk: realize async mode Akhil Goyal
2 siblings, 0 replies; 6+ messages in thread
From: Zhangfei Gao @ 2025-05-08 7:41 UTC (permalink / raw)
To: Akhil Goyal, Fan Zhang, Ashish Gupta; +Cc: dev, Zhangfei Gao
To get better performance, using async mode to replace sync mode
However, case UADK_CHAIN_CIPHER_AUTH and UADK_CHAIN_AUTH_CIPHER
still use sync mode for the first operation and async mode for
the second operation since the dependence.
Also RTE_CRYPTO_AUTH_OP_VERIFY will hold the generated auth in
qp->temp_digest[idx % BURST_MAX] to verify later.
Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
---
drivers/crypto/uadk/uadk_crypto_pmd.c | 321 +++++++++++++-----
drivers/crypto/uadk/uadk_crypto_pmd_private.h | 8 +-
2 files changed, 236 insertions(+), 93 deletions(-)
diff --git a/drivers/crypto/uadk/uadk_crypto_pmd.c b/drivers/crypto/uadk/uadk_crypto_pmd.c
index e4b1a32398..bbbc96231e 100644
--- a/drivers/crypto/uadk/uadk_crypto_pmd.c
+++ b/drivers/crypto/uadk/uadk_crypto_pmd.c
@@ -15,6 +15,9 @@
#include "uadk_crypto_pmd_private.h"
+#define MAX_ALG_NAME 64
+#define UADK_CIPHER_DEF_CTXS 2
+
static uint8_t uadk_cryptodev_driver_id;
static const struct rte_cryptodev_capabilities uadk_crypto_v2_capabilities[] = {
@@ -359,12 +362,10 @@ static int
uadk_crypto_pmd_config(struct rte_cryptodev *dev __rte_unused,
struct rte_cryptodev_config *config)
{
- char env[128];
+ struct uadk_crypto_priv *priv = dev->data->dev_private;
- /* set queue pairs num via env */
- sprintf(env, "sync:%d@0", config->nb_queue_pairs);
- setenv("WD_CIPHER_CTX_NUM", env, 1);
- setenv("WD_DIGEST_CTX_NUM", env, 1);
+ if (config->nb_queue_pairs != 0)
+ priv->nb_qpairs = config->nb_queue_pairs;
return 0;
}
@@ -388,14 +389,14 @@ uadk_crypto_pmd_close(struct rte_cryptodev *dev)
{
struct uadk_crypto_priv *priv = dev->data->dev_private;
- if (priv->env_cipher_init) {
- wd_cipher_env_uninit();
- priv->env_cipher_init = false;
+ if (priv->cipher_init) {
+ wd_cipher_uninit2();
+ priv->cipher_init = false;
}
- if (priv->env_auth_init) {
- wd_digest_env_uninit();
- priv->env_auth_init = false;
+ if (priv->auth_init) {
+ wd_digest_uninit2();
+ priv->auth_init = false;
}
return 0;
@@ -584,15 +585,11 @@ uadk_set_session_cipher_parameters(struct rte_cryptodev *dev,
struct rte_crypto_cipher_xform *cipher = &xform->cipher;
struct wd_cipher_sess_setup setup = {0};
struct sched_params params = {0};
+ struct wd_ctx_params cparams = {0};
+ struct wd_ctx_nums *ctx_set_num;
+ char alg_name[MAX_ALG_NAME];
int ret;
- if (!priv->env_cipher_init) {
- ret = wd_cipher_env_init(NULL);
- if (ret < 0)
- return -EINVAL;
- priv->env_cipher_init = true;
- }
-
sess->cipher.direction = cipher->op;
sess->iv.offset = cipher->iv.offset;
sess->iv.length = cipher->iv.length;
@@ -603,15 +600,18 @@ uadk_set_session_cipher_parameters(struct rte_cryptodev *dev,
setup.alg = WD_CIPHER_AES;
setup.mode = WD_CIPHER_CTR;
sess->cipher.req.out_bytes = 64;
+ rte_strscpy(alg_name, "ctr(aes)", sizeof(alg_name));
break;
case RTE_CRYPTO_CIPHER_AES_ECB:
setup.alg = WD_CIPHER_AES;
setup.mode = WD_CIPHER_ECB;
sess->cipher.req.out_bytes = 16;
+ rte_strscpy(alg_name, "ecb(aes)", sizeof(alg_name));
break;
case RTE_CRYPTO_CIPHER_AES_CBC:
setup.alg = WD_CIPHER_AES;
setup.mode = WD_CIPHER_CBC;
+ rte_strscpy(alg_name, "cbc(aes)", sizeof(alg_name));
if (cipher->key.length == 16)
sess->cipher.req.out_bytes = 16;
else
@@ -620,14 +620,45 @@ uadk_set_session_cipher_parameters(struct rte_cryptodev *dev,
case RTE_CRYPTO_CIPHER_AES_XTS:
setup.alg = WD_CIPHER_AES;
setup.mode = WD_CIPHER_XTS;
+ rte_strscpy(alg_name, "xts(aes)", sizeof(alg_name));
if (cipher->key.length == 16)
sess->cipher.req.out_bytes = 32;
else
sess->cipher.req.out_bytes = 512;
break;
default:
- ret = -ENOTSUP;
- goto env_uninit;
+ return -ENOTSUP;
+ }
+
+ if (!priv->cipher_init) {
+ ctx_set_num = calloc(1, sizeof(*ctx_set_num));
+ if (!ctx_set_num) {
+ UADK_LOG(ERR, "failed to alloc ctx_set_size!");
+ return -WD_ENOMEM;
+ }
+
+ cparams.op_type_num = 1;
+ cparams.ctx_set_num = ctx_set_num;
+ cparams.bmp = numa_allocate_nodemask();
+ if (!cparams.bmp) {
+ UADK_LOG(ERR, "failed to create nodemask!");
+ ret = -WD_ENOMEM;
+ goto out_freectx;
+ }
+
+ numa_bitmask_setall(cparams.bmp);
+ ctx_set_num->sync_ctx_num = priv->nb_qpairs;
+ ctx_set_num->async_ctx_num = priv->nb_qpairs;
+
+ ret = wd_cipher_init2_(alg_name, SCHED_POLICY_RR, TASK_HW, &cparams);
+ numa_free_nodemask(cparams.bmp);
+ free(ctx_set_num);
+
+ if (ret) {
+ UADK_LOG(ERR, "failed to do cipher init2!");
+ return ret;
+ }
+ priv->cipher_init = true;
}
params.numa_id = -1; /* choose nearby numa node */
@@ -636,7 +667,7 @@ uadk_set_session_cipher_parameters(struct rte_cryptodev *dev,
if (!sess->handle_cipher) {
UADK_LOG(ERR, "uadk failed to alloc session!");
ret = -EINVAL;
- goto env_uninit;
+ goto uninit;
}
ret = wd_cipher_set_key(sess->handle_cipher, cipher->key.data, cipher->key.length);
@@ -644,14 +675,17 @@ uadk_set_session_cipher_parameters(struct rte_cryptodev *dev,
wd_cipher_free_sess(sess->handle_cipher);
UADK_LOG(ERR, "uadk failed to set key!");
ret = -EINVAL;
- goto env_uninit;
+ goto uninit;
}
return 0;
-env_uninit:
- wd_cipher_env_uninit();
- priv->env_cipher_init = false;
+uninit:
+ wd_cipher_uninit2();
+ priv->cipher_init = false;
+ return ret;
+out_freectx:
+ free(ctx_set_num);
return ret;
}
@@ -664,15 +698,11 @@ uadk_set_session_auth_parameters(struct rte_cryptodev *dev,
struct uadk_crypto_priv *priv = dev->data->dev_private;
struct wd_digest_sess_setup setup = {0};
struct sched_params params = {0};
+ struct wd_ctx_params cparams = {0};
+ struct wd_ctx_nums *ctx_set_num;
+ char alg_name[MAX_ALG_NAME];
int ret;
- if (!priv->env_auth_init) {
- ret = wd_digest_env_init(NULL);
- if (ret < 0)
- return -EINVAL;
- priv->env_auth_init = true;
- }
-
sess->auth.operation = xform->auth.op;
sess->auth.digest_length = xform->auth.digest_length;
@@ -684,6 +714,7 @@ uadk_set_session_auth_parameters(struct rte_cryptodev *dev,
setup.alg = WD_DIGEST_MD5;
sess->auth.req.out_buf_bytes = 16;
sess->auth.req.out_bytes = 16;
+ rte_strscpy(alg_name, "md5", sizeof(alg_name));
break;
case RTE_CRYPTO_AUTH_SHA1:
case RTE_CRYPTO_AUTH_SHA1_HMAC:
@@ -692,6 +723,7 @@ uadk_set_session_auth_parameters(struct rte_cryptodev *dev,
setup.alg = WD_DIGEST_SHA1;
sess->auth.req.out_buf_bytes = 20;
sess->auth.req.out_bytes = 20;
+ rte_strscpy(alg_name, "sha1", sizeof(alg_name));
break;
case RTE_CRYPTO_AUTH_SHA224:
case RTE_CRYPTO_AUTH_SHA224_HMAC:
@@ -700,6 +732,7 @@ uadk_set_session_auth_parameters(struct rte_cryptodev *dev,
setup.alg = WD_DIGEST_SHA224;
sess->auth.req.out_buf_bytes = 28;
sess->auth.req.out_bytes = 28;
+ rte_strscpy(alg_name, "sha224", sizeof(alg_name));
break;
case RTE_CRYPTO_AUTH_SHA256:
case RTE_CRYPTO_AUTH_SHA256_HMAC:
@@ -708,6 +741,7 @@ uadk_set_session_auth_parameters(struct rte_cryptodev *dev,
setup.alg = WD_DIGEST_SHA256;
sess->auth.req.out_buf_bytes = 32;
sess->auth.req.out_bytes = 32;
+ rte_strscpy(alg_name, "sha256", sizeof(alg_name));
break;
case RTE_CRYPTO_AUTH_SHA384:
case RTE_CRYPTO_AUTH_SHA384_HMAC:
@@ -716,6 +750,7 @@ uadk_set_session_auth_parameters(struct rte_cryptodev *dev,
setup.alg = WD_DIGEST_SHA384;
sess->auth.req.out_buf_bytes = 48;
sess->auth.req.out_bytes = 48;
+ rte_strscpy(alg_name, "sha384", sizeof(alg_name));
break;
case RTE_CRYPTO_AUTH_SHA512:
case RTE_CRYPTO_AUTH_SHA512_HMAC:
@@ -724,10 +759,42 @@ uadk_set_session_auth_parameters(struct rte_cryptodev *dev,
setup.alg = WD_DIGEST_SHA512;
sess->auth.req.out_buf_bytes = 64;
sess->auth.req.out_bytes = 64;
+ rte_strscpy(alg_name, "sha512", sizeof(alg_name));
break;
default:
- ret = -ENOTSUP;
- goto env_uninit;
+ return -ENOTSUP;
+ }
+
+ if (!priv->auth_init) {
+ ctx_set_num = calloc(1, sizeof(*ctx_set_num));
+ if (!ctx_set_num) {
+ UADK_LOG(ERR, "failed to alloc ctx_set_size!");
+ return -WD_ENOMEM;
+ }
+
+ cparams.op_type_num = 1;
+ cparams.ctx_set_num = ctx_set_num;
+ cparams.bmp = numa_allocate_nodemask();
+ if (!cparams.bmp) {
+ UADK_LOG(ERR, "failed to create nodemask!");
+ ret = -WD_ENOMEM;
+ goto out_freectx;
+ }
+
+ numa_bitmask_setall(cparams.bmp);
+ ctx_set_num->sync_ctx_num = priv->nb_qpairs;
+ ctx_set_num->async_ctx_num = priv->nb_qpairs;
+
+ ret = wd_digest_init2_(alg_name, SCHED_POLICY_RR, TASK_HW, &cparams);
+ numa_free_nodemask(cparams.bmp);
+ free(ctx_set_num);
+
+ if (ret) {
+ UADK_LOG(ERR, "failed to do digest init2!");
+ return ret;
+ }
+
+ priv->auth_init = true;
}
params.numa_id = -1; /* choose nearby numa node */
@@ -736,7 +803,7 @@ uadk_set_session_auth_parameters(struct rte_cryptodev *dev,
if (!sess->handle_digest) {
UADK_LOG(ERR, "uadk failed to alloc session!");
ret = -EINVAL;
- goto env_uninit;
+ goto uninit;
}
/* if mode is HMAC, should set key */
@@ -749,15 +816,18 @@ uadk_set_session_auth_parameters(struct rte_cryptodev *dev,
wd_digest_free_sess(sess->handle_digest);
sess->handle_digest = 0;
ret = -EINVAL;
- goto env_uninit;
+ goto uninit;
}
}
return 0;
-env_uninit:
- wd_digest_env_uninit();
- priv->env_auth_init = false;
+uninit:
+ wd_digest_uninit2();
+ priv->auth_init = false;
+ return ret;
+out_freectx:
+ free(ctx_set_num);
return ret;
}
@@ -854,78 +924,98 @@ static struct rte_cryptodev_ops uadk_crypto_pmd_ops = {
.sym_session_clear = uadk_crypto_sym_session_clear,
};
+static void *uadk_cipher_async_cb(struct wd_cipher_req *req __rte_unused,
+ void *data __rte_unused)
+{
+ struct rte_crypto_op *op = req->cb_param;
+
+ if (op->status == RTE_CRYPTO_OP_STATUS_NOT_PROCESSED)
+ op->status = RTE_CRYPTO_OP_STATUS_SUCCESS;
+
+ return NULL;
+}
+
static void
uadk_process_cipher_op(struct rte_crypto_op *op,
struct uadk_crypto_session *sess,
- struct rte_mbuf *msrc, struct rte_mbuf *mdst)
+ struct rte_mbuf *msrc, struct rte_mbuf *mdst,
+ bool async)
{
uint32_t off = op->sym->cipher.data.offset;
+ struct wd_cipher_req *req = &sess->cipher.req;
int ret;
- if (!sess) {
- op->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;
- return;
- }
+ req->src = rte_pktmbuf_mtod_offset(msrc, uint8_t *, off);
+ req->in_bytes = op->sym->cipher.data.length;
+ req->dst = rte_pktmbuf_mtod_offset(mdst, uint8_t *, off);
+ req->out_buf_bytes = sess->cipher.req.in_bytes;
+ req->iv_bytes = sess->iv.length;
+ req->iv = rte_crypto_op_ctod_offset(op, uint8_t *, sess->iv.offset);
+ req->cb = uadk_cipher_async_cb;
+ req->cb_param = op;
- sess->cipher.req.src = rte_pktmbuf_mtod_offset(msrc, uint8_t *, off);
- sess->cipher.req.in_bytes = op->sym->cipher.data.length;
- sess->cipher.req.dst = rte_pktmbuf_mtod_offset(mdst, uint8_t *, off);
- sess->cipher.req.out_buf_bytes = sess->cipher.req.in_bytes;
- sess->cipher.req.iv_bytes = sess->iv.length;
- sess->cipher.req.iv = rte_crypto_op_ctod_offset(op, uint8_t *,
- sess->iv.offset);
if (sess->cipher.direction == RTE_CRYPTO_CIPHER_OP_ENCRYPT)
- sess->cipher.req.op_type = WD_CIPHER_ENCRYPTION;
+ req->op_type = WD_CIPHER_ENCRYPTION;
else
- sess->cipher.req.op_type = WD_CIPHER_DECRYPTION;
+ req->op_type = WD_CIPHER_DECRYPTION;
do {
- ret = wd_do_cipher_sync(sess->handle_cipher, &sess->cipher.req);
+ if (async)
+ ret = wd_do_cipher_async(sess->handle_cipher, req);
+ else
+ ret = wd_do_cipher_sync(sess->handle_cipher, req);
} while (ret == -WD_EBUSY);
if (ret)
op->status = RTE_CRYPTO_OP_STATUS_ERROR;
}
+static void *uadk_digest_async_cb(void *param)
+{
+ struct wd_digest_req *req = param;
+ struct rte_crypto_op *op = req->cb_param;
+
+ if (op->status == RTE_CRYPTO_OP_STATUS_NOT_PROCESSED)
+ op->status = RTE_CRYPTO_OP_STATUS_SUCCESS;
+
+ return NULL;
+}
+
static void
uadk_process_auth_op(struct uadk_qp *qp, struct rte_crypto_op *op,
struct uadk_crypto_session *sess,
- struct rte_mbuf *msrc, struct rte_mbuf *mdst)
+ struct rte_mbuf *msrc, struct rte_mbuf *mdst,
+ bool async, int idx)
{
+ struct wd_digest_req *req = &sess->auth.req;
uint32_t srclen = op->sym->auth.data.length;
uint32_t off = op->sym->auth.data.offset;
- uint8_t *dst = qp->temp_digest;
+ uint8_t *dst = NULL;
int ret;
- if (!sess) {
- op->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;
- return;
- }
-
- sess->auth.req.in = rte_pktmbuf_mtod_offset(msrc, uint8_t *, off);
- sess->auth.req.in_bytes = srclen;
- sess->auth.req.out = dst;
-
- do {
- ret = wd_do_digest_sync(sess->handle_digest, &sess->auth.req);
- } while (ret == -WD_EBUSY);
-
if (sess->auth.operation == RTE_CRYPTO_AUTH_OP_VERIFY) {
- if (memcmp(dst, op->sym->auth.digest.data,
- sess->auth.digest_length) != 0) {
- op->status = RTE_CRYPTO_OP_STATUS_AUTH_FAILED;
- }
+ dst = qp->temp_digest[idx % BURST_MAX];
} else {
- uint8_t *auth_dst;
-
- auth_dst = op->sym->auth.digest.data;
- if (auth_dst == NULL)
- auth_dst = rte_pktmbuf_mtod_offset(mdst, uint8_t *,
+ dst = op->sym->auth.digest.data;
+ if (dst == NULL)
+ dst = rte_pktmbuf_mtod_offset(mdst, uint8_t *,
op->sym->auth.data.offset +
op->sym->auth.data.length);
- memcpy(auth_dst, dst, sess->auth.digest_length);
}
+ req->in = rte_pktmbuf_mtod_offset(msrc, uint8_t *, off);
+ req->in_bytes = srclen;
+ req->out = dst;
+ req->cb = uadk_digest_async_cb;
+ req->cb_param = op;
+
+ do {
+ if (async)
+ ret = wd_do_digest_async(sess->handle_digest, req);
+ else
+ ret = wd_do_digest_sync(sess->handle_digest, req);
+ } while (ret == -WD_EBUSY);
+
if (ret)
op->status = RTE_CRYPTO_OP_STATUS_ERROR;
}
@@ -935,13 +1025,14 @@ uadk_crypto_enqueue_burst(void *queue_pair, struct rte_crypto_op **ops,
uint16_t nb_ops)
{
struct uadk_qp *qp = queue_pair;
- struct uadk_crypto_session *sess = NULL;
struct rte_mbuf *msrc, *mdst;
struct rte_crypto_op *op;
uint16_t enqd = 0;
int i, ret;
for (i = 0; i < nb_ops; i++) {
+ struct uadk_crypto_session *sess = NULL;
+
op = ops[i];
op->status = RTE_CRYPTO_OP_STATUS_NOT_PROCESSED;
msrc = op->sym->m_src;
@@ -953,29 +1044,31 @@ uadk_crypto_enqueue_burst(void *queue_pair, struct rte_crypto_op **ops,
op->sym->session);
}
+ if (!sess) {
+ op->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;
+ continue;
+ }
+
switch (sess->chain_order) {
case UADK_CHAIN_ONLY_CIPHER:
- uadk_process_cipher_op(op, sess, msrc, mdst);
+ uadk_process_cipher_op(op, sess, msrc, mdst, true);
break;
case UADK_CHAIN_ONLY_AUTH:
- uadk_process_auth_op(qp, op, sess, msrc, mdst);
+ uadk_process_auth_op(qp, op, sess, msrc, mdst, true, i);
break;
case UADK_CHAIN_CIPHER_AUTH:
- uadk_process_cipher_op(op, sess, msrc, mdst);
- uadk_process_auth_op(qp, op, sess, mdst, mdst);
+ uadk_process_cipher_op(op, sess, msrc, mdst, false);
+ uadk_process_auth_op(qp, op, sess, mdst, mdst, true, i);
break;
case UADK_CHAIN_AUTH_CIPHER:
- uadk_process_auth_op(qp, op, sess, msrc, mdst);
- uadk_process_cipher_op(op, sess, msrc, mdst);
+ uadk_process_auth_op(qp, op, sess, msrc, mdst, false, i);
+ uadk_process_cipher_op(op, sess, msrc, mdst, true);
break;
default:
op->status = RTE_CRYPTO_OP_STATUS_ERROR;
break;
}
- if (op->status == RTE_CRYPTO_OP_STATUS_NOT_PROCESSED)
- op->status = RTE_CRYPTO_OP_STATUS_SUCCESS;
-
if (op->status != RTE_CRYPTO_OP_STATUS_ERROR) {
ret = rte_ring_enqueue(qp->processed_pkts, (void *)op);
if (ret < 0)
@@ -1000,13 +1093,60 @@ uadk_crypto_dequeue_burst(void *queue_pair, struct rte_crypto_op **ops,
uint16_t nb_ops)
{
struct uadk_qp *qp = queue_pair;
+ struct uadk_crypto_session *sess = NULL;
+ struct rte_crypto_op *op;
unsigned int nb_dequeued;
+ unsigned int recv = 0, count = 0, i;
+ int ret;
nb_dequeued = rte_ring_dequeue_burst(qp->processed_pkts,
(void **)ops, nb_ops, NULL);
+
+ for (i = 0; i < nb_dequeued; i++) {
+ op = ops[i];
+ if (op->sess_type != RTE_CRYPTO_OP_WITH_SESSION)
+ continue;
+
+ sess = CRYPTODEV_GET_SYM_SESS_PRIV(op->sym->session);
+
+ if (!sess) {
+ op->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;
+ continue;
+ }
+
+ switch (sess->chain_order) {
+ case UADK_CHAIN_ONLY_CIPHER:
+ case UADK_CHAIN_AUTH_CIPHER:
+ do {
+ ret = wd_cipher_poll(1, &recv);
+ } while (ret == -WD_EAGAIN);
+ break;
+ case UADK_CHAIN_ONLY_AUTH:
+ case UADK_CHAIN_CIPHER_AUTH:
+ do {
+ ret = wd_digest_poll(1, &recv);
+ } while (ret == -WD_EAGAIN);
+ break;
+ default:
+ op->status = RTE_CRYPTO_OP_STATUS_ERROR;
+ break;
+ }
+
+ if (sess->auth.operation == RTE_CRYPTO_AUTH_OP_VERIFY) {
+ uint8_t *dst = qp->temp_digest[i % BURST_MAX];
+
+ if (memcmp(dst, op->sym->auth.digest.data,
+ sess->auth.digest_length) != 0)
+ op->status = RTE_CRYPTO_OP_STATUS_AUTH_FAILED;
+ }
+
+ count += recv;
+ recv = 0;
+ }
+
qp->qp_stats.dequeued_count += nb_dequeued;
- return nb_dequeued;
+ return count;
}
static int
@@ -1056,6 +1196,7 @@ uadk_cryptodev_probe(struct rte_vdev_device *vdev)
priv = dev->data->dev_private;
priv->version = version;
priv->max_nb_qpairs = init_params.max_nb_queue_pairs;
+ priv->nb_qpairs = UADK_CIPHER_DEF_CTXS;
rte_cryptodev_pmd_probing_finish(dev);
diff --git a/drivers/crypto/uadk/uadk_crypto_pmd_private.h b/drivers/crypto/uadk/uadk_crypto_pmd_private.h
index 1f55d09a54..cb60cc2ffa 100644
--- a/drivers/crypto/uadk/uadk_crypto_pmd_private.h
+++ b/drivers/crypto/uadk/uadk_crypto_pmd_private.h
@@ -8,6 +8,7 @@
/* Maximum length for digest (SHA-512 needs 64 bytes) */
#define DIGEST_LENGTH_MAX 64
+#define BURST_MAX 64
struct __rte_cache_aligned uadk_qp {
/* Ring for placing process packets */
@@ -22,7 +23,7 @@ struct __rte_cache_aligned uadk_qp {
* by the driver when verifying a digest provided
* by the user (using authentication verify operation)
*/
- uint8_t temp_digest[DIGEST_LENGTH_MAX];
+ uint8_t temp_digest[BURST_MAX][DIGEST_LENGTH_MAX];
};
enum uadk_chain_order {
@@ -64,10 +65,11 @@ enum uadk_crypto_version {
};
struct __rte_cache_aligned uadk_crypto_priv {
- bool env_cipher_init;
- bool env_auth_init;
+ bool cipher_init;
+ bool auth_init;
enum uadk_crypto_version version;
unsigned int max_nb_qpairs;
+ unsigned int nb_qpairs;
};
extern int uadk_crypto_logtype;
--
2.25.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [EXTERNAL] [PATCH 0/2] uadk: realize async mode
2025-05-08 7:41 [PATCH 0/2] uadk: realize async mode Zhangfei Gao
2025-05-08 7:41 ` [PATCH 1/2] compress/uadk: use async mode to replace sync mode Zhangfei Gao
2025-05-08 7:41 ` [PATCH 2/2] crypto/uadk: " Zhangfei Gao
@ 2025-05-21 12:39 ` Akhil Goyal
2025-05-22 10:02 ` Zhangfei Gao
2 siblings, 1 reply; 6+ messages in thread
From: Akhil Goyal @ 2025-05-21 12:39 UTC (permalink / raw)
To: Zhangfei Gao, Fan Zhang, Ashish Gupta; +Cc: dev
> Realize async mode to replace sync mode for better performance
>
> Zhangfei Gao (2):
> compress/uadk: use async mode to replace sync mode
> crypto/uadk: use async mode to replace sync mode
>
> drivers/compress/uadk/uadk_compress_pmd.c | 107 ++++--
> .../compress/uadk/uadk_compress_pmd_private.h | 2 +-
> drivers/crypto/uadk/uadk_crypto_pmd.c | 321 +++++++++++++-----
> drivers/crypto/uadk/uadk_crypto_pmd_private.h | 8 +-
> 4 files changed, 318 insertions(+), 120 deletions(-)
This patchset is not building for me atleast. Please fix compilation.
ninja: Entering directory `./build-gcc-static'
[2/31] Compiling C object drivers/libtmp_rte_compress_uadk.a.p/compress_uadk_uadk_compress_pmd.c.o
FAILED: drivers/libtmp_rte_compress_uadk.a.p/compress_uadk_uadk_compress_pmd.c.o
ccache gcc -Idrivers/libtmp_rte_compress_uadk.a.p -Idrivers -I../drivers -Idrivers/compress/uadk -I../drivers/compress/uadk -Ilib/compressdev -I../lib/compressdev -Ilib/eal/common -I../lib/eal/common -I. -I.. -Iconfig -I../config -Ilib/eal/include -I../lib/eal/include -Ilib/eal/linux/include -I../lib/eal/linux/include -Ilib/eal/x86/include -I../lib/eal/x86/include -I../kernel/linux -Ilib/eal -I../lib/eal -Ilib/kvargs -I../lib/kvargs -Ilib/log -I../lib/log -Ilib/metrics -I../lib/metrics -Ilib/telemetry -I../lib/telemetry -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Idrivers/bus/vdev -I../drivers/bus/vdev -I/home/gakhil/up/uadk/build_x86/include -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -std=c11 -O2 -g -include rte_config.h -Wvla -Wcast-qual -Wdeprecated -Wformat -Wformat-nonliteral -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wsign-compare -Wstrict-prototypes -Wundef -Wwrite-strings -Wno-packed-not-aligned -Wno-missing-field-initializers -D_GNU_SOURCE -fPIC -march=native -mrtm -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of-packed-member -DRTE_LOG_DEFAULT_LOGTYPE=pmd.compress.uadk -MD -MQ drivers/libtmp_rte_compress_uadk.a.p/compress_uadk_uadk_compress_pmd.c.o -MF drivers/libtmp_rte_compress_uadk.a.p/compress_uadk_uadk_compress_pmd.c.o.d -o drivers/libtmp_rte_compress_uadk.a.p/compress_uadk_uadk_compress_pmd.c.o -c ../drivers/compress/uadk/uadk_compress_pmd.c
../drivers/compress/uadk/uadk_compress_pmd.c: In function ‘uadk_compress_pmd_config’:
../drivers/compress/uadk/uadk_compress_pmd.c:35:9: error: variable ‘cparams’ has initializer but incomplete type
35 | struct wd_ctx_params cparams = {0};
| ^~~~~~~~~~~~~
../drivers/compress/uadk/uadk_compress_pmd.c:35:34: error: excess elements in struct initializer [-Werror]
35 | struct wd_ctx_params cparams = {0};
| ^
../drivers/compress/uadk/uadk_compress_pmd.c:35:34: note: (near initialization for ‘cparams’)
../drivers/compress/uadk/uadk_compress_pmd.c:35:23: error: storage size of ‘cparams’ isn’t known
35 | struct wd_ctx_params cparams = {0};
| ^~~~~~~
../drivers/compress/uadk/uadk_compress_pmd.c:42:42: error: dereferencing pointer to incomplete type ‘struct wd_ctx_nums’
42 | ctx_set_num = calloc(WD_DIR_MAX, sizeof(*ctx_set_num));
| ^~~~~~~~~~~~
../drivers/compress/uadk/uadk_compress_pmd.c:50:16: error: implicit declaration of function ‘numa_allocate_nodemask’ [-Werror=implicit-function-declaration]
50 | cparams.bmp = numa_allocate_nodemask();
| ^~~~~~~~~~~~~~~~~~~~~~
../drivers/compress/uadk/uadk_compress_pmd.c:50:16: error: nested extern declaration of ‘numa_allocate_nodemask’ [-Werror=nested-externs]
../drivers/compress/uadk/uadk_compress_pmd.c:57:2: error: implicit declaration of function ‘numa_bitmask_setall’ [-Werror=implicit-function-declaration]
57 | numa_bitmask_setall(cparams.bmp);
| ^~~~~~~~~~~~~~~~~~~
../drivers/compress/uadk/uadk_compress_pmd.c:57:2: error: nested extern declaration of ‘numa_bitmask_setall’ [-Werror=nested-externs]
../drivers/compress/uadk/uadk_compress_pmd.c:60:14: error: invalid use of undefined type ‘struct wd_ctx_nums’
60 | ctx_set_num[i].async_ctx_num = UADK_COMP_DEF_CTXS;
| ^
../drivers/compress/uadk/uadk_compress_pmd.c:62:8: error: implicit declaration of function ‘wd_comp_init2_’; did you mean ‘wd_comp_init’? [-Werror=implicit-function-declaration]
62 | ret = wd_comp_init2_(alg_name, SCHED_POLICY_RR, TASK_HW, &cparams);
| ^~~~~~~~~~~~~~
| wd_comp_init
../drivers/compress/uadk/uadk_compress_pmd.c:62:8: error: nested extern declaration of ‘wd_comp_init2_’ [-Werror=nested-externs]
../drivers/compress/uadk/uadk_compress_pmd.c:62:50: error: ‘TASK_HW’ undeclared (first use in this function)
62 | ret = wd_comp_init2_(alg_name, SCHED_POLICY_RR, TASK_HW, &cparams);
| ^~~~~~~
../drivers/compress/uadk/uadk_compress_pmd.c:62:50: note: each undeclared identifier is reported only once for each function it appears in
../drivers/compress/uadk/uadk_compress_pmd.c:63:2: error: implicit declaration of function ‘numa_free_nodemask’ [-Werror=implicit-function-declaration]
63 | numa_free_nodemask(cparams.bmp);
| ^~~~~~~~~~~~~~~~~~
../drivers/compress/uadk/uadk_compress_pmd.c:63:2: error: nested extern declaration of ‘numa_free_nodemask’ [-Werror=nested-externs]
../drivers/compress/uadk/uadk_compress_pmd.c:35:23: error: unused variable ‘cparams’ [-Werror=unused-variable]
35 | struct wd_ctx_params cparams = {0};
| ^~~~~~~
../drivers/compress/uadk/uadk_compress_pmd.c: In function ‘uadk_compress_pmd_close’:
../drivers/compress/uadk/uadk_compress_pmd.c:97:3: error: implicit declaration of function ‘wd_comp_uninit2’; did you mean ‘wd_comp_uninit’? [-Werror=implicit-function-declaration]
97 | wd_comp_uninit2();
| ^~~~~~~~~~~~~~~
| wd_comp_uninit
../drivers/compress/uadk/uadk_compress_pmd.c:97:3: error: nested extern declaration of ‘wd_comp_uninit2’ [-Werror=nested-externs]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [EXTERNAL] [PATCH 0/2] uadk: realize async mode
2025-05-21 12:39 ` [EXTERNAL] [PATCH 0/2] uadk: realize async mode Akhil Goyal
@ 2025-05-22 10:02 ` Zhangfei Gao
2025-05-22 11:50 ` Akhil Goyal
0 siblings, 1 reply; 6+ messages in thread
From: Zhangfei Gao @ 2025-05-22 10:02 UTC (permalink / raw)
To: Akhil Goyal; +Cc: Fan Zhang, Ashish Gupta, dev
Hi, Akhil
On Wed, 21 May 2025 at 20:39, Akhil Goyal <gakhil@marvell.com> wrote:
>
> > Realize async mode to replace sync mode for better performance
> >
> > Zhangfei Gao (2):
> > compress/uadk: use async mode to replace sync mode
> > crypto/uadk: use async mode to replace sync mode
> >
> > drivers/compress/uadk/uadk_compress_pmd.c | 107 ++++--
> > .../compress/uadk/uadk_compress_pmd_private.h | 2 +-
> > drivers/crypto/uadk/uadk_crypto_pmd.c | 321 +++++++++++++-----
> > drivers/crypto/uadk/uadk_crypto_pmd_private.h | 8 +-
> > 4 files changed, 318 insertions(+), 120 deletions(-)
>
> This patchset is not building for me atleast. Please fix compilation.
>
> ninja: Entering directory `./build-gcc-static'
> [2/31] Compiling C object drivers/libtmp_rte_compress_uadk.a.p/compress_uadk_uadk_compress_pmd.c.o
> FAILED: drivers/libtmp_rte_compress_uadk.a.p/compress_uadk_uadk_compress_pmd.c.o
> ccache gcc -Idrivers/libtmp_rte_compress_uadk.a.p -Idrivers -I../drivers -Idrivers/compress/uadk -I../drivers/compress/uadk -Ilib/compressdev -I../lib/compressdev -Ilib/eal/common -I../lib/eal/common -I. -I.. -Iconfig -I../config -Ilib/eal/include -I../lib/eal/include -Ilib/eal/linux/include -I../lib/eal/linux/include -Ilib/eal/x86/include -I../lib/eal/x86/include -I../kernel/linux -Ilib/eal -I../lib/eal -Ilib/kvargs -I../lib/kvargs -Ilib/log -I../lib/log -Ilib/metrics -I../lib/metrics -Ilib/telemetry -I../lib/telemetry -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Idrivers/bus/vdev -I../drivers/bus/vdev -I/home/gakhil/up/uadk/build_x86/include -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -std=c11 -O2 -g -include rte_config.h -Wvla -Wcast-qual -Wdeprecated -Wformat -Wformat-nonliteral -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wsign-compare -Wstrict-prototypes -Wundef -Wwrite-strings -Wno-packed-not-aligned -Wno-missing-field-initializers -D_GNU_SOURCE -fPIC -march=native -mrtm -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of-packed-member -DRTE_LOG_DEFAULT_LOGTYPE=pmd.compress.uadk -MD -MQ drivers/libtmp_rte_compress_uadk.a.p/compress_uadk_uadk_compress_pmd.c.o -MF drivers/libtmp_rte_compress_uadk.a.p/compress_uadk_uadk_compress_pmd.c.o.d -o drivers/libtmp_rte_compress_uadk.a.p/compress_uadk_uadk_compress_pmd.c.o -c ../drivers/compress/uadk/uadk_compress_pmd.c
> ../drivers/compress/uadk/uadk_compress_pmd.c: In function ‘uadk_compress_pmd_config’:
> ../drivers/compress/uadk/uadk_compress_pmd.c:35:9: error: variable ‘cparams’ has initializer but incomplete type
> 35 | struct wd_ctx_params cparams = {0};
> | ^~~~~~~~~~~~~
> ../drivers/compress/uadk/uadk_compress_pmd.c:35:34: error: excess elements in struct initializer [-Werror]
> 35 | struct wd_ctx_params cparams = {0};
> | ^
> ../drivers/compress/uadk/uadk_compress_pmd.c:35:34: note: (near initialization for ‘cparams’)
> ../drivers/compress/uadk/uadk_compress_pmd.c:35:23: error: storage size of ‘cparams’ isn’t known
> 35 | struct wd_ctx_params cparams = {0};
> | ^~~~~~~
> ../drivers/compress/uadk/uadk_compress_pmd.c:42:42: error: dereferencing pointer to incomplete type ‘struct wd_ctx_nums’
> 42 | ctx_set_num = calloc(WD_DIR_MAX, sizeof(*ctx_set_num));
> | ^~~~~~~~~~~~
> ../drivers/compress/uadk/uadk_compress_pmd.c:50:16: error: implicit declaration of function ‘numa_allocate_nodemask’ [-Werror=implicit-function-declaration]
> 50 | cparams.bmp = numa_allocate_nodemask();
> | ^~~~~~~~~~~~~~~~~~~~~~
> ../drivers/compress/uadk/uadk_compress_pmd.c:50:16: error: nested extern declaration of ‘numa_allocate_nodemask’ [-Werror=nested-externs]
> ../drivers/compress/uadk/uadk_compress_pmd.c:57:2: error: implicit declaration of function ‘numa_bitmask_setall’ [-Werror=implicit-function-declaration]
> 57 | numa_bitmask_setall(cparams.bmp);
> | ^~~~~~~~~~~~~~~~~~~
> ../drivers/compress/uadk/uadk_compress_pmd.c:57:2: error: nested extern declaration of ‘numa_bitmask_setall’ [-Werror=nested-externs]
> ../drivers/compress/uadk/uadk_compress_pmd.c:60:14: error: invalid use of undefined type ‘struct wd_ctx_nums’
> 60 | ctx_set_num[i].async_ctx_num = UADK_COMP_DEF_CTXS;
> | ^
> ../drivers/compress/uadk/uadk_compress_pmd.c:62:8: error: implicit declaration of function ‘wd_comp_init2_’; did you mean ‘wd_comp_init’? [-Werror=implicit-function-declaration]
> 62 | ret = wd_comp_init2_(alg_name, SCHED_POLICY_RR, TASK_HW, &cparams);
> | ^~~~~~~~~~~~~~
> | wd_comp_init
> ../drivers/compress/uadk/uadk_compress_pmd.c:62:8: error: nested extern declaration of ‘wd_comp_init2_’ [-Werror=nested-externs]
> ../drivers/compress/uadk/uadk_compress_pmd.c:62:50: error: ‘TASK_HW’ undeclared (first use in this function)
> 62 | ret = wd_comp_init2_(alg_name, SCHED_POLICY_RR, TASK_HW, &cparams);
> | ^~~~~~~
> ../drivers/compress/uadk/uadk_compress_pmd.c:62:50: note: each undeclared identifier is reported only once for each function it appears in
> ../drivers/compress/uadk/uadk_compress_pmd.c:63:2: error: implicit declaration of function ‘numa_free_nodemask’ [-Werror=implicit-function-declaration]
> 63 | numa_free_nodemask(cparams.bmp);
> | ^~~~~~~~~~~~~~~~~~
> ../drivers/compress/uadk/uadk_compress_pmd.c:63:2: error: nested extern declaration of ‘numa_free_nodemask’ [-Werror=nested-externs]
> ../drivers/compress/uadk/uadk_compress_pmd.c:35:23: error: unused variable ‘cparams’ [-Werror=unused-variable]
> 35 | struct wd_ctx_params cparams = {0};
> | ^~~~~~~
> ../drivers/compress/uadk/uadk_compress_pmd.c: In function ‘uadk_compress_pmd_close’:
> ../drivers/compress/uadk/uadk_compress_pmd.c:97:3: error: implicit declaration of function ‘wd_comp_uninit2’; did you mean ‘wd_comp_uninit’? [-Werror=implicit-function-declaration]
> 97 | wd_comp_uninit2();
> | ^~~~~~~~~~~~~~~
> | wd_comp_uninit
> ../drivers/compress/uadk/uadk_compress_pmd.c:97:3: error: nested extern declaration of ‘wd_comp_uninit2’ [-Werror=nested-externs]
I am sorry for the error.
There are two reasons, one is using a newer uadk api, the other is
dependence on numa.
When using the old version uadk, I can reproduce a similar build
error, though not exactly the same.
And it can be solved by using a newer uadk version, at least 2.6, uadk
master branch does not have issues.
a. 2.6 version exports the new api
b. building uadk library itself requires install numa, like yum
install numactl-devel
c. 2.6 header file +#include <numa.h>, which will be included automatically.
Will add version dependence in the next version.
diff --git a/drivers/compress/uadk/meson.build
b/drivers/compress/uadk/meson.build
index 34113cd08c..e251af14cf 100644
--- a/drivers/compress/uadk/meson.build
+++ b/drivers/compress/uadk/meson.build
@@ -13,7 +13,7 @@ sources = files(
)
deps += 'bus_vdev'
-dep = dependency('libwd_comp', required: false, method: 'pkg-config')
+dep = dependency('libwd_comp', version: '>=2.6', required: false,
method: 'pkg-config')
if not dep.found()
build = false
reason = 'missing dependency, "libwd_comp"'
@@ -21,7 +21,7 @@ else
ext_deps += dep
endif
-dep = dependency('libwd', required: false, method: 'pkg-config')
+dep = dependency('libwd', version: '>=2.6', required: false, method:
'pkg-config')
if not dep.found()
build = false
reason = 'missing dependency, "libwd"'
diff --git a/drivers/crypto/uadk/meson.build b/drivers/crypto/uadk/meson.build
index e46abd21e5..52db344c8e 100644
--- a/drivers/crypto/uadk/meson.build
+++ b/drivers/crypto/uadk/meson.build
@@ -13,7 +13,7 @@ sources = files(
)
deps += 'bus_vdev'
-dep = dependency('libwd_crypto', required: false, method: 'pkg-config')
+dep = dependency('libwd_crypto', version: '>=2.6', required: false,
method: 'pkg-config')
if not dep.found()
build = false
reason = 'missing dependency, "libwd_crypto"'
@@ -21,7 +21,7 @@ else
ext_deps += dep
endif
-dep = dependency('libwd', required: false, method: 'pkg-config')
+dep = dependency('libwd', version: '>=2.6', required: false, method:
'pkg-config')
if not dep.found()
build = false
reason = 'missing dependency, "libwd"'
Thanks
^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [EXTERNAL] [PATCH 0/2] uadk: realize async mode
2025-05-22 10:02 ` Zhangfei Gao
@ 2025-05-22 11:50 ` Akhil Goyal
0 siblings, 0 replies; 6+ messages in thread
From: Akhil Goyal @ 2025-05-22 11:50 UTC (permalink / raw)
To: Zhangfei Gao, Marchand, David, Aaron Conole
Cc: Fan Zhang, Ashish Gupta, dev, NBU-Contact-Thomas Monjalon (EXTERNAL)
> Hi, Akhil
>
> On Wed, 21 May 2025 at 20:39, Akhil Goyal <gakhil@marvell.com> wrote:
> >
> > > Realize async mode to replace sync mode for better performance
> > >
> > > Zhangfei Gao (2):
> > > compress/uadk: use async mode to replace sync mode
> > > crypto/uadk: use async mode to replace sync mode
> > >
> > > drivers/compress/uadk/uadk_compress_pmd.c | 107 ++++--
> > > .../compress/uadk/uadk_compress_pmd_private.h | 2 +-
> > > drivers/crypto/uadk/uadk_crypto_pmd.c | 321 +++++++++++++-----
> > > drivers/crypto/uadk/uadk_crypto_pmd_private.h | 8 +-
> > > 4 files changed, 318 insertions(+), 120 deletions(-)
> >
> > This patchset is not building for me atleast. Please fix compilation.
> >
> > ninja: Entering directory `./build-gcc-static'
> > [2/31] Compiling C object
> drivers/libtmp_rte_compress_uadk.a.p/compress_uadk_uadk_compress_pmd.c.
> o
> > FAILED:
> drivers/libtmp_rte_compress_uadk.a.p/compress_uadk_uadk_compress_pmd.c.
> o
> > ccache gcc -Idrivers/libtmp_rte_compress_uadk.a.p -Idrivers -I../drivers -
> Idrivers/compress/uadk -I../drivers/compress/uadk -Ilib/compressdev -
> I../lib/compressdev -Ilib/eal/common -I../lib/eal/common -I. -I.. -Iconfig -
> I../config -Ilib/eal/include -I../lib/eal/include -Ilib/eal/linux/include -
> I../lib/eal/linux/include -Ilib/eal/x86/include -I../lib/eal/x86/include -
> I../kernel/linux -Ilib/eal -I../lib/eal -Ilib/kvargs -I../lib/kvargs -Ilib/log -I../lib/log -
> Ilib/metrics -I../lib/metrics -Ilib/telemetry -I../lib/telemetry -Ilib/mbuf -
> I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -
> Idrivers/bus/vdev -I../drivers/bus/vdev -
> I/home/gakhil/up/uadk/build_x86/include -fdiagnostics-color=always -
> D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -std=c11 -O2 -g -
> include rte_config.h -Wvla -Wcast-qual -Wdeprecated -Wformat -Wformat-
> nonliteral -Wformat-security -Wmissing-declarations -Wmissing-prototypes -
> Wnested-externs -Wold-style-definition -Wpointer-arith -Wsign-compare -
> Wstrict-prototypes -Wundef -Wwrite-strings -Wno-packed-not-aligned -Wno-
> missing-field-initializers -D_GNU_SOURCE -fPIC -march=native -mrtm -
> DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation
> -Wno-address-of-packed-member -
> DRTE_LOG_DEFAULT_LOGTYPE=pmd.compress.uadk -MD -MQ
> drivers/libtmp_rte_compress_uadk.a.p/compress_uadk_uadk_compress_pmd.c.
> o -MF
> drivers/libtmp_rte_compress_uadk.a.p/compress_uadk_uadk_compress_pmd.c.
> o.d -o
> drivers/libtmp_rte_compress_uadk.a.p/compress_uadk_uadk_compress_pmd.c.
> o -c ../drivers/compress/uadk/uadk_compress_pmd.c
> > ../drivers/compress/uadk/uadk_compress_pmd.c: In function
> ‘uadk_compress_pmd_config’:
> > ../drivers/compress/uadk/uadk_compress_pmd.c:35:9: error: variable
> ‘cparams’ has initializer but incomplete type
> > 35 | struct wd_ctx_params cparams = {0};
> > | ^~~~~~~~~~~~~
> > ../drivers/compress/uadk/uadk_compress_pmd.c:35:34: error: excess elements
> in struct initializer [-Werror]
> > 35 | struct wd_ctx_params cparams = {0};
> > | ^
> > ../drivers/compress/uadk/uadk_compress_pmd.c:35:34: note: (near
> initialization for ‘cparams’)
> > ../drivers/compress/uadk/uadk_compress_pmd.c:35:23: error: storage size of
> ‘cparams’ isn’t known
> > 35 | struct wd_ctx_params cparams = {0};
> > | ^~~~~~~
> > ../drivers/compress/uadk/uadk_compress_pmd.c:42:42: error: dereferencing
> pointer to incomplete type ‘struct wd_ctx_nums’
> > 42 | ctx_set_num = calloc(WD_DIR_MAX, sizeof(*ctx_set_num));
> > | ^~~~~~~~~~~~
> > ../drivers/compress/uadk/uadk_compress_pmd.c:50:16: error: implicit
> declaration of function ‘numa_allocate_nodemask’ [-Werror=implicit-function-
> declaration]
> > 50 | cparams.bmp = numa_allocate_nodemask();
> > | ^~~~~~~~~~~~~~~~~~~~~~
> > ../drivers/compress/uadk/uadk_compress_pmd.c:50:16: error: nested extern
> declaration of ‘numa_allocate_nodemask’ [-Werror=nested-externs]
> > ../drivers/compress/uadk/uadk_compress_pmd.c:57:2: error: implicit
> declaration of function ‘numa_bitmask_setall’ [-Werror=implicit-function-
> declaration]
> > 57 | numa_bitmask_setall(cparams.bmp);
> > | ^~~~~~~~~~~~~~~~~~~
> > ../drivers/compress/uadk/uadk_compress_pmd.c:57:2: error: nested extern
> declaration of ‘numa_bitmask_setall’ [-Werror=nested-externs]
> > ../drivers/compress/uadk/uadk_compress_pmd.c:60:14: error: invalid use of
> undefined type ‘struct wd_ctx_nums’
> > 60 | ctx_set_num[i].async_ctx_num = UADK_COMP_DEF_CTXS;
> > | ^
> > ../drivers/compress/uadk/uadk_compress_pmd.c:62:8: error: implicit
> declaration of function ‘wd_comp_init2_’; did you mean ‘wd_comp_init’? [-
> Werror=implicit-function-declaration]
> > 62 | ret = wd_comp_init2_(alg_name, SCHED_POLICY_RR, TASK_HW,
> &cparams);
> > | ^~~~~~~~~~~~~~
> > | wd_comp_init
> > ../drivers/compress/uadk/uadk_compress_pmd.c:62:8: error: nested extern
> declaration of ‘wd_comp_init2_’ [-Werror=nested-externs]
> > ../drivers/compress/uadk/uadk_compress_pmd.c:62:50: error: ‘TASK_HW’
> undeclared (first use in this function)
> > 62 | ret = wd_comp_init2_(alg_name, SCHED_POLICY_RR, TASK_HW,
> &cparams);
> > | ^~~~~~~
> > ../drivers/compress/uadk/uadk_compress_pmd.c:62:50: note: each undeclared
> identifier is reported only once for each function it appears in
> > ../drivers/compress/uadk/uadk_compress_pmd.c:63:2: error: implicit
> declaration of function ‘numa_free_nodemask’ [-Werror=implicit-function-
> declaration]
> > 63 | numa_free_nodemask(cparams.bmp);
> > | ^~~~~~~~~~~~~~~~~~
> > ../drivers/compress/uadk/uadk_compress_pmd.c:63:2: error: nested extern
> declaration of ‘numa_free_nodemask’ [-Werror=nested-externs]
> > ../drivers/compress/uadk/uadk_compress_pmd.c:35:23: error: unused variable
> ‘cparams’ [-Werror=unused-variable]
> > 35 | struct wd_ctx_params cparams = {0};
> > | ^~~~~~~
> > ../drivers/compress/uadk/uadk_compress_pmd.c: In function
> ‘uadk_compress_pmd_close’:
> > ../drivers/compress/uadk/uadk_compress_pmd.c:97:3: error: implicit
> declaration of function ‘wd_comp_uninit2’; did you mean ‘wd_comp_uninit’? [-
> Werror=implicit-function-declaration]
> > 97 | wd_comp_uninit2();
> > | ^~~~~~~~~~~~~~~
> > | wd_comp_uninit
> > ../drivers/compress/uadk/uadk_compress_pmd.c:97:3: error: nested extern
> declaration of ‘wd_comp_uninit2’ [-Werror=nested-externs]
>
> I am sorry for the error.
>
> There are two reasons, one is using a newer uadk api, the other is
> dependence on numa.
> When using the old version uadk, I can reproduce a similar build
> error, though not exactly the same.
> And it can be solved by using a newer uadk version, at least 2.6, uadk
> master branch does not have issues.
>
> a. 2.6 version exports the new api
> b. building uadk library itself requires install numa, like yum
> install numactl-devel
> c. 2.6 header file +#include <numa.h>, which will be included automatically.
>
> Will add version dependence in the next version.
Yes this is what I also suspected.
But we cannot just change the version dependency without prior deprecation notice.
I would suggest sending a deprecation notice in this release and use it in next release.
@David/Aaron, your thoughts?
>
> diff --git a/drivers/compress/uadk/meson.build
> b/drivers/compress/uadk/meson.build
> index 34113cd08c..e251af14cf 100644
> --- a/drivers/compress/uadk/meson.build
> +++ b/drivers/compress/uadk/meson.build
> @@ -13,7 +13,7 @@ sources = files(
> )
>
> deps += 'bus_vdev'
> -dep = dependency('libwd_comp', required: false, method: 'pkg-config')
> +dep = dependency('libwd_comp', version: '>=2.6', required: false,
> method: 'pkg-config')
> if not dep.found()
> build = false
> reason = 'missing dependency, "libwd_comp"'
> @@ -21,7 +21,7 @@ else
> ext_deps += dep
> endif
>
> -dep = dependency('libwd', required: false, method: 'pkg-config')
> +dep = dependency('libwd', version: '>=2.6', required: false, method:
> 'pkg-config')
> if not dep.found()
> build = false
> reason = 'missing dependency, "libwd"'
> diff --git a/drivers/crypto/uadk/meson.build b/drivers/crypto/uadk/meson.build
> index e46abd21e5..52db344c8e 100644
> --- a/drivers/crypto/uadk/meson.build
> +++ b/drivers/crypto/uadk/meson.build
> @@ -13,7 +13,7 @@ sources = files(
> )
>
> deps += 'bus_vdev'
> -dep = dependency('libwd_crypto', required: false, method: 'pkg-config')
> +dep = dependency('libwd_crypto', version: '>=2.6', required: false,
> method: 'pkg-config')
> if not dep.found()
> build = false
> reason = 'missing dependency, "libwd_crypto"'
> @@ -21,7 +21,7 @@ else
> ext_deps += dep
> endif
>
> -dep = dependency('libwd', required: false, method: 'pkg-config')
> +dep = dependency('libwd', version: '>=2.6', required: false, method:
> 'pkg-config')
> if not dep.found()
> build = false
> reason = 'missing dependency, "libwd"'
>
> Thanks
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2025-05-22 11:50 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-05-08 7:41 [PATCH 0/2] uadk: realize async mode Zhangfei Gao
2025-05-08 7:41 ` [PATCH 1/2] compress/uadk: use async mode to replace sync mode Zhangfei Gao
2025-05-08 7:41 ` [PATCH 2/2] crypto/uadk: " Zhangfei Gao
2025-05-21 12:39 ` [EXTERNAL] [PATCH 0/2] uadk: realize async mode Akhil Goyal
2025-05-22 10:02 ` Zhangfei Gao
2025-05-22 11:50 ` Akhil Goyal
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).