From: "Medvedkin, Vladimir" <vladimir.medvedkin@intel.com>
To: "Walsh, Conor" <conor.walsh@intel.com>,
"jerinj@marvell.com" <jerinj@marvell.com>,
"stephen@networkplumber.org" <stephen@networkplumber.org>,
"Iremonger, Bernard" <bernard.iremonger@intel.com>,
"Ananyev, Konstantin" <konstantin.ananyev@intel.com>
Cc: "dev@dpdk.org" <dev@dpdk.org>
Subject: Re: [dpdk-dev] [PATCH v3 2/5] examples/l3fwd: move l3fwd routes to common header
Date: Mon, 8 Mar 2021 10:42:23 +0000 [thread overview]
Message-ID: <c4475250-1669-8291-3375-eeac982d6897@intel.com> (raw)
In-Reply-To: <20210219150945.2071651-3-conor.walsh@intel.com>
On 19/02/2021 15:09, Walsh, Conor wrote:
> To prevent code duplication from the addition of lookup methods
> the routes specified in lpm should be moved to a common header.
>
> Signed-off-by: Conor Walsh <conor.walsh@intel.com>
> ---
> examples/l3fwd/l3fwd_common_route.h | 48 +++++++++++++++++++
> examples/l3fwd/l3fwd_lpm.c | 74 +++++++----------------------
> 2 files changed, 65 insertions(+), 57 deletions(-)
> create mode 100644 examples/l3fwd/l3fwd_common_route.h
>
> diff --git a/examples/l3fwd/l3fwd_common_route.h b/examples/l3fwd/l3fwd_common_route.h
> new file mode 100644
> index 0000000000..7f0125a8a5
> --- /dev/null
> +++ b/examples/l3fwd/l3fwd_common_route.h
> @@ -0,0 +1,48 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + * Copyright(c) 2021 Intel Corporation
> + */
> +
> +#include <stdint.h>
> +#include <rte_ip.h>
> +
> +struct ipv4_l3fwd_common_route {
> +uint32_t ip;
> +uint8_t depth;
> +uint8_t if_out;
> +};
> +
> +struct ipv6_l3fwd_common_route {
> +uint8_t ip[16];
> +uint8_t depth;
> +uint8_t if_out;
> +};
> +
> +/*
> + * 198.18.0.0/16 are set aside for RFC2544 benchmarking (RFC5735).
> + * 198.18.{0-7}.0/24 = Port {0-7}
> + */
> +static const struct ipv4_l3fwd_common_route ipv4_l3fwd_common_route_array[] = {
> +{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:200::/48 is IANA reserved range for IPv6 benchmarking (RFC5180).
> + * 2001:200:0:{0-7}::/64 = Port {0-7}
> + */
> +static const struct ipv6_l3fwd_common_route ipv6_l3fwd_common_route_array[] = {
> +{{32, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 0},
> +{{32, 1, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 1},
> +{{32, 1, 2, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 2},
> +{{32, 1, 2, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 3},
> +{{32, 1, 2, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 4},
> +{{32, 1, 2, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 5},
> +{{32, 1, 2, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 6},
> +{{32, 1, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 7},
> +};
> diff --git a/examples/l3fwd/l3fwd_lpm.c b/examples/l3fwd/l3fwd_lpm.c
> index 1cfaf36572..818cf717d1 100644
> --- a/examples/l3fwd/l3fwd_lpm.c
> +++ b/examples/l3fwd/l3fwd_lpm.c
> @@ -30,47 +30,7 @@
> #include "l3fwd.h"
> #include "l3fwd_event.h"
>
> -struct ipv4_l3fwd_lpm_route {
> -uint32_t ip;
> -uint8_t depth;
> -uint8_t if_out;
> -};
> -
> -struct ipv6_l3fwd_lpm_route {
> -uint8_t ip[16];
> -uint8_t depth;
> -uint8_t if_out;
> -};
> -
> -/*
> - * 198.18.0.0/16 are set aside for RFC2544 benchmarking (RFC5735).
> - * 198.18.{0-7}.0/24 = Port {0-7}
> - */
> -static const struct ipv4_l3fwd_lpm_route ipv4_l3fwd_lpm_route_array[] = {
> -{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:200::/48 is IANA reserved range for IPv6 benchmarking (RFC5180).
> - * 2001:200:0:{0-7}::/64 = Port {0-7}
> - */
> -static const struct ipv6_l3fwd_lpm_route ipv6_l3fwd_lpm_route_array[] = {
> -{{32, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 0},
> -{{32, 1, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 1},
> -{{32, 1, 2, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 2},
> -{{32, 1, 2, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 3},
> -{{32, 1, 2, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 4},
> -{{32, 1, 2, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 5},
> -{{32, 1, 2, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 6},
> -{{32, 1, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 7},
> -};
> +#include "l3fwd_common_route.h"
>
> #define IPV4_L3FWD_LPM_MAX_RULES 1024
> #define IPV4_L3FWD_LPM_NUMBER_TBL8S (1 << 8)
> @@ -485,18 +445,18 @@ setup_lpm(const int socketid)
> socketid);
>
> /* populate the LPM table */
> -for (i = 0; i < RTE_DIM(ipv4_l3fwd_lpm_route_array); i++) {
> +for (i = 0; i < RTE_DIM(ipv4_l3fwd_common_route_array); i++) {
> struct in_addr in;
>
> /* skip unused ports */
> -if ((1 << ipv4_l3fwd_lpm_route_array[i].if_out &
> +if ((1 << ipv4_l3fwd_common_route_array[i].if_out &
> enabled_port_mask) == 0)
> continue;
>
> ret = rte_lpm_add(ipv4_l3fwd_lpm_lookup_struct[socketid],
> -ipv4_l3fwd_lpm_route_array[i].ip,
> -ipv4_l3fwd_lpm_route_array[i].depth,
> -ipv4_l3fwd_lpm_route_array[i].if_out);
> +ipv4_l3fwd_common_route_array[i].ip,
> +ipv4_l3fwd_common_route_array[i].depth,
> +ipv4_l3fwd_common_route_array[i].if_out);
>
> if (ret < 0) {
> rte_exit(EXIT_FAILURE,
> @@ -504,11 +464,11 @@ setup_lpm(const int socketid)
> i, socketid);
> }
>
> -in.s_addr = htonl(ipv4_l3fwd_lpm_route_array[i].ip);
> +in.s_addr = htonl(ipv4_l3fwd_common_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);
> +ipv4_l3fwd_common_route_array[i].depth,
> +ipv4_l3fwd_common_route_array[i].if_out);
> }
>
> /* create the LPM6 table */
> @@ -525,17 +485,17 @@ setup_lpm(const int socketid)
> socketid);
>
> /* populate the LPM table */
> -for (i = 0; i < RTE_DIM(ipv6_l3fwd_lpm_route_array); i++) {
> +for (i = 0; i < RTE_DIM(ipv6_l3fwd_common_route_array); i++) {
>
> /* skip unused ports */
> -if ((1 << ipv6_l3fwd_lpm_route_array[i].if_out &
> +if ((1 << ipv6_l3fwd_common_route_array[i].if_out &
> enabled_port_mask) == 0)
> continue;
>
> ret = rte_lpm6_add(ipv6_l3fwd_lpm_lookup_struct[socketid],
> -ipv6_l3fwd_lpm_route_array[i].ip,
> -ipv6_l3fwd_lpm_route_array[i].depth,
> -ipv6_l3fwd_lpm_route_array[i].if_out);
> +ipv6_l3fwd_common_route_array[i].ip,
> +ipv6_l3fwd_common_route_array[i].depth,
> +ipv6_l3fwd_common_route_array[i].if_out);
>
> if (ret < 0) {
> rte_exit(EXIT_FAILURE,
> @@ -544,10 +504,10 @@ setup_lpm(const int socketid)
> }
>
> printf("LPM: Adding route %s / %d (%d)\n",
> - inet_ntop(AF_INET6, ipv6_l3fwd_lpm_route_array[i].ip,
> + inet_ntop(AF_INET6, ipv6_l3fwd_common_route_array[i].ip,
> abuf, sizeof(abuf)),
> - ipv6_l3fwd_lpm_route_array[i].depth,
> - ipv6_l3fwd_lpm_route_array[i].if_out);
> + ipv6_l3fwd_common_route_array[i].depth,
> + ipv6_l3fwd_common_route_array[i].if_out);
> }
> }
>
> --
> 2.25.1
>
Acked-by: Vladimir Medvedkin <vladimir.medvedkin@intel.com>
--
Regards,
Vladimir
next prev parent reply other threads:[~2021-03-08 10:42 UTC|newest]
Thread overview: 77+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-18 12:15 [dpdk-dev] [PATCH 0/5] examples/l3fwd: add FIB lookup method to l3fwd Conor Walsh
2021-02-18 12:15 ` [dpdk-dev] [PATCH 1/5] examples/l3fwd: fix LPM IPv6 subnets Conor Walsh
2021-02-18 12:15 ` [dpdk-dev] [PATCH 2/5] examples/l3fwd: move l3fwd routes to common header Conor Walsh
2021-02-18 12:15 ` [dpdk-dev] [PATCH 3/5] examples/l3fwd: add FIB infrastructure Conor Walsh
2021-02-18 12:15 ` [dpdk-dev] [PATCH 4/5] examples/l3fwd: implement FIB lookup method Conor Walsh
2021-02-18 12:15 ` [dpdk-dev] [PATCH 5/5] doc/guides/l3_forward: update documentation for FIB Conor Walsh
2021-02-18 15:20 ` [dpdk-dev] [PATCH v2 0/5] examples/l3fwd: add FIB lookup method to l3fwd Conor Walsh
2021-02-18 15:20 ` [dpdk-dev] [PATCH v2 1/5] examples/l3fwd: fix LPM IPv6 subnets Conor Walsh
2021-02-18 15:20 ` [dpdk-dev] [PATCH v2 2/5] examples/l3fwd: move l3fwd routes to common header Conor Walsh
2021-02-18 15:20 ` [dpdk-dev] [PATCH v2 3/5] examples/l3fwd: add FIB infrastructure Conor Walsh
2021-02-18 15:20 ` [dpdk-dev] [PATCH v2 4/5] examples/l3fwd: implement FIB lookup method Conor Walsh
2021-02-18 15:20 ` [dpdk-dev] [PATCH v2 5/5] doc/guides/l3_forward: update documentation for FIB Conor Walsh
2021-02-19 15:09 ` [dpdk-dev] [PATCH v3 0/5] examples/l3fwd: add FIB lookup method to l3fwd Conor Walsh
2021-02-19 15:09 ` [dpdk-dev] [PATCH v3 1/5] examples/l3fwd: fix LPM IPv6 subnets Conor Walsh
2021-03-08 10:41 ` Medvedkin, Vladimir
2021-02-19 15:09 ` [dpdk-dev] [PATCH v3 2/5] examples/l3fwd: move l3fwd routes to common header Conor Walsh
2021-03-02 16:20 ` Ananyev, Konstantin
2021-03-08 10:42 ` Medvedkin, Vladimir [this message]
2021-02-19 15:09 ` [dpdk-dev] [PATCH v3 3/5] examples/l3fwd: add FIB infrastructure Conor Walsh
2021-03-02 16:22 ` Ananyev, Konstantin
2021-03-03 11:36 ` Burakov, Anatoly
2021-03-08 15:13 ` Walsh, Conor
2021-03-08 10:42 ` Medvedkin, Vladimir
2021-02-19 15:09 ` [dpdk-dev] [PATCH v3 4/5] examples/l3fwd: implement FIB lookup method Conor Walsh
2021-03-02 16:21 ` Ananyev, Konstantin
2021-03-03 11:52 ` Burakov, Anatoly
2021-03-08 15:35 ` Walsh, Conor
2021-03-08 10:43 ` Medvedkin, Vladimir
2021-03-08 17:20 ` Walsh, Conor
2021-02-19 15:09 ` [dpdk-dev] [PATCH v3 5/5] doc/guides/l3_forward: update documentation for FIB Conor Walsh
2021-03-11 12:01 ` [dpdk-dev] [PATCH v4 0/5] examples/l3fwd: add FIB lookup method to l3fwd Conor Walsh
2021-03-11 12:01 ` [dpdk-dev] [PATCH v4 1/5] examples/l3fwd: fix LPM IPv6 subnets Conor Walsh
2021-03-11 12:01 ` [dpdk-dev] [PATCH v4 2/5] examples/l3fwd: move l3fwd routes to common header Conor Walsh
2021-03-11 12:01 ` [dpdk-dev] [PATCH v4 3/5] examples/l3fwd: add FIB infrastructure Conor Walsh
2021-03-11 12:01 ` [dpdk-dev] [PATCH v4 4/5] examples/l3fwd: implement FIB lookup method Conor Walsh
2021-03-12 18:56 ` Medvedkin, Vladimir
2021-03-15 10:21 ` Walsh, Conor
2021-03-11 12:01 ` [dpdk-dev] [PATCH v4 5/5] doc/guides/l3_forward: update documentation for FIB Conor Walsh
2021-03-15 11:34 ` [dpdk-dev] [PATCH v5 0/5] examples/l3fwd: add FIB lookup method to l3fwd Conor Walsh
2021-03-15 11:34 ` [dpdk-dev] [PATCH v5 1/5] examples/l3fwd: fix LPM IPv6 subnets Conor Walsh
2021-03-15 11:34 ` [dpdk-dev] [PATCH v5 2/5] examples/l3fwd: move l3fwd routes to common header Conor Walsh
2021-03-15 11:34 ` [dpdk-dev] [PATCH v5 3/5] examples/l3fwd: add FIB infrastructure Conor Walsh
2021-04-01 11:20 ` Burakov, Anatoly
2021-04-01 12:59 ` Walsh, Conor
2021-03-15 11:34 ` [dpdk-dev] [PATCH v5 4/5] examples/l3fwd: implement FIB lookup method Conor Walsh
2021-03-16 18:46 ` Medvedkin, Vladimir
2021-03-15 11:34 ` [dpdk-dev] [PATCH v5 5/5] doc/guides/l3_forward: update documentation for FIB Conor Walsh
2021-03-18 19:45 ` Mcnamara, John
2021-04-02 10:52 ` [dpdk-dev] [PATCH v6 0/5] examples/l3fwd: add FIB lookup method to l3fwd Conor Walsh
2021-04-02 10:52 ` [dpdk-dev] [PATCH v6 1/5] examples/l3fwd: fix LPM IPv6 subnets Conor Walsh
2021-04-02 10:52 ` [dpdk-dev] [PATCH v6 2/5] examples/l3fwd: move l3fwd routes to common header Conor Walsh
2021-04-02 10:52 ` [dpdk-dev] [PATCH v6 3/5] examples/l3fwd: add FIB infrastructure Conor Walsh
2021-04-02 16:34 ` Burakov, Anatoly
2021-04-06 11:05 ` Walsh, Conor
2021-04-02 10:52 ` [dpdk-dev] [PATCH v6 4/5] examples/l3fwd: implement FIB lookup method Conor Walsh
2021-04-02 10:52 ` [dpdk-dev] [PATCH v6 5/5] doc/guides/l3_forward: update documentation for FIB Conor Walsh
2021-04-06 11:11 ` [dpdk-dev] [PATCH v7 0/5] examples/l3fwd: add FIB lookup method to l3fwd Conor Walsh
2021-04-06 11:11 ` [dpdk-dev] [PATCH v7 1/5] examples/l3fwd: fix LPM IPv6 subnets Conor Walsh
2021-04-14 20:59 ` David Marchand
2021-04-15 8:44 ` Walsh, Conor
2021-04-15 14:31 ` David Marchand
2021-04-15 15:18 ` Walsh, Conor
2021-04-06 11:11 ` [dpdk-dev] [PATCH v7 2/5] examples/l3fwd: move l3fwd routes to common header Conor Walsh
2021-04-15 14:38 ` David Marchand
2021-04-06 11:11 ` [dpdk-dev] [PATCH v7 3/5] examples/l3fwd: add FIB infrastructure Conor Walsh
2021-04-06 11:11 ` [dpdk-dev] [PATCH v7 4/5] examples/l3fwd: implement FIB lookup method Conor Walsh
2021-04-15 14:42 ` David Marchand
2021-04-06 11:11 ` [dpdk-dev] [PATCH v7 5/5] doc/guides/l3_forward: update documentation for FIB Conor Walsh
2021-04-15 14:43 ` David Marchand
2021-04-15 14:59 ` David Marchand
2021-04-16 17:19 ` [dpdk-dev] [PATCH v8 0/5] examples/l3fwd: add FIB lookup method to l3fwd Conor Walsh
2021-04-16 17:19 ` [dpdk-dev] [PATCH v8 1/5] examples/l3fwd: fix LPM IPv6 subnets Conor Walsh
2021-04-16 17:19 ` [dpdk-dev] [PATCH v8 2/5] examples/l3fwd: move l3fwd routes to common header Conor Walsh
2021-04-16 17:19 ` [dpdk-dev] [PATCH v8 3/5] examples/l3fwd: add FIB infrastructure Conor Walsh
2021-04-16 17:19 ` [dpdk-dev] [PATCH v8 4/5] examples/l3fwd: implement FIB lookup method Conor Walsh
2021-04-16 17:19 ` [dpdk-dev] [PATCH v8 5/5] doc/guides/l3_forward: update documentation for FIB Conor Walsh
2021-04-20 18:28 ` [dpdk-dev] [PATCH v8 0/5] examples/l3fwd: add FIB lookup method to l3fwd Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c4475250-1669-8291-3375-eeac982d6897@intel.com \
--to=vladimir.medvedkin@intel.com \
--cc=bernard.iremonger@intel.com \
--cc=conor.walsh@intel.com \
--cc=dev@dpdk.org \
--cc=jerinj@marvell.com \
--cc=konstantin.ananyev@intel.com \
--cc=stephen@networkplumber.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).