Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/102749/?format=api
{ "id": 102749, "url": "http://patches.dpdk.org/api/patches/102749/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1635148739-61415-1-git-send-email-chcchc88@163.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": "<1635148739-61415-1-git-send-email-chcchc88@163.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1635148739-61415-1-git-send-email-chcchc88@163.com", "date": "2021-10-25T07:58:59", "name": "test/ipfrag: add test content to the test unit", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "8f27d200ea5b2b4fa5f881b1ec48858adfdb5e76", "submitter": { "id": 2371, "url": "http://patches.dpdk.org/api/people/2371/?format=api", "name": "Huichao Cai", "email": "chcchc88@163.com" }, "delegate": { "id": 24651, "url": "http://patches.dpdk.org/api/users/24651/?format=api", "username": "dmarchand", "first_name": "David", "last_name": "Marchand", "email": "david.marchand@redhat.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1635148739-61415-1-git-send-email-chcchc88@163.com/mbox/", "series": [ { "id": 19949, "url": "http://patches.dpdk.org/api/series/19949/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=19949", "date": "2021-10-25T07:58:59", "name": "test/ipfrag: add test content to the test unit", "version": 1, "mbox": "http://patches.dpdk.org/series/19949/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/102749/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/102749/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 242F2A0C45;\n\tMon, 25 Oct 2021 09:59:41 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 920C8407FF;\n\tMon, 25 Oct 2021 09:59:40 +0200 (CEST)", "from m12-16.163.com (m12-16.163.com [220.181.12.16])\n by mails.dpdk.org (Postfix) with ESMTP id 5CAB24003E\n for <dev@dpdk.org>; Mon, 25 Oct 2021 09:59:38 +0200 (CEST)", "from bogon.localdomain (unknown [36.112.33.106])\n by smtp12 (Coremail) with SMTP id EMCowABH8JLPY3ZhBcucFQ--.34S2;\n Mon, 25 Oct 2021 15:59:36 +0800 (CST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com;\n s=s110527; h=From:Subject:Date:Message-Id; bh=sLLEn226Oermf0Koog\n yXiUvlhAfxb0lnifdLJdOagjQ=; b=gCggdgZfuOgErA6ATM3ZRdo0+Zf1h6vRwB\n b7z5jppBl4cezWTvS+cX+t8dZ+6sl4ad/y/RAkn8pvcUghHsYhqdzH/E8QInlqHn\n Njlkn/gN7MbwEBCivvn0vgBQs2VXfRWEPoYA+jCmKvYaAHYUoj2sp7aTvnur4V5b\n 6fPRkJ2O8=", "From": "huichao cai <chcchc88@163.com>", "To": "dev@dpdk.org", "Cc": "konstantin.ananyev@intel.com", "Date": "Mon, 25 Oct 2021 15:58:59 +0800", "Message-Id": "<1635148739-61415-1-git-send-email-chcchc88@163.com>", "X-Mailer": "git-send-email 1.8.3.1", "X-CM-TRANSID": "EMCowABH8JLPY3ZhBcucFQ--.34S2", "X-Coremail-Antispam": "1Uf129KBjvJXoWxCF45ZF1rCFW8ZFW8JryfXrb_yoW7Gry7p3\n sxt3s0kws3XFnrX3Z3Xrn09r4rGws7KrnFg3sxCr1Fyay2vr48tayDKFyIgr15Kry8A34f\n ZasYvayagwnFkw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2\n 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07j-VysUUUUU=", "X-Originating-IP": "[36.112.33.106]", "X-CM-SenderInfo": "pfkfuxrfyyqiywtou0bp/1tbitxA3F1aELjcD8wAAs8", "Subject": "[dpdk-dev] [PATCH] test/ipfrag: add test content to the test unit", "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": "Add the test content of the fragment_offset(offset and MF)\nto the test_ip_frag function. Add test data for a fragment\nthat is not the last fragment.\n\nSigned-off-by: huichao cai <chcchc88@163.com>\n---\n app/test/test_ipfrag.c | 95 +++++++++++++++++++++++++++++++++++++++++---------\n 1 file changed, 79 insertions(+), 16 deletions(-)", "diff": "diff --git a/app/test/test_ipfrag.c b/app/test/test_ipfrag.c\nindex da8c212..1ced25a 100644\n--- a/app/test/test_ipfrag.c\n+++ b/app/test/test_ipfrag.c\n@@ -89,12 +89,14 @@ static void ut_teardown(void)\n }\n \n static void\n-v4_allocate_packet_of(struct rte_mbuf *b, int fill, size_t s, int df,\n+v4_allocate_packet_of(struct rte_mbuf *b, int fill,\n+\t\t size_t s, int df, uint8_t mf, uint16_t off,\n \t\t uint8_t ttl, uint8_t proto, uint16_t pktid)\n {\n \t/* Create a packet, 2k bytes long */\n \tb->data_off = 0;\n \tchar *data = rte_pktmbuf_mtod(b, char *);\n+\trte_be16_t fragment_offset = 0;\t/**< fragmentation offset */\n \n \tmemset(data, fill, sizeof(struct rte_ipv4_hdr) + s);\n \n@@ -106,9 +108,17 @@ static void ut_teardown(void)\n \tb->data_len = b->pkt_len;\n \thdr->total_length = rte_cpu_to_be_16(b->pkt_len);\n \thdr->packet_id = rte_cpu_to_be_16(pktid);\n-\thdr->fragment_offset = 0;\n+\n \tif (df)\n-\t\thdr->fragment_offset = rte_cpu_to_be_16(0x4000);\n+\t\tfragment_offset |= 0x4000;\n+\n+\tif (mf)\n+\t\tfragment_offset |= 0x2000;\n+\n+\tif (off)\n+\t\tfragment_offset |= off;\n+\n+\thdr->fragment_offset = rte_cpu_to_be_16(fragment_offset);\n \n \tif (!ttl)\n \t\tttl = 64; /* default to 64 */\n@@ -155,38 +165,73 @@ static void ut_teardown(void)\n \t\trte_pktmbuf_free(mb[i]);\n }\n \n+static inline void\n+test_get_offset(struct rte_mbuf **mb, int32_t len,\n+\tuint16_t *offset, int ipv)\n+{\n+\tint32_t i;\n+\n+\tfor (i = 0; i < len; i++) {\n+\t\tif (ipv == 4) {\n+\t\t\tstruct rte_ipv4_hdr *iph =\n+\t\t\t rte_pktmbuf_mtod(mb[i], struct rte_ipv4_hdr *);\n+\t\t\toffset[i] = iph->fragment_offset;\n+\t\t} else if (ipv == 6) {\n+\t\t\tstruct ipv6_extension_fragment *fh =\n+\t\t\t rte_pktmbuf_mtod_offset(\n+\t\t\t\t\tmb[i],\n+\t\t\t\t\tstruct ipv6_extension_fragment *,\n+\t\t\t\t\tsizeof(struct rte_ipv6_hdr));\n+\t\t\toffset[i] = fh->frag_data;\n+\t\t}\n+\t}\n+}\n+\n static int\n test_ip_frag(void)\n {\n \tstatic const uint16_t RND_ID = UINT16_MAX;\n \tint result = TEST_SUCCESS;\n-\tsize_t i;\n+\tsize_t i, j;\n \n \tstruct test_ip_frags {\n \t\tint ipv;\n \t\tsize_t mtu_size;\n \t\tsize_t pkt_size;\n \t\tint set_df;\n+\t\tuint8_t set_mf;\n+\t\tuint16_t set_of;\n \t\tuint8_t ttl;\n \t\tuint8_t proto;\n \t\tuint16_t pkt_id;\n \t\tint expected_frags;\n+\t\tuint16_t expected_fragment_offset[BURST];\n \t} tests[] = {\n-\t\t {4, 1280, 1400, 0, 64, IPPROTO_ICMP, RND_ID, 2},\n-\t\t {4, 1280, 1400, 0, 64, IPPROTO_ICMP, 0, 2},\n-\t\t {4, 600, 1400, 0, 64, IPPROTO_ICMP, RND_ID, 3},\n-\t\t {4, 4, 1400, 0, 64, IPPROTO_ICMP, RND_ID, -EINVAL},\n-\t\t {4, 600, 1400, 1, 64, IPPROTO_ICMP, RND_ID, -ENOTSUP},\n-\t\t {4, 600, 1400, 0, 0, IPPROTO_ICMP, RND_ID, 3},\n-\n-\t\t {6, 1280, 1400, 0, 64, IPPROTO_ICMP, RND_ID, 2},\n-\t\t {6, 1300, 1400, 0, 64, IPPROTO_ICMP, RND_ID, 2},\n-\t\t {6, 4, 1400, 0, 64, IPPROTO_ICMP, RND_ID, -EINVAL},\n-\t\t {6, 1300, 1400, 0, 0, IPPROTO_ICMP, RND_ID, 2},\n+\t\t {4, 1280, 1400, 0, 0, 0, 64, IPPROTO_ICMP, RND_ID, 2,\n+\t\t {0x2000, 0x009D}},\n+\t\t {4, 1280, 1400, 0, 0, 0, 64, IPPROTO_ICMP, 0, 2,\n+\t\t {0x2000, 0x009D}},\n+\t\t {4, 600, 1400, 0, 0, 0, 64, IPPROTO_ICMP, RND_ID, 3,\n+\t\t {0x2000, 0x2048, 0x0090}},\n+\t\t {4, 4, 1400, 0, 0, 0, 64, IPPROTO_ICMP, RND_ID, -EINVAL},\n+\t\t {4, 600, 1400, 1, 0, 0, 64, IPPROTO_ICMP, RND_ID, -ENOTSUP},\n+\t\t {4, 600, 1400, 0, 0, 0, 0, IPPROTO_ICMP, RND_ID, 3,\n+\t\t {0x2000, 0x2048, 0x0090}},\n+\t\t {4, 68, 104, 0, 1, 13, 0, IPPROTO_ICMP, RND_ID, 3,\n+\t\t {0x200D, 0x2013, 0x2019}},\n+\n+\t\t {6, 1280, 1400, 0, 0, 0, 64, IPPROTO_ICMP, RND_ID, 2,\n+\t\t {0x0001, 0x04D0}},\n+\t\t {6, 1300, 1400, 0, 0, 0, 64, IPPROTO_ICMP, RND_ID, 2,\n+\t\t {0x0001, 0x04E0}},\n+\t\t {6, 4, 1400, 0, 0, 0, 64, IPPROTO_ICMP, RND_ID, -EINVAL},\n+\t\t {6, 1300, 1400, 0, 0, 0, 0, IPPROTO_ICMP, RND_ID, 2,\n+\t\t {0x0001, 0x04E0}},\n \t};\n \n \tfor (i = 0; i < RTE_DIM(tests); i++) {\n \t\tint32_t len = 0;\n+\t\tuint16_t fragment_offset[BURST];\n \t\tuint16_t pktid = tests[i].pkt_id;\n \t\tstruct rte_mbuf *pkts_out[BURST];\n \t\tstruct rte_mbuf *b = rte_pktmbuf_alloc(pkt_pool);\n@@ -201,6 +246,8 @@ static void ut_teardown(void)\n \t\t\tv4_allocate_packet_of(b, 0x41414141,\n \t\t\t\t\t tests[i].pkt_size,\n \t\t\t\t\t tests[i].set_df,\n+\t\t\t\t\t tests[i].set_mf,\n+\t\t\t\t\t tests[i].set_of,\n \t\t\t\t\t tests[i].ttl,\n \t\t\t\t\t tests[i].proto,\n \t\t\t\t\t pktid);\n@@ -225,14 +272,30 @@ static void ut_teardown(void)\n \n \t\trte_pktmbuf_free(b);\n \n-\t\tif (len > 0)\n+\t\tif (len > 0) {\n+\t\t\ttest_get_offset(pkts_out, len,\n+\t\t\t fragment_offset, tests[i].ipv);\n \t\t\ttest_free_fragments(pkts_out, len);\n+\t\t}\n \n \t\tprintf(\"%zd: checking %d with %d\\n\", i, len,\n \t\t tests[i].expected_frags);\n \t\tRTE_TEST_ASSERT_EQUAL(len, tests[i].expected_frags,\n \t\t\t\t \"Failed case %zd.\\n\", i);\n \n+\t\tif (len > 0) {\n+\t\t\tfor (j = 0; j < (size_t)len; j++) {\n+\t\t\t\tprintf(\"%zd-%zd: checking %d with %d\\n\",\n+\t\t\t\t i, j, fragment_offset[j],\n+\t\t\t\t rte_cpu_to_be_16(\n+\t\t\t\t\ttests[i].expected_fragment_offset[j]));\n+\t\t\t\tRTE_TEST_ASSERT_EQUAL(fragment_offset[j],\n+\t\t\t\t rte_cpu_to_be_16(\n+\t\t\t\t\ttests[i].expected_fragment_offset[j]),\n+\t\t\t\t \"Failed case %zd.\\n\", i);\n+\t\t\t}\n+\t\t}\n+\n \t}\n \n \treturn result;\n", "prefixes": [] }