selftest/tcp-ao: Set routes in a proper VRF table id

In unsigned-md5 selftests ip_route_add() is not needed in
client_add_ip(): the route was pre-setup in __test_init() => link_init()
for subnet, rather than a specific ip-address.

Currently, __ip_route_add() mistakenly always sets VRF table
to RT_TABLE_MAIN - this seems to have sneaked in during unsigned-md5
tests debugging. That also explains, why ip_route_add_vrf() ignored
EEXIST, returned by fib6.

Yet, keep EEXIST ignoring in bench-lookups selftests as it's expected
that those selftests may add the same (duplicate) routes.

Reported-by: Hangbin Liu <liuhangbin@gmail.com>
Signed-off-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/tools/testing/selftests/net/tcp_ao/bench-lookups.c b/tools/testing/selftests/net/tcp_ao/bench-lookups.c
index 7be8a7d9308c2d1c6869ee1d767f72aaa64cbb08..a1e6e007c2912108507ed54496c7818c57f47900 100644 (file)
--- a/tools/testing/selftests/net/tcp_ao/bench-lookups.c
+++ b/tools/testing/selftests/net/tcp_ao/bench-lookups.c
@@ -46,8 +46,10 @@ static void test_add_routes(union tcp_addr *ips, size_t ips_nr)
 
        for (i = 0; i < ips_nr; i++) {
                union tcp_addr *p = (union tcp_addr *)&ips[i];
+               int err;
 
-               if (ip_route_add(veth_name, TEST_FAMILY, this_ip_addr, *p))
+               err = ip_route_add(veth_name, TEST_FAMILY, this_ip_addr, *p);
+               if (err && err != -EEXIST)
                        test_error("Failed to add route");
        }
 }

diff --git a/tools/testing/selftests/net/tcp_ao/lib/netlink.c b/tools/testing/selftests/net/tcp_ao/lib/netlink.c
index b731f2c84083187536648a41897e4b7521bb12ca..7f108493a29ade397290f765d4411c97b6c9be34 100644 (file)
--- a/tools/testing/selftests/net/tcp_ao/lib/netlink.c
+++ b/tools/testing/selftests/net/tcp_ao/lib/netlink.c
@@ -261,7 +261,7 @@ static int __ip_route_add(int sock, uint32_t seq, const char *intf, int family,
        req.nh.nlmsg_seq        = seq;
        req.rt.rtm_family       = family;
        req.rt.rtm_dst_len      = (family == AF_INET) ? 32 : 128;
-       req.rt.rtm_table        = RT_TABLE_MAIN;
+       req.rt.rtm_table        = vrf;
        req.rt.rtm_protocol     = RTPROT_BOOT;
        req.rt.rtm_scope        = RT_SCOPE_UNIVERSE;
        req.rt.rtm_type         = RTN_UNICAST;
@@ -294,8 +294,6 @@ int ip_route_add_vrf(const char *intf, int family,
 
        ret = __ip_route_add(route_sock, route_seq++, intf,
                             family, src, dst, vrf);
-       if (ret == -EEXIST) /* ignoring */
-               ret = 0;
 
        close(route_sock);
        return ret;

diff --git a/tools/testing/selftests/net/tcp_ao/unsigned-md5.c b/tools/testing/selftests/net/tcp_ao/unsigned-md5.c
index 14addfd46468cfdc6e9adf376615a6fb6e3e6433..c5b568cd7d901ce19d26cc0228dc7089581bb7f1 100644 (file)
--- a/tools/testing/selftests/net/tcp_ao/unsigned-md5.c
+++ b/tools/testing/selftests/net/tcp_ao/unsigned-md5.c
@@ -30,7 +30,7 @@ static void setup_vrfs(void)
        err = ip_route_add_vrf(veth_name, TEST_FAMILY,
                               this_ip_addr, this_ip_dest, test_vrf_tabid);
        if (err)
-               test_error("Failed to add a route to VRF");
+               test_error("Failed to add a route to VRF: %d", err);
 }
 
 static void try_accept(const char *tst_name, unsigned int port,
@@ -494,15 +494,14 @@ out:
 
 static void client_add_ip(union tcp_addr *client, const char *ip)
 {
-       int family = TEST_FAMILY;
+       int err, family = TEST_FAMILY;
 
        if (inet_pton(family, ip, client) != 1)
                test_error("Can't convert ip address %s", ip);
 
-       if (ip_addr_add(veth_name, family, *client, TEST_PREFIX))
-               test_error("Failed to add ip address");
-       if (ip_route_add(veth_name, family, *client, this_ip_dest))
-               test_error("Failed to add route");
+       err = ip_addr_add(veth_name, family, *client, TEST_PREFIX);
+       if (err)
+               test_error("Failed to add ip address: %d", err);
 }
 
 static void client_add_ips(void)