Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/51414/?format=api
{ "id": 51414, "url": "http://patches.dpdk.org/api/patches/51414/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1553102679-23576-3-git-send-email-konstantin.ananyev@intel.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": "<1553102679-23576-3-git-send-email-konstantin.ananyev@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1553102679-23576-3-git-send-email-konstantin.ananyev@intel.com", "date": "2019-03-20T17:24:34", "name": "[v2,2/7] ipsec: add Tx offload template into SA", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "b447eadc3df6af08406a74ffd1d5bde9ea03e77e", "submitter": { "id": 33, "url": "http://patches.dpdk.org/api/people/33/?format=api", "name": "Ananyev, Konstantin", "email": "konstantin.ananyev@intel.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/1553102679-23576-3-git-send-email-konstantin.ananyev@intel.com/mbox/", "series": [ { "id": 3829, "url": "http://patches.dpdk.org/api/series/3829/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=3829", "date": "2019-03-20T17:24:34", "name": null, "version": 2, "mbox": "http://patches.dpdk.org/series/3829/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/51414/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/51414/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 99D241B206;\n\tWed, 20 Mar 2019 18:25:02 +0100 (CET)", "from mga12.intel.com (mga12.intel.com [192.55.52.136])\n\tby dpdk.org (Postfix) with ESMTP id 58DF71B184\n\tfor <dev@dpdk.org>; Wed, 20 Mar 2019 18:24:57 +0100 (CET)", "from orsmga002.jf.intel.com ([10.7.209.21])\n\tby fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t20 Mar 2019 10:24:50 -0700", "from sivswdev08.ir.intel.com (HELO localhost.localdomain)\n\t([10.237.217.47])\n\tby orsmga002.jf.intel.com with ESMTP; 20 Mar 2019 10:24:49 -0700" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.60,249,1549958400\"; d=\"scan'208\";a=\"143689965\"", "From": "Konstantin Ananyev <konstantin.ananyev@intel.com>", "To": "dev@dpdk.org", "Cc": "akhil.goyal@nxp.com, olivier.matz@6wind.com,\n\tKonstantin Ananyev <konstantin.ananyev@intel.com>", "Date": "Wed, 20 Mar 2019 17:24:34 +0000", "Message-Id": "<1553102679-23576-3-git-send-email-konstantin.ananyev@intel.com>", "X-Mailer": "git-send-email 1.7.0.7", "In-Reply-To": "<1551381661-21078-1-git-send-email-konstantin.ananyev@intel.com>", "References": "<1551381661-21078-1-git-send-email-konstantin.ananyev@intel.com>", "Subject": "[dpdk-dev] [PATCH v2 2/7] ipsec: add Tx offload template into SA", "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": "Operations to set/update bit-fields often cause compilers\nto generate suboptimal code. To avoid such negative effect,\nuse tx_offload raw value and mask to update l2_len and l3_len\nfields within mbufs.\n\nSigned-off-by: Konstantin Ananyev <konstantin.ananyev@intel.com>\n---\n lib/librte_ipsec/sa.c | 23 ++++++++++++++++++-----\n lib/librte_ipsec/sa.h | 5 +++++\n 2 files changed, 23 insertions(+), 5 deletions(-)", "diff": "diff --git a/lib/librte_ipsec/sa.c b/lib/librte_ipsec/sa.c\nindex 5f55c2a4e..31548e968 100644\n--- a/lib/librte_ipsec/sa.c\n+++ b/lib/librte_ipsec/sa.c\n@@ -14,6 +14,9 @@\n #include \"iph.h\"\n #include \"pad.h\"\n \n+#define MBUF_MAX_L2_LEN\t\tRTE_LEN2MASK(RTE_MBUF_L2_LEN_BITS, uint64_t)\n+#define MBUF_MAX_L3_LEN\t\tRTE_LEN2MASK(RTE_MBUF_L3_LEN_BITS, uint64_t)\n+\n /* some helper structures */\n struct crypto_xform {\n \tstruct rte_crypto_auth_xform *auth;\n@@ -243,6 +246,11 @@ esp_outb_tun_init(struct rte_ipsec_sa *sa, const struct rte_ipsec_sa_prm *prm)\n \tsa->proto = prm->tun.next_proto;\n \tsa->hdr_len = prm->tun.hdr_len;\n \tsa->hdr_l3_off = prm->tun.hdr_l3_off;\n+\n+\t/* update l2_len and l3_len fields for outbound mbuf */\n+\tsa->tx_offload.val = rte_mbuf_tx_offload(sa->hdr_l3_off,\n+\t\tsa->hdr_len - sa->hdr_l3_off, 0, 0, 0, 0);\n+\n \tmemcpy(sa->hdr, prm->tun.hdr, sa->hdr_len);\n \n \tesp_outb_init(sa, sa->hdr_len);\n@@ -285,6 +293,11 @@ esp_sa_init(struct rte_ipsec_sa *sa, const struct rte_ipsec_sa_prm *prm,\n \tsa->spi = rte_cpu_to_be_32(prm->ipsec_xform.spi);\n \tsa->salt = prm->ipsec_xform.salt;\n \n+\t/* preserve all values except l2_len and l3_len */\n+\tsa->tx_offload.msk =\n+\t\t~rte_mbuf_tx_offload(MBUF_MAX_L2_LEN, MBUF_MAX_L3_LEN,\n+\t\t\t\t0, 0, 0, 0);\n+\n \tswitch (sa->type & msk) {\n \tcase (RTE_IPSEC_SATP_DIR_IB | RTE_IPSEC_SATP_MODE_TUNLV4):\n \tcase (RTE_IPSEC_SATP_DIR_IB | RTE_IPSEC_SATP_MODE_TUNLV6):\n@@ -486,7 +499,7 @@ esp_outb_tun_pkt_prepare(struct rte_ipsec_sa *sa, rte_be64_t sqc,\n \n \t/* size of ipsec protected data */\n \tl2len = mb->l2_len;\n-\tplen = mb->pkt_len - mb->l2_len;\n+\tplen = mb->pkt_len - l2len;\n \n \t/* number of bytes to encrypt */\n \tclen = plen + sizeof(*espt);\n@@ -513,8 +526,8 @@ esp_outb_tun_pkt_prepare(struct rte_ipsec_sa *sa, rte_be64_t sqc,\n \tpt = rte_pktmbuf_mtod_offset(ml, typeof(pt), pdofs);\n \n \t/* update pkt l2/l3 len */\n-\tmb->l2_len = sa->hdr_l3_off;\n-\tmb->l3_len = sa->hdr_len - sa->hdr_l3_off;\n+\tmb->tx_offload = (mb->tx_offload & sa->tx_offload.msk) |\n+\t\tsa->tx_offload.val;\n \n \t/* copy tunnel pkt header */\n \trte_memcpy(ph, sa->hdr, sa->hdr_len);\n@@ -1029,8 +1042,8 @@ esp_inb_tun_single_pkt_process(struct rte_ipsec_sa *sa, struct rte_mbuf *mb,\n \n \t/* reset mbuf metatdata: L2/L3 len, packet type */\n \tmb->packet_type = RTE_PTYPE_UNKNOWN;\n-\tmb->l2_len = 0;\n-\tmb->l3_len = 0;\n+\tmb->tx_offload = (mb->tx_offload & sa->tx_offload.msk) |\n+\t\tsa->tx_offload.val;\n \n \t/* clear the PKT_RX_SEC_OFFLOAD flag if set */\n \tmb->ol_flags &= ~(mb->ol_flags & PKT_RX_SEC_OFFLOAD);\ndiff --git a/lib/librte_ipsec/sa.h b/lib/librte_ipsec/sa.h\nindex 392e8fd7b..133a35d83 100644\n--- a/lib/librte_ipsec/sa.h\n+++ b/lib/librte_ipsec/sa.h\n@@ -64,6 +64,11 @@ struct rte_ipsec_sa {\n \t\tunion sym_op_ofslen cipher;\n \t\tunion sym_op_ofslen auth;\n \t} ctp;\n+\t/* tx_offload template for tunnel mbuf */\n+\tstruct {\n+\t\tuint64_t msk;\n+\t\tuint64_t val;\n+\t} tx_offload;\n \tuint32_t salt;\n \tuint8_t proto; /* next proto */\n \tuint8_t aad_len;\n", "prefixes": [ "v2", "2/7" ] }