From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 17DCEA0C41;
Tue, 7 Sep 2021 10:05:34 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 618C841187;
Tue, 7 Sep 2021 10:04:17 +0200 (CEST)
Received: from EUR05-VI1-obe.outbound.protection.outlook.com
(mail-vi1eur05on2078.outbound.protection.outlook.com [40.107.21.78])
by mails.dpdk.org (Postfix) with ESMTP id CEE3C4117F
for <dev@dpdk.org>; Tue, 7 Sep 2021 10:04:16 +0200 (CEST)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
b=JqAY08CR1hetFuDUwuMnQ49xkhyk6tKJ1YIX2zW/wXj1zXQYBBgZzgXhV+cGy9a9nDq1PEZMZ9cDjWNOgox8tpRM1V4t4CP1xpRhXIiOSP3RoBI1r2EbvjWmIMYsqprBXMDoTBx/7QEOs9p6fnQMAIO2uL2J8MJA5gRa18paPiyf1vUyHw8YOihgIFs4Vx3odyC6MSmPPj12HKmLWQNtjaowjyKm7IZdoMIkRbyKfkC/nn5AtsvSvW9XeKtBRbFTsEx+vmGenEpsdLGzYOpFL1ufbtDANvBMYpQwJyuje6tnrJOJNHEN52b8xrZaKCZSSMzfIkTgqf97S/nkmaWl+A==
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=YqaXcWZmzes9i4Dns5vYrmIBnikEsdWyaDkbLdillH4=;
b=Yw2NApbgt9zoRY/oCBz/OZipe+UJozWESLBSyQJQq1UeY6/XDjONn18gyB7ONqFa1zjc8gcIpbsUGyhhWY2ftDtczOsny1uvVfY+bjm+a0Lz2tp/lO1gBDUE20w/Uv7eISratwzy8ShS3ziYRPfoJ8tF4VNycLN4GG5/QRRoi8E+941dIIE8d8iIerim7zKUCT2n+ypSbendbkDW1laJHzHfpj5l3LnB22IeZfAQcxbrWBDidFfHYb7UdsakA0px5fw43iVcBW19ViCZt4gQxaLo3s5VTEhFSnybjugdyuAwnUgZ9gTLh5Oj6r6TXGbl1P+JevcPmZ/uNMIyqahvdg==
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=YqaXcWZmzes9i4Dns5vYrmIBnikEsdWyaDkbLdillH4=;
b=T0is956Noh6jLzjbPCE7kliNmN0DnH1wV9FgFbfoi6W4FuOeCviGFxPwDD9eDQKtwg/eZHRpAnJYbQHjofhKfe8ayhrm1GCMwsbYWo8KXRqk1PhmNZR7eRIo6x1ezQJkd0Rj5Pzs/R2/efScVpzq9+nXq06l03k/YBskRHlmg6E=
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 DU2PR04MB8709.eurprd04.prod.outlook.com (2603:10a6:10:2dc::7) with
Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14; Tue, 7 Sep
2021 08:04:16 +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:04:16 +0000
From: Hemant Agrawal <hemant.agrawal@nxp.com>
To: dev@dpdk.org,
gakhil@marvell.com
Cc: konstantin.ananyev@intel.com, roy.fan.zhang@intel.com,
Gagandeep Singh <g.singh@nxp.com>
Date: Tue, 7 Sep 2021 13:29:54 +0530
Message-Id: <20210907075957.28848-13-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>
Content-Type: text/plain
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:04:14 +0000
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 3f4b5762-7333-4ba4-06d3-08d971d61614
X-MS-TrafficTypeDiagnostic: DU2PR04MB8709:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <DU2PR04MB8709310F924F76C375D6872C89D39@DU2PR04MB8709.eurprd04.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:1443;
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: STFlgnLlwPZ1gVVOMRSBDMaKtHO7B4bJaCWI1brJPAho4hPbdEMJZ7Z5CJsIq08WK6BgtrGuPNREXfbJoGpLpRaNO3+yqJ0hnN/86sBCp2ev9bVWp6Is4Fy+P/BB/Q/OgIKtKXVgM3U+85HNXOp2TOAoic9V9RvH6FQ8Lcxjh7wqheNa4FsgnylPV4tbvOn+OB81bgI+vmvnrALXhI3NvcSWzpOagAzywP2laDBQFnXL8/saosBp3c4BtJZZrTUYbSyxrk8CVLTfwxZQ/LayahsqlSAF+goRppS0I0WT/bSlxPsNrJiK3M/S5tkmZW7f04tj7CgBBG1MGCShBGYdGd35W/KItIJc9GSKLxYwLYquliaoxIdOmbne6HAlCdLU25xYRHTjRFpS28T0xcHrAksJc+0/yGizeIOgRV7OSi+ulEPTjoyS+tDiW6YeZ5Tk+PGuSfwAWSX2NBviKG4mq3OciWMYRmSASDhlzGleBCTZxYlNAud3hlfvyNvmHntZ+wArcpvtDCHEMLlqqD2uJrXTSl9ZfGGQUrhLMbZbhtBk2QkVjZJ9HnRDGDMJOB3m4+SBF/qGcnAomAzSeSWcTd8dlIqesSELAZWOoXAiPdpZnvgR4egFRK9BV3+P8P3Ql6tG0lQqiKqlKNl5kBbD4fs3o1HfKX8o19wu1pYR8Qd80c2hC98kjdHsuB6OiRO38QNlpn8GftXzUhZ3iPNFBA==
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)(396003)(376002)(346002)(39860400002)(136003)(366004)(36756003)(38350700002)(186003)(52116002)(1076003)(6666004)(38100700002)(5660300002)(66476007)(66556008)(6486002)(6506007)(8936002)(8676002)(44832011)(26005)(66946007)(4326008)(86362001)(2616005)(2906002)(956004)(316002)(478600001)(6512007)(83380400001);
DIR:OUT; SFP:1101;
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?WUTYWJlS467uDBHM1gBAF1MX3dnxeC/ket1vlxASxglBauvSuCe76T9PuQu0?=
=?us-ascii?Q?YzEa1McQtcVco+g96uEEW6gTOZMG5dKB0ZLnDRf+CBMzJenROYbaVhHdu+BQ?=
=?us-ascii?Q?bxEP7mVz1kCls0GB6nAytLRf0aPy8yJX4EDdTRMcriTCckPKKHl3Z3DHjn+U?=
=?us-ascii?Q?Lm1vgVYWzTE9QR18t0N1ziY73BQIXFZysbVxFHFR9NEaJmwFabnOjXbmuljp?=
=?us-ascii?Q?JX+KLEt0bl31wb5UbtCMOIk/7aeJQhH47aS+chFY89BwDapjtYSNIeJgexPa?=
=?us-ascii?Q?DTmfoGbYLDGcTTX+EleDla6tJqRA2hz8U4C2aAK6yIs70G/o91KxC1X7/ml8?=
=?us-ascii?Q?haKQJdLFSM5bDC7ZqBj6NUJbgB6CjNCdayFR6o17r5CX7KqsREVkS4HUh/Wg?=
=?us-ascii?Q?pNSpH2YWrI5QihcwiyTXqh4Q7tIbQszmJ99wB0Jy93HXJGL1TMH3C1GHF1GQ?=
=?us-ascii?Q?+hZ4tTPyw9VjhOn4IfgXmnopSQV4J48aiwprTCheGDIhgafDKWjOFEjB8+2w?=
=?us-ascii?Q?9IIMIe4wlY3oUn09ILwXA1srLi760nLFgAlni68NIIzqdlpf5ryQdpe6gU8k?=
=?us-ascii?Q?q1FDMSkG0MdsjuEPi+yt8Xx1fRGgc7R3ZFITBIU1UEvGilLEu3ERBt+iLnSC?=
=?us-ascii?Q?zokWkTwfbF4BXAKMQOuq3etyVJGzHmTtmGseVcw4sdC8V0kvdvrRjQbhj9v1?=
=?us-ascii?Q?UHcMLIJD63sSkUM385mSWPbt/AOOOKkUqkTMETy81WnNAbS+md9IpBMkNZDg?=
=?us-ascii?Q?0hp7giAHHeAxrE1j9lra/khhzOxux4qEwtfKFjw36tH0tf8fRZQjTSFl9uOm?=
=?us-ascii?Q?x9EefbFKLW/rguaq015ie4UdlnX02tSi009sDueyz9Lzt+JWFU9X4ZRSITv5?=
=?us-ascii?Q?cFFXhch5knY0KuXoXTOfRfPpX5SraXw7guew0GeEsQwHTf/UEanG4bdMeUog?=
=?us-ascii?Q?QwOX9r7Pj3N4T2cVb0KdtnBH0vsQKBJ7AzSE0eaZX8FgfdLMULyZfmGL5CVI?=
=?us-ascii?Q?qgmEjwvhu+Q3HM7oHEu1StEeyBxWxIO6BqHNWHs9WXi3VWB8asrzVaB3K1eK?=
=?us-ascii?Q?FV7jxSIJB9FR2XePr6nABUQfAuNuhSJ3vWLeuRnr3yfRv5OIuJmSJMRUqXid?=
=?us-ascii?Q?1nUefnEgVuC87/Lk0rRw+i2TmJLEdzdK48FksLhfOYhCfsU2oq7ChymQIcaE?=
=?us-ascii?Q?c57eWwKVEbYlW5vltKzp0/fKU5+WIAPQ8pThdaCqTaY0sBsOLl4TINfHTeAO?=
=?us-ascii?Q?WNp2Hrt9ZOoZgsZ1ElR4wvPZ4Z1DwSyoDyOs7sLZYjkbKwHX7eqtY6glvTuN?=
=?us-ascii?Q?oE4zoqMz2NoUr5NpBTJpyp+T?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 3f4b5762-7333-4ba4-06d3-08d971d61614
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:04:15.9277 (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: GqPGLmFFDjQNzTerpP8sz+qorvVn08eQ7By3/cBUlt15dFTv91LDkXv8aNLe6wV6ulIlWS7O/igEycwpe82Y4Q==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB8709
Subject: [dpdk-dev] [PATCH v2 12/15] crypto/dpaa_sec: support authonly and
chain with raw APIs
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
From: Gagandeep Singh <g.singh@nxp.com>
This patch improves the raw vector support in dpaa_sec driver
for authonly and chain usecase.
Signed-off-by: Gagandeep Singh <g.singh@nxp.com>
---
drivers/crypto/dpaa_sec/dpaa_sec.h | 3 +-
drivers/crypto/dpaa_sec/dpaa_sec_raw_dp.c | 296 +++++++++++++++++++++-
2 files changed, 287 insertions(+), 12 deletions(-)
diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.h b/drivers/crypto/dpaa_sec/dpaa_sec.h
index f6e83d46e7..2e0ab93ff0 100644
--- a/drivers/crypto/dpaa_sec/dpaa_sec.h
+++ b/drivers/crypto/dpaa_sec/dpaa_sec.h
@@ -135,7 +135,8 @@ typedef struct dpaa_sec_job* (*dpaa_sec_build_raw_dp_fd_t)(uint8_t *drv_ctx,
struct rte_crypto_va_iova_ptr *digest,
struct rte_crypto_va_iova_ptr *auth_iv,
union rte_crypto_sym_ofs ofs,
- void *userdata);
+ void *userdata,
+ struct qm_fd *fd);
typedef struct dpaa_sec_session_entry {
struct sec_cdb cdb; /**< cmd block associated with qp */
diff --git a/drivers/crypto/dpaa_sec/dpaa_sec_raw_dp.c b/drivers/crypto/dpaa_sec/dpaa_sec_raw_dp.c
index ee0ca2e0d5..4e34629f18 100644
--- a/drivers/crypto/dpaa_sec/dpaa_sec_raw_dp.c
+++ b/drivers/crypto/dpaa_sec/dpaa_sec_raw_dp.c
@@ -12,6 +12,7 @@
#endif
/* RTA header files */
+#include <desc/algo.h>
#include <desc/ipsec.h>
#include <rte_dpaa_bus.h>
@@ -26,6 +27,17 @@ struct dpaa_sec_raw_dp_ctx {
uint16_t cached_dequeue;
};
+static inline int
+is_encode(dpaa_sec_session *ses)
+{
+ return ses->dir == DIR_ENC;
+}
+
+static inline int is_decode(dpaa_sec_session *ses)
+{
+ return ses->dir == DIR_DEC;
+}
+
static __rte_always_inline int
dpaa_sec_raw_enqueue_done(void *qp_data, uint8_t *drv_ctx, uint32_t n)
{
@@ -82,18 +94,276 @@ build_dpaa_raw_dp_auth_fd(uint8_t *drv_ctx,
struct rte_crypto_va_iova_ptr *digest,
struct rte_crypto_va_iova_ptr *auth_iv,
union rte_crypto_sym_ofs ofs,
- void *userdata)
+ void *userdata,
+ struct qm_fd *fd)
{
- RTE_SET_USED(drv_ctx);
- RTE_SET_USED(sgl);
RTE_SET_USED(dest_sgl);
RTE_SET_USED(iv);
- RTE_SET_USED(digest);
RTE_SET_USED(auth_iv);
- RTE_SET_USED(ofs);
- RTE_SET_USED(userdata);
+ RTE_SET_USED(fd);
- return NULL;
+ dpaa_sec_session *ses =
+ ((struct dpaa_sec_raw_dp_ctx *)drv_ctx)->session;
+ struct dpaa_sec_job *cf;
+ struct dpaa_sec_op_ctx *ctx;
+ struct qm_sg_entry *sg, *out_sg, *in_sg;
+ phys_addr_t start_addr;
+ uint8_t *old_digest, extra_segs;
+ int data_len, data_offset, total_len = 0;
+ unsigned int i;
+
+ for (i = 0; i < sgl->num; i++)
+ total_len += sgl->vec[i].len;
+
+ data_len = total_len - ofs.ofs.auth.head - ofs.ofs.auth.tail;
+ data_offset = ofs.ofs.auth.head;
+
+ /* Support only length in bits for SNOW3G and ZUC */
+
+ if (is_decode(ses))
+ extra_segs = 3;
+ else
+ extra_segs = 2;
+
+ if (sgl->num > MAX_SG_ENTRIES) {
+ DPAA_SEC_DP_ERR("Auth: Max sec segs supported is %d",
+ MAX_SG_ENTRIES);
+ return NULL;
+ }
+ ctx = dpaa_sec_alloc_raw_ctx(ses, sgl->num * 2 + extra_segs);
+ if (!ctx)
+ return NULL;
+
+ cf = &ctx->job;
+ ctx->userdata = (void *)userdata;
+ old_digest = ctx->digest;
+
+ /* output */
+ out_sg = &cf->sg[0];
+ qm_sg_entry_set64(out_sg, digest->iova);
+ out_sg->length = ses->digest_length;
+ cpu_to_hw_sg(out_sg);
+
+ /* input */
+ in_sg = &cf->sg[1];
+ /* need to extend the input to a compound frame */
+ in_sg->extension = 1;
+ in_sg->final = 1;
+ in_sg->length = data_len;
+ qm_sg_entry_set64(in_sg, rte_dpaa_mem_vtop(&cf->sg[2]));
+
+ /* 1st seg */
+ sg = in_sg + 1;
+
+ if (ses->iv.length) {
+ uint8_t *iv_ptr;
+
+ iv_ptr = rte_crypto_op_ctod_offset(userdata, uint8_t *,
+ ses->iv.offset);
+
+ if (ses->auth_alg == RTE_CRYPTO_AUTH_SNOW3G_UIA2) {
+ iv_ptr = conv_to_snow_f9_iv(iv_ptr);
+ sg->length = 12;
+ } else if (ses->auth_alg == RTE_CRYPTO_AUTH_ZUC_EIA3) {
+ iv_ptr = conv_to_zuc_eia_iv(iv_ptr);
+ sg->length = 8;
+ } else {
+ sg->length = ses->iv.length;
+ }
+ qm_sg_entry_set64(sg, rte_dpaa_mem_vtop(iv_ptr));
+ in_sg->length += sg->length;
+ cpu_to_hw_sg(sg);
+ sg++;
+ }
+
+ qm_sg_entry_set64(sg, sgl->vec[0].iova);
+ sg->offset = data_offset;
+
+ if (data_len <= (int)(sgl->vec[0].len - data_offset)) {
+ sg->length = data_len;
+ } else {
+ sg->length = sgl->vec[0].len - data_offset;
+
+ /* remaining i/p segs */
+ for (i = 1; i < sgl->num; i++) {
+ cpu_to_hw_sg(sg);
+ sg++;
+ qm_sg_entry_set64(sg, sgl->vec[i].iova);
+ if (data_len > (int)sgl->vec[i].len)
+ sg->length = sgl->vec[0].len;
+ else
+ sg->length = data_len;
+
+ data_len = data_len - sg->length;
+ if (data_len < 1)
+ break;
+ }
+ }
+
+ if (is_decode(ses)) {
+ /* Digest verification case */
+ cpu_to_hw_sg(sg);
+ sg++;
+ rte_memcpy(old_digest, digest->va,
+ ses->digest_length);
+ start_addr = rte_dpaa_mem_vtop(old_digest);
+ qm_sg_entry_set64(sg, start_addr);
+ sg->length = ses->digest_length;
+ in_sg->length += ses->digest_length;
+ }
+ sg->final = 1;
+ cpu_to_hw_sg(sg);
+ cpu_to_hw_sg(in_sg);
+
+ return cf;
+}
+
+static inline struct dpaa_sec_job *
+build_dpaa_raw_dp_chain_fd(uint8_t *drv_ctx,
+ struct rte_crypto_sgl *sgl,
+ struct rte_crypto_sgl *dest_sgl,
+ struct rte_crypto_va_iova_ptr *iv,
+ struct rte_crypto_va_iova_ptr *digest,
+ struct rte_crypto_va_iova_ptr *auth_iv,
+ union rte_crypto_sym_ofs ofs,
+ void *userdata,
+ struct qm_fd *fd)
+{
+ RTE_SET_USED(auth_iv);
+
+ dpaa_sec_session *ses =
+ ((struct dpaa_sec_raw_dp_ctx *)drv_ctx)->session;
+ struct dpaa_sec_job *cf;
+ struct dpaa_sec_op_ctx *ctx;
+ struct qm_sg_entry *sg, *out_sg, *in_sg;
+ uint8_t *IV_ptr = iv->va;
+ unsigned int i;
+ uint16_t auth_hdr_len = ofs.ofs.cipher.head -
+ ofs.ofs.auth.head;
+ uint16_t auth_tail_len = ofs.ofs.auth.tail;
+ uint32_t auth_only_len = (auth_tail_len << 16) | auth_hdr_len;
+ int data_len = 0, auth_len = 0, cipher_len = 0;
+
+ for (i = 0; i < sgl->num; i++)
+ data_len += sgl->vec[i].len;
+
+ cipher_len = data_len - ofs.ofs.cipher.head - ofs.ofs.cipher.tail;
+ auth_len = data_len - ofs.ofs.auth.head - ofs.ofs.auth.tail;
+
+ if (sgl->num > MAX_SG_ENTRIES) {
+ DPAA_SEC_DP_ERR("Cipher-Auth: Max sec segs supported is %d",
+ MAX_SG_ENTRIES);
+ return NULL;
+ }
+
+ ctx = dpaa_sec_alloc_raw_ctx(ses, sgl->num * 2 + 4);
+ if (!ctx)
+ return NULL;
+
+ cf = &ctx->job;
+ ctx->userdata = (void *)userdata;
+
+ rte_prefetch0(cf->sg);
+
+ /* output */
+ out_sg = &cf->sg[0];
+ out_sg->extension = 1;
+ if (is_encode(ses))
+ out_sg->length = cipher_len + ses->digest_length;
+ else
+ out_sg->length = cipher_len;
+
+ /* output sg entries */
+ sg = &cf->sg[2];
+ qm_sg_entry_set64(out_sg, rte_dpaa_mem_vtop(sg));
+ cpu_to_hw_sg(out_sg);
+
+ /* 1st seg */
+ if (dest_sgl) {
+ qm_sg_entry_set64(sg, dest_sgl->vec[0].iova);
+ sg->length = dest_sgl->vec[0].len - ofs.ofs.cipher.head;
+ sg->offset = ofs.ofs.cipher.head;
+
+ /* Successive segs */
+ for (i = 1; i < dest_sgl->num; i++) {
+ cpu_to_hw_sg(sg);
+ sg++;
+ qm_sg_entry_set64(sg, dest_sgl->vec[i].iova);
+ sg->length = dest_sgl->vec[i].len;
+ }
+ } else {
+ qm_sg_entry_set64(sg, sgl->vec[0].iova);
+ sg->length = sgl->vec[0].len - ofs.ofs.cipher.head;
+ sg->offset = ofs.ofs.cipher.head;
+
+ /* Successive segs */
+ for (i = 1; i < sgl->num; i++) {
+ cpu_to_hw_sg(sg);
+ sg++;
+ qm_sg_entry_set64(sg, sgl->vec[i].iova);
+ sg->length = sgl->vec[i].len;
+ }
+ }
+
+ if (is_encode(ses)) {
+ cpu_to_hw_sg(sg);
+ /* set auth output */
+ sg++;
+ qm_sg_entry_set64(sg, digest->iova);
+ sg->length = ses->digest_length;
+ }
+ sg->final = 1;
+ cpu_to_hw_sg(sg);
+
+ /* input */
+ in_sg = &cf->sg[1];
+ in_sg->extension = 1;
+ in_sg->final = 1;
+ if (is_encode(ses))
+ in_sg->length = ses->iv.length + auth_len;
+ else
+ in_sg->length = ses->iv.length + auth_len
+ + ses->digest_length;
+
+ /* input sg entries */
+ sg++;
+ qm_sg_entry_set64(in_sg, rte_dpaa_mem_vtop(sg));
+ cpu_to_hw_sg(in_sg);
+
+ /* 1st seg IV */
+ qm_sg_entry_set64(sg, rte_dpaa_mem_vtop(IV_ptr));
+ sg->length = ses->iv.length;
+ cpu_to_hw_sg(sg);
+
+ /* 2 seg */
+ sg++;
+ qm_sg_entry_set64(sg, sgl->vec[0].iova);
+ sg->length = sgl->vec[0].len - ofs.ofs.auth.head;
+ sg->offset = ofs.ofs.auth.head;
+
+ /* Successive segs */
+ for (i = 1; i < sgl->num; i++) {
+ cpu_to_hw_sg(sg);
+ sg++;
+ qm_sg_entry_set64(sg, sgl->vec[i].iova);
+ sg->length = sgl->vec[i].len;
+ }
+
+ if (is_decode(ses)) {
+ cpu_to_hw_sg(sg);
+ sg++;
+ memcpy(ctx->digest, digest->va,
+ ses->digest_length);
+ qm_sg_entry_set64(sg, rte_dpaa_mem_vtop(ctx->digest));
+ sg->length = ses->digest_length;
+ }
+ sg->final = 1;
+ cpu_to_hw_sg(sg);
+
+ if (auth_only_len)
+ fd->cmd = 0x80000000 | auth_only_len;
+
+ return cf;
}
static struct dpaa_sec_job *
@@ -104,10 +374,13 @@ build_dpaa_raw_dp_cipher_fd(uint8_t *drv_ctx,
struct rte_crypto_va_iova_ptr *digest,
struct rte_crypto_va_iova_ptr *auth_iv,
union rte_crypto_sym_ofs ofs,
- void *userdata)
+ void *userdata,
+ struct qm_fd *fd)
{
RTE_SET_USED(digest);
RTE_SET_USED(auth_iv);
+ RTE_SET_USED(fd);
+
dpaa_sec_session *ses =
((struct dpaa_sec_raw_dp_ctx *)drv_ctx)->session;
struct dpaa_sec_job *cf;
@@ -264,15 +537,14 @@ dpaa_sec_raw_enqueue_burst(void *qp_data, uint8_t *drv_ctx,
&vec->digest[loop],
&vec->auth_iv[loop],
ofs,
- user_data[loop]);
+ user_data[loop],
+ fd);
if (!cf) {
DPAA_SEC_ERR("error: Improper packet contents"
" for crypto operation");
goto skip_tx;
}
inq[loop] = ses->inq[rte_lcore_id() % MAX_DPAA_CORES];
- fd->opaque_addr = 0;
- fd->cmd = 0;
qm_fd_addr_set64(fd, rte_dpaa_mem_vtop(cf->sg));
fd->_format1 = qm_fd_compound;
fd->length29 = 2 * sizeof(struct qm_sg_entry);
@@ -470,6 +742,8 @@ dpaa_sec_configure_raw_dp_ctx(struct rte_cryptodev *dev, uint16_t qp_id,
sess->build_raw_dp_fd = build_dpaa_raw_dp_cipher_fd;
else if (sess->ctxt == DPAA_SEC_AUTH)
sess->build_raw_dp_fd = build_dpaa_raw_dp_auth_fd;
+ else if (sess->ctxt == DPAA_SEC_CIPHER_HASH)
+ sess->build_raw_dp_fd = build_dpaa_raw_dp_chain_fd;
else
return -ENOTSUP;
dp_ctx = (struct dpaa_sec_raw_dp_ctx *)raw_dp_ctx->drv_ctx_data;
--
2.17.1