Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/43994/?format=api
{ "id": 43994, "url": "http://patches.dpdk.org/api/patches/43994/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1535608265-13323-11-git-send-email-hemant.agrawal@nxp.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<1535608265-13323-11-git-send-email-hemant.agrawal@nxp.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1535608265-13323-11-git-send-email-hemant.agrawal@nxp.com", "date": "2018-08-30T05:51:05", "name": "[10/10] crypto/dpaa_sec: ipsec offload add null algo support", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "d1d25e119d820745981f83fe8ae159d5359cfa3b", "submitter": { "id": 477, "url": "http://patches.dpdk.org/api/people/477/?format=api", "name": "Hemant Agrawal", "email": "hemant.agrawal@nxp.com" }, "delegate": { "id": 6690, "url": "http://patches.dpdk.org/api/users/6690/?format=api", "username": "akhil", "first_name": "akhil", "last_name": "goyal", "email": "gakhil@marvell.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1535608265-13323-11-git-send-email-hemant.agrawal@nxp.com/mbox/", "series": [ { "id": 1101, "url": "http://patches.dpdk.org/api/series/1101/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=1101", "date": "2018-08-30T05:50:55", "name": "crypto: DPAA and DPAA2_SEC enhancements", "version": 1, "mbox": "http://patches.dpdk.org/series/1101/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/43994/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/43994/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id B6C645B34;\n\tThu, 30 Aug 2018 07:53:33 +0200 (CEST)", "from EUR02-HE1-obe.outbound.protection.outlook.com\n\t(mail-eopbgr10071.outbound.protection.outlook.com [40.107.1.71])\n\tby dpdk.org (Postfix) with ESMTP id A6F0F4CC3\n\tfor <dev@dpdk.org>; Thu, 30 Aug 2018 07:53:20 +0200 (CEST)", "from bf-netperf1.ap.freescale.net (14.143.30.134) by\n\tVI1PR0401MB2541.eurprd04.prod.outlook.com (2603:10a6:800:56::19) with\n\tMicrosoft SMTP Server (version=TLS1_2,\n\tcipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.17;\n\tThu, 30 Aug 2018 05:53:18 +0000" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1;\n\th=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n\tbh=OAXZsGT5pccuokismpn/enb8RY3yoXO56zYYYs3EjF8=;\n\tb=g6hcp6Ezrb4dv3yxOt86sewxYmRoGC98SijC5hWkdS1MQNXtb1X+4OJjatdEJfAF3Z9zukjSTDQ46e0IE9lru4VZHZrJELhP6gW0N+bz/8StecKxIi9zwDxDaUoCTj/9pd4Xzg4WcDleELBxEt0zNxCOMomuurth7v521pIKLKw=", "Authentication-Results": "spf=none (sender IP is )\n\tsmtp.mailfrom=hemant.agrawal@nxp.com; ", "From": "Hemant Agrawal <hemant.agrawal@nxp.com>", "To": "dev@dpdk.org", "Cc": "akhil.goyal@nxp.com", "Date": "Thu, 30 Aug 2018 11:21:05 +0530", "Message-Id": "<1535608265-13323-11-git-send-email-hemant.agrawal@nxp.com>", "X-Mailer": "git-send-email 2.7.4", "In-Reply-To": "<1535608265-13323-1-git-send-email-hemant.agrawal@nxp.com>", "References": "<1535608265-13323-1-git-send-email-hemant.agrawal@nxp.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-Originating-IP": "[14.143.30.134]", "X-ClientProxiedBy": "PN1PR0101CA0049.INDPRD01.PROD.OUTLOOK.COM\n\t(2603:1096:c00:d::11) To VI1PR0401MB2541.eurprd04.prod.outlook.com\n\t(2603:10a6:800:56::19)", "X-MS-PublicTrafficType": "Email", "X-MS-Office365-Filtering-Correlation-Id": "da31737c-b49b-4149-38c2-08d60e3ce36b", "X-MS-Office365-Filtering-HT": "Tenant", "X-Microsoft-Antispam": "BCL:0; PCL:0;\n\tRULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020);\n\tSRVR:VI1PR0401MB2541; ", "X-Microsoft-Exchange-Diagnostics": [ "1; VI1PR0401MB2541;\n\t3:EuKwxNy9XXYEmOffwEp1DFwzm6eXRh3quKAyFnZKdWDgMe/NJhydmgM9Rkit4MuO6gee2Kfgajkr4mz4jYl5QfBe97ezloFVVA9oDTPSHd9yr0kruc6R7RtwMjVyP3NtAsvcw8+864rdwtHmcCRiA6o0BZV3COG189HsWDsmHSLVLxKchaXwjmHRcBscmFrh9X7KHvAVLHPhkjMUTRnOzhnIrbJ87KAYSMFerJxWpmZuPgLDmAn5DuX217o5zHVA;\n\t25:JGehxbQd4HcOeem4UlfEWa714iPiBaXZy0x4iXOv0UQhoPCT1JtfA+Us94ep11FeinJigZtGBf9LOKTX0u2BR9aqs9p6zeHWdZ35HSKjqktC118VoRzafYYraYR9b0iwgjYDbgTPOOKFKg9Q5RlznYHT8V9ZntsYQ9gY5QsbE97Wf4JiXNR6OHZBNcL24ax/N+LNIhFRiv6xUtyVKz6MRTMs+ZVQgnk7/2daVegaDmeWDuBAfv5qk9udkdEAfKP0a71cBcOTvlR/Lo+gnQxc0TTq8NUmAWVCCj+y6O5rjVnRskJkND0IVxtwrxJSm8nlIGzbKtMeaEdaZvgjmlnvXw==;\n\t31:sPtOUzxHtPdoso39jwf6P52BDncCUuwlNcmwCPeVHynK65HDEMovmSMjc3pcy1HiwWlaYDD0PErhXgevvRcm3OMTQqwzK/AyyzpDqqCWXA9KExXALMHAXXzlCytRYMr00MH2FZ6Ng+qS1Zq9KpvCDthi0I5XwDzerz9L2SQZwWI0bIjj6sn6UX9GFOnh9rDLOkJh2igyVAVw4vNiBr9wiQ46pQ+27VDBbRXpQEZb0ik=", "1; VI1PR0401MB2541;\n\t20:5Wie+4RCbQQ3hc4Cj6As8aHSXxgZxgMCoAbauxzxn9V3SGBhgyKqICMXnDJUZqeZp6a4pG82whcGBn0TsJuzuqFgcJTFHSjxcPDXu706dCZqKyWMuSC+jFZOtIJj/2ahP9mIgmrKjjmbvVz4m6PQfNZf6UHbh+yI7IOyWfyohTz99D9F3N8yNJujhhOCyD2iA8rV4Mwd1imK/ITHcYcbzEaiAQViHevg9BPE9Mz2B2y9LxZ6HePklJqXHTxkAfadBPPfBuWmtRk31y4r68plNqKqla7jU7SzWt2CWzqoUP29ORJg95Osw6BUjukYHxIdLEsFee/jpq9yTGqrspvVt1+BrUmRI62gBwPrVWqxUpnLyacHKVTTz9uivDhopk4st4dwg4so812SO6Ev1W3WXS8Pd7+Q1WZDK/h+rU1nBvE+lFCYM8ifnt6z/PwOqlSePvDrc42W//m1Mj1GXO9VcumxXoEZhXHuhzv0Li8uOLqxmxjdtc7tImn2nY1a5DKY;\n\t4:Yb6V4GCrfe7xemkW1Ery014lU9sVd5CAwLqEi8WdxUy4iOt2QbwGrQZ/qolfWmvj6oxT/wk5i40ezb5xIcJRnvE9muAuxf27aMI+kqpYT/og71IdHLgS6URecvtGGIrCagwqy11XC+AwXouz5XhOmg5MYMiS9JPZAY1AOpl03ivCU533bS+CrvLklrgftMyaUpiweXgFvur23CfyFNod1ENTIEeAuxWGUYuDAToOX8MdmUnYnMYieC0uTmsWj8KJIXyuOcYcl2NM33a+8KBfBc5ZTTEJIhlcEyUYt91rjIUsbb1Lf+fSzYgMoqzWjZeM", "=?us-ascii?Q?1; VI1PR0401MB2541;\n\t23:Lml/g3HnfNzK6WxVOoFLe9XLYd/m8mMm/PO292g?=\n\tXY+PNvmCGTCYcZtr64Pj9exDtbxSNcDbRdnCY8b7YxZqQbaGo8rMS4EIS6wro5tHSKJe7BdwaDBfs5WpSLaGNAl4oU+eGab/TVje2MOVOzv1GKuujGe9N2DxMpXpiT6bSDf3PaCFwxXiCHudJb+L9Z3FOkpm949xVlH17G917WkThGTiSZRuG1lPMvteA2/Lmha/NCDFVQYRZ+Mf7ayl3P1/z4VBKPr0y1h2To5J3KH6co5LQFFrjbqzYilK/nw+szixNosqh6OKuqUvPyYe1/hU9AHSlENO+jQe9eScBpKsM+iRdYYmPVXl0763+HQZVh/wEZMXp0njjJ5GdbaBws7aQSEAMjQ0mBZmSZJZMz+Lk55J7XDfGyEbROpL1pdd9b+/VCbMjE5pHVFIUgcHT5VlPRDLdYdspN5BmFHCMBW5gbWhKWdVZD+zzfqtWcM7wKN1uqlKUz7T4UBdsTI0jHmBCGJhyoN4tbQnBJ4+CjB+0kKP43ZGps2EhwbFOByOHVUnkBnQL/j0wVrgCXUrEb/uDyphemkTPVt5j/tqEqvJrsKxX+o4b1D7bkmJCwxt6xKIqjfdCT3IVtewjABf/JRkFdVCZW4/SHTp3sUj0tj55+JqKMuF3Jyv6p72VeYrD9QJ+B6uzVCTXOahwB31ljAs23skJYW42Ga+G0jOiH0v+ABXtkt9GcUa4CM9++Hhb8Wg4chlCtxHWtYChORFIuUHLqkvPZFwOI4sqI/3E9gnp3ysQ8kjC8uTXc100bBkVkWCfWDGgd+jUL+N444TiGpxjvxQW+EY2okh4IkklfZ1IvGK/Rz1r/IoLIfNkUDUkqLJStNmVY95Cwj4lT0K0BnfjcaIaSuvJanZTiFHq/0u7oeZhTfF6TeJpYWBsAYDH9Ts0BvVaaC0qo5akupApvZUkyP+zjS4rvC84B/czYHWpxlnU2baEzBW4OXtHR1yf77sm6+EnZdi2EV2fJ7rzZxNMRn3FZT55LWTttskupCIIwsBmbZl+sC4oMr9qh6VNIhWwd8hhzK9Ddqz42wTAc50i3TcLDUNde3XY1nL4MGLNpljsrbxAdso6i465ghUcTHVBvVH6w/KoDd6P3hgDIFSYv2sDGGjY9ekqNbJtySODlOC53HpJaE0Nx9Raoi4QB9+/MZQfqNuJW+vs9ni2pNUse2jkCHAgleFyZn/IJuTQI5tYvrYL4qpBdYELrSqdta5jaq88/jUR5FDdnv77KggJJFcDPV59+gcgn7OuVrd7+M/mVj50LXvK8NZL0btu7+n9eKz88Lm9cMY5Pd2RZj6j", "1; VI1PR0401MB2541;\n\t6:CZ4gKYWtGtkxo1G0zMZe0IbSmdaesjpBV3BSzOsr0fh7O/mo/9SwwQzSiWNgDSJt/Wam9Po58kMNPYky2l2Bd1LkItB8KlVRlw9xpAg+71dJVCZ3nkyKeDxEnRKZ0fEjsaYo8GqOfQWKrBvnBOqJcS9JogABjGoeIyG/eD3x+7lTRga+F7zmDMcJtNH+Xit7QULA1MThmmVNzBig3qQFCX0mTS+NnH0Zn5mwPmq9DZ9V68ykumKe4YTCfnWUX/e03jX63Az7fFXsbuOukClzgd3AZ3A6PdF2OD56clqKOvbiDAdzD7cZaQaxdAu2GrWnLDlI2kVjSm7FUziY1Nuhez5WrgjtFl5ndrAQHFmF3usHOHqoXhSDopSEMZGY7J9jns7VSX36LbCPDPRwTXGC8gC4J0mrKNnYZkk6a3yvmpoDZWeMBVYsXZoV/SH4LCzj45VnD2C/Str0jMDPA3zquQ==;\n\t5:PlTa+LIYFzaQBiy+1sO28niWZ3OkymQjKhgVWSZKFOxp+dsFSBPe9r0/68VxS3fjS+WgFSoTpHEMGKQw8KRxLl8n7m5/XhNy8Tr8/FLAVFhqUzcY4H1thoRwBVXabkMM9oHvFTsFncEcRKLHYiXWEiVBPgMTY9r59nkdmj+L2MA=;\n\t7:DZx7i8Hh5cm567P0XFg4JrELwU4F27/VF0iiajx4Rz9aNg7vSsyVFS/rt1e98Pls5fTMhqp+21xTmAxduok02MfvsqQqS70jN7YwkY1AbR2yWaVhc9zrT9l0wer/nCVY4QknskeGfDKAmw9AYM9jBmdBAHe1CgL9KTrmKi3Wh351ZnmUcZ2GN+qiqLflIsl8IKrs0ll0avIeFJ/KWGAgMeSgvKuTnDzVmjRjxsTIGMs7p7NmhUF9+46tgHyRBLNQ" ], "X-MS-TrafficTypeDiagnostic": "VI1PR0401MB2541:", "X-Microsoft-Antispam-PRVS": "<VI1PR0401MB2541F016223CCD262680593A89080@VI1PR0401MB2541.eurprd04.prod.outlook.com>", "X-Exchange-Antispam-Report-Test": "UriScan:(185117386973197);", "X-MS-Exchange-SenderADCheck": "1", "X-Exchange-Antispam-Report-CFA-Test": "BCL:0; PCL:0;\n\tRULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(823301075)(3231311)(944501410)(52105095)(10201501046)(3002001)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123558120)(20161123564045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016);\n\tSRVR:VI1PR0401MB2541; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0401MB2541; ", "X-Forefront-PRVS": "07807C55DC", "X-Forefront-Antispam-Report": "SFV:NSPM;\n\tSFS:(10009020)(376002)(396003)(346002)(39860400002)(136003)(366004)(189003)(199004)(316002)(486006)(106356001)(47776003)(16526019)(53936002)(6916009)(6666003)(186003)(26005)(386003)(5009440100003)(6506007)(52116002)(2351001)(956004)(76176011)(66066001)(446003)(51416003)(6512007)(11346002)(6486002)(16586007)(97736004)(86362001)(575784001)(4326008)(44832011)(25786009)(68736007)(105586002)(2616005)(305945005)(2906002)(14444005)(3846002)(6116002)(5660300001)(476003)(81166006)(478600001)(48376002)(8936002)(81156014)(7736002)(8676002)(50466002)(50226002)(2361001)(36756003)(110426005);\n\tDIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0401MB2541;\n\tH:bf-netperf1.ap.freescale.net; \n\tFPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; ", "Received-SPF": "None (protection.outlook.com: nxp.com does not designate\n\tpermitted sender hosts)", "X-Microsoft-Antispam-Message-Info": "9faWKXC7Mue/lnNZtSiYLOXb/rje0bewHC2V00AkSeGe4ESatXXOzlQhIAjtIB54pNTD8DwOzsd7OhWl84CDEMSjb7JK5qqZyOPmg1kET+cL5sY+cvN657LAHumVnPHXTTOHjO0jtHCxIJzP57/73KsMvscdSoKrREvZBfLN9I0ZN//syAG3O+2HKJ/8rep4050bW7hAaAQpGDRAuvOojqWiKbK/F4WijHwXs7mwxyrV1kuirRngzGD2RKpaKSvtUk6JSx0E2AlEPuFFMqWILgWfqCzmBU/1iwFdMSSI/ugahLcJZRf3nXqbxjHOecjzP3EAisAx5lkfo/bOc4LFKrrvGsWIfD0irAhbutE23b4=", "SpamDiagnosticOutput": "1:99", "SpamDiagnosticMetadata": "NSPM", "X-OriginatorOrg": "nxp.com", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "30 Aug 2018 05:53:18.9520\n\t(UTC)", "X-MS-Exchange-CrossTenant-Network-Message-Id": "da31737c-b49b-4149-38c2-08d60e3ce36b", "X-MS-Exchange-CrossTenant-FromEntityHeader": "Hosted", "X-MS-Exchange-CrossTenant-Id": "686ea1d3-bc2b-4c6f-a92c-d99c5c301635", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "VI1PR0401MB2541", "Subject": "[dpdk-dev] [PATCH 10/10] crypto/dpaa_sec: ipsec offload add null\n\talgo support", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<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>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>\n---\n drivers/crypto/dpaa_sec/dpaa_sec.c | 284 +++++++++++++++++++++----------------\n 1 file changed, 165 insertions(+), 119 deletions(-)", "diff": "diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c\nindex e5b18df..2f0a5d2 100644\n--- a/drivers/crypto/dpaa_sec/dpaa_sec.c\n+++ b/drivers/crypto/dpaa_sec/dpaa_sec.c\n@@ -275,6 +275,9 @@ caam_auth_alg(dpaa_sec_session *ses, struct alginfo *alginfo_a)\n {\n \tswitch (ses->auth_alg) {\n \tcase RTE_CRYPTO_AUTH_NULL:\n+\t\talginfo_a->algtype =\n+\t\t\t(ses->proto_alg == RTE_SECURITY_PROTOCOL_IPSEC) ?\n+\t\t\tOP_PCL_IPSEC_HMAC_NULL : 0;\n \t\tses->digest_length = 0;\n \t\tbreak;\n \tcase RTE_CRYPTO_AUTH_MD5_HMAC:\n@@ -323,6 +326,9 @@ caam_cipher_alg(dpaa_sec_session *ses, struct alginfo *alginfo_c)\n {\n \tswitch (ses->cipher_alg) {\n \tcase RTE_CRYPTO_CIPHER_NULL:\n+\t\talginfo_c->algtype =\n+\t\t\t(ses->proto_alg == RTE_SECURITY_PROTOCOL_IPSEC) ?\n+\t\t\tOP_PCL_IPSEC_NULL : 0;\n \t\tbreak;\n \tcase RTE_CRYPTO_CIPHER_AES_CBC:\n \t\talginfo_c->algtype =\n@@ -360,6 +366,87 @@ caam_aead_alg(dpaa_sec_session *ses, struct alginfo *alginfo)\n \t}\n }\n \n+/* prepare ipsec proto command block of the session */\n+static int\n+dpaa_sec_prep_ipsec_cdb(dpaa_sec_session *ses)\n+{\n+\tstruct alginfo cipherdata = {0}, authdata = {0};\n+\tstruct sec_cdb *cdb = &ses->cdb;\n+\tint32_t shared_desc_len = 0;\n+\tint err;\n+#if RTE_BYTE_ORDER == RTE_BIG_ENDIAN\n+\tint swap = false;\n+#else\n+\tint swap = true;\n+#endif\n+\n+\tcaam_cipher_alg(ses, &cipherdata);\n+\tif (cipherdata.algtype == (unsigned int)DPAA_SEC_ALG_UNSUPPORT) {\n+\t\tDPAA_SEC_ERR(\"not supported cipher alg\");\n+\t\treturn -ENOTSUP;\n+\t}\n+\n+\tcipherdata.key = (size_t)ses->cipher_key.data;\n+\tcipherdata.keylen = ses->cipher_key.length;\n+\tcipherdata.key_enc_flags = 0;\n+\tcipherdata.key_type = RTA_DATA_IMM;\n+\n+\tcaam_auth_alg(ses, &authdata);\n+\tif (authdata.algtype == (unsigned int)DPAA_SEC_ALG_UNSUPPORT) {\n+\t\tDPAA_SEC_ERR(\"not supported auth alg\");\n+\t\treturn -ENOTSUP;\n+\t}\n+\n+\tauthdata.key = (size_t)ses->auth_key.data;\n+\tauthdata.keylen = ses->auth_key.length;\n+\tauthdata.key_enc_flags = 0;\n+\tauthdata.key_type = RTA_DATA_IMM;\n+\n+\tcdb->sh_desc[0] = cipherdata.keylen;\n+\tcdb->sh_desc[1] = authdata.keylen;\n+\terr = rta_inline_query(IPSEC_AUTH_VAR_AES_DEC_BASE_DESC_LEN,\n+\t\t\t MIN_JOB_DESC_SIZE,\n+\t\t\t (unsigned int *)cdb->sh_desc,\n+\t\t\t &cdb->sh_desc[2], 2);\n+\n+\tif (err < 0) {\n+\t\tDPAA_SEC_ERR(\"Crypto: Incorrect key lengths\");\n+\t\treturn err;\n+\t}\n+\tif (cdb->sh_desc[2] & 1)\n+\t\tcipherdata.key_type = RTA_DATA_IMM;\n+\telse {\n+\t\tcipherdata.key = (size_t)dpaa_mem_vtop(\n+\t\t\t\t\t(void *)(size_t)cipherdata.key);\n+\t\tcipherdata.key_type = RTA_DATA_PTR;\n+\t}\n+\tif (cdb->sh_desc[2] & (1<<1))\n+\t\tauthdata.key_type = RTA_DATA_IMM;\n+\telse {\n+\t\tauthdata.key = (size_t)dpaa_mem_vtop(\n+\t\t\t\t\t(void *)(size_t)authdata.key);\n+\t\tauthdata.key_type = RTA_DATA_PTR;\n+\t}\n+\n+\tcdb->sh_desc[0] = 0;\n+\tcdb->sh_desc[1] = 0;\n+\tcdb->sh_desc[2] = 0;\n+\tif (ses->dir == DIR_ENC) {\n+\t\tshared_desc_len = cnstr_shdsc_ipsec_new_encap(\n+\t\t\t\tcdb->sh_desc,\n+\t\t\t\ttrue, swap, SHR_SERIAL,\n+\t\t\t\t&ses->encap_pdb,\n+\t\t\t\t(uint8_t *)&ses->ip4_hdr,\n+\t\t\t\t&cipherdata, &authdata);\n+\t} else if (ses->dir == DIR_DEC) {\n+\t\tshared_desc_len = cnstr_shdsc_ipsec_new_decap(\n+\t\t\t\tcdb->sh_desc,\n+\t\t\t\ttrue, swap, SHR_SERIAL,\n+\t\t\t\t&ses->decap_pdb,\n+\t\t\t\t&cipherdata, &authdata);\n+\t}\n+\treturn shared_desc_len;\n+}\n \n /* prepare command block of the session */\n static int\n@@ -377,7 +464,9 @@ dpaa_sec_prep_cdb(dpaa_sec_session *ses)\n \n \tmemset(cdb, 0, sizeof(struct sec_cdb));\n \n-\tif (is_cipher_only(ses)) {\n+\tif (is_proto_ipsec(ses)) {\n+\t\tshared_desc_len = dpaa_sec_prep_ipsec_cdb(ses);\n+\t} else if (is_cipher_only(ses)) {\n \t\tcaam_cipher_alg(ses, &alginfo_c);\n \t\tif (alginfo_c.algtype == (unsigned int)DPAA_SEC_ALG_UNSUPPORT) {\n \t\t\tDPAA_SEC_ERR(\"not supported cipher alg\");\n@@ -485,30 +574,13 @@ dpaa_sec_prep_cdb(dpaa_sec_session *ses)\n \t\tcdb->sh_desc[0] = 0;\n \t\tcdb->sh_desc[1] = 0;\n \t\tcdb->sh_desc[2] = 0;\n-\t\tif (is_proto_ipsec(ses)) {\n-\t\t\tif (ses->dir == DIR_ENC) {\n-\t\t\t\tshared_desc_len = cnstr_shdsc_ipsec_new_encap(\n-\t\t\t\t\t\tcdb->sh_desc,\n-\t\t\t\t\t\ttrue, swap, SHR_SERIAL,\n-\t\t\t\t\t\t&ses->encap_pdb,\n-\t\t\t\t\t\t(uint8_t *)&ses->ip4_hdr,\n-\t\t\t\t\t\t&alginfo_c, &alginfo_a);\n-\t\t\t} else if (ses->dir == DIR_DEC) {\n-\t\t\t\tshared_desc_len = cnstr_shdsc_ipsec_new_decap(\n-\t\t\t\t\t\tcdb->sh_desc,\n-\t\t\t\t\t\ttrue, swap, SHR_SERIAL,\n-\t\t\t\t\t\t&ses->decap_pdb,\n-\t\t\t\t\t\t&alginfo_c, &alginfo_a);\n-\t\t\t}\n-\t\t} else {\n-\t\t\t/* Auth_only_len is set as 0 here and it will be\n-\t\t\t * overwritten in fd for each packet.\n-\t\t\t */\n-\t\t\tshared_desc_len = cnstr_shdsc_authenc(cdb->sh_desc,\n-\t\t\t\t\ttrue, swap, &alginfo_c, &alginfo_a,\n-\t\t\t\t\tses->iv.length, 0,\n-\t\t\t\t\tses->digest_length, ses->dir);\n-\t\t}\n+\t\t/* Auth_only_len is set as 0 here and it will be\n+\t\t * overwritten in fd for each packet.\n+\t\t */\n+\t\tshared_desc_len = cnstr_shdsc_authenc(cdb->sh_desc,\n+\t\t\t\ttrue, swap, &alginfo_c, &alginfo_a,\n+\t\t\t\tses->iv.length, 0,\n+\t\t\t\tses->digest_length, ses->dir);\n \t}\n \n \tif (shared_desc_len < 0) {\n@@ -1465,7 +1537,9 @@ dpaa_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops,\n \t\t\tauth_only_len = op->sym->auth.data.length -\n \t\t\t\t\t\top->sym->cipher.data.length;\n \t\t\tif (rte_pktmbuf_is_contiguous(op->sym->m_src)) {\n-\t\t\t\tif (is_auth_only(ses)) {\n+\t\t\t\tif (is_proto_ipsec(ses)) {\n+\t\t\t\t\tcf = build_proto(op, ses);\n+\t\t\t\t} else if (is_auth_only(ses)) {\n \t\t\t\t\tcf = build_auth_only(op, ses);\n \t\t\t\t} else if (is_cipher_only(ses)) {\n \t\t\t\t\tcf = build_cipher_only(op, ses);\n@@ -1474,8 +1548,6 @@ dpaa_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops,\n \t\t\t\t\tauth_only_len = ses->auth_only_len;\n \t\t\t\t} else if (is_auth_cipher(ses)) {\n \t\t\t\t\tcf = build_cipher_auth(op, ses);\n-\t\t\t\t} else if (is_proto_ipsec(ses)) {\n-\t\t\t\t\tcf = build_proto(op, ses);\n \t\t\t\t} else {\n \t\t\t\t\tDPAA_SEC_DP_ERR(\"not supported ops\");\n \t\t\t\t\tframes_to_send = loop;\n@@ -1898,8 +1970,8 @@ dpaa_sec_set_ipsec_session(__rte_unused struct rte_cryptodev *dev,\n {\n \tstruct dpaa_sec_dev_private *internals = dev->data->dev_private;\n \tstruct rte_security_ipsec_xform *ipsec_xform = &conf->ipsec;\n-\tstruct rte_crypto_auth_xform *auth_xform;\n-\tstruct rte_crypto_cipher_xform *cipher_xform;\n+\tstruct rte_crypto_auth_xform *auth_xform = NULL;\n+\tstruct rte_crypto_cipher_xform *cipher_xform = NULL;\n \tdpaa_sec_session *session = (dpaa_sec_session *)sess;\n \n \tPMD_INIT_FUNC_TRACE();\n@@ -1907,103 +1979,77 @@ dpaa_sec_set_ipsec_session(__rte_unused struct rte_cryptodev *dev,\n \tmemset(session, 0, sizeof(dpaa_sec_session));\n \tif (ipsec_xform->direction == RTE_SECURITY_IPSEC_SA_DIR_EGRESS) {\n \t\tcipher_xform = &conf->crypto_xform->cipher;\n-\t\tauth_xform = &conf->crypto_xform->next->auth;\n+\t\tif (conf->crypto_xform->next)\n+\t\t\tauth_xform = &conf->crypto_xform->next->auth;\n \t} else {\n \t\tauth_xform = &conf->crypto_xform->auth;\n-\t\tcipher_xform = &conf->crypto_xform->next->cipher;\n+\t\tif (conf->crypto_xform->next)\n+\t\t\tcipher_xform = &conf->crypto_xform->next->cipher;\n \t}\n \tsession->proto_alg = conf->protocol;\n-\tsession->cipher_key.data = rte_zmalloc(NULL,\n-\t\t\t\t\t cipher_xform->key.length,\n-\t\t\t\t\t RTE_CACHE_LINE_SIZE);\n-\tif (session->cipher_key.data == NULL &&\n-\t\t\tcipher_xform->key.length > 0) {\n-\t\tDPAA_SEC_ERR(\"No Memory for cipher key\");\n-\t\treturn -ENOMEM;\n-\t}\n \n-\tsession->cipher_key.length = cipher_xform->key.length;\n-\tsession->auth_key.data = rte_zmalloc(NULL,\n-\t\t\t\t\tauth_xform->key.length,\n-\t\t\t\t\tRTE_CACHE_LINE_SIZE);\n-\tif (session->auth_key.data == NULL &&\n-\t\t\tauth_xform->key.length > 0) {\n-\t\tDPAA_SEC_ERR(\"No Memory for auth key\");\n-\t\trte_free(session->cipher_key.data);\n-\t\treturn -ENOMEM;\n+\tif (cipher_xform && cipher_xform->algo != RTE_CRYPTO_CIPHER_NULL) {\n+\t\tsession->cipher_key.data = rte_zmalloc(NULL,\n+\t\t\t\t\t\t cipher_xform->key.length,\n+\t\t\t\t\t\t RTE_CACHE_LINE_SIZE);\n+\t\tif (session->cipher_key.data == NULL &&\n+\t\t\t\tcipher_xform->key.length > 0) {\n+\t\t\tDPAA_SEC_ERR(\"No Memory for cipher key\");\n+\t\t\treturn -ENOMEM;\n+\t\t}\n+\t\tmemcpy(session->cipher_key.data, cipher_xform->key.data,\n+\t\t\t\tcipher_xform->key.length);\n+\t\tsession->cipher_key.length = cipher_xform->key.length;\n+\n+\t\tswitch (cipher_xform->algo) {\n+\t\tcase RTE_CRYPTO_CIPHER_AES_CBC:\n+\t\tcase RTE_CRYPTO_CIPHER_3DES_CBC:\n+\t\tcase RTE_CRYPTO_CIPHER_AES_CTR:\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\tDPAA_SEC_ERR(\"Crypto: Unsupported Cipher alg %u\",\n+\t\t\t\tcipher_xform->algo);\n+\t\t\tgoto out;\n+\t\t}\n+\t\tsession->cipher_alg = cipher_xform->algo;\n+\t} else {\n+\t\tsession->cipher_key.data = NULL;\n+\t\tsession->cipher_key.length = 0;\n+\t\tsession->cipher_alg = RTE_CRYPTO_CIPHER_NULL;\n \t}\n-\tsession->auth_key.length = auth_xform->key.length;\n-\tmemcpy(session->cipher_key.data, cipher_xform->key.data,\n-\t\t\tcipher_xform->key.length);\n-\tmemcpy(session->auth_key.data, auth_xform->key.data,\n-\t\t\tauth_xform->key.length);\n \n-\tswitch (auth_xform->algo) {\n-\tcase RTE_CRYPTO_AUTH_SHA1_HMAC:\n-\t\tsession->auth_alg = RTE_CRYPTO_AUTH_SHA1_HMAC;\n-\t\tbreak;\n-\tcase RTE_CRYPTO_AUTH_MD5_HMAC:\n-\t\tsession->auth_alg = RTE_CRYPTO_AUTH_MD5_HMAC;\n-\t\tbreak;\n-\tcase RTE_CRYPTO_AUTH_SHA256_HMAC:\n-\t\tsession->auth_alg = RTE_CRYPTO_AUTH_SHA256_HMAC;\n-\t\tbreak;\n-\tcase RTE_CRYPTO_AUTH_SHA384_HMAC:\n-\t\tsession->auth_alg = RTE_CRYPTO_AUTH_SHA384_HMAC;\n-\t\tbreak;\n-\tcase RTE_CRYPTO_AUTH_SHA512_HMAC:\n-\t\tsession->auth_alg = RTE_CRYPTO_AUTH_SHA512_HMAC;\n-\t\tbreak;\n-\tcase RTE_CRYPTO_AUTH_AES_CMAC:\n-\t\tsession->auth_alg = RTE_CRYPTO_AUTH_AES_CMAC;\n-\t\tbreak;\n-\tcase RTE_CRYPTO_AUTH_NULL:\n+\tif (auth_xform && auth_xform->algo != RTE_CRYPTO_AUTH_NULL) {\n+\t\tsession->auth_key.data = rte_zmalloc(NULL,\n+\t\t\t\t\t\tauth_xform->key.length,\n+\t\t\t\t\t\tRTE_CACHE_LINE_SIZE);\n+\t\tif (session->auth_key.data == NULL &&\n+\t\t\t\tauth_xform->key.length > 0) {\n+\t\t\tDPAA_SEC_ERR(\"No Memory for auth key\");\n+\t\t\trte_free(session->cipher_key.data);\n+\t\t\treturn -ENOMEM;\n+\t\t}\n+\t\tmemcpy(session->auth_key.data, auth_xform->key.data,\n+\t\t\t\tauth_xform->key.length);\n+\t\tsession->auth_key.length = auth_xform->key.length;\n+\n+\t\tswitch (auth_xform->algo) {\n+\t\tcase RTE_CRYPTO_AUTH_SHA1_HMAC:\n+\t\tcase RTE_CRYPTO_AUTH_MD5_HMAC:\n+\t\tcase RTE_CRYPTO_AUTH_SHA256_HMAC:\n+\t\tcase RTE_CRYPTO_AUTH_SHA384_HMAC:\n+\t\tcase RTE_CRYPTO_AUTH_SHA512_HMAC:\n+\t\tcase RTE_CRYPTO_AUTH_AES_CMAC:\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\tDPAA_SEC_ERR(\"Crypto: Unsupported auth alg %u\",\n+\t\t\t\tauth_xform->algo);\n+\t\t\tgoto out;\n+\t\t}\n+\t\tsession->auth_alg = auth_xform->algo;\n+\t} else {\n+\t\tsession->auth_key.data = NULL;\n+\t\tsession->auth_key.length = 0;\n \t\tsession->auth_alg = RTE_CRYPTO_AUTH_NULL;\n-\t\tbreak;\n-\tcase RTE_CRYPTO_AUTH_SHA224_HMAC:\n-\tcase RTE_CRYPTO_AUTH_AES_XCBC_MAC:\n-\tcase RTE_CRYPTO_AUTH_SNOW3G_UIA2:\n-\tcase RTE_CRYPTO_AUTH_SHA1:\n-\tcase RTE_CRYPTO_AUTH_SHA256:\n-\tcase RTE_CRYPTO_AUTH_SHA512:\n-\tcase RTE_CRYPTO_AUTH_SHA224:\n-\tcase RTE_CRYPTO_AUTH_SHA384:\n-\tcase RTE_CRYPTO_AUTH_MD5:\n-\tcase RTE_CRYPTO_AUTH_AES_GMAC:\n-\tcase RTE_CRYPTO_AUTH_KASUMI_F9:\n-\tcase RTE_CRYPTO_AUTH_AES_CBC_MAC:\n-\tcase RTE_CRYPTO_AUTH_ZUC_EIA3:\n-\t\tDPAA_SEC_ERR(\"Crypto: Unsupported auth alg %u\",\n-\t\t\tauth_xform->algo);\n-\t\tgoto out;\n-\tdefault:\n-\t\tDPAA_SEC_ERR(\"Crypto: Undefined Auth specified %u\",\n-\t\t\tauth_xform->algo);\n-\t\tgoto out;\n-\t}\n-\n-\tswitch (cipher_xform->algo) {\n-\tcase RTE_CRYPTO_CIPHER_AES_CBC:\n-\t\tsession->cipher_alg = RTE_CRYPTO_CIPHER_AES_CBC;\n-\t\tbreak;\n-\tcase RTE_CRYPTO_CIPHER_3DES_CBC:\n-\t\tsession->cipher_alg = RTE_CRYPTO_CIPHER_3DES_CBC;\n-\t\tbreak;\n-\tcase RTE_CRYPTO_CIPHER_AES_CTR:\n-\t\tsession->cipher_alg = RTE_CRYPTO_CIPHER_AES_CTR;\n-\t\tbreak;\n-\tcase RTE_CRYPTO_CIPHER_NULL:\n-\tcase RTE_CRYPTO_CIPHER_SNOW3G_UEA2:\n-\tcase RTE_CRYPTO_CIPHER_3DES_ECB:\n-\tcase RTE_CRYPTO_CIPHER_AES_ECB:\n-\tcase RTE_CRYPTO_CIPHER_KASUMI_F8:\n-\t\tDPAA_SEC_ERR(\"Crypto: Unsupported Cipher alg %u\",\n-\t\t\tcipher_xform->algo);\n-\t\tgoto out;\n-\tdefault:\n-\t\tDPAA_SEC_ERR(\"Crypto: Undefined Cipher specified %u\",\n-\t\t\tcipher_xform->algo);\n-\t\tgoto out;\n \t}\n \n \tif (ipsec_xform->direction == RTE_SECURITY_IPSEC_SA_DIR_EGRESS) {\n", "prefixes": [ "10/10" ] }