From: Pavan Nikhilesh <pbhagavat...@marvell.com>
Since the number of Ethernet ports have gone up, print the pci bdf along
with the routes.
This is also helpful for cases where allow listing order is not honored.
Signed-off-by: Pavan Nikhilesh <pbhagavat...@marvell.com>
---
examples/l3fwd/l3fwd_fib.c | 31 +++++++++++++++++++------------
examples/l3fwd/l3fwd_lpm.c | 19 ++++++++++++-------
2 files changed, 31 insertions(+), 19 deletions(-)
diff --git a/examples/l3fwd/l3fwd_fib.c b/examples/l3fwd/l3fwd_fib.c
index f5c685a4f3..2110459cc3 100644
--- a/examples/l3fwd/l3fwd_fib.c
+++ b/examples/l3fwd/l3fwd_fib.c
@@ -580,6 +580,7 @@ fib_event_main_loop_tx_q_burst_vector(__rte_unused void
*dummy)
void
setup_fib(const int socketid)
{
+ struct rte_eth_dev_info dev_info;
struct rte_fib6_conf config;
struct rte_fib_conf config_ipv4;
unsigned int i;
@@ -611,6 +612,8 @@ setup_fib(const int socketid)
enabled_port_mask) == 0)
continue;
+ rte_eth_dev_info_get(ipv4_l3fwd_route_array[i].if_out,
+ &dev_info);
ret = rte_fib_add(ipv4_l3fwd_fib_lookup_struct[socketid],
ipv4_l3fwd_route_array[i].ip,
ipv4_l3fwd_route_array[i].depth,
@@ -624,13 +627,14 @@ setup_fib(const int socketid)
in.s_addr = htonl(ipv4_l3fwd_route_array[i].ip);
if (inet_ntop(AF_INET, &in, abuf, sizeof(abuf)) != NULL) {
- printf("FIB: Adding route %s / %d (%d)\n",
- abuf,
- ipv4_l3fwd_route_array[i].depth,
- ipv4_l3fwd_route_array[i].if_out);
+ printf("FIB: Adding route %s / %d (%d) [%s]\n", abuf,
+ ipv4_l3fwd_route_array[i].depth,
+ ipv4_l3fwd_route_array[i].if_out,
+ dev_info.device->name);
} else {
- printf("FIB: IPv4 route added to port %d\n",
- ipv4_l3fwd_route_array[i].if_out);
+ printf("FIB: IPv4 route added to port %d [%s]\n",
+ ipv4_l3fwd_route_array[i].if_out,
+ dev_info.device->name);
}
}
/* >8 End of setup fib. */
@@ -659,6 +663,8 @@ setup_fib(const int socketid)
enabled_port_mask) == 0)
continue;
+ rte_eth_dev_info_get(ipv6_l3fwd_route_array[i].if_out,
+ &dev_info);
ret = rte_fib6_add(ipv6_l3fwd_fib_lookup_struct[socketid],
ipv6_l3fwd_route_array[i].ip,
ipv6_l3fwd_route_array[i].depth,
@@ -672,13 +678,14 @@ setup_fib(const int socketid)
if (inet_ntop(AF_INET6, ipv6_l3fwd_route_array[i].ip,
abuf, sizeof(abuf)) != NULL) {
- printf("FIB: Adding route %s / %d (%d)\n",
- abuf,
- ipv6_l3fwd_route_array[i].depth,
- ipv6_l3fwd_route_array[i].if_out);
+ printf("FIB: Adding route %s / %d (%d) [%s]\n", abuf,
+ ipv6_l3fwd_route_array[i].depth,
+ ipv6_l3fwd_route_array[i].if_out,
+ dev_info.device->name);
} else {
- printf("FIB: IPv6 route added to port %d\n",
- ipv6_l3fwd_route_array[i].if_out);
+ printf("FIB: IPv6 route added to port %d [%s]\n",
+ ipv6_l3fwd_route_array[i].if_out,
+ dev_info.device->name);
}
}
}
diff --git a/examples/l3fwd/l3fwd_lpm.c b/examples/l3fwd/l3fwd_lpm.c
index 9ae288780c..a5b476ced3 100644
--- a/examples/l3fwd/l3fwd_lpm.c
+++ b/examples/l3fwd/l3fwd_lpm.c
@@ -551,6 +551,7 @@ lpm_event_main_loop_tx_q_burst_vector(__rte_unused void
*dummy)
void
setup_lpm(const int socketid)
{
+ struct rte_eth_dev_info dev_info;
struct rte_lpm6_config config;
struct rte_lpm_config config_ipv4;
unsigned i;
@@ -579,6 +580,8 @@ setup_lpm(const int socketid)
enabled_port_mask) == 0)
continue;
+ rte_eth_dev_info_get(ipv4_l3fwd_route_array[i].if_out,
+ &dev_info);
ret = rte_lpm_add(ipv4_l3fwd_lpm_lookup_struct[socketid],
ipv4_l3fwd_route_array[i].ip,
ipv4_l3fwd_route_array[i].depth,
@@ -591,10 +594,10 @@ setup_lpm(const int socketid)
}
in.s_addr = htonl(ipv4_l3fwd_route_array[i].ip);
- printf("LPM: Adding route %s / %d (%d)\n",
+ printf("LPM: Adding route %s / %d (%d) [%s]\n",
inet_ntop(AF_INET, &in, abuf, sizeof(abuf)),
- ipv4_l3fwd_route_array[i].depth,
- ipv4_l3fwd_route_array[i].if_out);
+ ipv4_l3fwd_route_array[i].depth,
+ ipv4_l3fwd_route_array[i].if_out, dev_info.device->name);
}
/* create the LPM6 table */
@@ -618,6 +621,8 @@ setup_lpm(const int socketid)
enabled_port_mask) == 0)
continue;
+ rte_eth_dev_info_get(ipv4_l3fwd_route_array[i].if_out,
+ &dev_info);
ret = rte_lpm6_add(ipv6_l3fwd_lpm_lookup_struct[socketid],
ipv6_l3fwd_route_array[i].ip,
ipv6_l3fwd_route_array[i].depth,
@@ -629,11 +634,11 @@ setup_lpm(const int socketid)
i, socketid);
}
- printf("LPM: Adding route %s / %d (%d)\n",
- inet_ntop(AF_INET6, ipv6_l3fwd_route_array[i].ip,
- abuf, sizeof(abuf)),
+ printf("LPM: Adding route %s / %d (%d) [%s]\n",
+ inet_ntop(AF_INET6, ipv6_l3fwd_route_array[i].ip, abuf,
+ sizeof(abuf)),
ipv6_l3fwd_route_array[i].depth,
- ipv6_l3fwd_route_array[i].if_out);
+ ipv6_l3fwd_route_array[i].if_out, dev_info.device->name);
}
}
--
2.17.1
