selftest: tun: Add test data for success and failure paths

To improve the robustness and coverage of the TUN selftests, this
patch expands the set of test data.

Signed-off-by: Xu Du <xudu@redhat.com>
Link: https://patch.msgid.link/5054f3ad9f3dbfe33b827183fccc5efeb8fd0da7.1768979440.git.xudu@redhat.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/tools/testing/selftests/net/tun.c b/tools/testing/selftests/net/tun.c
index 628ae2caf6f4c4930f7633988be27ccf8f28fc70..8a5cd5cb5472721badf84f6447d830b5a4c9cf17 100644 (file)
--- a/tools/testing/selftests/net/tun.c
+++ b/tools/testing/selftests/net/tun.c
@@ -57,6 +57,10 @@ static struct in6_addr param_ipaddr6_inner_src = {
        { { 0x20, 0x02, 0x0d, 0xb8, 0x02, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2 } },
 };
 
+#ifndef BIT
+#define BIT(nr) (1UL << (nr))
+#endif
+
 #define VN_ID 1
 #define VN_PORT 4789
 #define UDP_SRC_PORT 22
@@ -72,6 +76,8 @@ static struct in6_addr param_ipaddr6_inner_src = {
 #define UDP_TUNNEL_GENEVE_4IN6 0x04
 #define UDP_TUNNEL_GENEVE_6IN6 0x08
 
+#define UDP_TUNNEL_MAX_SEGMENTS BIT(7)
+
 #define UDP_TUNNEL_OUTER_IPV4 (UDP_TUNNEL_GENEVE_4IN4 | UDP_TUNNEL_GENEVE_6IN4)
 #define UDP_TUNNEL_INNER_IPV4 (UDP_TUNNEL_GENEVE_4IN4 | UDP_TUNNEL_GENEVE_4IN6)
 
@@ -553,6 +559,39 @@ FIXTURE_VARIANT(tun_vnet_udptnl)
 
 /* clang-format off */
 #define TUN_VNET_UDPTNL_VARIANT_ADD(type, desc)                              \
+       FIXTURE_VARIANT_ADD(tun_vnet_udptnl, desc##_nogsosz_1byte) {         \
+               /* no GSO: send a single byte */                             \
+               .tunnel_type = type,                                         \
+               .data_size = 1,                                              \
+               .r_num_mss = 1,                                              \
+               .is_tap = true,                                              \
+               .no_gso = true,                                              \
+       };                                                                   \
+       FIXTURE_VARIANT_ADD(tun_vnet_udptnl, desc##_nogsosz_1mss) {          \
+               /* no GSO: send a single MSS, fall back to no GSO */         \
+               .tunnel_type = type,                                         \
+               .data_size = UDP_TUNNEL_MSS(type),                           \
+               .r_num_mss = 1,                                              \
+               .is_tap = true,                                              \
+               .no_gso = true,                                              \
+       };                                                                   \
+       FIXTURE_VARIANT_ADD(tun_vnet_udptnl, desc##_nogsosz_gtmss) {         \
+               /* no GSO: send a single MSS + 1B: fail */                   \
+               .tunnel_type = type,                                         \
+               .data_size = UDP_TUNNEL_MSS(type) + 1,                       \
+               .r_num_mss = 1,                                              \
+               .is_tap = true,                                              \
+               .no_gso = true,                                              \
+       };                                                                   \
+       FIXTURE_VARIANT_ADD(tun_vnet_udptnl, desc##_1byte) {                 \
+               /* GSO: send 1 byte, gso 1 byte, fall back to no GSO */      \
+               .tunnel_type = type,                                         \
+               .gso_size = 1,                                               \
+               .data_size = 1,                                              \
+               .r_num_mss = 1,                                              \
+               .is_tap = true,                                              \
+               .no_gso = true,                                              \
+       };                                                                   \
        FIXTURE_VARIANT_ADD(tun_vnet_udptnl, desc##_1mss) {                  \
                /* send a single MSS: fall back to no GSO */                 \
                .tunnel_type = type,                                         \
@@ -561,8 +600,65 @@ FIXTURE_VARIANT(tun_vnet_udptnl)
                .r_num_mss = 1,                                              \
                .is_tap = true,                                              \
                .no_gso = true,                                              \
-       };
-/* clang-format on */
+       };                                                                   \
+       FIXTURE_VARIANT_ADD(tun_vnet_udptnl, desc##_ltgso) {                 \
+               /* data <= MSS < gso: will fall back to no GSO */            \
+               .tunnel_type = type,                                         \
+               .gso_size = UDP_TUNNEL_MSS(type) + 1,                        \
+               .data_size = UDP_TUNNEL_MSS(type),                           \
+               .r_num_mss = 1,                                              \
+               .is_tap = true,                                              \
+               .no_gso = true,                                              \
+       };                                                                   \
+       FIXTURE_VARIANT_ADD(tun_vnet_udptnl, desc##_gtgso) {                 \
+               /* GSO: a single MSS + 1B */                                 \
+               .tunnel_type = type,                                         \
+               .gso_size = UDP_TUNNEL_MSS(type),                            \
+               .data_size = UDP_TUNNEL_MSS(type) + 1,                       \
+               .r_num_mss = 2,                                              \
+               .is_tap = true,                                              \
+       };                                                                   \
+       FIXTURE_VARIANT_ADD(tun_vnet_udptnl, desc##_2mss) {                  \
+               /* no GSO: send exactly 2 MSS */                             \
+               .tunnel_type = type,                                         \
+               .gso_size = UDP_TUNNEL_MSS(type),                            \
+               .data_size = UDP_TUNNEL_MSS(type) * 2,                       \
+               .r_num_mss = 2,                                              \
+               .is_tap = true,                                              \
+       };                                                                   \
+       FIXTURE_VARIANT_ADD(tun_vnet_udptnl, desc##_maxbytes) {              \
+               /* GSO: send max bytes */                                    \
+               .tunnel_type = type,                                         \
+               .gso_size = UDP_TUNNEL_MSS(type),                            \
+               .data_size = UDP_TUNNEL_MAX(type, true),                     \
+               .r_num_mss = UDP_TUNNEL_MAX(type, true) /                    \
+                            UDP_TUNNEL_MSS(type) + 1,                       \
+               .is_tap = true,                                              \
+       };                                                                   \
+       FIXTURE_VARIANT_ADD(tun_vnet_udptnl, desc##_over_maxbytes) {         \
+               /* GSO: send oversize max bytes: fail */                     \
+               .tunnel_type = type,                                         \
+               .gso_size = UDP_TUNNEL_MSS(type),                            \
+               .data_size = ETH_MAX_MTU,                                    \
+               .r_num_mss = ETH_MAX_MTU / UDP_TUNNEL_MSS(type) + 1,         \
+               .is_tap = true,                                              \
+       };                                                                   \
+       FIXTURE_VARIANT_ADD(tun_vnet_udptnl, desc##_maxsegs) {               \
+               /* GSO: send max number of min sized segments */             \
+               .tunnel_type = type,                                         \
+               .gso_size = 1,                                               \
+               .data_size = UDP_TUNNEL_MAX_SEGMENTS,                        \
+               .r_num_mss = UDP_TUNNEL_MAX_SEGMENTS,                        \
+               .is_tap = true,                                              \
+       };                                                                   \
+       FIXTURE_VARIANT_ADD(tun_vnet_udptnl, desc##_5byte) {                 \
+               /* GSO: send 5 bytes, gso 2 bytes */                         \
+               .tunnel_type = type,                                         \
+               .gso_size = 2,                                               \
+               .data_size = 5,                                              \
+               .r_num_mss = 3,                                              \
+               .is_tap = true,                                              \
+       } /* clang-format on */
 
 TUN_VNET_UDPTNL_VARIANT_ADD(UDP_TUNNEL_GENEVE_4IN4, 4in4);
 TUN_VNET_UDPTNL_VARIANT_ADD(UDP_TUNNEL_GENEVE_6IN4, 6in4);
@@ -874,4 +970,19 @@ TEST_F(tun_vnet_udptnl, recv_gso_packet)
        }
 }
 
+XFAIL_ADD(tun_vnet_udptnl, 4in4_nogsosz_gtmss, recv_gso_packet);
+XFAIL_ADD(tun_vnet_udptnl, 6in4_nogsosz_gtmss, recv_gso_packet);
+XFAIL_ADD(tun_vnet_udptnl, 4in6_nogsosz_gtmss, recv_gso_packet);
+XFAIL_ADD(tun_vnet_udptnl, 6in6_nogsosz_gtmss, recv_gso_packet);
+
+XFAIL_ADD(tun_vnet_udptnl, 4in4_over_maxbytes, send_gso_packet);
+XFAIL_ADD(tun_vnet_udptnl, 6in4_over_maxbytes, send_gso_packet);
+XFAIL_ADD(tun_vnet_udptnl, 4in6_over_maxbytes, send_gso_packet);
+XFAIL_ADD(tun_vnet_udptnl, 6in6_over_maxbytes, send_gso_packet);
+
+XFAIL_ADD(tun_vnet_udptnl, 4in4_over_maxbytes, recv_gso_packet);
+XFAIL_ADD(tun_vnet_udptnl, 6in4_over_maxbytes, recv_gso_packet);
+XFAIL_ADD(tun_vnet_udptnl, 4in6_over_maxbytes, recv_gso_packet);
+XFAIL_ADD(tun_vnet_udptnl, 6in6_over_maxbytes, recv_gso_packet);
+
 TEST_HARNESS_MAIN