Patch Detail

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

{
    "id": 119788,
    "url": "https://patches.dpdk.org/api/patches/119788/?format=api",
    "web_url": "https://patches.dpdk.org/project/dpdk/patch/20221111084929.1579639-2-andrew.rybchenko@oktetlabs.ru/",
    "project": {
        "id": 1,
        "url": "https://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": "<20221111084929.1579639-2-andrew.rybchenko@oktetlabs.ru>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20221111084929.1579639-2-andrew.rybchenko@oktetlabs.ru",
    "date": "2022-11-11T08:49:28",
    "name": "[v2,1/2] app/testpmd: prepare to support TCP in Tx only mode",
    "commit_ref": null,
    "pull_url": null,
    "state": "changes-requested",
    "archived": true,
    "hash": "d437355bff58f53cc9d301375d60d4cf0a522b30",
    "submitter": {
        "id": 2013,
        "url": "https://patches.dpdk.org/api/people/2013/?format=api",
        "name": "Andrew Rybchenko",
        "email": "Andrew.Rybchenko@oktetlabs.ru"
    },
    "delegate": {
        "id": 3961,
        "url": "https://patches.dpdk.org/api/users/3961/?format=api",
        "username": "arybchenko",
        "first_name": "Andrew",
        "last_name": "Rybchenko",
        "email": "andrew.rybchenko@oktetlabs.ru"
    },
    "mbox": "https://patches.dpdk.org/project/dpdk/patch/20221111084929.1579639-2-andrew.rybchenko@oktetlabs.ru/mbox/",
    "series": [
        {
            "id": 25731,
            "url": "https://patches.dpdk.org/api/series/25731/?format=api",
            "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=25731",
            "date": "2022-11-11T08:49:27",
            "name": "app/testpmd: support TCP TSO in Tx only mode",
            "version": 2,
            "mbox": "https://patches.dpdk.org/series/25731/mbox/"
        }
    ],
    "comments": "https://patches.dpdk.org/api/patches/119788/comments/",
    "check": "success",
    "checks": "https://patches.dpdk.org/api/patches/119788/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 7F3BEA0542;\n\tFri, 11 Nov 2022 09:49:38 +0100 (CET)",
            "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 0730C42D11;\n\tFri, 11 Nov 2022 09:49:36 +0100 (CET)",
            "from shelob.oktetlabs.ru (shelob.oktetlabs.ru [91.220.146.113])\n by mails.dpdk.org (Postfix) with ESMTP id E5ABB4014F\n for <dev@dpdk.org>; Fri, 11 Nov 2022 09:49:33 +0100 (CET)",
            "by shelob.oktetlabs.ru (Postfix, from userid 115)\n id 5B94B83; Fri, 11 Nov 2022 11:49:33 +0300 (MSK)",
            "from aros.oktetlabs.ru (aros.oktetlabs.ru [192.168.38.17])\n by shelob.oktetlabs.ru (Postfix) with ESMTP id A17797F;\n Fri, 11 Nov 2022 11:49:31 +0300 (MSK)"
        ],
        "X-Spam-Checker-Version": "SpamAssassin 3.4.6 (2021-04-09) on mail1.oktetlabs.ru",
        "X-Spam-Level": "",
        "X-Spam-Status": "No, score=0.8 required=5.0 tests=ALL_TRUSTED, DKIM_ADSP_DISCARD\n autolearn=no autolearn_force=no version=3.4.6",
        "DKIM-Filter": "OpenDKIM Filter v2.11.0 shelob.oktetlabs.ru A17797F",
        "Authentication-Results": "shelob.oktetlabs.ru/A17797F; dkim=none;\n dkim-atps=neutral",
        "From": "Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>",
        "To": "Ferruh Yigit <ferruh.yigit@amd.com>,\n Aman Singh <aman.deep.singh@intel.com>,\n Yuying Zhang <yuying.zhang@intel.com>",
        "Cc": "dev@dpdk.org, Georgiy Levashov <georgiy.levashov@oktetlabs.ru>,\n Ivan Ilchenko <ivan.ilchenko@oktetlabs.ru>",
        "Subject": "[PATCH v2 1/2] app/testpmd: prepare to support TCP in Tx only mode",
        "Date": "Fri, 11 Nov 2022 11:49:28 +0300",
        "Message-Id": "<20221111084929.1579639-2-andrew.rybchenko@oktetlabs.ru>",
        "X-Mailer": "git-send-email 2.30.2",
        "In-Reply-To": "<20221111084929.1579639-1-andrew.rybchenko@oktetlabs.ru>",
        "References": "<20221111084929.1579639-1-andrew.rybchenko@oktetlabs.ru>",
        "MIME-Version": "1.0",
        "Content-Transfer-Encoding": "8bit",
        "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": "This is useful for the incoming support of TCP TSO in Tx only mode.\n\nSigned-off-by: Georgiy Levashov <georgiy.levashov@oktetlabs.ru>\nSigned-off-by: Ivan Ilchenko <ivan.ilchenko@oktetlabs.ru>\nSigned-off-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>\n---\n app/test-pmd/parameters.c |  6 +--\n app/test-pmd/testpmd.h    |  4 +-\n app/test-pmd/txonly.c     | 98 +++++++++++++++++++++++++--------------\n 3 files changed, 67 insertions(+), 41 deletions(-)",
    "diff": "diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c\nindex aed4cdcb84..2ed8afedfd 100644\n--- a/app/test-pmd/parameters.c\n+++ b/app/test-pmd/parameters.c\n@@ -833,7 +833,7 @@ launch_args_parse(int argc, char** argv)\n \t\t\t\t\trte_exit(EXIT_FAILURE,\n \t\t\t\t\t\t \"Invalid UDP port: %s\\n\",\n \t\t\t\t\t\t optarg);\n-\t\t\t\ttx_udp_src_port = n;\n+\t\t\t\ttx_l4_src_port = n;\n \t\t\t\tif (*end == ',') {\n \t\t\t\t\tchar *dst = end + 1;\n \n@@ -843,9 +843,9 @@ launch_args_parse(int argc, char** argv)\n \t\t\t\t\t\trte_exit(EXIT_FAILURE,\n \t\t\t\t\t\t\t \"Invalid destination UDP port: %s\\n\",\n \t\t\t\t\t\t\t dst);\n-\t\t\t\t\ttx_udp_dst_port = n;\n+\t\t\t\t\ttx_l4_dst_port = n;\n \t\t\t\t} else {\n-\t\t\t\t\ttx_udp_dst_port = n;\n+\t\t\t\t\ttx_l4_dst_port = n;\n \t\t\t\t}\n \n \t\t\t}\ndiff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h\nindex 05ca8628cf..976f4f83dd 100644\n--- a/app/test-pmd/testpmd.h\n+++ b/app/test-pmd/testpmd.h\n@@ -625,8 +625,8 @@ extern int8_t tx_pthresh;\n extern int8_t tx_hthresh;\n extern int8_t tx_wthresh;\n \n-extern uint16_t tx_udp_src_port;\n-extern uint16_t tx_udp_dst_port;\n+extern uint16_t tx_l4_src_port;\n+extern uint16_t tx_l4_dst_port;\n \n extern uint32_t tx_ip_src_addr;\n extern uint32_t tx_ip_dst_addr;\ndiff --git a/app/test-pmd/txonly.c b/app/test-pmd/txonly.c\nindex 021624952d..44bda752bc 100644\n--- a/app/test-pmd/txonly.c\n+++ b/app/test-pmd/txonly.c\n@@ -46,8 +46,8 @@ struct tx_timestamp {\n };\n \n /* use RFC863 Discard Protocol */\n-uint16_t tx_udp_src_port = 9;\n-uint16_t tx_udp_dst_port = 9;\n+uint16_t tx_l4_src_port = 9;\n+uint16_t tx_l4_dst_port = 9;\n \n /* use RFC5735 / RFC2544 reserved network test addresses */\n uint32_t tx_ip_src_addr = (198U << 24) | (18 << 16) | (0 << 8) | 1;\n@@ -57,7 +57,10 @@ uint32_t tx_ip_dst_addr = (198U << 24) | (18 << 16) | (0 << 8) | 2;\n \n static struct rte_ipv4_hdr pkt_ip_hdr; /**< IP header of transmitted packets. */\n RTE_DEFINE_PER_LCORE(uint8_t, _ip_var); /**< IP address variation */\n-static struct rte_udp_hdr pkt_udp_hdr; /**< UDP header of tx packets. */\n+\n+static union pkt_l4_hdr_t {\n+\tstruct rte_udp_hdr udp;\t/**< UDP header of tx packets. */\n+} pkt_l4_hdr; /**< Layer 4 header of tx packets. */\n \n static uint64_t timestamp_mask; /**< Timestamp dynamic flag mask */\n static int32_t timestamp_off; /**< Timestamp dynamic field offset */\n@@ -102,22 +105,30 @@ copy_buf_to_pkt(void* buf, unsigned len, struct rte_mbuf *pkt, unsigned offset)\n }\n \n static void\n-setup_pkt_udp_ip_headers(struct rte_ipv4_hdr *ip_hdr,\n-\t\t\t struct rte_udp_hdr *udp_hdr,\n-\t\t\t uint16_t pkt_data_len)\n+setup_pkt_l4_ip_headers(uint8_t ip_proto, struct rte_ipv4_hdr *ip_hdr,\n+\t\t\tunion pkt_l4_hdr_t *l4_hdr, uint16_t pkt_data_len)\n {\n \tuint16_t *ptr16;\n \tuint32_t ip_cksum;\n \tuint16_t pkt_len;\n+\tstruct rte_udp_hdr *udp_hdr;\n \n-\t/*\n-\t * Initialize UDP header.\n-\t */\n-\tpkt_len = (uint16_t) (pkt_data_len + sizeof(struct rte_udp_hdr));\n-\tudp_hdr->src_port = rte_cpu_to_be_16(tx_udp_src_port);\n-\tudp_hdr->dst_port = rte_cpu_to_be_16(tx_udp_dst_port);\n-\tudp_hdr->dgram_len      = RTE_CPU_TO_BE_16(pkt_len);\n-\tudp_hdr->dgram_cksum    = 0; /* No UDP checksum. */\n+\tswitch (ip_proto) {\n+\tcase IPPROTO_UDP:\n+\t\t/*\n+\t\t * Initialize UDP header.\n+\t\t */\n+\t\tpkt_len = (uint16_t)(pkt_data_len + sizeof(struct rte_udp_hdr));\n+\t\tudp_hdr = &l4_hdr->udp;\n+\t\tudp_hdr->src_port = rte_cpu_to_be_16(tx_l4_src_port);\n+\t\tudp_hdr->dst_port = rte_cpu_to_be_16(tx_l4_dst_port);\n+\t\tudp_hdr->dgram_len      = RTE_CPU_TO_BE_16(pkt_len);\n+\t\tudp_hdr->dgram_cksum    = 0; /* No UDP checksum. */\n+\t\tbreak;\n+\tdefault:\n+\t\tpkt_len = pkt_data_len;\n+\t\tbreak;\n+\t}\n \n \t/*\n \t * Initialize IP header.\n@@ -127,7 +138,7 @@ setup_pkt_udp_ip_headers(struct rte_ipv4_hdr *ip_hdr,\n \tip_hdr->type_of_service   = 0;\n \tip_hdr->fragment_offset = 0;\n \tip_hdr->time_to_live   = IP_DEFTTL;\n-\tip_hdr->next_proto_id = IPPROTO_UDP;\n+\tip_hdr->next_proto_id = ip_proto;\n \tip_hdr->packet_id = 0;\n \tip_hdr->total_length   = RTE_CPU_TO_BE_16(pkt_len);\n \tip_hdr->src_addr = rte_cpu_to_be_32(tx_ip_src_addr);\n@@ -162,27 +173,32 @@ update_pkt_header(struct rte_mbuf *pkt, uint32_t total_pkt_len)\n {\n \tstruct rte_ipv4_hdr *ip_hdr;\n \tstruct rte_udp_hdr *udp_hdr;\n-\tuint16_t pkt_data_len;\n+\tuint16_t ip_data_len;\n \tuint16_t pkt_len;\n \n-\tpkt_data_len = (uint16_t) (total_pkt_len - (\n+\tip_data_len = (uint16_t) (total_pkt_len - (\n \t\t\t\t\tsizeof(struct rte_ether_hdr) +\n-\t\t\t\t\tsizeof(struct rte_ipv4_hdr) +\n-\t\t\t\t\tsizeof(struct rte_udp_hdr)));\n-\t/* update UDP packet length */\n-\tudp_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_udp_hdr *,\n-\t\t\t\tsizeof(struct rte_ether_hdr) +\n-\t\t\t\tsizeof(struct rte_ipv4_hdr));\n-\tpkt_len = (uint16_t) (pkt_data_len + sizeof(struct rte_udp_hdr));\n-\tudp_hdr->dgram_len = RTE_CPU_TO_BE_16(pkt_len);\n+\t\t\t\t\tsizeof(struct rte_ipv4_hdr)));\n \n \t/* update IP packet length and checksum */\n \tip_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *,\n \t\t\t\tsizeof(struct rte_ether_hdr));\n \tip_hdr->hdr_checksum = 0;\n-\tpkt_len = (uint16_t) (pkt_len + sizeof(struct rte_ipv4_hdr));\n+\tpkt_len = (uint16_t) (ip_data_len + sizeof(struct rte_ipv4_hdr));\n \tip_hdr->total_length = RTE_CPU_TO_BE_16(pkt_len);\n \tip_hdr->hdr_checksum = rte_ipv4_cksum(ip_hdr);\n+\n+\tswitch (ip_hdr->next_proto_id) {\n+\tcase IPPROTO_UDP:\n+\t\t/* update UDP packet length */\n+\t\tudp_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_udp_hdr *,\n+\t\t\t\t\tsizeof(struct rte_ether_hdr) +\n+\t\t\t\t\tsizeof(struct rte_ipv4_hdr));\n+\t\tudp_hdr->dgram_len = RTE_CPU_TO_BE_16(ip_data_len);\n+\t\tbreak;\n+\tdefault:\n+\t\tbreak;\n+\t}\n }\n \n static inline bool\n@@ -193,8 +209,9 @@ pkt_burst_prepare(struct rte_mbuf *pkt, struct rte_mempool *mbp,\n {\n \tstruct rte_mbuf *pkt_segs[RTE_MAX_SEGS_PER_PKT];\n \tstruct rte_mbuf *pkt_seg;\n-\tuint32_t nb_segs, pkt_len;\n+\tuint32_t nb_segs, pkt_len, l4_hdr_size;\n \tuint8_t i;\n+\tstruct rte_ipv4_hdr *ip_hdr;\n \n \tif (unlikely(tx_pkt_split == TX_PKT_SPLIT_RND))\n \t\tnb_segs = rte_rand() % tx_pkt_nb_segs + 1;\n@@ -230,14 +247,14 @@ pkt_burst_prepare(struct rte_mbuf *pkt, struct rte_mempool *mbp,\n \tcopy_buf_to_pkt(eth_hdr, sizeof(*eth_hdr), pkt, 0);\n \tcopy_buf_to_pkt(&pkt_ip_hdr, sizeof(pkt_ip_hdr), pkt,\n \t\t\tsizeof(struct rte_ether_hdr));\n+\n+\tip_hdr = rte_pktmbuf_mtod_offset(pkt,\n+\t\t\tstruct rte_ipv4_hdr *,\n+\t\t\tsizeof(struct rte_ether_hdr));\n \tif (txonly_multi_flow) {\n \t\tuint8_t  ip_var = RTE_PER_LCORE(_ip_var);\n-\t\tstruct rte_ipv4_hdr *ip_hdr;\n \t\tuint32_t addr;\n \n-\t\tip_hdr = rte_pktmbuf_mtod_offset(pkt,\n-\t\t\t\tstruct rte_ipv4_hdr *,\n-\t\t\t\tsizeof(struct rte_ether_hdr));\n \t\t/*\n \t\t * Generate multiple flows by varying IP src addr. This\n \t\t * enables packets are well distributed by RSS in\n@@ -249,9 +266,17 @@ pkt_burst_prepare(struct rte_mbuf *pkt, struct rte_mempool *mbp,\n \t\tip_hdr->src_addr = rte_cpu_to_be_32(addr);\n \t\tRTE_PER_LCORE(_ip_var) = ip_var;\n \t}\n-\tcopy_buf_to_pkt(&pkt_udp_hdr, sizeof(pkt_udp_hdr), pkt,\n-\t\t\tsizeof(struct rte_ether_hdr) +\n-\t\t\tsizeof(struct rte_ipv4_hdr));\n+\tswitch (ip_hdr->next_proto_id) {\n+\tcase IPPROTO_UDP:\n+\t\tcopy_buf_to_pkt(&pkt_l4_hdr.udp, sizeof(pkt_l4_hdr.udp), pkt,\n+\t\t\t\tsizeof(struct rte_ether_hdr) +\n+\t\t\t\tsizeof(struct rte_ipv4_hdr));\n+\t\tl4_hdr_size = sizeof(pkt_l4_hdr.udp);\n+\t\tbreak;\n+\tdefault:\n+\t\tl4_hdr_size = 0;\n+\t\tbreak;\n+\t}\n \n \tif (unlikely(tx_pkt_split == TX_PKT_SPLIT_RND) || txonly_multi_flow)\n \t\tupdate_pkt_header(pkt, pkt_len);\n@@ -308,7 +333,7 @@ pkt_burst_prepare(struct rte_mbuf *pkt, struct rte_mempool *mbp,\n \t\tcopy_buf_to_pkt(&timestamp_mark, sizeof(timestamp_mark), pkt,\n \t\t\tsizeof(struct rte_ether_hdr) +\n \t\t\tsizeof(struct rte_ipv4_hdr) +\n-\t\t\tsizeof(pkt_udp_hdr));\n+\t\t\tl4_hdr_size);\n \t}\n \t/*\n \t * Complete first mbuf of packet and append it to the\n@@ -449,7 +474,8 @@ tx_only_begin(portid_t pi)\n \t\treturn -EINVAL;\n \t}\n \n-\tsetup_pkt_udp_ip_headers(&pkt_ip_hdr, &pkt_udp_hdr, pkt_data_len);\n+\tsetup_pkt_l4_ip_headers(IPPROTO_UDP, &pkt_ip_hdr, &pkt_l4_hdr,\n+\t\t\t\tpkt_data_len);\n \n \ttimestamp_enable = false;\n \ttimestamp_mask = 0;\n",
    "prefixes": [
        "v2",
        "1/2"
    ]
}