Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 51417,
    "url": "http://patchwork.dpdk.org/api/patches/51417/?format=api",
    "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/1553102679-23576-5-git-send-email-konstantin.ananyev@intel.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": "<1553102679-23576-5-git-send-email-konstantin.ananyev@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/1553102679-23576-5-git-send-email-konstantin.ananyev@intel.com",
    "date": "2019-03-20T17:24:36",
    "name": "[v2,4/7] ipsec: change the way unprocessed mbufs are accounted",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "d819f8ba8e3a35a7dfbffb91004bbf54971719e4",
    "submitter": {
        "id": 33,
        "url": "http://patchwork.dpdk.org/api/people/33/?format=api",
        "name": "Ananyev, Konstantin",
        "email": "konstantin.ananyev@intel.com"
    },
    "delegate": {
        "id": 6690,
        "url": "http://patchwork.dpdk.org/api/users/6690/?format=api",
        "username": "akhil",
        "first_name": "akhil",
        "last_name": "goyal",
        "email": "gakhil@marvell.com"
    },
    "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/1553102679-23576-5-git-send-email-konstantin.ananyev@intel.com/mbox/",
    "series": [
        {
            "id": 3832,
            "url": "http://patchwork.dpdk.org/api/series/3832/?format=api",
            "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=3832",
            "date": "2019-03-20T17:24:36",
            "name": null,
            "version": 2,
            "mbox": "http://patchwork.dpdk.org/series/3832/mbox/"
        }
    ],
    "comments": "http://patchwork.dpdk.org/api/patches/51417/comments/",
    "check": "success",
    "checks": "http://patchwork.dpdk.org/api/patches/51417/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 551A11B398;\n\tWed, 20 Mar 2019 18:25:10 +0100 (CET)",
            "from mga12.intel.com (mga12.intel.com [192.55.52.136])\n\tby dpdk.org (Postfix) with ESMTP id 9792F1B184\n\tfor <dev@dpdk.org>; Wed, 20 Mar 2019 18:24:58 +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:53 -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:52 -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=\"143689979\"",
        "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:36 +0000",
        "Message-Id": "<1553102679-23576-5-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 4/7] ipsec: change the way unprocessed mbufs\n\tare accounted",
        "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": "As was pointed in one of previous reviews - we can avoid updating\ncontents of mbuf array for successfully processed packets.\nInstead store indexes of failed packets, to move them beyond the good\nones later.\n\nSigned-off-by: Konstantin Ananyev <konstantin.ananyev@intel.com>\n---\n lib/librte_ipsec/sa.c | 166 +++++++++++++++++++++++-------------------\n 1 file changed, 93 insertions(+), 73 deletions(-)",
    "diff": "diff --git a/lib/librte_ipsec/sa.c b/lib/librte_ipsec/sa.c\nindex 74ed3b41e..e4e3d7fc3 100644\n--- a/lib/librte_ipsec/sa.c\n+++ b/lib/librte_ipsec/sa.c\n@@ -411,14 +411,31 @@ rte_ipsec_sa_init(struct rte_ipsec_sa *sa, const struct rte_ipsec_sa_prm *prm,\n \treturn sz;\n }\n \n-static inline void\n-mbuf_bulk_copy(struct rte_mbuf *dst[], struct rte_mbuf * const src[],\n-\tuint32_t num)\n+/*\n+ * Move bad (unprocessed) mbufs beyond the good (processed) ones.\n+ * dr[] contains the indexes of bad mbufs insinde the mb[].\n+ */\n+static void\n+mbuf_bad_move(struct rte_mbuf *mb[], const uint32_t dr[], uint32_t num,\n+\tuint32_t drn)\n {\n-\tuint32_t i;\n+\tuint32_t i, j, k;\n+\tstruct rte_mbuf *drb[drn];\n+\n+\tj = 0;\n+\tk = 0;\n \n-\tfor (i = 0; i != num; i++)\n-\t\tdst[i] = src[i];\n+\t/* copy bad ones into a temp place */\n+\tfor (i = 0; i != num; i++) {\n+\t\tif (j != drn && i == dr[j])\n+\t\t\tdrb[j++] = mb[i];\n+\t\telse\n+\t\t\tmb[k++] = mb[i];\n+\t}\n+\n+\t/* copy bad ones after the good ones */\n+\tfor (i = 0; i != drn; i++)\n+\t\tmb[k + i] = drb[i];\n }\n \n /*\n@@ -603,7 +620,7 @@ outb_tun_prepare(const struct rte_ipsec_session *ss, struct rte_mbuf *mb[],\n \tstruct rte_cryptodev_sym_session *cs;\n \tunion sym_op_data icv;\n \tuint64_t iv[IPSEC_MAX_IV_QWORD];\n-\tstruct rte_mbuf *dr[num];\n+\tuint32_t dr[num];\n \n \tsa = ss->sa;\n \tcs = ss->crypto.ses;\n@@ -627,17 +644,17 @@ outb_tun_prepare(const struct rte_ipsec_session *ss, struct rte_mbuf *mb[],\n \t\t\toutb_pkt_xprepare(sa, sqc, &icv);\n \t\t\tlksd_none_cop_prepare(cop[k], cs, mb[i]);\n \t\t\tesp_outb_cop_prepare(cop[k], sa, iv, &icv, 0, rc);\n-\t\t\tmb[k++] = mb[i];\n+\t\t\tk++;\n \t\t/* failure, put packet into the death-row */\n \t\t} else {\n-\t\t\tdr[i - k] = mb[i];\n+\t\t\tdr[i - k] = i;\n \t\t\trte_errno = -rc;\n \t\t}\n \t}\n \n \t /* copy not prepared mbufs beyond good ones */\n \tif (k != n && k != 0)\n-\t\tmbuf_bulk_copy(mb + k, dr, n - k);\n+\t\tmbuf_bad_move(mb, dr, n, n - k);\n \n \treturn k;\n }\n@@ -738,7 +755,7 @@ outb_trs_prepare(const struct rte_ipsec_session *ss, struct rte_mbuf *mb[],\n \tstruct rte_cryptodev_sym_session *cs;\n \tunion sym_op_data icv;\n \tuint64_t iv[IPSEC_MAX_IV_QWORD];\n-\tstruct rte_mbuf *dr[num];\n+\tuint32_t dr[num];\n \n \tsa = ss->sa;\n \tcs = ss->crypto.ses;\n@@ -766,17 +783,17 @@ outb_trs_prepare(const struct rte_ipsec_session *ss, struct rte_mbuf *mb[],\n \t\t\toutb_pkt_xprepare(sa, sqc, &icv);\n \t\t\tlksd_none_cop_prepare(cop[k], cs, mb[i]);\n \t\t\tesp_outb_cop_prepare(cop[k], sa, iv, &icv, l2 + l3, rc);\n-\t\t\tmb[k++] = mb[i];\n+\t\t\tk++;\n \t\t/* failure, put packet into the death-row */\n \t\t} else {\n-\t\t\tdr[i - k] = mb[i];\n+\t\t\tdr[i - k] = i;\n \t\t\trte_errno = -rc;\n \t\t}\n \t}\n \n \t/* copy not prepared mbufs beyond good ones */\n \tif (k != n && k != 0)\n-\t\tmbuf_bulk_copy(mb + k, dr, n - k);\n+\t\tmbuf_bad_move(mb, dr, n, n - k);\n \n \treturn k;\n }\n@@ -924,7 +941,7 @@ inb_pkt_prepare(const struct rte_ipsec_session *ss, struct rte_mbuf *mb[],\n \tstruct rte_cryptodev_sym_session *cs;\n \tstruct replay_sqn *rsn;\n \tunion sym_op_data icv;\n-\tstruct rte_mbuf *dr[num];\n+\tuint32_t dr[num];\n \n \tsa = ss->sa;\n \tcs = ss->crypto.ses;\n@@ -941,10 +958,9 @@ inb_pkt_prepare(const struct rte_ipsec_session *ss, struct rte_mbuf *mb[],\n \t\t\t\thl, rc);\n \t\t}\n \n-\t\tif (rc == 0)\n-\t\t\tmb[k++] = mb[i];\n-\t\telse {\n-\t\t\tdr[i - k] = mb[i];\n+\t\tk += (rc == 0);\n+\t\tif (rc != 0) {\n+\t\t\tdr[i - k] = i;\n \t\t\trte_errno = -rc;\n \t\t}\n \t}\n@@ -953,7 +969,7 @@ inb_pkt_prepare(const struct rte_ipsec_session *ss, struct rte_mbuf *mb[],\n \n \t/* copy not prepared mbufs beyond good ones */\n \tif (k != num && k != 0)\n-\t\tmbuf_bulk_copy(mb + k, dr, num - k);\n+\t\tmbuf_bad_move(mb, dr, num, num - k);\n \n \treturn k;\n }\n@@ -1105,7 +1121,7 @@ esp_inb_trs_single_pkt_process(struct rte_ipsec_sa *sa, struct rte_mbuf *mb,\n  */\n static inline uint16_t\n esp_inb_rsn_update(struct rte_ipsec_sa *sa, const uint32_t sqn[],\n-\tstruct rte_mbuf *mb[], struct rte_mbuf *dr[], uint16_t num)\n+\tuint32_t dr[], uint16_t num)\n {\n \tuint32_t i, k;\n \tstruct replay_sqn *rsn;\n@@ -1115,9 +1131,9 @@ esp_inb_rsn_update(struct rte_ipsec_sa *sa, const uint32_t sqn[],\n \tk = 0;\n \tfor (i = 0; i != num; i++) {\n \t\tif (esn_inb_update_sqn(rsn, sa, sqn[i]) == 0)\n-\t\t\tmb[k++] = mb[i];\n+\t\t\tk++;\n \t\telse\n-\t\t\tdr[i - k] = mb[i];\n+\t\t\tdr[i - k] = i;\n \t}\n \n \trsn_update_finish(sa, rsn);\n@@ -1131,10 +1147,10 @@ static uint16_t\n inb_tun_pkt_process(const struct rte_ipsec_session *ss, struct rte_mbuf *mb[],\n \tuint16_t num)\n {\n-\tuint32_t i, k;\n+\tuint32_t i, k, n;\n \tstruct rte_ipsec_sa *sa;\n \tuint32_t sqn[num];\n-\tstruct rte_mbuf *dr[num];\n+\tuint32_t dr[num];\n \n \tsa = ss->sa;\n \n@@ -1144,23 +1160,27 @@ inb_tun_pkt_process(const struct rte_ipsec_session *ss, struct rte_mbuf *mb[],\n \tfor (i = 0; i != num; i++) {\n \t\t/* good packet */\n \t\tif (esp_inb_tun_single_pkt_process(sa, mb[i], sqn + k) == 0)\n-\t\t\tmb[k++] = mb[i];\n+\t\t\tk++;\n \t\t/* bad packet, will drop from furhter processing */\n \t\telse\n-\t\t\tdr[i - k] = mb[i];\n+\t\t\tdr[i - k] = i;\n \t}\n \n-\t/* update seq # and replay winow */\n-\tk = esp_inb_rsn_update(sa, sqn, mb, dr + i - k, k);\n-\n \t/* handle unprocessed mbufs */\n-\tif (k != num) {\n+\tif (k != num && k != 0)\n+\t\tmbuf_bad_move(mb, dr, num, num - k);\n+\n+\t/* update SQN and replay winow */\n+\tn = esp_inb_rsn_update(sa, sqn, dr, k);\n+\n+\t/* handle mbufs with wrong SQN */\n+\tif (n != k && n != 0)\n+\t\tmbuf_bad_move(mb, dr, k, k - n);\n+\n+\tif (n != num)\n \t\trte_errno = EBADMSG;\n-\t\tif (k != 0)\n-\t\t\tmbuf_bulk_copy(mb + k, dr, num - k);\n-\t}\n \n-\treturn k;\n+\treturn n;\n }\n \n /*\n@@ -1170,10 +1190,10 @@ static uint16_t\n inb_trs_pkt_process(const struct rte_ipsec_session *ss, struct rte_mbuf *mb[],\n \tuint16_t num)\n {\n-\tuint32_t i, k;\n+\tuint32_t i, k, n;\n \tuint32_t sqn[num];\n \tstruct rte_ipsec_sa *sa;\n-\tstruct rte_mbuf *dr[num];\n+\tuint32_t dr[num];\n \n \tsa = ss->sa;\n \n@@ -1183,23 +1203,27 @@ inb_trs_pkt_process(const struct rte_ipsec_session *ss, struct rte_mbuf *mb[],\n \tfor (i = 0; i != num; i++) {\n \t\t/* good packet */\n \t\tif (esp_inb_trs_single_pkt_process(sa, mb[i], sqn + k) == 0)\n-\t\t\tmb[k++] = mb[i];\n+\t\t\tk++;\n \t\t/* bad packet, will drop from furhter processing */\n \t\telse\n-\t\t\tdr[i - k] = mb[i];\n+\t\t\tdr[i - k] = i;\n \t}\n \n-\t/* update seq # and replay winow */\n-\tk = esp_inb_rsn_update(sa, sqn, mb, dr + i - k, k);\n-\n \t/* handle unprocessed mbufs */\n-\tif (k != num) {\n+\tif (k != num && k != 0)\n+\t\tmbuf_bad_move(mb, dr, num, num - k);\n+\n+\t/* update SQN and replay winow */\n+\tn = esp_inb_rsn_update(sa, sqn, dr, k);\n+\n+\t/* handle mbufs with wrong SQN */\n+\tif (n != k && n != 0)\n+\t\tmbuf_bad_move(mb, dr, k, k - n);\n+\n+\tif (n != num)\n \t\trte_errno = EBADMSG;\n-\t\tif (k != 0)\n-\t\t\tmbuf_bulk_copy(mb + k, dr, num - k);\n-\t}\n \n-\treturn k;\n+\treturn n;\n }\n \n /*\n@@ -1215,7 +1239,7 @@ outb_sqh_process(const struct rte_ipsec_session *ss, struct rte_mbuf *mb[],\n \tuint32_t i, k, icv_len, *icv;\n \tstruct rte_mbuf *ml;\n \tstruct rte_ipsec_sa *sa;\n-\tstruct rte_mbuf *dr[num];\n+\tuint32_t dr[num];\n \n \tsa = ss->sa;\n \n@@ -1228,16 +1252,16 @@ outb_sqh_process(const struct rte_ipsec_session *ss, struct rte_mbuf *mb[],\n \t\t\ticv = rte_pktmbuf_mtod_offset(ml, void *,\n \t\t\t\tml->data_len - icv_len);\n \t\t\tremove_sqh(icv, icv_len);\n-\t\t\tmb[k++] = mb[i];\n+\t\t\tk++;\n \t\t} else\n-\t\t\tdr[i - k] = mb[i];\n+\t\t\tdr[i - k] = i;\n \t}\n \n \t/* handle unprocessed mbufs */\n \tif (k != num) {\n \t\trte_errno = EBADMSG;\n \t\tif (k != 0)\n-\t\t\tmbuf_bulk_copy(mb + k, dr, num - k);\n+\t\t\tmbuf_bad_move(mb, dr, num, num - k);\n \t}\n \n \treturn k;\n@@ -1257,23 +1281,23 @@ pkt_flag_process(const struct rte_ipsec_session *ss, struct rte_mbuf *mb[],\n \tuint16_t num)\n {\n \tuint32_t i, k;\n-\tstruct rte_mbuf *dr[num];\n+\tuint32_t dr[num];\n \n \tRTE_SET_USED(ss);\n \n \tk = 0;\n \tfor (i = 0; i != num; i++) {\n \t\tif ((mb[i]->ol_flags & PKT_RX_SEC_OFFLOAD_FAILED) == 0)\n-\t\t\tmb[k++] = mb[i];\n+\t\t\tk++;\n \t\telse\n-\t\t\tdr[i - k] = mb[i];\n+\t\t\tdr[i - k] = i;\n \t}\n \n \t/* handle unprocessed mbufs */\n \tif (k != num) {\n \t\trte_errno = EBADMSG;\n \t\tif (k != 0)\n-\t\t\tmbuf_bulk_copy(mb + k, dr, num - k);\n+\t\t\tmbuf_bad_move(mb, dr, num, num - k);\n \t}\n \n \treturn k;\n@@ -1314,7 +1338,7 @@ inline_outb_tun_pkt_process(const struct rte_ipsec_session *ss,\n \tstruct rte_ipsec_sa *sa;\n \tunion sym_op_data icv;\n \tuint64_t iv[IPSEC_MAX_IV_QWORD];\n-\tstruct rte_mbuf *dr[num];\n+\tuint32_t dr[num];\n \n \tsa = ss->sa;\n \n@@ -1332,22 +1356,20 @@ inline_outb_tun_pkt_process(const struct rte_ipsec_session *ss,\n \t\t/* try to update the packet itself */\n \t\trc = esp_outb_tun_pkt_prepare(sa, sqc, iv, mb[i], &icv);\n \n-\t\t/* success, update mbuf fields */\n-\t\tif (rc >= 0)\n-\t\t\tmb[k++] = mb[i];\n+\t\tk += (rc >= 0);\n+\n \t\t/* failure, put packet into the death-row */\n-\t\telse {\n-\t\t\tdr[i - k] = mb[i];\n+\t\tif (rc < 0) {\n+\t\t\tdr[i - k] = i;\n \t\t\trte_errno = -rc;\n \t\t}\n \t}\n \n-\tinline_outb_mbuf_prepare(ss, mb, k);\n-\n \t/* copy not processed mbufs beyond good ones */\n \tif (k != n && k != 0)\n-\t\tmbuf_bulk_copy(mb + k, dr, n - k);\n+\t\tmbuf_bad_move(mb, dr, n, n - k);\n \n+\tinline_outb_mbuf_prepare(ss, mb, k);\n \treturn k;\n }\n \n@@ -1366,7 +1388,7 @@ inline_outb_trs_pkt_process(const struct rte_ipsec_session *ss,\n \tstruct rte_ipsec_sa *sa;\n \tunion sym_op_data icv;\n \tuint64_t iv[IPSEC_MAX_IV_QWORD];\n-\tstruct rte_mbuf *dr[num];\n+\tuint32_t dr[num];\n \n \tsa = ss->sa;\n \n@@ -1388,22 +1410,20 @@ inline_outb_trs_pkt_process(const struct rte_ipsec_session *ss,\n \t\trc = esp_outb_trs_pkt_prepare(sa, sqc, iv, mb[i],\n \t\t\t\tl2, l3, &icv);\n \n-\t\t/* success, update mbuf fields */\n-\t\tif (rc >= 0)\n-\t\t\tmb[k++] = mb[i];\n+\t\tk += (rc >= 0);\n+\n \t\t/* failure, put packet into the death-row */\n-\t\telse {\n-\t\t\tdr[i - k] = mb[i];\n+\t\tif (rc < 0) {\n+\t\t\tdr[i - k] = i;\n \t\t\trte_errno = -rc;\n \t\t}\n \t}\n \n-\tinline_outb_mbuf_prepare(ss, mb, k);\n-\n \t/* copy not processed mbufs beyond good ones */\n \tif (k != n && k != 0)\n-\t\tmbuf_bulk_copy(mb + k, dr, n - k);\n+\t\tmbuf_bad_move(mb, dr, n, n - k);\n \n+\tinline_outb_mbuf_prepare(ss, mb, k);\n \treturn k;\n }\n \n",
    "prefixes": [
        "v2",
        "4/7"
    ]
}