Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/97610/?format=api
{ "id": 97610, "url": "http://patchwork.dpdk.org/api/patches/97610/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20210831140127.31775-9-ktejasree@marvell.com/", "project": { "id": 1, "url": "http://patchwork.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": "<20210831140127.31775-9-ktejasree@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210831140127.31775-9-ktejasree@marvell.com", "date": "2021-08-31T14:01:27", "name": "[8/8] common/cnxk: make IPsec defines common", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "08ceec88f56556fc5e4700ce4cdc7fff31e32d36", "submitter": { "id": 1789, "url": "http://patchwork.dpdk.org/api/people/1789/?format=api", "name": "Tejasree Kondoj", "email": "ktejasree@marvell.com" }, "delegate": null, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20210831140127.31775-9-ktejasree@marvell.com/mbox/", "series": [ { "id": 18562, "url": "http://patchwork.dpdk.org/api/series/18562/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=18562", "date": "2021-08-31T14:01:19", "name": "add lookaside IPsec additional features", "version": 1, "mbox": "http://patchwork.dpdk.org/series/18562/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/97610/comments/", "check": "warning", "checks": "http://patchwork.dpdk.org/api/patches/97610/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "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])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 40107A0C46;\n\tTue, 31 Aug 2021 15:09:01 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 3436440E01;\n\tTue, 31 Aug 2021 15:08:57 +0200 (CEST)", "from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com\n [67.231.156.173])\n by mails.dpdk.org (Postfix) with ESMTP id B740440687\n for <dev@dpdk.org>; Tue, 31 Aug 2021 15:08:55 +0200 (CEST)", "from pps.filterd (m0045851.ppops.net [127.0.0.1])\n by mx0b-0016f401.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 17VCLwru027724\n for <dev@dpdk.org>; Tue, 31 Aug 2021 06:08:55 -0700", "from dc5-exch01.marvell.com ([199.233.59.181])\n by mx0b-0016f401.pphosted.com with ESMTP id 3asf15hhsm-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT)\n for <dev@dpdk.org>; Tue, 31 Aug 2021 06:08:55 -0700", "from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH01.marvell.com\n (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.18;\n Tue, 31 Aug 2021 06:08:52 -0700", "from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com\n (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.18 via Frontend\n Transport; Tue, 31 Aug 2021 06:08:53 -0700", "from hyd1554T5810.caveonetworks.com.com (unknown [10.29.57.11])\n by maili.marvell.com (Postfix) with ESMTP id D0FA95B6925;\n Tue, 31 Aug 2021 06:08:49 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com;\n h=from : to : cc :\n subject : date : message-id : in-reply-to : references : mime-version :\n content-transfer-encoding : content-type; s=pfpt0220;\n bh=+xFZ6UE9jbHlQCEP8KUeRBjuJE/tGZMCYUGetnQxsKY=;\n b=Jm5+2q7D1BzYQjXcSZdZlZjkWCF0p/ZrBDMP9zam/DY2EvcnRYfZEIoht4QL+sl5Q7S3\n cHaUocrnXCaNsv0YEXIgw10wAkPniqtXHkwC7D2NNJBbNz+kpi1SbVkpj+iR9CNo9u3m\n EygfPOdrFRZwjmw3c90qbeGxLESyTZWFb7LkCRoH2cLD3KpFkX0xoCp/KfzYme7NkNsc\n 8fW5BCftHU64pJg+rcCK69JtcYCyo1SXJloX1ZaaqZoekBBbGYrz7rJ5TRaf3CEBzfl2\n R40TwfiFcHDmkZgxXfpP3rhJdk99kagxyd/MJxh9ghIP5U8QObMjB846oQcDiyr9PK/k gQ==", "From": "Tejasree Kondoj <ktejasree@marvell.com>", "To": "Akhil Goyal <gakhil@marvell.com>", "CC": "Archana Muniganti <marchana@marvell.com>, Anoob Joseph\n <anoobj@marvell.com>, Ankur Dwivedi <adwivedi@marvell.com>, Srujana Challa\n <schalla@marvell.com>, Nithin Dabilpuram <ndabilpuram@marvell.com>, \"Jerin\n Jacob\" <jerinj@marvell.com>,\n Tejasree Kondoj <ktejasree@marvell.com>, <dev@dpdk.org>", "Date": "Tue, 31 Aug 2021 19:31:27 +0530", "Message-ID": "<20210831140127.31775-9-ktejasree@marvell.com>", "X-Mailer": "git-send-email 2.27.0", "In-Reply-To": "<20210831140127.31775-1-ktejasree@marvell.com>", "References": "<20210831140127.31775-1-ktejasree@marvell.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Proofpoint-ORIG-GUID": "gPJH_AxODt8jj9S67Jx4XJB-9F_j0Nhn", "X-Proofpoint-GUID": "gPJH_AxODt8jj9S67Jx4XJB-9F_j0Nhn", "X-Proofpoint-Virus-Version": "vendor=baseguard\n engine=ICAP:2.0.182.1,Aquarius:18.0.790,Hydra:6.0.391,FMLib:17.0.607.475\n definitions=2021-08-31_05,2021-08-31_01,2020-04-07_01", "Subject": "[dpdk-dev] [PATCH 8/8] common/cnxk: make IPsec defines common", "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>,\n <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 <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Archana Muniganti <marchana@marvell.com>\n\nMake IPsec defines common and remove redundant macros.\n\nSigned-off-by: Archana Muniganti <marchana@marvell.com>\n---\n drivers/common/cnxk/cnxk_security.c | 24 +++++++++--------\n drivers/common/cnxk/roc_api.h | 1 +\n drivers/common/cnxk/roc_ie.h | 33 ++++++++++++++++-------\n drivers/common/cnxk/roc_ie_on.h | 26 ------------------\n drivers/common/cnxk/roc_ie_ot.h | 26 ------------------\n drivers/crypto/cnxk/cn10k_cryptodev_ops.c | 4 ++-\n 6 files changed, 41 insertions(+), 73 deletions(-)", "diff": "diff --git a/drivers/common/cnxk/cnxk_security.c b/drivers/common/cnxk/cnxk_security.c\nindex fe64e70c81..4f7fd1b3a0 100644\n--- a/drivers/common/cnxk/cnxk_security.c\n+++ b/drivers/common/cnxk/cnxk_security.c\n@@ -6,6 +6,8 @@\n \n #include \"cnxk_security.h\"\n \n+#include \"roc_api.h\"\n+\n static void\n ipsec_hmac_opad_ipad_gen(struct rte_crypto_sym_xform *auth_xform,\n \t\t\t uint8_t *hmac_opad_ipad)\n@@ -51,12 +53,12 @@ ot_ipsec_sa_common_param_fill(union roc_ot_ipsec_sa_word2 *w2,\n \t/* Set direction */\n \tswitch (ipsec_xfrm->direction) {\n \tcase RTE_SECURITY_IPSEC_SA_DIR_INGRESS:\n-\t\tw2->s.dir = ROC_IE_OT_SA_DIR_INBOUND;\n+\t\tw2->s.dir = ROC_IE_SA_DIR_INBOUND;\n \t\tauth_xfrm = crypto_xfrm;\n \t\tcipher_xfrm = crypto_xfrm->next;\n \t\tbreak;\n \tcase RTE_SECURITY_IPSEC_SA_DIR_EGRESS:\n-\t\tw2->s.dir = ROC_IE_OT_SA_DIR_OUTBOUND;\n+\t\tw2->s.dir = ROC_IE_SA_DIR_OUTBOUND;\n \t\tcipher_xfrm = crypto_xfrm;\n \t\tauth_xfrm = crypto_xfrm->next;\n \t\tbreak;\n@@ -67,10 +69,10 @@ ot_ipsec_sa_common_param_fill(union roc_ot_ipsec_sa_word2 *w2,\n \t/* Set protocol - ESP vs AH */\n \tswitch (ipsec_xfrm->proto) {\n \tcase RTE_SECURITY_IPSEC_SA_PROTO_ESP:\n-\t\tw2->s.protocol = ROC_IE_OT_SA_PROTOCOL_ESP;\n+\t\tw2->s.protocol = ROC_IE_SA_PROTOCOL_ESP;\n \t\tbreak;\n \tcase RTE_SECURITY_IPSEC_SA_PROTO_AH:\n-\t\tw2->s.protocol = ROC_IE_OT_SA_PROTOCOL_AH;\n+\t\tw2->s.protocol = ROC_IE_SA_PROTOCOL_AH;\n \t\tbreak;\n \tdefault:\n \t\treturn -EINVAL;\n@@ -79,10 +81,10 @@ ot_ipsec_sa_common_param_fill(union roc_ot_ipsec_sa_word2 *w2,\n \t/* Set mode - transport vs tunnel */\n \tswitch (ipsec_xfrm->mode) {\n \tcase RTE_SECURITY_IPSEC_SA_MODE_TRANSPORT:\n-\t\tw2->s.mode = ROC_IE_OT_SA_MODE_TRANSPORT;\n+\t\tw2->s.mode = ROC_IE_SA_MODE_TRANSPORT;\n \t\tbreak;\n \tcase RTE_SECURITY_IPSEC_SA_MODE_TUNNEL:\n-\t\tw2->s.mode = ROC_IE_OT_SA_MODE_TUNNEL;\n+\t\tw2->s.mode = ROC_IE_SA_MODE_TUNNEL;\n \t\tbreak;\n \tdefault:\n \t\treturn -EINVAL;\n@@ -147,13 +149,13 @@ ot_ipsec_sa_common_param_fill(union roc_ot_ipsec_sa_word2 *w2,\n \n \tswitch (length) {\n \tcase ROC_CPT_AES128_KEY_LEN:\n-\t\tw2->s.aes_key_len = ROC_IE_OT_SA_AES_KEY_LEN_128;\n+\t\tw2->s.aes_key_len = ROC_IE_SA_AES_KEY_LEN_128;\n \t\tbreak;\n \tcase ROC_CPT_AES192_KEY_LEN:\n-\t\tw2->s.aes_key_len = ROC_IE_OT_SA_AES_KEY_LEN_192;\n+\t\tw2->s.aes_key_len = ROC_IE_SA_AES_KEY_LEN_192;\n \t\tbreak;\n \tcase ROC_CPT_AES256_KEY_LEN:\n-\t\tw2->s.aes_key_len = ROC_IE_OT_SA_AES_KEY_LEN_256;\n+\t\tw2->s.aes_key_len = ROC_IE_SA_AES_KEY_LEN_256;\n \t\tbreak;\n \tdefault:\n \t\treturn -EINVAL;\n@@ -271,7 +273,7 @@ cnxk_ot_ipsec_outb_sa_fill(struct roc_ot_ipsec_outb_sa *sa,\n \t/* Tunnel header info */\n \tswitch (tunnel->type) {\n \tcase RTE_SECURITY_IPSEC_TUNNEL_IPV4:\n-\t\tsa->w2.s.outer_ip_ver = ROC_IE_OT_SA_IP_VERSION_4;\n+\t\tsa->w2.s.outer_ip_ver = ROC_IE_SA_IP_VERSION_4;\n \t\tmemcpy(&sa->outer_hdr.ipv4.src_addr, &tunnel->ipv4.src_ip,\n \t\t sizeof(struct in_addr));\n \t\tmemcpy(&sa->outer_hdr.ipv4.dst_addr, &tunnel->ipv4.dst_ip,\n@@ -302,7 +304,7 @@ cnxk_ot_ipsec_outb_sa_fill(struct roc_ot_ipsec_outb_sa *sa,\n \t\t}\n \t\tbreak;\n \tcase RTE_SECURITY_IPSEC_TUNNEL_IPV6:\n-\t\tsa->w2.s.outer_ip_ver = ROC_IE_OT_SA_IP_VERSION_6;\n+\t\tsa->w2.s.outer_ip_ver = ROC_IE_SA_IP_VERSION_6;\n \t\tmemcpy(&sa->outer_hdr.ipv6.src_addr, &tunnel->ipv6.src_addr,\n \t\t sizeof(struct in6_addr));\n \t\tmemcpy(&sa->outer_hdr.ipv6.dst_addr, &tunnel->ipv6.dst_addr,\ndiff --git a/drivers/common/cnxk/roc_api.h b/drivers/common/cnxk/roc_api.h\nindex 9c06cfee9a..7dec8453b4 100644\n--- a/drivers/common/cnxk/roc_api.h\n+++ b/drivers/common/cnxk/roc_api.h\n@@ -121,6 +121,7 @@\n /* CPT microcode */\n #include \"roc_ae.h\"\n #include \"roc_ae_fpm_tables.h\"\n+#include \"roc_ie.h\"\n #include \"roc_ie_on.h\"\n #include \"roc_ie_ot.h\"\n #include \"roc_se.h\"\ndiff --git a/drivers/common/cnxk/roc_ie.h b/drivers/common/cnxk/roc_ie.h\nindex a330ea1b50..31b83948e1 100644\n--- a/drivers/common/cnxk/roc_ie.h\n+++ b/drivers/common/cnxk/roc_ie.h\n@@ -5,15 +5,30 @@\n #ifndef __ROC_IE_H__\n #define __ROC_IE_H__\n \n-/* CNXK IPSEC helper macros */\n-#define ROC_IE_AH_HDR_LEN 12\n-#define ROC_IE_AES_GCM_IV_LEN 8\n-#define ROC_IE_AES_GCM_MAC_LEN 16\n-#define ROC_IE_AES_CBC_IV_LEN 16\n-#define ROC_IE_SHA1_HMAC_LEN 12\n-#define ROC_IE_AUTH_KEY_LEN_MAX 64\n+enum {\n+\tROC_IE_SA_DIR_INBOUND = 0,\n+\tROC_IE_SA_DIR_OUTBOUND = 1,\n+};\n \n-#define ROC_IE_AES_GCM_ROUNDUP_BYTE_LEN 4\n-#define ROC_IE_AES_CBC_ROUNDUP_BYTE_LEN 16\n+enum {\n+\tROC_IE_SA_IP_VERSION_4 = 0,\n+\tROC_IE_SA_IP_VERSION_6 = 1,\n+};\n+\n+enum {\n+\tROC_IE_SA_MODE_TRANSPORT = 0,\n+\tROC_IE_SA_MODE_TUNNEL = 1,\n+};\n+\n+enum {\n+\tROC_IE_SA_PROTOCOL_AH = 0,\n+\tROC_IE_SA_PROTOCOL_ESP = 1,\n+};\n+\n+enum {\n+\tROC_IE_SA_AES_KEY_LEN_128 = 1,\n+\tROC_IE_SA_AES_KEY_LEN_192 = 2,\n+\tROC_IE_SA_AES_KEY_LEN_256 = 3,\n+};\n \n #endif /* __ROC_IE_H__ */\ndiff --git a/drivers/common/cnxk/roc_ie_on.h b/drivers/common/cnxk/roc_ie_on.h\nindex 508654a9d8..222c298a53 100644\n--- a/drivers/common/cnxk/roc_ie_on.h\n+++ b/drivers/common/cnxk/roc_ie_on.h\n@@ -18,32 +18,6 @@\n /* Ucode completion codes */\n #define ROC_IE_ONF_UCC_SUCCESS 0\n \n-enum {\n-\tROC_IE_ON_SA_DIR_INBOUND = 0,\n-\tROC_IE_ON_SA_DIR_OUTBOUND = 1,\n-};\n-\n-enum {\n-\tROC_IE_ON_SA_IP_VERSION_4 = 0,\n-\tROC_IE_ON_SA_IP_VERSION_6 = 1,\n-};\n-\n-enum {\n-\tROC_IE_ON_SA_MODE_TRANSPORT = 0,\n-\tROC_IE_ON_SA_MODE_TUNNEL = 1,\n-};\n-\n-enum {\n-\tROC_IE_ON_SA_PROTOCOL_AH = 0,\n-\tROC_IE_ON_SA_PROTOCOL_ESP = 1,\n-};\n-\n-enum {\n-\tROC_IE_ON_SA_AES_KEY_LEN_128 = 1,\n-\tROC_IE_ON_SA_AES_KEY_LEN_192 = 2,\n-\tROC_IE_ON_SA_AES_KEY_LEN_256 = 3,\n-};\n-\n enum {\n \tROC_IE_ON_SA_ENC_NULL = 0,\n \tROC_IE_ON_SA_ENC_DES_CBC = 1,\ndiff --git a/drivers/common/cnxk/roc_ie_ot.h b/drivers/common/cnxk/roc_ie_ot.h\nindex aeb4be2971..3987a082a2 100644\n--- a/drivers/common/cnxk/roc_ie_ot.h\n+++ b/drivers/common/cnxk/roc_ie_ot.h\n@@ -97,32 +97,6 @@ enum {\n \tROC_IE_OT_SA_INNER_PKT_L4_CSUM_DISABLE = 1,\n };\n \n-enum {\n-\tROC_IE_OT_SA_DIR_INBOUND = 0,\n-\tROC_IE_OT_SA_DIR_OUTBOUND = 1,\n-};\n-\n-enum {\n-\tROC_IE_OT_SA_IP_VERSION_4 = 0,\n-\tROC_IE_OT_SA_IP_VERSION_6 = 1,\n-};\n-\n-enum {\n-\tROC_IE_OT_SA_MODE_TRANSPORT = 0,\n-\tROC_IE_OT_SA_MODE_TUNNEL = 1,\n-};\n-\n-enum {\n-\tROC_IE_OT_SA_PROTOCOL_AH = 0,\n-\tROC_IE_OT_SA_PROTOCOL_ESP = 1,\n-};\n-\n-enum {\n-\tROC_IE_OT_SA_AES_KEY_LEN_128 = 1,\n-\tROC_IE_OT_SA_AES_KEY_LEN_192 = 2,\n-\tROC_IE_OT_SA_AES_KEY_LEN_256 = 3,\n-};\n-\n enum {\n \tROC_IE_OT_SA_ENC_NULL = 0,\n \tROC_IE_OT_SA_ENC_3DES_CBC = 2,\ndiff --git a/drivers/crypto/cnxk/cn10k_cryptodev_ops.c b/drivers/crypto/cnxk/cn10k_cryptodev_ops.c\nindex 780a321cf7..28055aceed 100644\n--- a/drivers/crypto/cnxk/cn10k_cryptodev_ops.c\n+++ b/drivers/crypto/cnxk/cn10k_cryptodev_ops.c\n@@ -16,6 +16,8 @@\n #include \"cnxk_cryptodev_ops.h\"\n #include \"cnxk_se.h\"\n \n+#include \"roc_api.h\"\n+\n static inline struct cnxk_se_sess *\n cn10k_cpt_sym_temp_sess_create(struct cnxk_cpt_qp *qp, struct rte_crypto_op *op)\n {\n@@ -68,7 +70,7 @@ cpt_sec_inst_fill(struct rte_crypto_op *op, struct cn10k_sec_session *sess,\n \tsa = &sess->sa;\n \tw2 = (union roc_ot_ipsec_sa_word2 *)&sa->in_sa.w2;\n \n-\tif (w2->s.dir == ROC_IE_OT_SA_DIR_OUTBOUND)\n+\tif (w2->s.dir == ROC_IE_SA_DIR_OUTBOUND)\n \t\tret = process_outb_sa(op, sa, inst);\n \telse\n \t\tret = process_inb_sa(op, sa, inst);\n", "prefixes": [ "8/8" ] }