Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/47293/?format=api
{ "id": 47293, "url": "http://patchwork.dpdk.org/api/patches/47293/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20181024081833.21432-7-olivier.matz@6wind.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": "<20181024081833.21432-7-olivier.matz@6wind.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20181024081833.21432-7-olivier.matz@6wind.com", "date": "2018-10-24T08:18:25", "name": "[RFC,06/14] net: add rte prefix to esp structure", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "135ca860e6b0497351b68fdc1771eb41823a421b", "submitter": { "id": 8, "url": "http://patchwork.dpdk.org/api/people/8/?format=api", "name": "Olivier Matz", "email": "olivier.matz@6wind.com" }, "delegate": { "id": 319, "url": "http://patchwork.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20181024081833.21432-7-olivier.matz@6wind.com/mbox/", "series": [ { "id": 2053, "url": "http://patchwork.dpdk.org/api/series/2053/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=2053", "date": "2018-10-24T08:18:21", "name": "prefix network structures", "version": 1, "mbox": "http://patchwork.dpdk.org/series/2053/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/47293/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/47293/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 674805F2A;\n\tWed, 24 Oct 2018 10:19:16 +0200 (CEST)", "from proxy.6wind.com (host.76.145.23.62.rev.coltfrance.com\n\t[62.23.145.76]) by dpdk.org (Postfix) with ESMTP id 9FFB05920\n\tfor <dev@dpdk.org>; Wed, 24 Oct 2018 10:19:01 +0200 (CEST)", "from glumotte.dev.6wind.com. (unknown [10.16.0.195])\n\tby proxy.6wind.com (Postfix) with ESMTP id B7CE2208A97\n\tfor <dev@dpdk.org>; Wed, 24 Oct 2018 10:15:07 +0200 (CEST)" ], "From": "Olivier Matz <olivier.matz@6wind.com>", "To": "dev@dpdk.org", "Date": "Wed, 24 Oct 2018 10:18:25 +0200", "Message-Id": "<20181024081833.21432-7-olivier.matz@6wind.com>", "X-Mailer": "git-send-email 2.11.0", "In-Reply-To": "<20181024081833.21432-1-olivier.matz@6wind.com>", "References": "<20181024081833.21432-1-olivier.matz@6wind.com>", "Subject": "[dpdk-dev] [RFC 06/14] net: add rte prefix to esp structure", "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": "Add 'rte_' prefix to structures:\n- rename struct esp_hdr as struct rte_esp_hdr.\n\nSigned-off-by: Olivier Matz <olivier.matz@6wind.com>\n---\n examples/ipsec-secgw/esp.c | 42 +++++++++++++++++++++---------------------\n examples/ipsec-secgw/sa.c | 6 +++---\n lib/librte_ethdev/rte_flow.h | 2 +-\n lib/librte_net/rte_esp.h | 2 +-\n 4 files changed, 26 insertions(+), 26 deletions(-)", "diff": "diff --git a/examples/ipsec-secgw/esp.c b/examples/ipsec-secgw/esp.c\nindex e33232c98..da031a3c9 100644\n--- a/examples/ipsec-secgw/esp.c\n+++ b/examples/ipsec-secgw/esp.c\n@@ -49,7 +49,7 @@ esp_inbound(struct rte_mbuf *m, struct ipsec_sa *sa,\n \t}\n \n \tpayload_len = rte_pktmbuf_pkt_len(m) - ip_hdr_len -\n-\t\tsizeof(struct esp_hdr) - sa->iv_len - sa->digest_len;\n+\t\tsizeof(struct rte_esp_hdr) - sa->iv_len - sa->digest_len;\n \n \tif ((payload_len & (sa->block_size - 1)) || (payload_len <= 0)) {\n \t\tRTE_LOG_DP(DEBUG, IPSEC_ESP, \"payload %d not multiple of %u\\n\",\n@@ -61,13 +61,13 @@ esp_inbound(struct rte_mbuf *m, struct ipsec_sa *sa,\n \tsym_cop->m_src = m;\n \n \tif (sa->aead_algo == RTE_CRYPTO_AEAD_AES_GCM) {\n-\t\tsym_cop->aead.data.offset = ip_hdr_len + sizeof(struct esp_hdr) +\n+\t\tsym_cop->aead.data.offset = ip_hdr_len + sizeof(struct rte_esp_hdr) +\n \t\t\tsa->iv_len;\n \t\tsym_cop->aead.data.length = payload_len;\n \n \t\tstruct cnt_blk *icb;\n \t\tuint8_t *aad;\n-\t\tuint8_t *iv = RTE_PTR_ADD(ip4, ip_hdr_len + sizeof(struct esp_hdr));\n+\t\tuint8_t *iv = RTE_PTR_ADD(ip4, ip_hdr_len + sizeof(struct rte_esp_hdr));\n \n \t\ticb = get_cnt_blk(m);\n \t\ticb->salt = sa->salt;\n@@ -75,7 +75,7 @@ esp_inbound(struct rte_mbuf *m, struct ipsec_sa *sa,\n \t\ticb->cnt = rte_cpu_to_be_32(1);\n \n \t\taad = get_aad(m);\n-\t\tmemcpy(aad, iv - sizeof(struct esp_hdr), 8);\n+\t\tmemcpy(aad, iv - sizeof(struct rte_esp_hdr), 8);\n \t\tsym_cop->aead.aad.data = aad;\n \t\tsym_cop->aead.aad.phys_addr = rte_pktmbuf_iova_offset(m,\n \t\t\t\taad - rte_pktmbuf_mtod(m, uint8_t *));\n@@ -85,12 +85,12 @@ esp_inbound(struct rte_mbuf *m, struct ipsec_sa *sa,\n \t\tsym_cop->aead.digest.phys_addr = rte_pktmbuf_iova_offset(m,\n \t\t\t\trte_pktmbuf_pkt_len(m) - sa->digest_len);\n \t} else {\n-\t\tsym_cop->cipher.data.offset = ip_hdr_len + sizeof(struct esp_hdr) +\n+\t\tsym_cop->cipher.data.offset = ip_hdr_len + sizeof(struct rte_esp_hdr) +\n \t\t\tsa->iv_len;\n \t\tsym_cop->cipher.data.length = payload_len;\n \n \t\tstruct cnt_blk *icb;\n-\t\tuint8_t *iv = RTE_PTR_ADD(ip4, ip_hdr_len + sizeof(struct esp_hdr));\n+\t\tuint8_t *iv = RTE_PTR_ADD(ip4, ip_hdr_len + sizeof(struct rte_esp_hdr));\n \t\tuint8_t *iv_ptr = rte_crypto_op_ctod_offset(cop,\n \t\t\t\t\tuint8_t *, IV_OFFSET);\n \n@@ -118,7 +118,7 @@ esp_inbound(struct rte_mbuf *m, struct ipsec_sa *sa,\n \t\tcase RTE_CRYPTO_AUTH_SHA1_HMAC:\n \t\tcase RTE_CRYPTO_AUTH_SHA256_HMAC:\n \t\t\tsym_cop->auth.data.offset = ip_hdr_len;\n-\t\t\tsym_cop->auth.data.length = sizeof(struct esp_hdr) +\n+\t\t\tsym_cop->auth.data.length = sizeof(struct rte_esp_hdr) +\n \t\t\t\tsa->iv_len + payload_len;\n \t\t\tbreak;\n \t\tdefault:\n@@ -192,7 +192,7 @@ esp_inbound_post(struct rte_mbuf *m, struct ipsec_sa *sa,\n \tif (unlikely(sa->flags == TRANSPORT)) {\n \t\tip = rte_pktmbuf_mtod(m, struct ip *);\n \t\tip4 = (struct ip *)rte_pktmbuf_adj(m,\n-\t\t\t\tsizeof(struct esp_hdr) + sa->iv_len);\n+\t\t\t\tsizeof(struct rte_esp_hdr) + sa->iv_len);\n \t\tif (likely(ip->ip_v == IPVERSION)) {\n \t\t\tmemmove(ip4, ip, ip->ip_hl * 4);\n \t\t\tip4->ip_p = *nexthdr;\n@@ -206,7 +206,7 @@ esp_inbound_post(struct rte_mbuf *m, struct ipsec_sa *sa,\n \t\t\t\t\t sizeof(struct ip6_hdr));\n \t\t}\n \t} else\n-\t\tipip_inbound(m, sizeof(struct esp_hdr) + sa->iv_len);\n+\t\tipip_inbound(m, sizeof(struct rte_esp_hdr) + sa->iv_len);\n \n \treturn 0;\n }\n@@ -217,7 +217,7 @@ esp_outbound(struct rte_mbuf *m, struct ipsec_sa *sa,\n {\n \tstruct ip *ip4;\n \tstruct ip6_hdr *ip6;\n-\tstruct esp_hdr *esp = NULL;\n+\tstruct rte_esp_hdr *esp = NULL;\n \tuint8_t *padding = NULL, *new_ip, nlp;\n \tstruct rte_crypto_sym_op *sym_cop;\n \tint32_t i;\n@@ -268,7 +268,7 @@ esp_outbound(struct rte_mbuf *m, struct ipsec_sa *sa,\n \t}\n \n \t/* Check maximum packet size */\n-\tif (unlikely(ip_hdr_len + sizeof(struct esp_hdr) + sa->iv_len +\n+\tif (unlikely(ip_hdr_len + sizeof(struct rte_esp_hdr) + sa->iv_len +\n \t\t\tpad_payload_len + sa->digest_len > IP_MAXPACKET)) {\n \t\tRTE_LOG(ERR, IPSEC_ESP, \"ipsec packet is too big\\n\");\n \t\treturn -EINVAL;\n@@ -290,20 +290,20 @@ esp_outbound(struct rte_mbuf *m, struct ipsec_sa *sa,\n \n \tswitch (sa->flags) {\n \tcase IP4_TUNNEL:\n-\t\tip4 = ip4ip_outbound(m, sizeof(struct esp_hdr) + sa->iv_len,\n+\t\tip4 = ip4ip_outbound(m, sizeof(struct rte_esp_hdr) + sa->iv_len,\n \t\t\t\t&sa->src, &sa->dst);\n-\t\tesp = (struct esp_hdr *)(ip4 + 1);\n+\t\tesp = (struct rte_esp_hdr *)(ip4 + 1);\n \t\tbreak;\n \tcase IP6_TUNNEL:\n-\t\tip6 = ip6ip_outbound(m, sizeof(struct esp_hdr) + sa->iv_len,\n+\t\tip6 = ip6ip_outbound(m, sizeof(struct rte_esp_hdr) + sa->iv_len,\n \t\t\t\t&sa->src, &sa->dst);\n-\t\tesp = (struct esp_hdr *)(ip6 + 1);\n+\t\tesp = (struct rte_esp_hdr *)(ip6 + 1);\n \t\tbreak;\n \tcase TRANSPORT:\n \t\tnew_ip = (uint8_t *)rte_pktmbuf_prepend(m,\n-\t\t\t\tsizeof(struct esp_hdr) + sa->iv_len);\n+\t\t\t\tsizeof(struct rte_esp_hdr) + sa->iv_len);\n \t\tmemmove(new_ip, ip4, ip_hdr_len);\n-\t\tesp = (struct esp_hdr *)(new_ip + ip_hdr_len);\n+\t\tesp = (struct rte_esp_hdr *)(new_ip + ip_hdr_len);\n \t\tip4 = (struct ip *)new_ip;\n \t\tif (likely(ip4->ip_v == IPVERSION)) {\n \t\t\tip4->ip_p = IPPROTO_ESP;\n@@ -362,7 +362,7 @@ esp_outbound(struct rte_mbuf *m, struct ipsec_sa *sa,\n \t\tuint8_t *aad;\n \n \t\tsym_cop->aead.data.offset = ip_hdr_len +\n-\t\t\tsizeof(struct esp_hdr) + sa->iv_len;\n+\t\t\tsizeof(struct rte_esp_hdr) + sa->iv_len;\n \t\tsym_cop->aead.data.length = pad_payload_len;\n \n \t\t/* Fill pad_len using default sequential scheme */\n@@ -392,12 +392,12 @@ esp_outbound(struct rte_mbuf *m, struct ipsec_sa *sa,\n \t\tcase RTE_CRYPTO_CIPHER_3DES_CBC:\n \t\tcase RTE_CRYPTO_CIPHER_AES_CBC:\n \t\t\tsym_cop->cipher.data.offset = ip_hdr_len +\n-\t\t\t\tsizeof(struct esp_hdr);\n+\t\t\t\tsizeof(struct rte_esp_hdr);\n \t\t\tsym_cop->cipher.data.length = pad_payload_len + sa->iv_len;\n \t\t\tbreak;\n \t\tcase RTE_CRYPTO_CIPHER_AES_CTR:\n \t\t\tsym_cop->cipher.data.offset = ip_hdr_len +\n-\t\t\t\tsizeof(struct esp_hdr) + sa->iv_len;\n+\t\t\t\tsizeof(struct rte_esp_hdr) + sa->iv_len;\n \t\t\tsym_cop->cipher.data.length = pad_payload_len;\n \t\t\tbreak;\n \t\tdefault:\n@@ -422,7 +422,7 @@ esp_outbound(struct rte_mbuf *m, struct ipsec_sa *sa,\n \t\tcase RTE_CRYPTO_AUTH_SHA1_HMAC:\n \t\tcase RTE_CRYPTO_AUTH_SHA256_HMAC:\n \t\t\tsym_cop->auth.data.offset = ip_hdr_len;\n-\t\t\tsym_cop->auth.data.length = sizeof(struct esp_hdr) +\n+\t\t\tsym_cop->auth.data.length = sizeof(struct rte_esp_hdr) +\n \t\t\t\tsa->iv_len + pad_payload_len;\n \t\t\tbreak;\n \t\tdefault:\ndiff --git a/examples/ipsec-secgw/sa.c b/examples/ipsec-secgw/sa.c\nindex d2d3550a4..cb021efa6 100644\n--- a/examples/ipsec-secgw/sa.c\n+++ b/examples/ipsec-secgw/sa.c\n@@ -957,7 +957,7 @@ static inline void\n single_inbound_lookup(struct ipsec_sa *sadb, struct rte_mbuf *pkt,\n \t\tstruct ipsec_sa **sa_ret)\n {\n-\tstruct esp_hdr *esp;\n+\tstruct rte_esp_hdr *esp;\n \tstruct ip *ip;\n \tuint32_t *src4_addr;\n \tuint8_t *src6_addr;\n@@ -967,9 +967,9 @@ single_inbound_lookup(struct ipsec_sa *sadb, struct rte_mbuf *pkt,\n \n \tip = rte_pktmbuf_mtod(pkt, struct ip *);\n \tif (ip->ip_v == IPVERSION)\n-\t\tesp = (struct esp_hdr *)(ip + 1);\n+\t\tesp = (struct rte_esp_hdr *)(ip + 1);\n \telse\n-\t\tesp = (struct esp_hdr *)(((struct ip6_hdr *)ip) + 1);\n+\t\tesp = (struct rte_esp_hdr *)(((struct ip6_hdr *)ip) + 1);\n \n \tif (esp->spi == INVALID_SPI)\n \t\treturn;\ndiff --git a/lib/librte_ethdev/rte_flow.h b/lib/librte_ethdev/rte_flow.h\nindex 6887741cf..c2cdc8c08 100644\n--- a/lib/librte_ethdev/rte_flow.h\n+++ b/lib/librte_ethdev/rte_flow.h\n@@ -908,7 +908,7 @@ static const struct rte_flow_item_gtp rte_flow_item_gtp_mask = {\n * Matches an ESP header.\n */\n struct rte_flow_item_esp {\n-\tstruct esp_hdr hdr; /**< ESP header definition. */\n+\tstruct rte_esp_hdr hdr; /**< ESP header definition. */\n };\n \n /** Default mask for RTE_FLOW_ITEM_TYPE_ESP. */\ndiff --git a/lib/librte_net/rte_esp.h b/lib/librte_net/rte_esp.h\nindex f77ec2eb2..034c113ff 100644\n--- a/lib/librte_net/rte_esp.h\n+++ b/lib/librte_net/rte_esp.h\n@@ -20,7 +20,7 @@ extern \"C\" {\n /**\n * ESP Header\n */\n-struct esp_hdr {\n+struct rte_esp_hdr {\n \trte_be32_t spi; /**< Security Parameters Index */\n \trte_be32_t seq; /**< packet sequence number */\n } __attribute__((__packed__));\n", "prefixes": [ "RFC", "06/14" ] }