Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/127345/?format=api
{ "id": 127345, "url": "http://patches.dpdk.org/api/patches/127345/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20230524160116.304-15-anoobj@marvell.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": "<20230524160116.304-15-anoobj@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230524160116.304-15-anoobj@marvell.com", "date": "2023-05-24T16:01:08", "name": "[v3,14/22] test/pdcp: add in-order delivery cases", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "938940a18facbbb837cf8680094757bfc616410b", "submitter": { "id": 1205, "url": "http://patches.dpdk.org/api/people/1205/?format=api", "name": "Anoob Joseph", "email": "anoobj@marvell.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/20230524160116.304-15-anoobj@marvell.com/mbox/", "series": [ { "id": 28158, "url": "http://patches.dpdk.org/api/series/28158/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=28158", "date": "2023-05-24T16:00:54", "name": "lib: add pdcp protocol", "version": 3, "mbox": "http://patches.dpdk.org/series/28158/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/127345/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/127345/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 C800842B8F;\n\tWed, 24 May 2023 18:04:10 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 88DD842D75;\n\tWed, 24 May 2023 18:02:31 +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 B26B542D75\n for <dev@dpdk.org>; Wed, 24 May 2023 18:02:30 +0200 (CEST)", "from pps.filterd (m0045851.ppops.net [127.0.0.1])\n by mx0b-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id\n 34OEjnov026744; Wed, 24 May 2023 09:02:29 -0700", "from dc5-exch02.marvell.com ([199.233.59.182])\n by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3qsh90h16y-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT);\n Wed, 24 May 2023 09:02:29 -0700", "from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH02.marvell.com\n (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.48;\n Wed, 24 May 2023 09:02:27 -0700", "from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com\n (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.48 via Frontend\n Transport; Wed, 24 May 2023 09:02:27 -0700", "from BG-LT92004.corp.innovium.com (unknown [10.28.161.183])\n by maili.marvell.com (Postfix) with ESMTP id 71AEC3F703F;\n Wed, 24 May 2023 09:02:23 -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=5b+aw9mpCb+dfuX8V/2STSky8tesfsQCZu2OKx7jrts=;\n b=B+Lbn6HZW2l9kMHkdid1ddcX1iIPwgp+XckusExouadXxJS2BXgaevQlW27KBdE7THGJ\n FuHCj4x0Avz7K/Orv4KHViWakdhJvMa7vqR53yuuF7Mw0NKBPo98SJZqgvoNoyCwdRgn\n 8MITNOKpGJTq+AuntGXVe1xDoIn9fYJLj+2uwwzKtGDR8lO4dF5s+iRVnQiaJ3GTPSae\n KSRmZ0O/a+6Zfg8vKlu9LQN1a8iIqSMBM+56OD7TI61u6muKPzrb4jdzsbBZgRcq20pr\n 8if/zlzP9I3yZff4Oe+sI6QMTsgWsmsdXwH34Hg9PZAO8D2cH9O7zpuC8N6h/YhSt3LT 3A==", "From": "Anoob Joseph <anoobj@marvell.com>", "To": "Thomas Monjalon <thomas@monjalon.net>, Akhil Goyal <gakhil@marvell.com>,\n Jerin Jacob <jerinj@marvell.com>, Konstantin Ananyev\n <konstantin.v.ananyev@yandex.ru>, Bernard Iremonger\n <bernard.iremonger@intel.com>", "CC": "Volodymyr Fialko <vfialko@marvell.com>,\n Hemant Agrawal <hemant.agrawal@nxp.com>,\n =?utf-8?q?Mattias_R=C3=B6nnblom?= <mattias.ronnblom@ericsson.com>,\n Kiran Kumar K <kirankumark@marvell.com>, <dev@dpdk.org>,\n Olivier Matz <olivier.matz@6wind.com>", "Subject": "[PATCH v3 14/22] test/pdcp: add in-order delivery cases", "Date": "Wed, 24 May 2023 21:31:08 +0530", "Message-ID": "<20230524160116.304-15-anoobj@marvell.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20230524160116.304-1-anoobj@marvell.com>", "References": "<20230414174512.642-1-anoobj@marvell.com>\n <20230524160116.304-1-anoobj@marvell.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Proofpoint-GUID": "WLrya78BDEFEvgCW1O3XcKE0rhMaaT4H", "X-Proofpoint-ORIG-GUID": "WLrya78BDEFEvgCW1O3XcKE0rhMaaT4H", "X-Proofpoint-Virus-Version": "vendor=baseguard\n engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.176.26\n definitions=2023-05-24_11,2023-05-24_01,2023-05-22_02", "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" }, "content": "From: Volodymyr Fialko <vfialko@marvell.com>\n\nAdd test cases to verify behaviour when in-order delivery is enabled and\npackets arrive in out-of-order. PDCP library is expected to buffer the\npackets and return packets in-order when the missing packet arrives.\n\nSigned-off-by: Anoob Joseph <anoobj@marvell.com>\nSigned-off-by: Volodymyr Fialko <vfialko@marvell.com>\n---\n app/test/test_pdcp.c | 223 +++++++++++++++++++++++++++++++++++++++++++\n 1 file changed, 223 insertions(+)", "diff": "diff --git a/app/test/test_pdcp.c b/app/test/test_pdcp.c\nindex ed2dfe921c..b2563f0cc0 100644\n--- a/app/test/test_pdcp.c\n+++ b/app/test/test_pdcp.c\n@@ -16,6 +16,15 @@\n #define NB_TESTS RTE_DIM(pdcp_test_params)\n #define PDCP_IV_LEN 16\n \n+/* Assert that condition is true, or goto the mark */\n+#define ASSERT_TRUE_OR_GOTO(cond, mark, ...) do {\\\n+\tif (!(cond)) { \\\n+\t\tRTE_LOG(ERR, USER1, \"Error at: %s:%d\\n\", __func__, __LINE__); \\\n+\t\tRTE_LOG(ERR, USER1, __VA_ARGS__); \\\n+\t\tgoto mark; \\\n+\t} \\\n+} while (0)\n+\n /* According to formula(7.2.a Window_Size) */\n #define PDCP_WINDOW_SIZE(sn_size) (1 << (sn_size - 1))\n \n@@ -83,6 +92,38 @@ run_test_with_all_known_vec(const void *args)\n \treturn run_test_foreach_known_vec(test, false);\n }\n \n+static int\n+run_test_with_all_known_vec_until_first_pass(const void *args)\n+{\n+\ttest_with_conf_t test = args;\n+\n+\treturn run_test_foreach_known_vec(test, true);\n+}\n+\n+static inline uint32_t\n+pdcp_sn_mask_get(enum rte_security_pdcp_sn_size sn_size)\n+{\n+\treturn (1 << sn_size) - 1;\n+}\n+\n+static inline uint32_t\n+pdcp_sn_from_count_get(uint32_t count, enum rte_security_pdcp_sn_size sn_size)\n+{\n+\treturn (count & pdcp_sn_mask_get(sn_size));\n+}\n+\n+static inline uint32_t\n+pdcp_hfn_mask_get(enum rte_security_pdcp_sn_size sn_size)\n+{\n+\treturn ~pdcp_sn_mask_get(sn_size);\n+}\n+\n+static inline uint32_t\n+pdcp_hfn_from_count_get(uint32_t count, enum rte_security_pdcp_sn_size sn_size)\n+{\n+\treturn (count & pdcp_hfn_mask_get(sn_size)) >> sn_size;\n+}\n+\n static inline int\n pdcp_hdr_size_get(enum rte_security_pdcp_sn_size sn_size)\n {\n@@ -416,6 +457,7 @@ create_test_conf_from_index(const int index, struct pdcp_test_conf *conf)\n \n \tconf->entity.sess_mpool = ts_params->sess_pool;\n \tconf->entity.cop_pool = ts_params->cop_pool;\n+\tconf->entity.ctrl_pdu_pool = ts_params->mbuf_pool;\n \tconf->entity.pdcp_xfrm.bearer = pdcp_test_bearer[index];\n \tconf->entity.pdcp_xfrm.en_ordering = 0;\n \tconf->entity.pdcp_xfrm.remove_duplicates = 0;\n@@ -866,6 +908,7 @@ test_sn_range_type(enum sn_range_type type, struct pdcp_test_conf *conf)\n \n \t/* Configure Uplink to generate expected, encrypted packet */\n \tpdcp_sn_to_raw_set(conf->input, new_sn, conf->entity.pdcp_xfrm.sn_size);\n+\tconf->entity.out_of_order_delivery = true;\n \tconf->entity.reverse_iv_direction = true;\n \tconf->entity.pdcp_xfrm.hfn = new_hfn;\n \tconf->entity.sn = new_sn;\n@@ -913,6 +956,171 @@ test_sn_minus_outside(struct pdcp_test_conf *t_conf)\n \treturn test_sn_range_type(SN_RANGE_MINUS_OUTSIDE, t_conf);\n }\n \n+static struct rte_mbuf *\n+generate_packet_for_dl_with_sn(struct pdcp_test_conf ul_conf, uint32_t count)\n+{\n+\tenum rte_security_pdcp_sn_size sn_size = ul_conf.entity.pdcp_xfrm.sn_size;\n+\tint ret;\n+\n+\tul_conf.entity.pdcp_xfrm.hfn = pdcp_hfn_from_count_get(count, sn_size);\n+\tul_conf.entity.sn = pdcp_sn_from_count_get(count, sn_size);\n+\tul_conf.entity.out_of_order_delivery = true;\n+\tul_conf.entity.reverse_iv_direction = true;\n+\tul_conf.output_len = 0;\n+\n+\tret = test_attempt_single(&ul_conf);\n+\tif (ret != TEST_SUCCESS)\n+\t\treturn NULL;\n+\n+\treturn mbuf_from_data_create(ul_conf.output, ul_conf.output_len);\n+}\n+\n+static bool\n+array_asc_sorted_check(struct rte_mbuf *m[], uint32_t len, enum rte_security_pdcp_sn_size sn_size)\n+{\n+\tuint32_t i;\n+\n+\tif (len < 2)\n+\t\treturn true;\n+\n+\tfor (i = 0; i < (len - 1); i++) {\n+\t\tif (pdcp_sn_from_raw_get(rte_pktmbuf_mtod(m[i], void *), sn_size) >\n+\t\t pdcp_sn_from_raw_get(rte_pktmbuf_mtod(m[i + 1], void *), sn_size))\n+\t\t\treturn false;\n+\t}\n+\n+\treturn true;\n+}\n+\n+static int\n+test_reorder_gap_fill(struct pdcp_test_conf *ul_conf)\n+{\n+\tconst enum rte_security_pdcp_sn_size sn_size = ul_conf->entity.pdcp_xfrm.sn_size;\n+\tstruct rte_mbuf *m0 = NULL, *m1 = NULL, *out_mb[2] = {0};\n+\tuint16_t nb_success = 0, nb_err = 0;\n+\tstruct rte_pdcp_entity *pdcp_entity;\n+\tstruct pdcp_test_conf dl_conf;\n+\tint ret = TEST_FAILED, nb_out;\n+\tuint8_t cdev_id;\n+\n+\tconst int start_count = 0;\n+\n+\tif (ul_conf->entity.pdcp_xfrm.pkt_dir == RTE_SECURITY_PDCP_DOWNLINK)\n+\t\treturn TEST_SKIPPED;\n+\n+\t/* Create configuration for actual testing */\n+\tuplink_to_downlink_convert(ul_conf, &dl_conf);\n+\tdl_conf.entity.pdcp_xfrm.hfn = pdcp_hfn_from_count_get(start_count, sn_size);\n+\tdl_conf.entity.sn = pdcp_sn_from_count_get(start_count, sn_size);\n+\n+\tpdcp_entity = test_entity_create(&dl_conf, &ret);\n+\tif (pdcp_entity == NULL)\n+\t\treturn ret;\n+\n+\tcdev_id = dl_conf.entity.dev_id;\n+\n+\t/* Send packet with SN > RX_DELIV to create a gap */\n+\tm1 = generate_packet_for_dl_with_sn(*ul_conf, start_count + 1);\n+\tASSERT_TRUE_OR_GOTO(m1 != NULL, exit, \"Could not allocate buffer for packet\\n\");\n+\n+\t/* Buffered packets after insert [NULL, m1] */\n+\tnb_success = test_process_packets(pdcp_entity, cdev_id, &m1, 1, out_mb, &nb_err);\n+\tASSERT_TRUE_OR_GOTO(nb_err == 0, exit, \"Error occurred during packet process\\n\");\n+\tASSERT_TRUE_OR_GOTO(nb_success == 0, exit, \"Packet was not buffered as expected\\n\");\n+\tm1 = NULL; /* Packet was moved to PDCP lib */\n+\n+\t/* Generate packet to fill the existing gap */\n+\tm0 = generate_packet_for_dl_with_sn(*ul_conf, start_count);\n+\tASSERT_TRUE_OR_GOTO(m0 != NULL, exit, \"Could not allocate buffer for packet\\n\");\n+\n+\t/*\n+\t * Buffered packets after insert [m0, m1]\n+\t * Gap filled, all packets should be returned\n+\t */\n+\tnb_success = test_process_packets(pdcp_entity, cdev_id, &m0, 1, out_mb, &nb_err);\n+\tASSERT_TRUE_OR_GOTO(nb_err == 0, exit, \"Error occurred during packet process\\n\");\n+\tASSERT_TRUE_OR_GOTO(nb_success == 2, exit,\n+\t\t\t\"Packet count mismatch (received: %i, expected: 2)\\n\", nb_success);\n+\tm0 = NULL; /* Packet was moved to out_mb */\n+\n+\t/* Check that packets in correct order */\n+\tASSERT_TRUE_OR_GOTO(array_asc_sorted_check(out_mb, nb_success, sn_size), exit,\n+\t\t\t\"Error occurred during packet drain\\n\");\n+\n+\tret = TEST_SUCCESS;\n+exit:\n+\trte_pktmbuf_free(m0);\n+\trte_pktmbuf_free(m1);\n+\trte_pktmbuf_free_bulk(out_mb, nb_success);\n+\tnb_out = rte_pdcp_entity_release(pdcp_entity, out_mb);\n+\trte_pktmbuf_free_bulk(out_mb, nb_out);\n+\treturn ret;\n+}\n+\n+static int\n+test_reorder_buffer_full_window_size_sn_12(const struct pdcp_test_conf *ul_conf)\n+{\n+\tconst enum rte_security_pdcp_sn_size sn_size = ul_conf->entity.pdcp_xfrm.sn_size;\n+\tconst uint32_t window_size = PDCP_WINDOW_SIZE(sn_size);\n+\tstruct rte_mbuf *m1 = NULL, **out_mb = NULL;\n+\tuint16_t nb_success = 0, nb_err = 0;\n+\tstruct rte_pdcp_entity *pdcp_entity;\n+\tstruct pdcp_test_conf dl_conf;\n+\tconst int rx_deliv = 0;\n+\tint ret = TEST_FAILED;\n+\tsize_t i, nb_out;\n+\tuint8_t cdev_id;\n+\n+\tif (ul_conf->entity.pdcp_xfrm.pkt_dir == RTE_SECURITY_PDCP_DOWNLINK ||\n+\t\tsn_size != RTE_SECURITY_PDCP_SN_SIZE_12)\n+\t\treturn TEST_SKIPPED;\n+\n+\t/* Create configuration for actual testing */\n+\tuplink_to_downlink_convert(ul_conf, &dl_conf);\n+\tdl_conf.entity.pdcp_xfrm.hfn = pdcp_hfn_from_count_get(rx_deliv, sn_size);\n+\tdl_conf.entity.sn = pdcp_sn_from_count_get(rx_deliv, sn_size);\n+\n+\tpdcp_entity = test_entity_create(&dl_conf, &ret);\n+\tif (pdcp_entity == NULL)\n+\t\treturn ret;\n+\n+\tASSERT_TRUE_OR_GOTO(pdcp_entity->max_pkt_cache >= window_size, exit,\n+\t\t\t\"PDCP max packet cache is too small\");\n+\tcdev_id = dl_conf.entity.dev_id;\n+\tout_mb = rte_zmalloc(NULL, pdcp_entity->max_pkt_cache * sizeof(uintptr_t), 0);\n+\tASSERT_TRUE_OR_GOTO(out_mb != NULL, exit,\n+\t\t\t\"Could not allocate buffer for holding out_mb buffers\\n\");\n+\n+\t/* Send packets with SN > RX_DELIV to create a gap */\n+\tfor (i = rx_deliv + 1; i < window_size; i++) {\n+\t\tm1 = generate_packet_for_dl_with_sn(*ul_conf, i);\n+\t\tASSERT_TRUE_OR_GOTO(m1 != NULL, exit, \"Could not allocate buffer for packet\\n\");\n+\t\t/* Buffered packets after insert [NULL, m1] */\n+\t\tnb_success = test_process_packets(pdcp_entity, cdev_id, &m1, 1, out_mb, &nb_err);\n+\t\tASSERT_TRUE_OR_GOTO(nb_err == 0, exit, \"Error occurred during packet buffering\\n\");\n+\t\tASSERT_TRUE_OR_GOTO(nb_success == 0, exit, \"Packet was not buffered as expected\\n\");\n+\t}\n+\n+\tm1 = generate_packet_for_dl_with_sn(*ul_conf, rx_deliv);\n+\tASSERT_TRUE_OR_GOTO(m1 != NULL, exit, \"Could not allocate buffer for packet\\n\");\n+\t/* Insert missing packet */\n+\tnb_success = test_process_packets(pdcp_entity, cdev_id, &m1, 1, out_mb, &nb_err);\n+\tASSERT_TRUE_OR_GOTO(nb_err == 0, exit, \"Error occurred during packet buffering\\n\");\n+\tASSERT_TRUE_OR_GOTO(nb_success == window_size, exit,\n+\t\t\t\"Packet count mismatch (received: %i, expected: %i)\\n\",\n+\t\t\tnb_success, window_size);\n+\tm1 = NULL;\n+\n+\tret = TEST_SUCCESS;\n+exit:\n+\trte_pktmbuf_free(m1);\n+\trte_pktmbuf_free_bulk(out_mb, nb_success);\n+\tnb_out = rte_pdcp_entity_release(pdcp_entity, out_mb);\n+\trte_pktmbuf_free_bulk(out_mb, nb_out);\n+\trte_free(out_mb);\n+\treturn ret;\n+}\n+\n static int\n test_combined(struct pdcp_test_conf *ul_conf)\n {\n@@ -969,10 +1177,25 @@ static struct unit_test_suite hfn_sn_test_cases = {\n \t}\n };\n \n+static struct unit_test_suite reorder_test_cases = {\n+\t.suite_name = \"PDCP reorder\",\n+\t.unit_test_cases = {\n+\t\tTEST_CASE_NAMED_WITH_DATA(\"test_reorder_gap_fill\",\n+\t\t\tut_setup_pdcp, ut_teardown_pdcp,\n+\t\t\trun_test_with_all_known_vec, test_reorder_gap_fill),\n+\t\tTEST_CASE_NAMED_WITH_DATA(\"test_reorder_buffer_full_window_size_sn_12\",\n+\t\t\tut_setup_pdcp, ut_teardown_pdcp,\n+\t\t\trun_test_with_all_known_vec_until_first_pass,\n+\t\t\ttest_reorder_buffer_full_window_size_sn_12),\n+\t\tTEST_CASES_END() /**< NULL terminate unit test array */\n+\t}\n+};\n+\n struct unit_test_suite *test_suites[] = {\n \tNULL, /* Place holder for known_vector_cases */\n \t&combined_mode_cases,\n \t&hfn_sn_test_cases,\n+\t&reorder_test_cases,\n \tNULL /* End of suites list */\n };\n \n", "prefixes": [ "v3", "14/22" ] }