From patchwork Tue Sep 7 07:59:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 98126 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id DE62DA0C41; Tue, 7 Sep 2021 10:04:08 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 32B2B41142; Tue, 7 Sep 2021 10:03:52 +0200 (CEST) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-eopbgr140079.outbound.protection.outlook.com [40.107.14.79]) by mails.dpdk.org (Postfix) with ESMTP id AC53D41141 for ; Tue, 7 Sep 2021 10:03:50 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GI/tqxYgFlnw3rPF3CmTnrweL+4ZxlFJDFLhkuiC6gxxUlzMPBp8I8v+HauE3AoOyHqpdNiBI47cq3CmNeeKPQX+3cPZPbp3f0pF03CL28Vbov8LgdwHeOAglEVdhmJAkBZJDK8FxKxTNA8xlQeu8gUcXEyHmx9l7H7tKkBUQZ1aUAp2jp6cycFw5X7D6WDRC/8i7i8FOvEdlRajrBYcyYf84XaKOGKUMADe+Y0D8NZkRrEeUWICby1pSj8FReUl9KUxfAfIKIKsHVUuLtIPAPUpw8UfIx03gjKp/fOqpI9cCpTsnMqCvYwiKLgTW378ApUd7jhRi8j8LunrDtV52A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=fTGHYKayBaZw9BJdUq1L8OtwGFTw8RexvlpcCP+RYhQ=; b=cqgl0MetAaG+FC+tB/qG5Nd8KsV6PSNjQXgmgh125r/8zHIjgXRwSYktoa5w6xTE/GTtO8G4uh7G4pCnW/9Mfj8+IuQBg7t3D4gJ3sFuIwu2Iy77C4Nxid9ROzuAoliWx5n4VFd1C2yerQb8t/xGk8HyU7MyhagMBoWkgtVVh3VMW17CQvVBIRcS1EjmAp9x4OfkbSIg3mcGC3xi395iFWb+8B3/gJnQ1G55vGNf9l/siYBm9T15nrIrFISqumkL32GqngWbrEm+wS3S2WS93DEkO7Yxrtd7c2fhcj3jSDaxirj7h8Gy2sCQ7yFzP1v4LPzUF+Ys185nXn3xtAyZBg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=fTGHYKayBaZw9BJdUq1L8OtwGFTw8RexvlpcCP+RYhQ=; b=f4OLD3KqX29bHqCirLMu0b4ZqOsQMD1EwdUVpQyGSih3POyuJ/qYLc1S4m/wb2RX6CE6V4K+GzdYgsGp4UlE1lURWNpZ0HvK3W7GBX7qhoGtFSD1YyJ4vaZFoRLI3K3wPR/qnY1QfUumwan6ORetzBzR+KEGjVfKEpdZBKDLj2g= Authentication-Results: dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=none action=none header.from=nxp.com; Received: from DU2PR04MB8630.eurprd04.prod.outlook.com (2603:10a6:10:2dd::15) by DU2PR04MB8551.eurprd04.prod.outlook.com (2603:10a6:10:2d6::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.17; Tue, 7 Sep 2021 08:03:49 +0000 Received: from DU2PR04MB8630.eurprd04.prod.outlook.com ([fe80::945d:e362:712d:1b80]) by DU2PR04MB8630.eurprd04.prod.outlook.com ([fe80::945d:e362:712d:1b80%4]) with mapi id 15.20.4478.025; Tue, 7 Sep 2021 08:03:49 +0000 From: Hemant Agrawal To: dev@dpdk.org, gakhil@marvell.com Cc: konstantin.ananyev@intel.com, roy.fan.zhang@intel.com Date: Tue, 7 Sep 2021 13:29:43 +0530 Message-Id: <20210907075957.28848-2-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210907075957.28848-1-hemant.agrawal@nxp.com> References: <20210825071510.7913-1-hemant.agrawal@nxp.com> <20210907075957.28848-1-hemant.agrawal@nxp.com> X-ClientProxiedBy: SG2PR02CA0068.apcprd02.prod.outlook.com (2603:1096:4:54::32) To DU2PR04MB8630.eurprd04.prod.outlook.com (2603:10a6:10:2dd::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from dpdk-xeon.ap.freescale.net (92.120.0.67) by SG2PR02CA0068.apcprd02.prod.outlook.com (2603:1096:4:54::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Tue, 7 Sep 2021 08:03:48 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bf205337-6124-42e3-a3af-08d971d60688 X-MS-TrafficTypeDiagnostic: DU2PR04MB8551: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:260; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: S3uNL9PzxkjWlYOh/qgL1bV7+jvNk7FDIkHdqwivHNSpqQCtVvhtluz6EdAy1o87US9jnr1E7vN0ZoMSH9Mcj3bewss8jXbzKRJjoTxqxcLcj563PHxc1UpFjOKBYlTxAxTpIOceTO9ZMX+rD99RoXvPspbWzKQ0YxE4Mts/PIzZsMXanC1ZIk/0k9Z2x7VkdCgfxU7K4iq9Ja4d+NIiYOFXVGn20xA8vE+1nFDevwnj4KBStNjdkU299/blTShBd6MjnReHyI/4Fk9Tf7BPhxqpsH2CFgbT3WTDsFX3UGdMKNwddaeTlBh4vG4tAWXMeEgMzhWdA1JwVu6HEVa7tgiSKhvPN6u3kLV08Od2LY/4ynRbm1Ic9upjfDFipIgM6d984wkjuPWd/k3o90M3B65wGxLYIdxe/4gBi5CTZQH3fi4HwlcIsFRZPlMz0us1P3izn8S5mUR05urwtYH2prxPtYj8NAU8GExUjBHB0F+35NwNIQGwxEj7F/WSnGrpxEr5EQtf5msv98HeP2qf3w+QgejX8GuYsahcQt2T2DdFio73D4JcJd217dcNP0rl3fViNCmorUsoFFzPzbfZ//Owa75zqsd8uPWKelQ+mI4GWu654+UhMWj4TnAsqD/hfyHCMM3Cu8/pYNv8i+pkMlYjgcB9dcCG36m6CvrSZ795K41TB7ziuU2oEAx2+9NPmYZc4i33jiGV6KAVWhGlgA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU2PR04MB8630.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(39860400002)(376002)(366004)(136003)(396003)(36756003)(38350700002)(6666004)(52116002)(8676002)(38100700002)(6486002)(956004)(2616005)(6506007)(5660300002)(66946007)(66476007)(83380400001)(2906002)(6512007)(316002)(26005)(186003)(86362001)(66556008)(4326008)(478600001)(1076003)(44832011)(8936002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8PJbpIA6Y9Xoob/RizBgrnaSFunp/w2sRkpcAB0plwKpUt6LZwEqzMbD4h3MBs/fymRbUKPOPTBYNnx2B6JyevyPBnOX34Cfh+im5D+C3lUePrPQeRe67xj57udrpW1zRJELwP77lk6lvYUkfI1j9McDOSkAG4Qo1jzpYoRP+xxc8F1KPROXniI8LKE+awd0FiDhGXFFldcqvv4oKDK8zjDeRkd1blMMQZDedNQ1ksaWKof97pERUzn0T+R1qGOnEjdEa+CFva/FB20z8tYOiasY0A731y2DC0iX0OqnYKWG/Kp8xyL6ALPp9tgyULOxMQ+8vAyZGd8aJvcA/pr9mvEXLn+zaxS9cf6JwS0qUGWDrt/fmYal8ycFHJW4l2CxZ2yUW5nc7aZXhM2Ev5TCCbXNgY1uMmJXrgUC/hl3b8Bns5ePh37H004JZ1Ve4466tQEbdnpl1CygbhPIK0cGfJTZt0D01BYJjrwEEeKPthGk6+n9FnDgif+OhQ9b+HQ8qDx6euiQH0ABkBBAi/LpzxMTTNlFnKYSi4kfBz59sokqYmiYoAwAzP/DwoYj61hVfr2MxgjOKMk9+Fu+wDnEOHjDfB65EyT7JICD6n8kvWr3nU0yKXz3nHgYsayUlTKYVUj2cHVSABLaV+NmWiK2Mse5uK1hjQnfrwylzfa6Y0nUMoJKUIkNUhgknCU45chgkTebjp3eWNALEyviT9SEET2Z5Uk8zNpkYlT6+SvCNenOKkmfRZTsBoGJVUswNtFP2TGiZUcw+IPyA7moktwcC3uMZObwhIxgqMQb6SiJkNQJcFExnNNvIQPXD6oTqer4YV/PF8gt+sXdnO5z/vUnJ8y6LwwIyZrEzMfHZ8+1iopovKvkozOAYoJ+nBKAFOkTufVvkoUAdYJJytLSF4zD4MDYCDNAladeMM3iSgyTNgZrZRSCme5u4y5aqh1KSfoYFDcoV6C15CmnLgiEBLsNyqkjll9kGgTTjQrbGRzc52bDCHxQG1b9fIsVm076U7af2+GaYO5NtfH2LPsMO9vwVbx530Op0MwSWshecIPC/reJIZgqvGzn59nzPxLBAAOeXD1x+CoZfzjUN4cYDVAit5Yc8j410IcEL9evJ+TOhCTpitV6sgGSHc0asJRI2maJdepU1YCPOs6RdC8wWi167ajTNnh1KLnD/bERHjtIiQlu3ndnf00Lax9qc4zNAHN1HoIpC0AlTzI3eTWzu7DefoY/3KG5urTQosNdQqVV6tJxB2MVRTuTthv5nLUzQp1L0LLmToljFOiVkJhRcuHHuuTZ8V7Vc/qr6ne7K/Ura3CGGhCsgTfs/W8sRAZQa0x8 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: bf205337-6124-42e3-a3af-08d971d60688 X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8630.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2021 08:03:49.8195 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: bj9J3tyUoXZjZeueQSHb0zLZRRRDOGLn78RS9I88b7RsT6NwLy6LH4CThYMhg4gJOPplV/AiEn0KNkLsv5AfBA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB8551 Subject: [dpdk-dev] [PATCH v2 01/15] crypto: change sgl to src_sgl in vector 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 Sender: "dev" This patch renames the sgl to src_sgl to help differentiating between source and destination sgl. Signed-off-by: Hemant Agrawal Acked-by: Akhil Goyal Acked-by: Konstantin Ananyev --- app/test/test_cryptodev.c | 6 ++--- drivers/crypto/aesni_gcm/aesni_gcm_pmd.c | 12 +++++----- drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c | 6 ++--- drivers/crypto/qat/qat_sym_hw_dp.c | 27 +++++++++++++--------- lib/cryptodev/rte_crypto_sym.h | 2 +- lib/ipsec/misc.h | 4 ++-- 6 files changed, 31 insertions(+), 26 deletions(-) diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index 843d07ba37..ed63524edc 100644 --- a/app/test/test_cryptodev.c +++ b/app/test/test_cryptodev.c @@ -221,7 +221,7 @@ process_sym_raw_dp_op(uint8_t dev_id, uint16_t qp_id, digest.va = NULL; sgl.vec = data_vec; vec.num = 1; - vec.sgl = &sgl; + vec.src_sgl = &sgl; vec.iv = &cipher_iv; vec.digest = &digest; vec.aad = &aad_auth_iv; @@ -385,7 +385,7 @@ process_cpu_aead_op(uint8_t dev_id, struct rte_crypto_op *op) sgl.vec = vec; sgl.num = n; - symvec.sgl = &sgl; + symvec.src_sgl = &sgl; symvec.iv = &iv_ptr; symvec.digest = &digest_ptr; symvec.aad = &aad_ptr; @@ -431,7 +431,7 @@ process_cpu_crypt_auth_op(uint8_t dev_id, struct rte_crypto_op *op) sgl.vec = vec; sgl.num = n; - symvec.sgl = &sgl; + symvec.src_sgl = &sgl; symvec.iv = &iv_ptr; symvec.digest = &digest_ptr; symvec.status = &st; diff --git a/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c b/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c index 886e2a5aaa..5fbb9b79f8 100644 --- a/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c +++ b/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c @@ -535,7 +535,7 @@ aesni_gcm_sgl_encrypt(struct aesni_gcm_session *s, processed = 0; for (i = 0; i < vec->num; ++i) { aesni_gcm_process_gcm_sgl_op(s, gdata_ctx, - &vec->sgl[i], vec->iv[i].va, + &vec->src_sgl[i], vec->iv[i].va, vec->aad[i].va); vec->status[i] = aesni_gcm_sgl_op_finalize_encryption(s, gdata_ctx, vec->digest[i].va); @@ -554,7 +554,7 @@ aesni_gcm_sgl_decrypt(struct aesni_gcm_session *s, processed = 0; for (i = 0; i < vec->num; ++i) { aesni_gcm_process_gcm_sgl_op(s, gdata_ctx, - &vec->sgl[i], vec->iv[i].va, + &vec->src_sgl[i], vec->iv[i].va, vec->aad[i].va); vec->status[i] = aesni_gcm_sgl_op_finalize_decryption(s, gdata_ctx, vec->digest[i].va); @@ -572,13 +572,13 @@ aesni_gmac_sgl_generate(struct aesni_gcm_session *s, processed = 0; for (i = 0; i < vec->num; ++i) { - if (vec->sgl[i].num != 1) { + if (vec->src_sgl[i].num != 1) { vec->status[i] = ENOTSUP; continue; } aesni_gcm_process_gmac_sgl_op(s, gdata_ctx, - &vec->sgl[i], vec->iv[i].va); + &vec->src_sgl[i], vec->iv[i].va); vec->status[i] = aesni_gcm_sgl_op_finalize_encryption(s, gdata_ctx, vec->digest[i].va); processed += (vec->status[i] == 0); @@ -595,13 +595,13 @@ aesni_gmac_sgl_verify(struct aesni_gcm_session *s, processed = 0; for (i = 0; i < vec->num; ++i) { - if (vec->sgl[i].num != 1) { + if (vec->src_sgl[i].num != 1) { vec->status[i] = ENOTSUP; continue; } aesni_gcm_process_gmac_sgl_op(s, gdata_ctx, - &vec->sgl[i], vec->iv[i].va); + &vec->src_sgl[i], vec->iv[i].va); vec->status[i] = aesni_gcm_sgl_op_finalize_decryption(s, gdata_ctx, vec->digest[i].va); processed += (vec->status[i] == 0); diff --git a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c index a01c826a3c..1b05099446 100644 --- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c +++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c @@ -2002,14 +2002,14 @@ aesni_mb_cpu_crypto_process_bulk(struct rte_cryptodev *dev, for (i = 0, j = 0, k = 0; i != vec->num; i++) { - ret = check_crypto_sgl(sofs, vec->sgl + i); + ret = check_crypto_sgl(sofs, vec->src_sgl + i); if (ret != 0) { vec->status[i] = ret; continue; } - buf = vec->sgl[i].vec[0].base; - len = vec->sgl[i].vec[0].len; + buf = vec->src_sgl[i].vec[0].base; + len = vec->src_sgl[i].vec[0].len; job = IMB_GET_NEXT_JOB(mb_mgr); if (job == NULL) { diff --git a/drivers/crypto/qat/qat_sym_hw_dp.c b/drivers/crypto/qat/qat_sym_hw_dp.c index ac9ac05363..4870ebf66a 100644 --- a/drivers/crypto/qat/qat_sym_hw_dp.c +++ b/drivers/crypto/qat/qat_sym_hw_dp.c @@ -181,8 +181,9 @@ qat_sym_dp_enqueue_cipher_jobs(void *qp_data, uint8_t *drv_ctx, (uint8_t *)tx_queue->base_addr + tail); rte_mov128((uint8_t *)req, (const uint8_t *)&(ctx->fw_req)); - data_len = qat_sym_dp_parse_data_vec(qp, req, vec->sgl[i].vec, - vec->sgl[i].num); + data_len = qat_sym_dp_parse_data_vec(qp, req, + vec->src_sgl[i].vec, + vec->src_sgl[i].num); if (unlikely(data_len < 0)) break; req->comn_mid.opaque_data = (uint64_t)(uintptr_t)user_data[i]; @@ -302,8 +303,9 @@ qat_sym_dp_enqueue_auth_jobs(void *qp_data, uint8_t *drv_ctx, (uint8_t *)tx_queue->base_addr + tail); rte_mov128((uint8_t *)req, (const uint8_t *)&(ctx->fw_req)); - data_len = qat_sym_dp_parse_data_vec(qp, req, vec->sgl[i].vec, - vec->sgl[i].num); + data_len = qat_sym_dp_parse_data_vec(qp, req, + vec->src_sgl[i].vec, + vec->src_sgl[i].num); if (unlikely(data_len < 0)) break; req->comn_mid.opaque_data = (uint64_t)(uintptr_t)user_data[i]; @@ -484,14 +486,16 @@ qat_sym_dp_enqueue_chain_jobs(void *qp_data, uint8_t *drv_ctx, (uint8_t *)tx_queue->base_addr + tail); rte_mov128((uint8_t *)req, (const uint8_t *)&(ctx->fw_req)); - data_len = qat_sym_dp_parse_data_vec(qp, req, vec->sgl[i].vec, - vec->sgl[i].num); + data_len = qat_sym_dp_parse_data_vec(qp, req, + vec->src_sgl[i].vec, + vec->src_sgl[i].num); if (unlikely(data_len < 0)) break; req->comn_mid.opaque_data = (uint64_t)(uintptr_t)user_data[i]; - if (unlikely(enqueue_one_chain_job(ctx, req, vec->sgl[i].vec, - vec->sgl[i].num, &vec->iv[i], &vec->digest[i], - &vec->auth_iv[i], ofs, (uint32_t)data_len))) + if (unlikely(enqueue_one_chain_job(ctx, req, + vec->src_sgl[i].vec, vec->src_sgl[i].num, + &vec->iv[i], &vec->digest[i], + &vec->auth_iv[i], ofs, (uint32_t)data_len))) break; tail = (tail + tx_queue->msg_size) & tx_queue->modulo_mask; @@ -688,8 +692,9 @@ qat_sym_dp_enqueue_aead_jobs(void *qp_data, uint8_t *drv_ctx, (uint8_t *)tx_queue->base_addr + tail); rte_mov128((uint8_t *)req, (const uint8_t *)&(ctx->fw_req)); - data_len = qat_sym_dp_parse_data_vec(qp, req, vec->sgl[i].vec, - vec->sgl[i].num); + data_len = qat_sym_dp_parse_data_vec(qp, req, + vec->src_sgl[i].vec, + vec->src_sgl[i].num); if (unlikely(data_len < 0)) break; req->comn_mid.opaque_data = (uint64_t)(uintptr_t)user_data[i]; diff --git a/lib/cryptodev/rte_crypto_sym.h b/lib/cryptodev/rte_crypto_sym.h index 58c0724743..dcc0bd5933 100644 --- a/lib/cryptodev/rte_crypto_sym.h +++ b/lib/cryptodev/rte_crypto_sym.h @@ -69,7 +69,7 @@ struct rte_crypto_sym_vec { /** number of operations to perform */ uint32_t num; /** array of SGL vectors */ - struct rte_crypto_sgl *sgl; + struct rte_crypto_sgl *src_sgl; /** array of pointers to cipher IV */ struct rte_crypto_va_iova_ptr *iv; /** array of pointers to digest */ diff --git a/lib/ipsec/misc.h b/lib/ipsec/misc.h index 79b9a20762..58ff538141 100644 --- a/lib/ipsec/misc.h +++ b/lib/ipsec/misc.h @@ -136,7 +136,7 @@ cpu_crypto_bulk(const struct rte_ipsec_session *ss, /* not enough space in vec[] to hold all segments */ if (vcnt < 0) { /* fill the request structure */ - symvec.sgl = &vecpkt[j]; + symvec.src_sgl = &vecpkt[j]; symvec.iv = &iv[j]; symvec.digest = &dgst[j]; symvec.aad = &aad[j]; @@ -160,7 +160,7 @@ cpu_crypto_bulk(const struct rte_ipsec_session *ss, } /* fill the request structure */ - symvec.sgl = &vecpkt[j]; + symvec.src_sgl = &vecpkt[j]; symvec.iv = &iv[j]; symvec.aad = &aad[j]; symvec.digest = &dgst[j];