From patchwork Tue Apr 2 20:39:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 52133 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 641ED1B12A; Tue, 2 Apr 2019 22:39:16 +0200 (CEST) Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by dpdk.org (Postfix) with ESMTP id E27471B11C for ; Tue, 2 Apr 2019 22:39:12 +0200 (CEST) Received: by mail-pf1-f195.google.com with SMTP id 10so6953756pfo.5 for ; Tue, 02 Apr 2019 13:39: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=HJtX5V5FJIwTW/kG6PNsptsquwc233N/A/cg4MNE6CA=; b=Y+wYFipTnpm0G2rn2njITnaxZKmSwltIW9nATFXrE256gcPDRGF9+jUVgqJacvla+N gjCy7Y9HmW9LvpuZkm9TcSdf9UH4yyVM/ZS8eBFjF0StuLZ8nm/LqLy4RBRxU46DMSGd pBO8c0NaGGNYzyCi5lYBmGdAx3m6Gqrc3OmpdXgQYOriMRpMqvkQOR9sjOTC7igbGcYd zCbsInWJEt/Epb2r3mYqqkdPE1hrEmr1ydFKL+4kW5hSITbvvZzrdelQQKR9i9U6QPVE PsLsJoUNzs2k1Nu12YrJDLEJDnViBuumru9d/HauL0dohtwPBaM7GJgrGmoVqliP6Sby eGbg== 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=HJtX5V5FJIwTW/kG6PNsptsquwc233N/A/cg4MNE6CA=; b=A7GaKRqvZ5JzvsxeMnQACZHpYDPG5Xw6LSaVC499GoudWCa5+MbGsV7f2Izo7ZQurM zZx1vIvS2gaXZJLOmgnjUuALWER/vBgwEO68vfaor5xmVl3Lx2n8GPAz3+qyj9qrcljN PIctf7mT74JbC+6W0n6kKG0+ku5kyBHvX6NR78g8Ofsiqu1ID0lAAw44rnRIP0NN+QsF 4JSEc8REMbqUud0X0k3eNKtEa4v4xIQSoy+vEN0zrIhm8hfJkumkFonUMAXYzbP97EmY y2+NOOvd9sGOwjR4XxYNEyY6MOEoMzKB4946p1fGIXVnfVEfp7LBayAJKAKjwFN2KvdS mY1Q== X-Gm-Message-State: APjAAAXimgNR2LxsKLC3F1t5okB/SPA/w6wB2WD0jzsy62L9LQkvgNfE FUXk8coImsojW21dL6RPxAwVOADA+qKPkA== X-Google-Smtp-Source: APXvYqwN3Fz+Z2PRKAqVd9g7MtgEJwthiuH2BW1B24tgxCu6UbCiqFtJ3F9CflUA6BFEkH4jZubjog== X-Received: by 2002:aa7:9193:: with SMTP id x19mr62292766pfa.108.1554237551676; Tue, 02 Apr 2019 13:39: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 t64sm34191748pfa.86.2019.04.02.13.39.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Apr 2019 13:39:10 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Tue, 2 Apr 2019 13:39:05 -0700 Message-Id: <20190402203907.28679-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190402203907.28679-1-stephen@networkplumber.org> References: <20180618213557.15209-2-stephen@networkplumber.org> <20190402203907.28679-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH v4 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" Use RFC 2544 standard values for Tx only test as default IP address and port. But let the user override those values on command line. Signed-off-by: Stephen Hemminger --- v4 - update documentation to be more precise support new tx-multi-flow addresses app/test-pmd/parameters.c | 49 +++++++++++++++++++++++++++ app/test-pmd/testpmd.h | 6 ++++ app/test-pmd/txonly.c | 22 +++++++----- doc/guides/testpmd_app_ug/run_app.rst | 12 ++++++- 4 files changed, 79 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 def52a0487ea..ed5e715ea648 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. @@ -253,7 +255,9 @@ pkt_burst_transmit(struct fwd_stream *fs) * 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``. From patchwork Tue Apr 2 20:39:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 52134 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 9C6AC1B184; Tue, 2 Apr 2019 22:39:19 +0200 (CEST) Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by dpdk.org (Postfix) with ESMTP id 4397B1B13A for ; Tue, 2 Apr 2019 22:39:14 +0200 (CEST) Received: by mail-pl1-f196.google.com with SMTP id b65so6837811plb.6 for ; Tue, 02 Apr 2019 13:39:14 -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=ADwu+sB8FOuB6j+XjwKBgAnbwkO3j2SRWaMKmPAxYk8=; b=us+/zHwKeq2aPHafEUVA8cEazy3rYDRZFgkZz5WMwfDFP0IQzBuZFj9f3qbf22vfz5 M4WYW6NzawhFsiwN0ypReyZAFptnD2qvz3kqS7tNKaVBcDYxTPRh/c1+g4cMzLqsB3ja qxHxuuk3KKv7DYt+2eUkElxIbv+XtC5Bo9hcn89ZZbb0adUFM6RJ4pEbClSR9d+wc8He Xn0eOQ5HjdrsM1uWiHyQhoRVYzjKNqFO0MAxwJvkmyZFSeR+ScJMW6Exg/O90P/cqoeX 6SSxlNKzSRWdhj0kKPnMz/XSY7j6GQo2mwvkSGM8A6EIpgHQDVdWDWNNlmfPK9KyaVjx hw4g== 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=ADwu+sB8FOuB6j+XjwKBgAnbwkO3j2SRWaMKmPAxYk8=; b=BCkYoA3AgpgIZ7rox20nJyo1hNH0vMKvD0KGCQ7T3Is7gHl7+iZNDLaBrbyIBLiOUk PaCbat1f+8Oz1IPsxIG7nRQeogwqgyq8Z7dUJqhxRXnALeWhrYWS9AC2mLzFFou9yzgw Kskh5wHbHMbiFJNjK2Fki7iqHMWAza/KJK1rLJLBJlwYlyArAPBJg+cV1KwPfDcKpQK0 WtwSrM8ZWWSMuwuwbZUj3JjEwNZH0BDHGZ4h7wRyLrKc8zunlO/UCAtEssfpYZYH+9Pl sPWPGZ08SQsvJxumosQiWDuIkElQPvJtmHXQCp50T6labOnqzxEXPtCB6IF1W4h/Z2k5 b7ag== X-Gm-Message-State: APjAAAU7/PRSXfCIO7qsRLWKP3mvMb8fMN2cy46l0rQzFkvoRFHcLVZR DTatJmh0EEA70qqBPDTeP1L+IgFnPLfcaA== X-Google-Smtp-Source: APXvYqyYUFYjyy8dUq9H2zSroqrq6fRREVIkJ6M73N6YvZhiuAYx8BQTNaSYCLON3Hugc0PnsEIQLA== X-Received: by 2002:a17:902:e109:: with SMTP id cc9mr19960830plb.148.1554237553048; Tue, 02 Apr 2019 13:39:13 -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 t64sm34191748pfa.86.2019.04.02.13.39.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Apr 2019 13:39:11 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Tue, 2 Apr 2019 13:39:06 -0700 Message-Id: <20190402203907.28679-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190402203907.28679-1-stephen@networkplumber.org> References: <20180618213557.15209-2-stephen@networkplumber.org> <20190402203907.28679-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH v4 2/3] examples/l3fwd: use reserved IPv4/IPv6 addresses 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" The l3fwd example should use the IPv4 addresses defined in RFC5735 and the IPv6 addresses defined in RFC5180 for the L3 forwarding example Longest Prefix Match table. Signed-off-by: Stephen Hemminger --- v4 - fix IPv6 /48 entries examples/l3fwd/l3fwd_lpm.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/examples/l3fwd/l3fwd_lpm.c b/examples/l3fwd/l3fwd_lpm.c index b1dc195ad8cb..3191fc4c2639 100644 --- a/examples/l3fwd/l3fwd_lpm.c +++ b/examples/l3fwd/l3fwd_lpm.c @@ -39,26 +39,28 @@ struct ipv6_l3fwd_lpm_route { uint8_t if_out; }; +/* 192.18.0.0/16 are set aside for RFC2544 benchmarking. */ static struct ipv4_l3fwd_lpm_route ipv4_l3fwd_lpm_route_array[] = { - {IPv4(1, 1, 1, 0), 24, 0}, - {IPv4(2, 1, 1, 0), 24, 1}, - {IPv4(3, 1, 1, 0), 24, 2}, - {IPv4(4, 1, 1, 0), 24, 3}, - {IPv4(5, 1, 1, 0), 24, 4}, - {IPv4(6, 1, 1, 0), 24, 5}, - {IPv4(7, 1, 1, 0), 24, 6}, - {IPv4(8, 1, 1, 0), 24, 7}, + {IPv4(192, 18, 0, 0), 24, 0}, + {IPv4(192, 18, 1, 0), 24, 1}, + {IPv4(192, 18, 2, 0), 24, 2}, + {IPv4(192, 18, 3, 0), 24, 3}, + {IPv4(192, 18, 4, 0), 24, 4}, + {IPv4(192, 18, 5, 0), 24, 5}, + {IPv4(192, 18, 6, 0), 24, 6}, + {IPv4(192, 18, 7, 0), 24, 7}, }; +/* 2001:0200::/48 is IANA reserved range for IPv6 benchmarking (RFC5180) */ static struct ipv6_l3fwd_lpm_route ipv6_l3fwd_lpm_route_array[] = { - {{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, 48, 0}, - {{2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, 48, 1}, - {{3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, 48, 2}, - {{4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, 48, 3}, - {{5, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, 48, 4}, - {{6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, 48, 5}, - {{7, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, 48, 6}, - {{8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, 48, 7}, + {{32, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 48, 0}, + {{32, 1, 2, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, 48, 1}, + {{32, 1, 2, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0}, 48, 2}, + {{32, 1, 2, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0}, 48, 3}, + {{32, 1, 2, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0}, 48, 4}, + {{32, 1, 2, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0}, 48, 5}, + {{32, 1, 2, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0}, 48, 6}, + {{32, 1, 2, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0}, 48, 7}, }; #define IPV4_L3FWD_LPM_NUM_ROUTES \ From patchwork Tue Apr 2 20:39:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 52135 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 0DA7D1B1F5; Tue, 2 Apr 2019 22:39:23 +0200 (CEST) Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) by dpdk.org (Postfix) with ESMTP id 995341B13F for ; Tue, 2 Apr 2019 22:39:15 +0200 (CEST) Received: by mail-pl1-f194.google.com with SMTP id d1so5144667plj.8 for ; Tue, 02 Apr 2019 13:39:15 -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=rsu/zd9+WjV0lAvraEaCr9X8lrfbEF661yFytoN2VXA=; b=nGBvCd/Dteu7/B4sxuQZFSxMZPt74hLkeXzhA3zPS6GTeh8CHeC47jQXxxO7u0VCH8 +2I73ZgPhoV0Uhm63Hh+i4i1fGK0+UPwTzdO9uFiHNZxdwA2XLpiman52YugpFlKnvYF yXcGJoIHhsGp6NNYI563b9KYzMEAyQ3X8Mt/49VbQX14Gi8wLnQmsvAc141ePehtKV30 Ykhs+eHOKLj1LUTdT6DfveXbqySDQsDMpmj+C1q2H0pTmx5zXyXNnzwhzHhGOKGdsZEd c0GzDDLcQfSzwr7HtqnmJyRR1aVVMhOnoN7x3uoql8cxjvXxjAlHiK/2yxgnpxaS59Vc wDjQ== 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=rsu/zd9+WjV0lAvraEaCr9X8lrfbEF661yFytoN2VXA=; b=tnULVVlIREP1gwruSLCMK7AyfvPbQTrgZAQm0Av3yhXdCfg9rifEWZPK55Onox7Lwl Mr8FytEuJD8C6WDOppXwc5X8nj6q7xO9ZRmp9nR7HlHkvLb0iiJPBhm32Y5zeNUdm3kI fboSiDlR/z5GWbRm08EoXkOJECR9CBPg+9w+FaxUguMscieCFCf7e+0iFxmDHCBJkuWJ +X4Dxz5VUFd0uZfrutyuk9VK5Focl4hVKHpWp3q5/HamiqyG2AtNzSdmA9O+vHzWHyZf Ys9gRdSt1afwX0N04tiznOpwclB4h/Gw18O0FBBDo0qv/N3f7VN4MewGt6I4PU6wc2BO tSEw== X-Gm-Message-State: APjAAAVDQmwGPYxiV4ouAeqiief6iIO0YQFtSFAT4nL6a135Qr5tt6N5 vj5oMXPwimzHa5sq6Hy61NvILKkDzK/6xQ== X-Google-Smtp-Source: APXvYqyJ2g3EyWIfLiSHUsbjAlAMctmP1LLNmcF6Py727K3rUKOTzOwTt2zOfm7xPaTeXldhh997DA== X-Received: by 2002:a17:902:b28b:: with SMTP id u11mr22236049plr.257.1554237554491; Tue, 02 Apr 2019 13:39:14 -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 t64sm34191748pfa.86.2019.04.02.13.39.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Apr 2019 13:39:13 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Tue, 2 Apr 2019 13:39:07 -0700 Message-Id: <20190402203907.28679-4-stephen@networkplumber.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190402203907.28679-1-stephen@networkplumber.org> References: <20180618213557.15209-2-stephen@networkplumber.org> <20190402203907.28679-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH v4 3/3] examples/l3fwd: format the IP addresses for printing 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" The IP addresses should be formatted using standard routines rather than dumpin in raw hex. Signed-off-by: Stephen Hemminger Acked-by: Bernard Iremonger --- v4 - remove fixes, the original output was raw but not a bug examples/l3fwd/l3fwd_lpm.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/examples/l3fwd/l3fwd_lpm.c b/examples/l3fwd/l3fwd_lpm.c index 3191fc4c2639..172a036b2707 100644 --- a/examples/l3fwd/l3fwd_lpm.c +++ b/examples/l3fwd/l3fwd_lpm.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include @@ -260,6 +261,7 @@ setup_lpm(const int socketid) unsigned i; int ret; char s[64]; + char abuf[INET6_ADDRSTRLEN]; /* create the LPM table */ config_ipv4.max_rules = IPV4_L3FWD_LPM_MAX_RULES; @@ -275,6 +277,7 @@ setup_lpm(const int socketid) /* populate the LPM table */ for (i = 0; i < IPV4_L3FWD_LPM_NUM_ROUTES; i++) { + struct in_addr in; /* skip unused ports */ if ((1 << ipv4_l3fwd_lpm_route_array[i].if_out & @@ -292,8 +295,9 @@ setup_lpm(const int socketid) i, socketid); } - printf("LPM: Adding route 0x%08x / %d (%d)\n", - (unsigned)ipv4_l3fwd_lpm_route_array[i].ip, + in.s_addr = htonl(ipv4_l3fwd_lpm_route_array[i].ip); + printf("LPM: Adding route %s / %d (%d)\n", + inet_ntop(AF_INET, &in, abuf, sizeof(abuf)), ipv4_l3fwd_lpm_route_array[i].depth, ipv4_l3fwd_lpm_route_array[i].if_out); } @@ -331,9 +335,10 @@ setup_lpm(const int socketid) } printf("LPM: Adding route %s / %d (%d)\n", - "IPV6", - ipv6_l3fwd_lpm_route_array[i].depth, - ipv6_l3fwd_lpm_route_array[i].if_out); + inet_ntop(AF_INET6, ipv6_l3fwd_lpm_route_array[i].ip, + abuf, sizeof(abuf)), + ipv6_l3fwd_lpm_route_array[i].depth, + ipv6_l3fwd_lpm_route_array[i].if_out); } }