From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl0-f47.google.com (mail-pl0-f47.google.com [209.85.160.47]) by dpdk.org (Postfix) with ESMTP id D7DF02C0C for ; Mon, 18 Jun 2018 23:36:01 +0200 (CEST) Received: by mail-pl0-f47.google.com with SMTP id g20-v6so9740870plq.1 for ; Mon, 18 Jun 2018 14:36:01 -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=K/RbMRXH+tC2fmTJM9CxU2swZJtOBhzqhQDwvzIlVX0=; b=yejtO+ssA2LhEQ/kXRANGDRP/+/g5AzTGw7UKXZR65qVtfv6R6jOmiPjQ+U0tjc1sU WIpdwy8ORltqQ5ZCExMe1q48F6mbUjRNz+zIaAAnKmAf5u9plluaFOxEolc+YlUj5Jb7 i10+7SlHNm3Q5uZlomxRqGz1e3NMvNqHizCO5cDsTWwZFNVft2WMlU6BSSiAdFhioVbY nFLv6yUF65nufvmu7MjOkYggPYVYkv8i9BfMOXMXB0v5Y9ffJIYWQiTKxnKo3xJDj854 INsxV/7lOg6/uHTlpW0D91nk3wOr6degNZITwIPJuvZyf5Eq/auZcLsLnQj0MOPuiTKf j9Qw== 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=K/RbMRXH+tC2fmTJM9CxU2swZJtOBhzqhQDwvzIlVX0=; b=j58q6/eYQKSiny75S21wdWi2w/8ngo2HdEZWa7eSQdErELMUVgtnSls1PCrIlfa4nh oX3cvHv0KILKtxl2Dn1iu/Df2jc68zCm0sL1S3Z+9OvDubQAEFPDjt/yjykDen0sHlGa twD4CY0dKe01JK126G/nfihDbOGU2Vlw4+Bl5s4nQn2UQNxNL5JaffEnw8Obtfi2lwvF SRlKsoDPBamwgs6XFcGTjT3QQCyYYjKdQ1INj/0Lr1oLCfO3vR4m+tuH2zTgIsRJ241+ L00rrbNOpoYSn08DZ5MoJan3frDTpGF8izJ7fNAJY1XV9kt1E0dl0DNXDS2w1vHuZVIJ 16yA== X-Gm-Message-State: APt69E0MSRo9Zv+r7eZ7CQVNXF7LPLuhmRv5npxabr64VfgFvhqndwF/ sOR+zpIJNUOPvGOkTI13/bHzWrtbvAQ= X-Google-Smtp-Source: ADUXVKL8nUtXdl7DB6lNlAYSKZNALVRB3uCbAlCq/jDxEor6laPWN4J9wWWeTSMr/pZZJHycfL0m7g== X-Received: by 2002:a17:902:2884:: with SMTP id f4-v6mr15864704plb.204.1529357760749; Mon, 18 Jun 2018 14:36:00 -0700 (PDT) Received: from xeon-e3.lan (204-195-35-107.wavecable.com. [204.195.35.107]) by smtp.gmail.com with ESMTPSA id n70-v6sm34246969pfh.140.2018.06.18.14.35.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Jun 2018 14:35:59 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Mon, 18 Jun 2018 14:35:55 -0700 Message-Id: <20180618213557.15209-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180618213557.15209-1-stephen@networkplumber.org> References: <20180618213557.15209-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH v3 1/3] 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: , X-List-Received-Date: Mon, 18 Jun 2018 21:36:02 -0000 Use RFC standard values 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 75807623c719..6d666e088fd9 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 | " @@ -625,6 +627,8 @@ launch_args_parse(int argc, char** argv) { "vxlan-gpe-port", 1, 0, 0 }, { "mlockall", 0, 0, 0 }, { "no-mlockall", 0, 0, 0 }, + { "tx-ip", 1, 0, 0 }, + { "tx-udp", 1, 0, 0 }, { 0, 0, 0, 0 }, }; @@ -717,6 +721,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 f51cd9dd9bbd..48f7b364e9b3 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -444,6 +444,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..689c53eb73f8 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 @@ -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 f301c2b6f709..ae9eb712e209 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``. -- 2.17.1