From patchwork Mon Jun 16 02:50:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhangfei Gao X-Patchwork-Id: 896887 Delivered-To: patch@linaro.org Received: by 2002:adf:9b99:0:b0:3a4:ee3f:8f15 with SMTP id d25csp1428639wrc; Sun, 15 Jun 2025 19:50:48 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUqcEqrXbhgQ8hUAdDMu/C1aPFVL181/Qjs3ubgBlRt4MLUlk2dbg650UaBnguh07S1aoWGzA==@linaro.org X-Google-Smtp-Source: AGHT+IGOFmv4HE+Z4Qb/aSSCV5NrmeL58tku1PXL83cqgSNqA01hNthQARtWhOBfNjRpCibUmbTo X-Received: by 2002:a05:6902:1027:b0:e7d:d830:41ee with SMTP id 3f1490d57ef6-e822ac8eb22mr4407432276.5.1750042248429; Sun, 15 Jun 2025 19:50:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1750042248; cv=none; d=google.com; s=arc-20240605; b=k6yzc14m/jOuJdVMYT9ZiVi8yVT2KIXCE2PxG54Xoe//X6MeGigEvMA7bqHp9KuxlN FAHbOg5f+W1vX+81zl0UUYhSGuEVB1EWqDbiYBJq4D0aVbt2zc6U7TzZ2utLC7Pr+3Dn gSQLWqLCawTSDeiuJYm0gnHJgM6du75D4ld7vNf4Yh1LbkRvSWXYz3VTo8Da66mDJ0ZC wxbTZ7WS+0Xt0ZlI7od11/xBrPKTYoODmYXLTS6GMNP31Td1YQzxCUK/qWp/49GtWMIu jbRrsJV1LBnyNkrH2DVwid7Jq8VDH/4tISXoe1n4AcHkQGmlX1YN1mh77wR7SvfXqeCD 5DQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=A9OAIrm0OcYOtjYN3Yuu+BxA+D3KbnadKClzdxU2XMI=; fh=N6ystvY2g7QTpz2QKkAMt/Nu9xETjtRlVAZxgmiIO6M=; b=Q85tl3S0ZaNX+2k2z+KhGXxcFJDAXEsNk3qkflHpU1fjlLtmliC8j8Njs6VSMLuB6b 1limM0XevhQnrYiQoiiT+X3MUj42HIyqwkwYC75zMSdHE8vhFSO3M6DAnzVenjRN7BVe 7ztkmbyZJOPh2E42AWIGFNlnk0B7S91AF2t1OWAYAuwufD6KZYxIlqz3VArEbiFx6miF CfwgklCh4yGdikeJnFa6dODuc1hY7HYFZyEoJ5NTpMrdv827YhxDng1LeqFc4yARvbbq Y3OCRUQ9K48rKhUzCny4lhzD6ETTxG3eQlqmiEr8Mn8vsNnl4fVYpGAoV6Gssb+whiZE BHUg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MNB+bic7; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 217.70.189.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from mails.dpdk.org (mails.dpdk.org. [217.70.189.124]) by mx.google.com with ESMTP id 3f1490d57ef6-e8228ce5783si5027116276.438.2025.06.15.19.50.48; Sun, 15 Jun 2025 19:50:48 -0700 (PDT) Received-SPF: pass (google.com: domain of dev-bounces@dpdk.org designates 217.70.189.124 as permitted sender) client-ip=217.70.189.124; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MNB+bic7; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 217.70.189.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 58EFE402EF; Mon, 16 Jun 2025 04:50:43 +0200 (CEST) Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by mails.dpdk.org (Postfix) with ESMTP id 5A3D6402BC for ; Mon, 16 Jun 2025 04:50:41 +0200 (CEST) Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-3137c20213cso4910082a91.3 for ; Sun, 15 Jun 2025 19:50:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750042240; x=1750647040; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=A9OAIrm0OcYOtjYN3Yuu+BxA+D3KbnadKClzdxU2XMI=; b=MNB+bic7Te8cag5SurLOW5W4paOWcLGrWVsOF9KAe+GoPURQTdOiSqHvv9uxmaGOzZ djrNRwDxjNOM4xYiBopq7yk8XiRedGvPUuHHuEokl2BNFJBkl95H2jzVAMI8TuC6Xbks cP/NeLmCl7wRn3mw3qsBBB4RgJIl+SQbCzljFVE5g00luOaIuwB6vWSaXwo8W1fWmFCL b3fJTwM9X131Mv/RV2B8df5DjcwPgQCObTJ9vtI57cF8hZfXvM03JFeTjERKAZ6/y51T /jL2lvsrMMX2EFfZi5dFNC4qnNIwetI998ljSdtL5Jd9UsOhP29/3XyMpsILPEO4cgE8 ZW7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750042240; x=1750647040; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=A9OAIrm0OcYOtjYN3Yuu+BxA+D3KbnadKClzdxU2XMI=; b=WNPj5V+/m5byTfzR5/fV3wjXW4kHzEvcflJW+uHRmtaOL+j42ds5YvTNrvMoUjAgIS 50mC0gyQR7kSj3BrbgpuHft9RSZBGMS7/5/fM2QGn30KB35NN9rCS4LNcs1BG5OGW8x5 zrK6j0j7FG2cFCmGUr0+yaP6XcpL546/Bl/n8HCak5gYnzjpxWkO/CKnZuGKmoSIZut1 lJN3kVZZ10uJEEClECQFBRzmlhpyQddF5++TolhGSzsc48N6HGl/5VhQBTUFmY3Eo5WV d6I6WbMCF3i2dPMQaSci9CsrMd5wHxY81Mx+T13tVYhnSJtPacerPRrxKX+o35DE+KeE Pk4Q== X-Gm-Message-State: AOJu0Yx11uEA0cAtC3ukCtpClkolhU/nGK1HeF4AIu3m388F5pjRONAK uXTu9jukYk5Go2HuFYU0iuQnRCuJYe4LvLgU7H3C/b/nlFjuNwNiTpdlweuA7x2lilY= X-Gm-Gg: ASbGncvfcp+tV+gOZgQ3dKJAlimlgTOGlQ5FlNrl3tYrvLsuCQFegGMtyNj2cKIP0lh 0wDFCf9KJsicVtUVLAcPbxfLsmn9DrD49a5wx/NoKqNkxxKadHSixnGjb6t4Si5UIlsFP97mvGf ZoqLbDd8at/c6dUDa9mzAw4mfen83JE7dRE/dhSqGm8phDrVI+U9ZnAAkfWFbQA1mbW+K0cZKqc 5DB5oZwzlq1qg5Zv9R1TLalGXvuUJ5BNIG9/twf+Ijy8IABu6lll+c5vDjnT/UTgJqm6xS4pBuq uoZGokAx1PIQqDv0gUr0q4DBwo1PgpD/Demn8we/BgrGzdF4WI8W84MliN9e9pGb X-Received: by 2002:a17:90b:3842:b0:312:1508:fb4e with SMTP id 98e67ed59e1d1-313f1cd6882mr13071089a91.17.1750042240270; Sun, 15 Jun 2025 19:50:40 -0700 (PDT) Received: from gmail.com ([121.37.54.139]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-313c19d2ccdsm7415027a91.19.2025.06.15.19.50.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jun 2025 19:50:39 -0700 (PDT) From: Zhangfei Gao To: Akhil Goyal , Fan Zhang , Ashish Gupta Cc: dev@dpdk.org, Zhangfei Gao Subject: [PATCH v2 1/2] compress/uadk: use async mode to replace sync mode Date: Mon, 16 Jun 2025 02:50:26 +0000 Message-Id: <20250616025027.209883-2-zhangfei.gao@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250616025027.209883-1-zhangfei.gao@linaro.org> References: <20250616025027.209883-1-zhangfei.gao@linaro.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org To get better performance, using async mode to replace sync mode Signed-off-by: Zhangfei Gao --- doc/guides/compressdevs/uadk.rst | 15 +++ drivers/compress/uadk/meson.build | 4 +- drivers/compress/uadk/uadk_compress_pmd.c | 94 ++++++++++++++----- .../compress/uadk/uadk_compress_pmd_private.h | 2 +- 4 files changed, 86 insertions(+), 29 deletions(-) diff --git a/doc/guides/compressdevs/uadk.rst b/doc/guides/compressdevs/uadk.rst index a29043e0c0..a234fe42fc 100644 --- a/doc/guides/compressdevs/uadk.rst +++ b/doc/guides/compressdevs/uadk.rst @@ -96,3 +96,18 @@ Test steps sudo dpdk-test --vdev=compress_uadk RTE>>compressdev_autotest RTE>>quit + + +As a reference, the following table shows a mapping between the past DPDK versions +and the UADK library version supported by them: + +.. _table_uadk_versions: + +.. table:: DPDK and external UADK library version compatibility + + ============== ============================ + DPDK version UADK library version + ============== ============================ + 24.07 - 25.03 2.4 - 2.8 + 25.07+ 2.9 + ============== ============================ diff --git a/drivers/compress/uadk/meson.build b/drivers/compress/uadk/meson.build index 34113cd08c..100fb2fc19 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.9', 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.9', required: false, method: 'pkg-config') if not dep.found() build = false reason = 'missing dependency, "libwd"' diff --git a/drivers/compress/uadk/uadk_compress_pmd.c b/drivers/compress/uadk/uadk_compress_pmd.c index 1f4c4cfd00..0d5cd21bec 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,15 +32,35 @@ 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; + + 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_MIX, &cparams); + free(ctx_set_num); + + if (ret) { + UADK_LOG(ERR, "failed to do comp init2!"); + return ret; + } + + priv->init = true; + return 0; } @@ -57,9 +80,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 +314,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 +357,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 +394,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 +428,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 +444,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 {