From patchwork Thu Apr 5 21:14:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 37343 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B7C621CDF5; Thu, 5 Apr 2018 23:14:55 +0200 (CEST) Received: from mail-pl0-f68.google.com (mail-pl0-f68.google.com [209.85.160.68]) by dpdk.org (Postfix) with ESMTP id 201A71CDED for ; Thu, 5 Apr 2018 23:14:54 +0200 (CEST) Received: by mail-pl0-f68.google.com with SMTP id 61-v6so19064314plb.2 for ; Thu, 05 Apr 2018 14:14:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=TPjkTM+QFVFDK78oJNJ4yNFY40MNOUavIMhUbJe38wI=; b=P5X+jMJGG5VG2mVrOJddEe8MdpRLw2JFFnFAcn+ycizbTvgAelHzI+jrqgVwf24S4v X6NEo77X4w7D+E/fD49TL+uCcJcKSgjJndMYuxF5UVvXkw5keGvriFXjcM0mqx/uv1da yA/QJ01qbNaFIs9NYW6QxxdNkjzXCGsIySbKsz2RpEeTd62kzGmde5PALDFKjTq/8pW4 zhz0eQXBradU08mECKK70dR+gQzWMz4wUX78WdSyJUbZoTJ6TlHyiQxUmhr3AFHu/3nn be2sQnuAMWRhZA14c+93En/0cII2YnU3eE/aFQyXE4BkQ1QLv/kNKTEmRlOT9dbRuAQP osYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=TPjkTM+QFVFDK78oJNJ4yNFY40MNOUavIMhUbJe38wI=; b=E6/sv3gm+l2wzFD0Qto3oyLAtxiNcQxoT/YHaf8bIc2yFdujwsy/wfi9Qg4L+faDoD pdmFqHS+0vL/IRn2NTxYRn1ZZ2qNvMhyot9oVB5mEKNr8B6nIg6JPWFnTrs75cYGfkoy z6mF+YnRfCqxfMhpCqmr6IuhMram0/8Y1sgbVgsF1a/+ibn/Jibj5JlacvJyEp2aX1l2 0u6beGFGKFGwFsG9I1WbsvmT/GmJvGb6/abdh5G3CaqabPKNa1/2akE2HeJTR3xsHKbJ s2Mlhle8JarfhK/oWvYcJeP69wDh0Zz3CoOTbl86ykTsdcxcRvToj9krse0ZOOczk2ou 3HQQ== X-Gm-Message-State: ALQs6tDvJ/7oN7ehrhhIpooeqAL147bwODOFoyLU263BIi+TzC/RW5yC U619s/P1tH9rATsIrLEDdiDtXmvb5eM= X-Google-Smtp-Source: AIpwx4/+CqHTCXhDLtJ9V94XUjZBYRODtMQP1+9uPiPGmuco/5/mHNyfOtNUT/r/9C1wXYpocd2HVQ== X-Received: by 10.101.88.140 with SMTP id d12mr2097346pgu.408.1522962892836; Thu, 05 Apr 2018 14:14:52 -0700 (PDT) Received: from xeon-e3.lan (204-195-71-95.wavecable.com. [204.195.71.95]) by smtp.gmail.com with ESMTPSA id q2sm12929710pgp.77.2018.04.05.14.14.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Apr 2018 14:14:52 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Thu, 5 Apr 2018 14:14:50 -0700 Message-Id: <20180405211450.31251-1-stephen@networkplumber.org> X-Mailer: git-send-email 2.16.3 Subject: [dpdk-dev] [RFC] testpmd: add ability to set tx IP and UDP parameters X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Use RFC standard values address and ports for Tx only test as defaults. But let the user override those values on command line. Signed-off-by: Stephen Hemminger --- app/test-pmd/parameters.c | 49 +++++++++++++++++++++++++++++++++++ app/test-pmd/testpmd.h | 6 +++++ app/test-pmd/txonly.c | 18 +++++++------ doc/guides/testpmd_app_ug/run_app.rst | 9 +++++++ 4 files changed, 74 insertions(+), 8 deletions(-) diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c index 2192bdcdff44..21d1e6e60ee7 100644 --- a/app/test-pmd/parameters.c +++ b/app/test-pmd/parameters.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -65,6 +66,7 @@ usage(char* progname) #ifdef RTE_LIBRTE_CMDLINE "--eth-peers-configfile= | " "--eth-peer=X,M:M:M:M:M:M | " + "--tx-ip=SRC,DST | --tx-udp=PORT | " #endif "--pkt-filter-mode= |" "--rss-ip | --rss-udp | " @@ -621,6 +623,8 @@ launch_args_parse(int argc, char** argv) { "print-event", 1, 0, 0 }, { "mask-event", 1, 0, 0 }, { "tx-offloads", 1, 0, 0 }, + { "tx-ip", 1, 0, 0 }, + { "tx-udp", 1, 0, 0 }, { 0, 0, 0, 0 }, }; @@ -713,6 +717,51 @@ launch_args_parse(int argc, char** argv) nb_peer_eth_addrs++; } #endif + if (!strcmp(lgopts[opt_idx].name, "tx-ip")) { + in_addr_t in; + char *end; + + end = strchr(optarg, ','); + if (end == optarg || !end) + rte_exit(EXIT_FAILURE, + "Invalid tx-ip: %s", optarg); + + *end++ = 0; + if (inet_pton(AF_INET, optarg, &in) != 1) + rte_exit(EXIT_FAILURE, + "Invalid source IP address: %s\n", optarg); + tx_ip_src_addr = rte_be_to_cpu_32(in); + + if (inet_pton(AF_INET, end, &in) != 1) + rte_exit(EXIT_FAILURE, + "Invalid destination IP address: %s\n", optarg); + tx_ip_dst_addr = rte_be_to_cpu_32(in); + } + if (!strcmp(lgopts[opt_idx].name, "tx-udp")) { + char *end = NULL; + + errno = 0; + n = strtoul(optarg, &end, 10); + if (errno != 0 || end == optarg || n > UINT16_MAX || + !(*end == '\0' || *end == ',')) + rte_exit(EXIT_FAILURE, + "Invalid UDP port: %s\n", optarg); + tx_udp_src_port = n; + if (*end == ',') { + char *dst = end + 1; + + n = strtoul(dst, &end, 10); + if (errno != 0 || end == dst || + n > UINT16_MAX || *end) + rte_exit(EXIT_FAILURE, + "Invalid destination UDP port: %s\n", + dst); + tx_udp_dst_port = n; + } else { + tx_udp_dst_port = n; + } + + } if (!strcmp(lgopts[opt_idx].name, "nb-ports")) { n = atoi(optarg); if (n > 0 && n <= nb_ports) diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index 153abea0507f..3f5f232b956f 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -427,6 +427,12 @@ extern int8_t tx_pthresh; extern int8_t tx_hthresh; extern int8_t tx_wthresh; +extern uint16_t tx_udp_src_port; +extern uint16_t tx_udp_dst_port; + +extern uint32_t tx_ip_src_addr; +extern uint32_t tx_ip_dst_addr; + extern struct fwd_config cur_fwd_config; extern struct fwd_engine *cur_fwd_eng; extern uint32_t retry_enabled; diff --git a/app/test-pmd/txonly.c b/app/test-pmd/txonly.c index 1f08b6ed37a2..b9f9cdaf0a38 100644 --- a/app/test-pmd/txonly.c +++ b/app/test-pmd/txonly.c @@ -40,11 +40,13 @@ #include "testpmd.h" -#define UDP_SRC_PORT 1024 -#define UDP_DST_PORT 1024 +/* from RFC 863 Discard Protocol */ +uint16_t tx_udp_src_port = 9; +uint16_t tx_udp_dst_port = 9; -#define IP_SRC_ADDR ((192U << 24) | (168 << 16) | (0 << 8) | 1) -#define IP_DST_ADDR ((192U << 24) | (168 << 16) | (0 << 8) | 2) +/* from RFC 2544 reserved network test addresses */ +uint32_t tx_ip_src_addr = (192U << 24) | (18 << 16) | (0 << 8) | 1; +uint32_t tx_ip_dst_addr = (192U << 24) | (18 << 16) | (0 << 8) | 2; #define IP_DEFTTL 64 /* from RFC 1340. */ #define IP_VERSION 0x40 @@ -104,8 +106,8 @@ setup_pkt_udp_ip_headers(struct ipv4_hdr *ip_hdr, * Initialize UDP header. */ pkt_len = (uint16_t) (pkt_data_len + sizeof(struct udp_hdr)); - udp_hdr->src_port = rte_cpu_to_be_16(UDP_SRC_PORT); - udp_hdr->dst_port = rte_cpu_to_be_16(UDP_DST_PORT); + udp_hdr->src_port = rte_cpu_to_be_16(tx_udp_src_port); + udp_hdr->dst_port = rte_cpu_to_be_16(tx_udp_dst_port); udp_hdr->dgram_len = RTE_CPU_TO_BE_16(pkt_len); udp_hdr->dgram_cksum = 0; /* No UDP checksum. */ @@ -120,8 +122,8 @@ setup_pkt_udp_ip_headers(struct ipv4_hdr *ip_hdr, ip_hdr->next_proto_id = IPPROTO_UDP; ip_hdr->packet_id = 0; ip_hdr->total_length = RTE_CPU_TO_BE_16(pkt_len); - ip_hdr->src_addr = rte_cpu_to_be_32(IP_SRC_ADDR); - ip_hdr->dst_addr = rte_cpu_to_be_32(IP_DST_ADDR); + ip_hdr->src_addr = rte_cpu_to_be_32(tx_ip_src_addr); + ip_hdr->dst_addr = rte_cpu_to_be_32(tx_ip_dst_addr); /* * Compute IP header checksum. diff --git a/doc/guides/testpmd_app_ug/run_app.rst b/doc/guides/testpmd_app_ug/run_app.rst index 1fd53958a537..b31aeb75abf0 100644 --- a/doc/guides/testpmd_app_ug/run_app.rst +++ b/doc/guides/testpmd_app_ug/run_app.rst @@ -249,6 +249,15 @@ The commandline options are: Set the MAC address ``XX:XX:XX:XX:XX:XX`` of the peer port N, where 0 <= N < ``CONFIG_RTE_MAX_ETHPORTS`` from the configuration file. + +* ``--tx-ip=SRC,DST`` + Set the source and destination IP address used when doing transmit only test. + The defaults are source 192.18.0.1 and destination 192.18.0.2. + +* ``--tx-udp=SRC[,DST]`` + Set the source and destination UDP port number for transmit test only test. + The default port is the 9 (discard). + * ``--pkt-filter-mode=mode`` Set Flow Director mode where mode is either ``none`` (the default), ``signature`` or ``perfect``.