examples/l3fwd: use correct IP reserved address range

Message ID 20191105160921.6951-1-stephen@networkplumber.org (mailing list archive)
State Accepted, archived
Delegated to: David Marchand
Headers
Series examples/l3fwd: use correct IP reserved address range |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-compilation success Compile Testing PASS
ci/Intel-compilation success Compilation OK
ci/iol-mellanox-Performance success Performance Testing PASS
ci/travis-robot success Travis build: passed

Commit Message

Stephen Hemminger Nov. 5, 2019, 4:09 p.m. UTC
  The original patch used incorrect subnet range for testing.

Fixes: 37afe381bde4 ("examples/l3fwd: use reserved IP addresses")
Reported-by: Ferruh Yigit <ferruh.yigit@intel.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 doc/guides/testpmd_app_ug/run_app.rst |  6 +++---
 examples/l3fwd/l3fwd_lpm.c            | 18 +++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)
  

Comments

Ferruh Yigit Nov. 5, 2019, 4:12 p.m. UTC | #1
On 11/5/2019 4:09 PM, Stephen Hemminger wrote:
> The original patch used incorrect subnet range for testing.
> 
> Fixes: 37afe381bde4 ("examples/l3fwd: use reserved IP addresses")
> Reported-by: Ferruh Yigit <ferruh.yigit@intel.com>

I guess this is:
Reported-by: Hemant Agrawal <hemant.agrawal@nxp.com>

> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
> ---
>  doc/guides/testpmd_app_ug/run_app.rst |  6 +++---
>  examples/l3fwd/l3fwd_lpm.c            | 18 +++++++++---------
>  2 files changed, 12 insertions(+), 12 deletions(-)
> 
> diff --git a/doc/guides/testpmd_app_ug/run_app.rst b/doc/guides/testpmd_app_ug/run_app.rst
> index 00e0c2ac5152..858cec7e0b0b 100644
> --- a/doc/guides/testpmd_app_ug/run_app.rst
> +++ b/doc/guides/testpmd_app_ug/run_app.rst
> @@ -129,9 +129,9 @@ The command line options are:
>  *   ``--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 benchmarking (RFC 2544).
> +    The defaults address values are source 198.18.0.1 and
> +    destination 198.18.0.2. These are special purpose addresses
> +    reserved for benchmarking (RFC 5735).
>  
>  *   ``--tx-udp=SRC[,DST]``
>  
> diff --git a/examples/l3fwd/l3fwd_lpm.c b/examples/l3fwd/l3fwd_lpm.c
> index a3a65f7fc814..349de2703cd1 100644
> --- a/examples/l3fwd/l3fwd_lpm.c
> +++ b/examples/l3fwd/l3fwd_lpm.c
> @@ -41,16 +41,16 @@ struct ipv6_l3fwd_lpm_route {
>  	uint8_t  if_out;
>  };
>  
> -/* 192.18.0.0/16 are set aside for RFC2544 benchmarking. */
> +/* 198.18.0.0/16 are set aside for RFC2544 benchmarking (RFC5735). */
>  static struct ipv4_l3fwd_lpm_route ipv4_l3fwd_lpm_route_array[] = {
> -	{RTE_IPV4(192, 18, 0, 0), 24, 0},
> -	{RTE_IPV4(192, 18, 1, 0), 24, 1},
> -	{RTE_IPV4(192, 18, 2, 0), 24, 2},
> -	{RTE_IPV4(192, 18, 3, 0), 24, 3},
> -	{RTE_IPV4(192, 18, 4, 0), 24, 4},
> -	{RTE_IPV4(192, 18, 5, 0), 24, 5},
> -	{RTE_IPV4(192, 18, 6, 0), 24, 6},
> -	{RTE_IPV4(192, 18, 7, 0), 24, 7},
> +	{RTE_IPV4(198, 18, 0, 0), 24, 0},
> +	{RTE_IPV4(198, 18, 1, 0), 24, 1},
> +	{RTE_IPV4(198, 18, 2, 0), 24, 2},
> +	{RTE_IPV4(198, 18, 3, 0), 24, 3},
> +	{RTE_IPV4(198, 18, 4, 0), 24, 4},
> +	{RTE_IPV4(198, 18, 5, 0), 24, 5},
> +	{RTE_IPV4(198, 18, 6, 0), 24, 6},
> +	{RTE_IPV4(198, 18, 7, 0), 24, 7},
>  };
>  
>  /* 2001:0200::/48 is IANA reserved range for IPv6 benchmarking (RFC5180) */
>
  
Stephen Hemminger Nov. 5, 2019, 4:32 p.m. UTC | #2
On Tue, 5 Nov 2019 16:12:31 +0000
Ferruh Yigit <ferruh.yigit@intel.com> wrote:

> On 11/5/2019 4:09 PM, Stephen Hemminger wrote:
> > The original patch used incorrect subnet range for testing.
> > 
> > Fixes: 37afe381bde4 ("examples/l3fwd: use reserved IP addresses")
> > Reported-by: Ferruh Yigit <ferruh.yigit@intel.com>  
> 
> I guess this is:
> Reported-by: Hemant Agrawal <hemant.agrawal@nxp.com>

Go ahead add both!
  
Hemant Agrawal Nov. 6, 2019, 5:36 a.m. UTC | #3
> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Stephen Hemminger
> Sent: Tuesday, November 5, 2019 9:39 PM
> To: dev@dpdk.org
> Cc: Stephen Hemminger <stephen@networkplumber.org>; Ferruh Yigit
> <ferruh.yigit@intel.com>
> Subject: [dpdk-dev] [PATCH] examples/l3fwd: use correct IP reserved
> address range
> 
> The original patch used incorrect subnet range for testing.
> 
> Fixes: 37afe381bde4 ("examples/l3fwd: use reserved IP addresses")

[Hemant]  better to also add Cc: stable@dpdk.org
Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>
  
David Marchand Nov. 7, 2019, 8:52 p.m. UTC | #4
Stephen,

Do we want to fix testpmd?

$ git grep 192.*18 origin/master -- app/test-pmd/
origin/master:app/test-pmd/txonly.c:uint32_t tx_ip_src_addr = (192U <<
24) | (18 << 16) | (0 << 8) | 1;
origin/master:app/test-pmd/txonly.c:uint32_t tx_ip_dst_addr = (192U <<
24) | (18 << 16) | (0 << 8) | 2;

Commit bf5b2126bf44 ("app/testpmd: add ability to set Tx IP and UDP parameters")


I will take this patch on the example, for now.

On Wed, Nov 6, 2019 at 6:36 AM Hemant Agrawal <hemant.agrawal@nxp.com> wrote:
>
> > -----Original Message-----
> > From: dev <dev-bounces@dpdk.org> On Behalf Of Stephen Hemminger
> > Sent: Tuesday, November 5, 2019 9:39 PM
> > To: dev@dpdk.org
> > Cc: Stephen Hemminger <stephen@networkplumber.org>; Ferruh Yigit
> > <ferruh.yigit@intel.com>
> > Subject: [dpdk-dev] [PATCH] examples/l3fwd: use correct IP reserved
> > address range
> >
> > The original patch used incorrect subnet range for testing.
> >
> > Fixes: 37afe381bde4 ("examples/l3fwd: use reserved IP addresses")
>
> [Hemant]  better to also add Cc: stable@dpdk.org

Yes.

> Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>

Applied, thanks.
  
Stephen Hemminger Nov. 8, 2019, 3:24 a.m. UTC | #5
On Thu, 7 Nov 2019 21:52:47 +0100
David Marchand <david.marchand@redhat.com> wrote:

> Stephen,
> 
> Do we want to fix testpmd?
> 
> $ git grep 192.*18 origin/master -- app/test-pmd/
> origin/master:app/test-pmd/txonly.c:uint32_t tx_ip_src_addr = (192U <<
> 24) | (18 << 16) | (0 << 8) | 1;
> origin/master:app/test-pmd/txonly.c:uint32_t tx_ip_dst_addr = (192U <<
> 24) | (18 << 16) | (0 << 8) | 2;
> 
> Commit bf5b2126bf44 ("app/testpmd: add ability to set Tx IP and UDP parameters")
> 

Yes, that should be fixed.
Ideally it should use a string instead of hardcoding shifts.
  

Patch

diff --git a/doc/guides/testpmd_app_ug/run_app.rst b/doc/guides/testpmd_app_ug/run_app.rst
index 00e0c2ac5152..858cec7e0b0b 100644
--- a/doc/guides/testpmd_app_ug/run_app.rst
+++ b/doc/guides/testpmd_app_ug/run_app.rst
@@ -129,9 +129,9 @@  The command line options are:
 *   ``--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 benchmarking (RFC 2544).
+    The defaults address values are source 198.18.0.1 and
+    destination 198.18.0.2. These are special purpose addresses
+    reserved for benchmarking (RFC 5735).
 
 *   ``--tx-udp=SRC[,DST]``
 
diff --git a/examples/l3fwd/l3fwd_lpm.c b/examples/l3fwd/l3fwd_lpm.c
index a3a65f7fc814..349de2703cd1 100644
--- a/examples/l3fwd/l3fwd_lpm.c
+++ b/examples/l3fwd/l3fwd_lpm.c
@@ -41,16 +41,16 @@  struct ipv6_l3fwd_lpm_route {
 	uint8_t  if_out;
 };
 
-/* 192.18.0.0/16 are set aside for RFC2544 benchmarking. */
+/* 198.18.0.0/16 are set aside for RFC2544 benchmarking (RFC5735). */
 static struct ipv4_l3fwd_lpm_route ipv4_l3fwd_lpm_route_array[] = {
-	{RTE_IPV4(192, 18, 0, 0), 24, 0},
-	{RTE_IPV4(192, 18, 1, 0), 24, 1},
-	{RTE_IPV4(192, 18, 2, 0), 24, 2},
-	{RTE_IPV4(192, 18, 3, 0), 24, 3},
-	{RTE_IPV4(192, 18, 4, 0), 24, 4},
-	{RTE_IPV4(192, 18, 5, 0), 24, 5},
-	{RTE_IPV4(192, 18, 6, 0), 24, 6},
-	{RTE_IPV4(192, 18, 7, 0), 24, 7},
+	{RTE_IPV4(198, 18, 0, 0), 24, 0},
+	{RTE_IPV4(198, 18, 1, 0), 24, 1},
+	{RTE_IPV4(198, 18, 2, 0), 24, 2},
+	{RTE_IPV4(198, 18, 3, 0), 24, 3},
+	{RTE_IPV4(198, 18, 4, 0), 24, 4},
+	{RTE_IPV4(198, 18, 5, 0), 24, 5},
+	{RTE_IPV4(198, 18, 6, 0), 24, 6},
+	{RTE_IPV4(198, 18, 7, 0), 24, 7},
 };
 
 /* 2001:0200::/48 is IANA reserved range for IPv6 benchmarking (RFC5180) */