Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/44646/?format=api
{ "id": 44646, "url": "http://patches.dpdk.org/api/patches/44646/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20180913060846.29930-11-g.singh@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": "<20180913060846.29930-11-g.singh@nxp.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20180913060846.29930-11-g.singh@nxp.com", "date": "2018-09-13T06:08:46", "name": "[10/10] crypto/caam_jr: add security offload support", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "6123a593814ca15ec8ad78bf9193e9c8dc0daac1", "submitter": { "id": 1068, "url": "http://patches.dpdk.org/api/people/1068/?format=api", "name": "Gagandeep Singh", "email": "g.singh@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/20180913060846.29930-11-g.singh@nxp.com/mbox/", "series": [ { "id": 1300, "url": "http://patches.dpdk.org/api/series/1300/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=1300", "date": "2018-09-13T06:08:36", "name": "Introducing the NXP CAAM job ring driver", "version": 1, "mbox": "http://patches.dpdk.org/series/1300/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/44646/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/44646/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 9E11D5F2C;\n\tThu, 13 Sep 2018 08:09:50 +0200 (CEST)", "from EUR02-VE1-obe.outbound.protection.outlook.com\n\t(mail-eopbgr20069.outbound.protection.outlook.com [40.107.2.69])\n\tby dpdk.org (Postfix) with ESMTP id 1B73958F6\n\tfor <dev@dpdk.org>; Thu, 13 Sep 2018 08:09:41 +0200 (CEST)", "from Tophie.ap.freescale.net (14.142.187.166) by\n\tHE1PR04MB1529.eurprd04.prod.outlook.com (2a01:111:e400:59a8::19) with\n\tMicrosoft SMTP Server (version=TLS1_2,\n\tcipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1143.15;\n\tThu, 13 Sep 2018 06:09:38 +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=35+otj37A8ViFD1n+dIZBlaPwv1d6hsCiGfq4vxP20M=;\n\tb=dlo07dmh7gjhXzYPNj7XO75tO2nCHxn2d+PbgOx5JHwpdzUUGt3/cThWgZShbWYAhLT6CQfCEkS7Bf+DbKZx0ndupsoW044mXvoJ9BYrR/F4bl63LwCiU14Xh6hk3a924qe8j7iH4HZvWNN8+ycmJPEqbpZB5s4zPS/z4cDXsGY=", "Authentication-Results": "spf=none (sender IP is )\n\tsmtp.mailfrom=G.Singh@nxp.com; ", "From": "Gagandeep Singh <g.singh@nxp.com>", "To": "dev@dpdk.org,\n\takhil.goyal@nxp.com", "Cc": "Hemant Agrawal <hemant.agrawal@nxp.com>", "Date": "Thu, 13 Sep 2018 11:38:46 +0530", "Message-Id": "<20180913060846.29930-11-g.singh@nxp.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20180913060846.29930-1-g.singh@nxp.com>", "References": "<20180913060846.29930-1-g.singh@nxp.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-Originating-IP": "[14.142.187.166]", "X-ClientProxiedBy": "BM1PR01CA0095.INDPRD01.PROD.OUTLOOK.COM\n\t(2603:1096:b00::11)\n\tTo HE1PR04MB1529.eurprd04.prod.outlook.com\n\t(2a01:111:e400:59a8::19)", "X-MS-PublicTrafficType": "Email", "X-MS-Office365-Filtering-Correlation-Id": "ff805c9f-ed0c-478c-4bc4-08d6193f7d06", "X-MS-Office365-Filtering-HT": "Tenant", "X-Microsoft-Antispam": "BCL:0; PCL:0;\n\tRULEID:(7020095)(4652040)(8989137)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020);\n\tSRVR:HE1PR04MB1529; ", "X-Microsoft-Exchange-Diagnostics": [ "1; HE1PR04MB1529;\n\t3:Jv+R+Kj2SK1T7E5jSfmY1FfCh5dnlSVm3lewZgBz8qHluKPcgVD/esjckoW0ljzQzrA7NuDn93bNnz152kLn97wU7THdltgpdt23uwkuE29sxbNDwzaJJVsCDXvFHgXaWGHydHkPe8CmO50GPd8FPK02c3ghoxXvTTgWC9a0jGd/neqqIHlAcGaFmHZYedqVbZAYR5iGFgXI0YigSsW4v+RuHjpXBHaf9vQukLbuB630hgEHyVloW9IlfYSBrR3/;\n\t25:6+NJdSO/naom6l3AsvYtci0eMqA9IgdBQNTy4F85pQlIuYkR4NCdsFnX01y/uFiq8iHcTvOED6uS9zQzKHPDXe+cSpBLyrUjOv52qzC2AfwwaV2JUVGY5abXAkenjbG3xIg5A8koHKN8jNMssgssQwSfW1JeDLFYBcc8zLmwg70csxxPhbbw/krp4AR162lmWTY+hsMLUX46xPpCMboqfvt0lEfhq/azbMn+yLltxcSYhXEfuJTjHYZJPDXhd0Xlr3pT4QrT3/6ReEMjpDWT7PDNUOk/0mM4dmU9Lc1hfDEBKHS23ndG5+SuCojpe6LzzQGSGerEsCEGdYBOdonxwQ==;\n\t31:cOndFLsTDrgkWplA+7EGLdKbQDJiWLoUQGtGw0kpIeexJwtyALUlYbdmerzWajp7ORrJXDTJH1eDSKZbM0r4x9/AtPxehOAMzRSZVfaLrroQwp+WwJ8J916SghIcPSvPKKsGeboQ+pgL0Dn/cxCFa92XS4r1yEaW1sDt74XNDPubSJrGqVavG4diXYdnksWvsAq7oasx2dnnK+rtA0hjNPaHwNhXlsWBSVVNQyTMW3o=", "1; HE1PR04MB1529;\n\t20:ECSS4GILo7UUW8zdzdj1FtGlCplt4ByeARbhraa8WcV9CpSrzEOgRj9t46K9hkTbwahhA5GkIEUTa4qJjXvluVfL5+JJRRRyd6gHgGpgJrO9fP1Wh5dqdj9F0R1F8K4ylHALihYN2hJgGCiGHG+ydepYVhEnIvfW/5U79hcF3LR8YIlPXNdT0+S2MiPHAdWxx7TV9X3iB4auWFUeLxnJhFtt/2TlqPSk3x7mNNgciCrWmPmxLilz86DfPta6JC8/DG/ub2t+T6MmiAwi/2KmzqqWKlsu+drm1nLKFQt6ZISP8OtGKB5fdGRSlWPeLxgoAjxo2Ozr3ztpR6YcBPCMLGg1EkDdj44mYjmcxKIBonzyXVNKvRv47nOiXKs2ndcMXVjcLR9g2fs/EzswPa3XqC5D131OkQWem+76aVTkhsWPBPsyJlkYSPuW/+7qdLBalX4ASEK24b+8idR8Le1R1u9HPMVnq/QKK80kmq0tcXtPJclkGedMGf9Gqme81ktT;\n\t4:+ZZ4C2T15SFApFUbkkCglnTZlBY0aK9iHF5vTjY+BEcm21XpIMvHGMk5d0HL2ze90oSMprNvEY6azPKtBEdNOPjH57h8tGaYm9siaF7TuB9LxAQtwaee3PsJWGRQS4OS5c75FQ+2numuphbuan5yAisWTlEIvaNk19F5VPWxHyudB+SOpibLcfugoL2l05r/XUQsS+lMa2ouYfE/PRRGSj6fsPQ69HnI3ZWpHYD3wDEQ/ohRyl/XcdGPVPumKrSW0lqMQ6H6RvV15vbY3JrtmgfgaPFUf/vV2EbYwxZaOCuam16U6yR7XSbHhOEEoJog3Ikg0XbQ1HgBysFpq+MFE8T2G3MHoDxo8DiV7Jz8Nco=", "=?us-ascii?Q?1; HE1PR04MB1529;\n\t23:KOJHRc8O4tNUfYhOgXRNEHWhX0HFmAHD+yX0yscvb?=\n\tadb8Jj3ZRcI/WUjV4t8EBSHSN/07Zrzn3nTWs2YzFDCIGwUrIhmR16HTCiFIoietzFba7Bt3TvlIIenXw25L1LqQNfvx5Z1AMIRoic7hncxHIUf6AYSHmFpRw+qPcxKRlEVbqbFeyt5SLY1xrJGqndAGzMHpjOTGHn3O/5pbaPQI97dF0uQnNGmQt0lIUAF0aECo3tUOuDvqmLbqS1FLGOuFHLg3aPjYAvL+D0k1h3Wbg0f/VvTeCdMIc4bm9PBTtuBA3zuGsxhb7aY+ta3ui5IgKfr1ooTUSTCz+B0PaCkJ47gEjeXvtbbFa25C74l3gx9ohOHLLemztWE7zCadKgmxH1HYDZwsoyZ9j+6cVs/ZxiTLbfekEONfRZ+FFceIA9O4peVMB+lGdfA10r0WciydvZKD7jtomE2Zk2WnR80RRTlBtkbxJ71Sp50zFk8GkSxFg0fWVEj6AghLx//cxZoQ1SwG6iXJc7boDZdeWQc/FGlQclRGMt6oVQtFeGmU5sjluXUzBy2vEkqk/byXCsKFHcPrS1Ot3Wj5ruA0KsBUUm8f5YqxTPiZl3rGeIYpd2zmQay1cGIz4qfsl++IIkcyjt8i1NDnvjQBvE+wLt73SNrgOkj3CAOHm0vXFIZC13d+rgEMm3MlnftB0gZ1QKzZkdmiRMV9EC/0iPfWzCz7uKXm0kkRvFQxr5LzRfh3nOmmLwfZg81QOgpYbVUheTtqjWE08W77E232w5UDwTSRQO0Omgeuj71Hq1VBhoNXCOyQxJIGPN1dcTOq22luHVQG6pwg/OUSz8v9qbNw5qEntK/6CF99j6byk8K2YxYD8oWpTq/Vc93ip6czngsd9qwlxpGsT33PYBb5UIUgFkMEIbRE2HBbso7tNzlbPa626Px3B11PJamGydwalKUcQnTfe0ld0hoa1rRVIIWshZ/jl38Ncrse2/eG/QKnDnKS5vXR8fWsYlsFV9dukJNltDf23oyCaY1qg2le9EplgxrjDq3YSYWwQgDSkQi8SCKLPXGjZ9YRAq9JjEUBVHXRUTpYMX7+Zpo1uKzMfBSkVHA4xDVEhXrcmvNFc3TW7BvKtA8QHVw3rFIIfpivjxsd2b/Xb+Hd9iTyBkbpmoEADqb6Rogr9oqT1fqJU3ZWQokWZnS8o/zx711XvXPNH+tMFeGbgAFYeQrlIAypPvDJ++304Hwr3qqDaZ+lSsYWKXUfiHj6J5MuN+nk+Exfbo0F+6IFFg7Wv4c9N08pw/vgDlklDkcZfPALYnP4Miw1tV9BIahGCrfGl105DvmRwnTkf6bHShOnoDneYUOdE0khavJcA==", "1; HE1PR04MB1529;\n\t6:ROxmv89cAe3xU7GyqOqWzeyhbd+TfNptzrNJXnCXLD32X6OPh7IMgW/4PkA4nRomrJAoUlET5jJRPyRdQKhTwaofv0crglT7AtAnTiz29sMYSSDL6q25uOOfi19bB+8xZJYkXW/31VZ3jpuwfxCFTlpdok95XPLMEVkYvgrzU0ahMQuMYXni/P7kajgVPirUUacjxdppANPrpTW4nW6MvO7gkvA3uAcF0Y6xdBW6RjqB2cX0t6ebHXQ8Fg+Hic25foPRcN9t4xXgvYR8RTpUB7fbY6b8uNYYmJeUWazPGOeOxXC4NWUoQZnMjH97mxpGNYK2vLvDlMQO8swXZ4cpBUsOtGMiQJD/huBZYiFxkyUnkA7t/AGlbiGAnruKWxJUCs3d7/ut3udIB5Pz72X9axAcZcg6LFpxPPSz3Ukup9GW8oWH6KGOtGj1jFbSxz7WKawkLsfkAf8iAFEqiJhiig==;\n\t5:GNHFZv0PJ0GclADNHLAFkQjJjKKazri8EDgHLvFpmaDCBvxj2hJQxRifJUgeM+yjPpt2GlXyiE+yOqU87tQheYBPdAR6ihdJGgoybuIo41lzQ0fqhSQT7qx+CgO9kOw81WIAgZTz5hudhAW85J5DEBcb0w3EC/3ikmifjImgZ2U=;\n\t7:E3l7zmdRkcoMwkj6q/aseZPd340IJ2RRUh7TEa/3YlMejToxKU8+NN1fNWNaEix1fNXGf+FezLO7WzEtYFioh7dOtrVkFz4mTj5KbMRqNEz3wfQj2JJwDk9wFUsYrldyNiIPK0PF4+wN3N6yzSxuI3lByu4wZSqaJ4ggaCN5H5Y6T92xuQ0NWbS7GSna9NKowKptMDk0GlIMXeb0TwS0/c9WKtj3BRpfXJSPAhEER78QaOIaTDM/uznVrzy+lPW2" ], "X-MS-TrafficTypeDiagnostic": "HE1PR04MB1529:", "X-Microsoft-Antispam-PRVS": "<HE1PR04MB15296D0ECD2A43C549AD64ACE11A0@HE1PR04MB1529.eurprd04.prod.outlook.com>", "X-Exchange-Antispam-Report-Test": "UriScan:(192374486261705)(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)(3002001)(93006095)(93001095)(10201501046)(6055026)(149027)(150027)(6041310)(20161123558120)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(201708071742011)(7699050);\n\tSRVR:HE1PR04MB1529; BCL:0; PCL:0; RULEID:; SRVR:HE1PR04MB1529; ", "X-Forefront-PRVS": "07943272E1", "X-Forefront-Antispam-Report": "SFV:NSPM;\n\tSFS:(10009020)(366004)(376002)(39860400002)(136003)(346002)(396003)(189003)(199004)(2906002)(6506007)(386003)(5009440100003)(6486002)(51416003)(6512007)(52116002)(486006)(2616005)(68736007)(956004)(53936002)(476003)(446003)(11346002)(305945005)(26005)(7736002)(55236004)(76176011)(186003)(16526019)(15650500001)(50226002)(478600001)(47776003)(1076002)(3846002)(6116002)(48376002)(105586002)(106356001)(25786009)(14444005)(50466002)(5660300001)(36756003)(72206003)(66066001)(316002)(97736004)(8936002)(81166006)(4326008)(8676002)(86362001)(6636002)(6666003)(575784001)(81156014)(16586007)(110426005);\n\tDIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR04MB1529;\n\tH:Tophie.ap.freescale.net; FPR:; \n\tSPF: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": "TdXwPe/74BdWhlrkapDAxVFbHp4vKSGdgUyFp4ya2gyHHzYTEOLjjx8jd2h5RUV73hBj5YfDXFWMHeq3dpc9fyU2D3Pi3FNGk8P84Owhm44qXdS3hpQHVbw3mY6KgxKwNMC7oPS/7OH17He7uVkaT3a7CtW8v1lsksORrSFh9ubWXotdDhDsLJSxD1wtwHZbKF5vvr3rZTj8xD0BHs2mcELZ5LDf8goyVBxjMy4GhJnM8yNVz2iA8xprPbQlhzQ9GfDUsTriRCFWw82+3I7Et/4wZhUyN97FskvFjMZ7Raom3++TwwTjGZI+QrTdgRrAsvHtv6Itzt725iVf1ryqmqg3KCyeNumCJjDhQAmTX2U=", "SpamDiagnosticOutput": "1:99", "SpamDiagnosticMetadata": "NSPM", "X-OriginatorOrg": "nxp.com", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "13 Sep 2018 06:09:38.0702\n\t(UTC)", "X-MS-Exchange-CrossTenant-Network-Message-Id": "ff805c9f-ed0c-478c-4bc4-08d6193f7d06", "X-MS-Exchange-CrossTenant-FromEntityHeader": "Hosted", "X-MS-Exchange-CrossTenant-Id": "686ea1d3-bc2b-4c6f-a92c-d99c5c301635", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "HE1PR04MB1529", "Subject": "[dpdk-dev] [PATCH 10/10] crypto/caam_jr: add security offload\n\tsupport", "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": "From: Hemant Agrawal <hemant.agrawal@nxp.com>\n\nSigned-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>\n---\n drivers/crypto/caam_jr/caam_jr.c | 361 ++++++++++++++++++++++++++-\n drivers/crypto/caam_jr/caam_jr_pvt.h | 3 +\n 2 files changed, 354 insertions(+), 10 deletions(-)", "diff": "diff --git a/drivers/crypto/caam_jr/caam_jr.c b/drivers/crypto/caam_jr/caam_jr.c\nindex f51ff1093..c4689078a 100644\n--- a/drivers/crypto/caam_jr/caam_jr.c\n+++ b/drivers/crypto/caam_jr/caam_jr.c\n@@ -174,7 +174,13 @@ static inline int is_aead(struct caam_jr_session *ses)\n static inline int is_auth_cipher(struct caam_jr_session *ses)\n {\n \treturn ((ses->cipher_alg != RTE_CRYPTO_CIPHER_NULL) &&\n-\t\t(ses->auth_alg != RTE_CRYPTO_AUTH_NULL));\n+\t\t(ses->auth_alg != RTE_CRYPTO_AUTH_NULL) &&\n+\t\t(ses->proto_alg != RTE_SECURITY_PROTOCOL_IPSEC));\n+}\n+\n+static inline int is_proto_ipsec(struct caam_jr_session *ses)\n+{\n+\treturn (ses->proto_alg == RTE_SECURITY_PROTOCOL_IPSEC);\n }\n \n static inline int is_encode(struct caam_jr_session *ses)\n@@ -195,27 +201,39 @@ caam_auth_alg(struct caam_jr_session *ses, struct alginfo *alginfo_a)\n \t\tses->digest_length = 0;\n \t\tbreak;\n \tcase RTE_CRYPTO_AUTH_MD5_HMAC:\n-\t\talginfo_a->algtype = OP_ALG_ALGSEL_MD5;\n+\t\talginfo_a->algtype =\n+\t\t\t(ses->proto_alg == RTE_SECURITY_PROTOCOL_IPSEC) ?\n+\t\t\tOP_PCL_IPSEC_HMAC_MD5_96 : OP_ALG_ALGSEL_MD5;\n \t\talginfo_a->algmode = OP_ALG_AAI_HMAC;\n \t\tbreak;\n \tcase RTE_CRYPTO_AUTH_SHA1_HMAC:\n-\t\talginfo_a->algtype = OP_ALG_ALGSEL_SHA1;\n+\t\talginfo_a->algtype =\n+\t\t\t(ses->proto_alg == RTE_SECURITY_PROTOCOL_IPSEC) ?\n+\t\t\tOP_PCL_IPSEC_HMAC_SHA1_96 : OP_ALG_ALGSEL_SHA1;\n \t\talginfo_a->algmode = OP_ALG_AAI_HMAC;\n \t\tbreak;\n \tcase RTE_CRYPTO_AUTH_SHA224_HMAC:\n-\t\talginfo_a->algtype = OP_ALG_ALGSEL_SHA224;\n+\t\talginfo_a->algtype =\n+\t\t\t(ses->proto_alg == RTE_SECURITY_PROTOCOL_IPSEC) ?\n+\t\t\tOP_PCL_IPSEC_HMAC_SHA1_160 : OP_ALG_ALGSEL_SHA224;\n \t\talginfo_a->algmode = OP_ALG_AAI_HMAC;\n \t\tbreak;\n \tcase RTE_CRYPTO_AUTH_SHA256_HMAC:\n-\t\talginfo_a->algtype = OP_ALG_ALGSEL_SHA256;\n+\t\talginfo_a->algtype =\n+\t\t\t(ses->proto_alg == RTE_SECURITY_PROTOCOL_IPSEC) ?\n+\t\t\tOP_PCL_IPSEC_HMAC_SHA2_256_128 : OP_ALG_ALGSEL_SHA256;\n \t\talginfo_a->algmode = OP_ALG_AAI_HMAC;\n \t\tbreak;\n \tcase RTE_CRYPTO_AUTH_SHA384_HMAC:\n-\t\talginfo_a->algtype = OP_ALG_ALGSEL_SHA384;\n+\t\talginfo_a->algtype =\n+\t\t\t(ses->proto_alg == RTE_SECURITY_PROTOCOL_IPSEC) ?\n+\t\t\tOP_PCL_IPSEC_HMAC_SHA2_384_192 : OP_ALG_ALGSEL_SHA384;\n \t\talginfo_a->algmode = OP_ALG_AAI_HMAC;\n \t\tbreak;\n \tcase RTE_CRYPTO_AUTH_SHA512_HMAC:\n-\t\talginfo_a->algtype = OP_ALG_ALGSEL_SHA512;\n+\t\talginfo_a->algtype =\n+\t\t\t(ses->proto_alg == RTE_SECURITY_PROTOCOL_IPSEC) ?\n+\t\t\tOP_PCL_IPSEC_HMAC_SHA2_512_256 : OP_ALG_ALGSEL_SHA512;\n \t\talginfo_a->algmode = OP_ALG_AAI_HMAC;\n \t\tbreak;\n \tdefault:\n@@ -230,15 +248,21 @@ caam_cipher_alg(struct caam_jr_session *ses, struct alginfo *alginfo_c)\n \tcase RTE_CRYPTO_CIPHER_NULL:\n \t\tbreak;\n \tcase RTE_CRYPTO_CIPHER_AES_CBC:\n-\t\talginfo_c->algtype = OP_ALG_ALGSEL_AES;\n+\t\talginfo_c->algtype =\n+\t\t\t(ses->proto_alg == RTE_SECURITY_PROTOCOL_IPSEC) ?\n+\t\t\tOP_PCL_IPSEC_AES_CBC : OP_ALG_ALGSEL_AES;\n \t\talginfo_c->algmode = OP_ALG_AAI_CBC;\n \t\tbreak;\n \tcase RTE_CRYPTO_CIPHER_3DES_CBC:\n-\t\talginfo_c->algtype = OP_ALG_ALGSEL_3DES;\n+\t\talginfo_c->algtype =\n+\t\t\t(ses->proto_alg == RTE_SECURITY_PROTOCOL_IPSEC) ?\n+\t\t\tOP_PCL_IPSEC_3DES : OP_ALG_ALGSEL_3DES;\n \t\talginfo_c->algmode = OP_ALG_AAI_CBC;\n \t\tbreak;\n \tcase RTE_CRYPTO_CIPHER_AES_CTR:\n-\t\talginfo_c->algtype = OP_ALG_ALGSEL_AES;\n+\t\talginfo_c->algtype =\n+\t\t\t(ses->proto_alg == RTE_SECURITY_PROTOCOL_IPSEC) ?\n+\t\t\tOP_PCL_IPSEC_AES_CTR : OP_ALG_ALGSEL_AES;\n \t\talginfo_c->algmode = OP_ALG_AAI_CTR;\n \t\tbreak;\n \tdefault:\n@@ -400,6 +424,22 @@ caam_jr_prep_cdb(struct caam_jr_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@@ -407,6 +447,7 @@ caam_jr_prep_cdb(struct caam_jr_session *ses)\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}\n \n \tif (shared_desc_len < 0) {\n@@ -1258,6 +1299,49 @@ build_cipher_auth(struct rte_crypto_op *op, struct caam_jr_session *ses)\n \n \treturn ctx;\n }\n+\n+static inline struct caam_jr_op_ctx *\n+build_proto(struct rte_crypto_op *op, struct caam_jr_session *ses)\n+{\n+\tstruct rte_crypto_sym_op *sym = op->sym;\n+\tstruct caam_jr_op_ctx *ctx = NULL;\n+\tphys_addr_t src_start_addr, dst_start_addr;\n+\tstruct sec_cdb *cdb;\n+\tuint64_t sdesc_offset;\n+\tstruct sec_job_descriptor_t *jobdescr;\n+\n+\tctx = caam_jr_alloc_ctx(ses);\n+\tif (!ctx)\n+\t\treturn NULL;\n+\tctx->op = op;\n+\n+\tsrc_start_addr = rte_pktmbuf_iova(sym->m_src);\n+\tif (sym->m_dst)\n+\t\tdst_start_addr = rte_pktmbuf_iova(sym->m_dst);\n+\telse\n+\t\tdst_start_addr = src_start_addr;\n+\n+\tcdb = ses->cdb;\n+\tsdesc_offset = (size_t) ((char *)&cdb->sh_desc - (char *)cdb);\n+\n+\tjobdescr = (struct sec_job_descriptor_t *) ctx->jobdes.desc;\n+\n+\tSEC_JD_INIT(jobdescr);\n+\tSEC_JD_SET_SD(jobdescr,\n+\t\t(phys_addr_t)(caam_jr_dma_vtop(cdb)) + sdesc_offset,\n+\t\t\tcdb->sh_hdr.hi.field.idlen);\n+\n+\t/* output */\n+\tSEC_JD_SET_OUT_PTR(jobdescr, (uint64_t)dst_start_addr, 0,\n+\t\t\tsym->m_src->buf_len - sym->m_src->data_off);\n+\t/* input */\n+\tSEC_JD_SET_IN_PTR(jobdescr, (uint64_t)src_start_addr, 0,\n+\t\t\tsym->m_src->pkt_len);\n+\tsym->m_src->packet_type &= ~RTE_PTYPE_L4_MASK;\n+\n+\treturn ctx;\n+}\n+\n static int\n caam_jr_enqueue_op(struct rte_crypto_op *op, struct caam_jr_qp *qp)\n {\n@@ -1272,6 +1356,11 @@ caam_jr_enqueue_op(struct rte_crypto_op *op, struct caam_jr_qp *qp)\n \t\tget_sym_session_private_data(op->sym->session,\n \t\t\t\t\tcryptodev_driver_id);\n \t\tbreak;\n+\tcase RTE_CRYPTO_OP_SECURITY_SESSION:\n+\t\tses = (struct caam_jr_session *)\n+\t\t\tget_sec_session_private_data(\n+\t\t\t\t\top->sym->sec_session);\n+\t\tbreak;\n \tdefault:\n \t\tCAAM_JR_DP_ERR(\"sessionless crypto op not supported\");\n \t\tqp->tx_errs++;\n@@ -1293,6 +1382,8 @@ caam_jr_enqueue_op(struct rte_crypto_op *op, struct caam_jr_qp *qp)\n \t\t\tctx = build_auth_only(op, ses);\n \t\telse if (is_cipher_only(ses))\n \t\t\tctx = build_cipher_only(op, ses);\n+\t\telse if (is_proto_ipsec(ses))\n+\t\t\tctx = build_proto(op, ses);\n \t} else {\n \t\tif (is_auth_cipher(ses))\n \t\t\tctx = build_cipher_auth_sg(op, ses);\n@@ -1661,6 +1752,227 @@ caam_jr_sym_session_clear(struct rte_cryptodev *dev,\n \t}\n }\n \n+static int\n+caam_jr_set_ipsec_session(__rte_unused struct rte_cryptodev *dev,\n+\t\t\t struct rte_security_session_conf *conf,\n+\t\t\t void *sess)\n+{\n+\tstruct sec_job_ring_t *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 caam_jr_session *session = (struct caam_jr_session *)sess;\n+\n+\tPMD_INIT_FUNC_TRACE();\n+\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} else {\n+\t\tauth_xform = &conf->crypto_xform->auth;\n+\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\tCAAM_JR_ERR(\"No Memory for cipher key\\n\");\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\tCAAM_JR_ERR(\"No Memory for auth key\\n\");\n+\t\trte_free(session->cipher_key.data);\n+\t\treturn -ENOMEM;\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+\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\tCAAM_JR_ERR(\"Crypto: Unsupported auth alg %u\\n\",\n+\t\t\tauth_xform->algo);\n+\t\tgoto out;\n+\tdefault:\n+\t\tCAAM_JR_ERR(\"Crypto: Undefined Auth specified %u\\n\",\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\tCAAM_JR_ERR(\"Crypto: Unsupported Cipher alg %u\\n\",\n+\t\t\tcipher_xform->algo);\n+\t\tgoto out;\n+\tdefault:\n+\t\tCAAM_JR_ERR(\"Crypto: Undefined Cipher specified %u\\n\",\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+\t\tmemset(&session->encap_pdb, 0, sizeof(struct ipsec_encap_pdb) +\n+\t\t\t\tsizeof(session->ip4_hdr));\n+\t\tsession->ip4_hdr.ip_v = IPVERSION;\n+\t\tsession->ip4_hdr.ip_hl = 5;\n+\t\tsession->ip4_hdr.ip_len = rte_cpu_to_be_16(\n+\t\t\t\t\t\tsizeof(session->ip4_hdr));\n+\t\tsession->ip4_hdr.ip_tos = ipsec_xform->tunnel.ipv4.dscp;\n+\t\tsession->ip4_hdr.ip_id = 0;\n+\t\tsession->ip4_hdr.ip_off = 0;\n+\t\tsession->ip4_hdr.ip_ttl = ipsec_xform->tunnel.ipv4.ttl;\n+\t\tsession->ip4_hdr.ip_p = (ipsec_xform->proto ==\n+\t\t\t\tRTE_SECURITY_IPSEC_SA_PROTO_ESP) ? IPPROTO_ESP\n+\t\t\t\t: IPPROTO_AH;\n+\t\tsession->ip4_hdr.ip_sum = 0;\n+\t\tsession->ip4_hdr.ip_src = ipsec_xform->tunnel.ipv4.src_ip;\n+\t\tsession->ip4_hdr.ip_dst = ipsec_xform->tunnel.ipv4.dst_ip;\n+\t\tsession->ip4_hdr.ip_sum = calc_chksum((uint16_t *)\n+\t\t\t\t\t\t(void *)&session->ip4_hdr,\n+\t\t\t\t\t\tsizeof(struct ip));\n+\n+\t\tsession->encap_pdb.options =\n+\t\t\t(IPVERSION << PDBNH_ESP_ENCAP_SHIFT) |\n+\t\t\tPDBOPTS_ESP_OIHI_PDB_INL |\n+\t\t\tPDBOPTS_ESP_IVSRC |\n+\t\t\tPDBHMO_ESP_ENCAP_DTTL;\n+\t\tsession->encap_pdb.spi = ipsec_xform->spi;\n+\t\tsession->encap_pdb.ip_hdr_len = sizeof(struct ip);\n+\n+\t\tsession->dir = DIR_ENC;\n+\t} else if (ipsec_xform->direction ==\n+\t\t\tRTE_SECURITY_IPSEC_SA_DIR_INGRESS) {\n+\t\tmemset(&session->decap_pdb, 0, sizeof(struct ipsec_decap_pdb));\n+\t\tsession->decap_pdb.options = sizeof(struct ip) << 16;\n+\t\tsession->dir = DIR_DEC;\n+\t} else\n+\t\tgoto out;\n+\tsession->ctx_pool = internals->ctx_pool;\n+\n+\treturn 0;\n+out:\n+\trte_free(session->auth_key.data);\n+\trte_free(session->cipher_key.data);\n+\tmemset(session, 0, sizeof(struct caam_jr_session));\n+\treturn -1;\n+}\n+\n+static int\n+caam_jr_security_session_create(void *dev,\n+\t\t\t\t struct rte_security_session_conf *conf,\n+\t\t\t\t struct rte_security_session *sess,\n+\t\t\t\t struct rte_mempool *mempool)\n+{\n+\tvoid *sess_private_data;\n+\tstruct rte_cryptodev *cdev = (struct rte_cryptodev *)dev;\n+\tint ret;\n+\n+\tif (rte_mempool_get(mempool, &sess_private_data)) {\n+\t\tCAAM_JR_ERR(\"Couldn't get object from session mempool\");\n+\t\treturn -ENOMEM;\n+\t}\n+\n+\tswitch (conf->protocol) {\n+\tcase RTE_SECURITY_PROTOCOL_IPSEC:\n+\t\tret = caam_jr_set_ipsec_session(cdev, conf,\n+\t\t\t\tsess_private_data);\n+\t\tbreak;\n+\tcase RTE_SECURITY_PROTOCOL_MACSEC:\n+\t\treturn -ENOTSUP;\n+\tdefault:\n+\t\treturn -EINVAL;\n+\t}\n+\tif (ret != 0) {\n+\t\tCAAM_JR_ERR(\"failed to configure session parameters\");\n+\t\t/* Return session to mempool */\n+\t\trte_mempool_put(mempool, sess_private_data);\n+\t\treturn ret;\n+\t}\n+\n+\tset_sec_session_private_data(sess, sess_private_data);\n+\n+\treturn ret;\n+}\n+\n+/* Clear the memory of session so it doesn't leave key material behind */\n+static int\n+caam_jr_security_session_destroy(void *dev __rte_unused,\n+\t\tstruct rte_security_session *sess)\n+{\n+\tPMD_INIT_FUNC_TRACE();\n+\tvoid *sess_priv = get_sec_session_private_data(sess);\n+\n+\tstruct caam_jr_session *s = (struct caam_jr_session *)sess_priv;\n+\n+\tif (sess_priv) {\n+\t\tstruct rte_mempool *sess_mp = rte_mempool_from_obj(sess_priv);\n+\n+\t\trte_free(s->cipher_key.data);\n+\t\trte_free(s->auth_key.data);\n+\t\tmemset(sess, 0, sizeof(struct caam_jr_session));\n+\t\tset_sec_session_private_data(sess, NULL);\n+\t\trte_mempool_put(sess_mp, sess_priv);\n+\t}\n+\treturn 0;\n+}\n+\n+\n static int\n caam_jr_dev_configure(struct rte_cryptodev *dev,\n \t\t struct rte_cryptodev_config *config __rte_unused)\n@@ -1752,6 +2064,20 @@ static struct rte_cryptodev_ops caam_jr_ops = {\n \t.sym_session_clear = caam_jr_sym_session_clear\n };\n \n+static const struct rte_security_capability *\n+caam_jr_capabilities_get(void *device __rte_unused)\n+{\n+\treturn caam_jr_security_cap;\n+}\n+\n+static struct rte_security_ops caam_jr_security_ops = {\n+\t.session_create = caam_jr_security_session_create,\n+\t.session_update = NULL,\n+\t.session_stats_get = NULL,\n+\t.session_destroy = caam_jr_security_session_destroy,\n+\t.set_pkt_metadata = NULL,\n+\t.capabilities_get = caam_jr_capabilities_get\n+};\n \n /* @brief Flush job rings of any processed descs.\n * The processed descs are silently dropped,\n@@ -1970,6 +2296,7 @@ caam_jr_dev_init(const char *name,\n \t\t\t struct rte_cryptodev_pmd_init_params *init_params)\n {\n \tstruct rte_cryptodev *dev;\n+\tstruct rte_security_ctx *security_instance;\n \tstruct uio_job_ring *job_ring;\n \tchar str[RTE_CRYPTODEV_NAME_MAX_LEN];\n \n@@ -2039,6 +2366,20 @@ caam_jr_dev_init(const char *name,\n \t\treturn 0;\n \t}\n \n+\t/*TODO free it during teardown*/\n+\tsecurity_instance = rte_malloc(\"caam_jr\",\n+\t\t\t\tsizeof(struct rte_security_ctx), 0);\n+\tif (security_instance == NULL) {\n+\t\tCAAM_JR_ERR(\"memory allocation failed\\n\");\n+\t\t//todo error handling.\n+\t\tgoto cleanup2;\n+\t}\n+\n+\tsecurity_instance->device = (void *)dev;\n+\tsecurity_instance->ops = &caam_jr_security_ops;\n+\tsecurity_instance->sess_cnt = 0;\n+\tdev->security_ctx = security_instance;\n+\n \tRTE_LOG(INFO, PMD, \"%s cryptodev init\\n\", dev->data->name);\n \n \treturn 0;\ndiff --git a/drivers/crypto/caam_jr/caam_jr_pvt.h b/drivers/crypto/caam_jr/caam_jr_pvt.h\nindex cc0aa65f1..cfa2f78ae 100644\n--- a/drivers/crypto/caam_jr/caam_jr_pvt.h\n+++ b/drivers/crypto/caam_jr/caam_jr_pvt.h\n@@ -110,6 +110,7 @@ struct caam_jr_session {\n \tenum rte_crypto_cipher_algorithm cipher_alg; /* Cipher Algorithm*/\n \tenum rte_crypto_auth_algorithm auth_alg; /* Authentication Algorithm*/\n \tenum rte_crypto_aead_algorithm aead_alg; /* AEAD Algorithm*/\n+\tenum rte_security_session_protocol proto_alg; /* Security Algorithm*/\n \tunion {\n \t\tstruct {\n \t\t\tuint8_t *data;\t/* pointer to key data */\n@@ -132,7 +133,9 @@ struct caam_jr_session {\n \t} iv;\t/* Initialisation vector parameters */\n \tuint16_t auth_only_len; /* Length of data for Auth only */\n \tuint32_t digest_length;\n+\tstruct ipsec_encap_pdb encap_pdb;\n \tstruct ip ip4_hdr;\n+\tstruct ipsec_decap_pdb decap_pdb;\n \tstruct caam_jr_qp *qp;\n \tstruct sec_cdb *cdb;\t/* cmd block associated with qp */\n \tstruct rte_mempool *ctx_pool; /* session mempool for caam_jr_op_ctx */\n", "prefixes": [ "10/10" ] }