From patchwork Tue Apr 9 18:20:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 52492 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 670554F9C; Tue, 9 Apr 2019 20:20:17 +0200 (CEST) Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by dpdk.org (Postfix) with ESMTP id E51E44D3A for ; Tue, 9 Apr 2019 20:20:12 +0200 (CEST) Received: by mail-pg1-f194.google.com with SMTP id y3so9762309pgk.12 for ; Tue, 09 Apr 2019 11:20:12 -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:in-reply-to:references; bh=BRYtHkz4WnaC37UZAPEgRzwurQxudvDR1JuZhjommzM=; b=xKg7tRFe0bJ3B5ozrYFaeBxcQ+Ytgq4bSzcalzxeEU7oi9pesajQAFCbi28HPb8HKd AxJbe5LzLfkU51eawfV7wSRpBSplDyH+2br0O8li+c3Y6gv5lXuTxxebOPEpKHzDWi6X BvcXMZHjulBBzeKuZN8t3SmDR6G/1WlLY0kcnmvWXVwYboM86/xnl44LITrrywSvS4GV ESibynFeVqmwGfgncFRRP9Zxp/eLTmHaUQl7pXaJ5aVkO+BqI7kZ7l+Md6ca4+SxIkDh QtYX040cKQG/hDnF7yjY3eJ9QZk7dX9ILcr/h9IxO0RrWqtAD+gN71tctEbY8ISJPYzw GtjQ== 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:in-reply-to :references; bh=BRYtHkz4WnaC37UZAPEgRzwurQxudvDR1JuZhjommzM=; b=PI+1iCEOryZ3bl3XemGm1FivcJHWmyTyrtJUYw/zPImKL6sUoP1VPQqer5vxqkr7Yu wJz4g8w4blimfR81QxXjQihtEjNsZ9Ce3+0EwKu79DdLSfqPcXfBGwXQYniMmHNnVJVa exRoFg+8kVD87eO4ka/O++zo2bQFiwxAKM+hVWKl8QnG1YzRo9tYW5FBuUBTK30ZeV/5 T+pZCua/cr4Ebm29MKPHlqyC6g07egOgDoDYBmRX5F28NRRCTiFh4erFwz7hAMATdfVo sTJOF7TpJ4/6YngS5Od7UX52lfIo1W1WDlp4ol56U2Z0yhOFTNi7aVWVe6nDOycxM1vF /0jA== X-Gm-Message-State: APjAAAVSbe0P9SuidWn+Bs/5233suJ3HJyzgLuLrqKVc9wA1XPXt+nrS BQ6lt1s5jlksvt8daI8Il+Y2FV17sMayWw== X-Google-Smtp-Source: APXvYqyENW9LNsad1VH70gaxpp4H4rgXXDE+Bv3azigQDbi3fLp0QXIM4woMzsqq+PPRn2A8leMZ1A== X-Received: by 2002:a63:2c55:: with SMTP id s82mr34710794pgs.356.1554834011688; Tue, 09 Apr 2019 11:20:11 -0700 (PDT) Received: from shemminger-XPS-13-9360.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id 128sm18538293pgb.47.2019.04.09.11.20.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Apr 2019 11:20:10 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Tue, 9 Apr 2019 11:20:04 -0700 Message-Id: <20190409182006.12944-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190409182006.12944-1-stephen@networkplumber.org> References: <20190402203907.28679-1-stephen@networkplumber.org> <20190409182006.12944-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH v5 1/3] app/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" This patch changes what testpmd uses as IP addresses when run in transmit only mode. The old code was using 192.168.0.1 -> 192.168.0.2 but these addresses are reserved for private Internet by RFC 1918. The new code uses 192.18.0.1 and 192.18.0.2 which are on the subnet reserved for performance testing by RFC 2544. New command line option allows the user to pick any other src/dst address desired. Notice: this changes the default IP address for transmit only. It may cause some user who has hardcoded network addresses to report a regression. Signed-off-by: Stephen Hemminger --- v5 -- rebase to 19.05-rc1 and fix reword commit message app/test-pmd/parameters.c | 49 +++++++++++++++++++++++++++ app/test-pmd/testpmd.h | 6 ++++ app/test-pmd/txonly.c | 20 ++++++----- doc/guides/testpmd_app_ug/run_app.rst | 12 ++++++- 4 files changed, 77 insertions(+), 10 deletions(-) diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c index 7b6b60905dce..8b523a5c66ed 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 | " @@ -645,6 +647,8 @@ launch_args_parse(int argc, char** argv) { "mlockall", 0, 0, 0 }, { "no-mlockall", 0, 0, 0 }, { "mp-alloc", 1, 0, 0 }, + { "tx-ip", 1, 0, 0 }, + { "tx-udp", 1, 0, 0 }, { "noisy-tx-sw-buffer-size", 1, 0, 0 }, { "noisy-tx-sw-buffer-flushtime", 1, 0, 0 }, { "noisy-lkup-memory", 1, 0, 0 }, @@ -743,6 +747,51 @@ launch_args_parse(int argc, char** argv) nb_peer_eth_addrs++; } #endif + if (!strcmp(lgopts[opt_idx].name, "tx-ip")) { + struct in_addr in; + char *end; + + end = strchr(optarg, ','); + if (end == optarg || !end) + rte_exit(EXIT_FAILURE, + "Invalid tx-ip: %s", optarg); + + *end++ = 0; + if (inet_aton(optarg, &in) == 0) + rte_exit(EXIT_FAILURE, + "Invalid source IP address: %s\n", optarg); + tx_ip_src_addr = rte_be_to_cpu_32(in.s_addr); + + if (inet_aton(end, &in) == 0) + rte_exit(EXIT_FAILURE, + "Invalid destination IP address: %s\n", optarg); + tx_ip_dst_addr = rte_be_to_cpu_32(in.s_addr); + } + 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 a45988ebc524..18d2c1ef1eaf 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -443,6 +443,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 66e63788a25e..632d655235f0 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 +/* use RFC863 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) +/* use RFC5735 / RFC2544 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 @@ -105,8 +107,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. */ @@ -121,8 +123,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. @@ -206,7 +208,7 @@ pkt_burst_prepare(struct rte_mbuf *pkt, struct rte_mempool *mbp, * packet generator for developer's quick performance * regression test. */ - addr = (IP_DST_ADDR | (ip_var++ << 8)) + rte_lcore_id(); + addr = (tx_ip_dst_addr | (ip_var++ << 8)) + rte_lcore_id(); ip_hdr->src_addr = rte_cpu_to_be_32(addr); } copy_buf_to_pkt(&pkt_udp_hdr, sizeof(pkt_udp_hdr), pkt, diff --git a/doc/guides/testpmd_app_ug/run_app.rst b/doc/guides/testpmd_app_ug/run_app.rst index b717b8c7b742..a72f94923210 100644 --- a/doc/guides/testpmd_app_ug/run_app.rst +++ b/doc/guides/testpmd_app_ug/run_app.rst @@ -121,12 +121,22 @@ The commandline options are: XX:XX:XX:XX:XX:02 ... - * ``--eth-peer=N,XX:XX:XX:XX:XX:XX`` 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 address values are source 192.18.0.1 and + destination 192.18.0.2. These are special purpose addresses + reserved for benchmakring (RFC 2544). + +* ``--tx-udp=SRC[,DST]`` + Set the source and destination UDP port number for transmit test only test. + The default port is the port 9 which is defined for the discard protocol + (RFC 863). + * ``--pkt-filter-mode=mode`` Set Flow Director mode where mode is either ``none`` (the default), ``signature`` or ``perfect``.