On Tue, Apr 6, 2021 at 1:11 PM Conor Walsh <conor.wa...@intel.com> 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.wa...@intel.com>
> Acked-by: Konstantin Ananyev <konstantin.anan...@intel.com>
> Acked-by: Vladimir Medvedkin <vladimir.medved...@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 {
Why "common" ? ipv4_l3fwd_route is enough.
Plus, this is what we reference in the doc.
doc/guides/sample_app_ug/l3_forward.rst: if ((1 <<
ipv4_l3fwd_route_array[i].if_out & enabled_port_mask) == 0)
doc/guides/sample_app_ug/l3_forward.rst: ret =
rte_lpm_add(ipv4_l3fwd_lookup_struct[socketid],
ipv4_l3fwd_route_array[i].ip,
doc/guides/sample_app_ug/l3_forward.rst:
ipv4_l3fwd_route_array[i].depth,
ipv4_l3fwd_route_array[i].if_out);
doc/guides/sample_app_ug/l3_forward.rst:
(unsigned)ipv4_l3fwd_route_array[i].ip,
ipv4_l3fwd_route_array[i].depth, ipv4_l3fwd_route_array[i].if_out);
> + uint32_t ip;
> + uint8_t depth;
> + uint8_t if_out;
> +};
> +
> +struct ipv6_l3fwd_common_route {
> + uint8_t ip[16];
> + uint8_t depth;
Unneeded double space.
> + 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},
> +};
With static symbols, we end up with duplicating info in lpm / fib.
$ nm build/examples/dpdk-l3fwd |grep ipv4_l3fwd_common_route_array
000000000100c260 r ipv4_l3fwd_common_route_array
000000000100c4c0 r ipv4_l3fwd_common_route_array
You can declare global symbols in a common header, and define them in main.c.
> +
> +/*
> + * 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},
> +};
--
David Marchand
