selftest: net: Extend ipmr.c for IP6MR.

This commit extends most test cases in ipmr.c for IPV6MR.

Note that IP6MR does not provide rtnetlink interface for MFC,
so such tests are added to XFAIL_ADD().

Signed-off-by: Kuniyuki Iwashima <kuniyu@google.com>
Link: https://patch.msgid.link/20260604224712.3209821-2-kuniyu@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/tools/testing/selftests/net/forwarding/ipmr.c b/tools/testing/selftests/net/forwarding/ipmr.c
index df870aad9eada64e39724099aea607f1ebb72f1f..9cd9f70de1320b48d0c689d55b1a862612bd57b4 100644 (file)
--- a/tools/testing/selftests/net/forwarding/ipmr.c
+++ b/tools/testing/selftests/net/forwarding/ipmr.c
@@ -2,7 +2,9 @@
 /* Copyright 2026 Google LLC */
 
 #include <linux/if.h>
+#include <linux/in6.h>
 #include <linux/mroute.h>
+#include <linux/mroute6.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
 #include <linux/socket.h>
@@ -17,6 +19,14 @@ FIXTURE(ipmr)
        int netlink_sk;
        int raw_sk;
        int veth_ifindex;
+       union {
+               struct vifctl vif;
+               struct mif6ctl vif6;
+       };
+       union {
+               struct mfcctl mfc;
+               struct mf6cctl mfc6;
+       };
 };
 
 FIXTURE_VARIANT(ipmr)
@@ -24,7 +34,14 @@ FIXTURE_VARIANT(ipmr)
        int family;
        int protocol;
        int level;
+       int rtm_family;
        int opts[MRT_MAX - MRT_BASE + 1];
+       int flush_flags;
+       int vif_size;
+       char vif_check_cmd_pimreg[64];
+       char vif_check_cmd_veth[64];
+       int mfc_size;
+       char mfc_check_cmd[1024];
 };
 
 FIXTURE_VARIANT_ADD(ipmr, ipv4)
@@ -32,6 +49,7 @@ FIXTURE_VARIANT_ADD(ipmr, ipv4)
        .family = AF_INET,
        .protocol = IPPROTO_IGMP,
        .level = IPPROTO_IP,
+       .rtm_family = RTNL_FAMILY_IPMR,
        .opts = {
                MRT_INIT,
                MRT_DONE,
@@ -47,6 +65,44 @@ FIXTURE_VARIANT_ADD(ipmr, ipv4)
                MRT_DEL_MFC_PROXY,
                MRT_FLUSH,
        },
+       .flush_flags = MRT_FLUSH_MFC | MRT_FLUSH_MFC_STATIC |
+               MRT_FLUSH_VIFS | MRT_FLUSH_VIFS_STATIC,
+       .vif_size = sizeof(struct vifctl),
+       .vif_check_cmd_pimreg = "cat /proc/net/ip_mr_vif | grep -q pimreg",
+       .vif_check_cmd_veth = "cat /proc/net/ip_mr_vif | grep -q veth",
+       .mfc_size = sizeof(struct mfcctl),
+       .mfc_check_cmd = "cat /proc/net/ip_mr_cache | grep -q '00000000 00000000'",
+};
+
+FIXTURE_VARIANT_ADD(ipmr, ipv6)
+{
+       .family = AF_INET6,
+       .protocol = IPPROTO_ICMPV6,
+       .level = IPPROTO_IPV6,
+       .rtm_family = RTNL_FAMILY_IP6MR,
+       .opts = {
+               MRT6_INIT,
+               MRT6_DONE,
+               MRT6_ADD_MIF,
+               MRT6_DEL_MIF,
+               MRT6_ADD_MFC,
+               MRT6_DEL_MFC,
+               MRT6_VERSION,
+               MRT6_ASSERT,
+               MRT6_PIM,
+               MRT6_TABLE,
+               MRT6_ADD_MFC_PROXY,
+               MRT6_DEL_MFC_PROXY,
+               MRT6_FLUSH,
+       },
+       .flush_flags = MRT6_FLUSH_MFC | MRT6_FLUSH_MFC_STATIC |
+               MRT6_FLUSH_MIFS | MRT6_FLUSH_MIFS_STATIC,
+       .vif_size = sizeof(struct mif6ctl),
+       .vif_check_cmd_pimreg = "cat /proc/net/ip6_mr_vif | grep -q pim6reg",
+       .vif_check_cmd_veth = "cat /proc/net/ip6_mr_vif | grep -q veth",
+       .mfc_size = sizeof(struct mf6cctl),
+       .mfc_check_cmd = "cat /proc/net/ip6_mr_cache | "
+               "grep -q '0000:0000:0000:0000:0000:0000:0000:0000 0000:0000:0000:0000:0000:0000:0000:0000'",
 };
 
 struct mfc_attr {
@@ -71,7 +127,9 @@ static struct rtattr *nl_add_rtattr(struct nlmsghdr *nlmsg, struct rtattr *rta,
        return RTA_NEXT(rta, unused);
 }
 
-static int nl_sendmsg_mfc(struct __test_metadata *_metadata, FIXTURE_DATA(ipmr) *self,
+static int nl_sendmsg_mfc(struct __test_metadata *_metadata,
+                         FIXTURE_DATA(ipmr) *self,
+                         const FIXTURE_VARIANT(ipmr) *variant,
                          __u16 nlmsg_type, struct mfc_attr *mfc_attr)
 {
        struct {
@@ -87,7 +145,7 @@ static int nl_sendmsg_mfc(struct __test_metadata *_metadata, FIXTURE_DATA(ipmr)
                },
                .rtm = {
                        /* hard requirements in rtm_to_ipmr_mfcc() */
-                       .rtm_family = RTNL_FAMILY_IPMR,
+                       .rtm_family = variant->rtm_family,
                        .rtm_dst_len = 32,
                        .rtm_type = RTN_MULTICAST,
                        .rtm_scope = RT_SCOPE_UNIVERSE,
@@ -144,6 +202,18 @@ FIXTURE_SETUP(ipmr)
        ASSERT_EQ(0, err);
 
        self->veth_ifindex = ifr.ifr_ifindex;
+
+       if (variant->family == AF_INET) {
+               self->vif = (struct vifctl){
+                       .vifc_flags = VIFF_USE_IFINDEX,
+                       .vifc_lcl_ifindex = self->veth_ifindex,
+               };
+       } else {
+               self->vif6 = (struct mif6ctl){
+                       .mif6c_flags = 0,
+                       .mif6c_pifi = self->veth_ifindex,
+               };
+       }
 }
 
 FIXTURE_TEARDOWN(ipmr)
@@ -169,41 +239,39 @@ TEST_F(ipmr, mrt_init)
 
 TEST_F(ipmr, mrt_add_vif_register)
 {
-       struct vifctl vif = {
-               .vifc_vifi = 0,
-               .vifc_flags = VIFF_REGISTER,
-       };
        int err;
 
+       memset(&self->vif, 0, variant->vif_size);
+
+       if (variant->family == AF_INET)
+               self->vif.vifc_flags = VIFF_REGISTER;
+       else
+               self->vif6.mif6c_flags = MIFF_REGISTER;
+
        err = setsockopt(self->raw_sk,
                         variant->level, variant->opts[MRT_ADD_VIF - MRT_BASE],
-                        &vif,  sizeof(vif));
+                        &self->vif,  variant->vif_size);
        ASSERT_EQ(0, err);
 
-       err = system("cat /proc/net/ip_mr_vif | grep -q pimreg");
+       err = system(variant->vif_check_cmd_pimreg);
        ASSERT_EQ(0, err);
 
        err = setsockopt(self->raw_sk,
                         variant->level, variant->opts[MRT_DEL_VIF - MRT_BASE],
-                        &vif,  sizeof(vif));
+                        &self->vif,  variant->vif_size);
        ASSERT_EQ(0, err);
 }
 
 TEST_F(ipmr, mrt_del_vif_unreg)
 {
-       struct vifctl vif = {
-               .vifc_vifi = 0,
-               .vifc_flags = VIFF_USE_IFINDEX,
-               .vifc_lcl_ifindex = self->veth_ifindex,
-       };
        int err;
 
        err = setsockopt(self->raw_sk,
                         variant->level, variant->opts[MRT_ADD_VIF - MRT_BASE],
-                        &vif,  sizeof(vif));
+                        &self->vif,  variant->vif_size);
        ASSERT_EQ(0, err);
 
-       err = system("cat /proc/net/ip_mr_vif | grep -q veth0");
+       err = system(variant->vif_check_cmd_veth);
        ASSERT_EQ(0, err);
 
        /* VIF is removed along with its device. */
@@ -213,23 +281,18 @@ TEST_F(ipmr, mrt_del_vif_unreg)
        /* mrt->vif_table[veth_ifindex]->dev is NULL. */
        err = setsockopt(self->raw_sk,
                         variant->level, variant->opts[MRT_DEL_VIF - MRT_BASE],
-                        &vif,  sizeof(vif));
+                        &self->vif,  variant->vif_size);
        ASSERT_EQ(-1, err);
        ASSERT_EQ(EADDRNOTAVAIL, errno);
 }
 
 TEST_F(ipmr, mrt_del_vif_netns_dismantle)
 {
-       struct vifctl vif = {
-               .vifc_vifi = 0,
-               .vifc_flags = VIFF_USE_IFINDEX,
-               .vifc_lcl_ifindex = self->veth_ifindex,
-       };
        int err;
 
        err = setsockopt(self->raw_sk,
                         variant->level, variant->opts[MRT_ADD_VIF - MRT_BASE],
-                        &vif,  sizeof(vif));
+                        &self->vif,  variant->vif_size);
        ASSERT_EQ(0, err);
 
        /* Let cleanup_net() remove veth0 and VIF. */
@@ -237,49 +300,42 @@ TEST_F(ipmr, mrt_del_vif_netns_dismantle)
 
 TEST_F(ipmr, mrt_add_mfc)
 {
-       struct mfcctl mfc = {};
        int err;
 
        /* MRT_ADD_MFC / MRT_ADD_MFC_PROXY does not need vif to exist (unlike netlink). */
        err = setsockopt(self->raw_sk,
                         variant->level, variant->opts[MRT_ADD_MFC - MRT_BASE],
-                        &mfc,  sizeof(mfc));
+                        &self->mfc, variant->mfc_size);
        ASSERT_EQ(0, err);
 
        /* (0.0.0.0 -> 0.0.0.0) */
-       err = system("cat /proc/net/ip_mr_cache | grep -q '00000000 00000000' ");
+       err = system(variant->mfc_check_cmd);
        ASSERT_EQ(0, err);
 
        err = setsockopt(self->raw_sk,
                         variant->level, variant->opts[MRT_DEL_MFC - MRT_BASE],
-                        &mfc,  sizeof(mfc));
+                        &self->mfc, variant->mfc_size);
 }
 
 TEST_F(ipmr, mrt_add_mfc_proxy)
 {
-       struct mfcctl mfc = {};
        int err;
 
        err = setsockopt(self->raw_sk,
                         variant->level, variant->opts[MRT_ADD_MFC_PROXY - MRT_BASE],
-                        &mfc,  sizeof(mfc));
+                        &self->mfc, variant->mfc_size);
        ASSERT_EQ(0, err);
 
-       err = system("cat /proc/net/ip_mr_cache | grep -q '00000000 00000000' ");
+       err = system(variant->mfc_check_cmd);
        ASSERT_EQ(0, err);
 
        err = setsockopt(self->raw_sk,
                         variant->level, variant->opts[MRT_DEL_MFC_PROXY - MRT_BASE],
-                        &mfc,  sizeof(mfc));
+                        &self->mfc, variant->mfc_size);
 }
 
 TEST_F(ipmr, mrt_add_mfc_netlink)
 {
-       struct vifctl vif = {
-               .vifc_vifi = 0,
-               .vifc_flags = VIFF_USE_IFINDEX,
-               .vifc_lcl_ifindex = self->veth_ifindex,
-       };
        struct mfc_attr mfc_attr = {
                .table = RT_TABLE_DEFAULT,
                .origin = 0,
@@ -291,26 +347,21 @@ TEST_F(ipmr, mrt_add_mfc_netlink)
 
        err = setsockopt(self->raw_sk,
                         variant->level, variant->opts[MRT_ADD_VIF - MRT_BASE],
-                        &vif,  sizeof(vif));
+                        &self->vif, variant->vif_size);
        ASSERT_EQ(0, err);
 
-       err = nl_sendmsg_mfc(_metadata, self, RTM_NEWROUTE, &mfc_attr);
+       err = nl_sendmsg_mfc(_metadata, self, variant, RTM_NEWROUTE, &mfc_attr);
        ASSERT_EQ(0, err);
 
-       err = system("cat /proc/net/ip_mr_cache | grep -q '00000000 00000000' ");
+       err = system(variant->mfc_check_cmd);
        ASSERT_EQ(0, err);
 
-       err = nl_sendmsg_mfc(_metadata, self, RTM_DELROUTE, &mfc_attr);
+       err = nl_sendmsg_mfc(_metadata, self, variant, RTM_DELROUTE, &mfc_attr);
        ASSERT_EQ(0, err);
 }
 
 TEST_F(ipmr, mrt_add_mfc_netlink_proxy)
 {
-       struct vifctl vif = {
-               .vifc_vifi = 0,
-               .vifc_flags = VIFF_USE_IFINDEX,
-               .vifc_lcl_ifindex = self->veth_ifindex,
-       };
        struct mfc_attr mfc_attr = {
                .table = RT_TABLE_DEFAULT,
                .origin = 0,
@@ -322,16 +373,16 @@ TEST_F(ipmr, mrt_add_mfc_netlink_proxy)
 
        err = setsockopt(self->raw_sk,
                         variant->level, variant->opts[MRT_ADD_VIF - MRT_BASE],
-                        &vif,  sizeof(vif));
+                        &self->vif, variant->vif_size);
        ASSERT_EQ(0, err);
 
-       err = nl_sendmsg_mfc(_metadata, self, RTM_NEWROUTE, &mfc_attr);
+       err = nl_sendmsg_mfc(_metadata, self, variant, RTM_NEWROUTE, &mfc_attr);
        ASSERT_EQ(0, err);
 
-       err = system("cat /proc/net/ip_mr_cache | grep -q '00000000 00000000' ");
+       err = system(variant->mfc_check_cmd);
        ASSERT_EQ(0, err);
 
-       err = nl_sendmsg_mfc(_metadata, self, RTM_DELROUTE, &mfc_attr);
+       err = nl_sendmsg_mfc(_metadata, self, variant, RTM_DELROUTE, &mfc_attr);
        ASSERT_EQ(0, err);
 }
 
@@ -347,12 +398,12 @@ TEST_F(ipmr, mrt_add_mfc_netlink_no_vif)
 
        /* netlink always requires RTA_IIF of an existing vif. */
        mfc_attr.ifindex = 0;
-       err = nl_sendmsg_mfc(_metadata, self, RTM_NEWROUTE, &mfc_attr);
+       err = nl_sendmsg_mfc(_metadata, self, variant, RTM_NEWROUTE, &mfc_attr);
        ASSERT_EQ(-ENFILE, err);
 
        /* netlink always requires RTA_IIF of an existing vif. */
        mfc_attr.ifindex = self->veth_ifindex;
-       err = nl_sendmsg_mfc(_metadata, self, RTM_NEWROUTE, &mfc_attr);
+       err = nl_sendmsg_mfc(_metadata, self, variant, RTM_NEWROUTE, &mfc_attr);
        ASSERT_EQ(-ENFILE, err);
 }
 
@@ -387,10 +438,10 @@ TEST_F(ipmr, mrt_del_mfc_netlink_netns_dismantle)
        }
 
        /* Create a MFC for mrt->vif_table[0]. */
-       err = nl_sendmsg_mfc(_metadata, self, RTM_NEWROUTE, &mfc_attr);
+       err = nl_sendmsg_mfc(_metadata, self, variant, RTM_NEWROUTE, &mfc_attr);
        ASSERT_EQ(0, err);
 
-       err = system("cat /proc/net/ip_mr_cache | grep -q '00000000 00000000' ");
+       err = system(variant->mfc_check_cmd);
        ASSERT_EQ(0, err);
 
        /* Remove mrt->vif_table[0]. */
@@ -398,13 +449,13 @@ TEST_F(ipmr, mrt_del_mfc_netlink_netns_dismantle)
        ASSERT_EQ(0, err);
 
        /* MFC entry is NOT removed even if the tied VIF is removed... */
-       err = system("cat /proc/net/ip_mr_cache | grep -q '00000000 00000000' ");
+       err = system(variant->mfc_check_cmd);
        ASSERT_EQ(0, err);
 
        /* ... and netlink is not capable of removing such an entry
         * because netlink always requires a valid RTA_IIF ... :/
         */
-       err = nl_sendmsg_mfc(_metadata, self, RTM_DELROUTE, &mfc_attr);
+       err = nl_sendmsg_mfc(_metadata, self, variant, RTM_DELROUTE, &mfc_attr);
        ASSERT_EQ(-ENODEV, err);
 
        /* It can be removed by setsockopt(), but let cleanup_net() remove this time. */
@@ -412,11 +463,6 @@ TEST_F(ipmr, mrt_del_mfc_netlink_netns_dismantle)
 
 TEST_F(ipmr, mrt_table_flush)
 {
-       struct vifctl vif = {
-               .vifc_vifi = 0,
-               .vifc_flags = VIFF_USE_IFINDEX,
-               .vifc_lcl_ifindex = self->veth_ifindex,
-       };
        struct mfc_attr mfc_attr = {
                .origin = 0,
                .group = 0,
@@ -424,7 +470,7 @@ TEST_F(ipmr, mrt_table_flush)
                .proxy = false,
        };
        int table_id = 92;
-       int err, flags;
+       int err;
 
        /* Set a random table id rather than RT_TABLE_DEFAULT.
         * Note that /proc/net/ip_mr_{vif,cache} only supports RT_TABLE_DEFAULT.
@@ -436,20 +482,29 @@ TEST_F(ipmr, mrt_table_flush)
 
        err = setsockopt(self->raw_sk,
                         variant->level, variant->opts[MRT_ADD_VIF - MRT_BASE],
-                        &vif,  sizeof(vif));
+                        &self->vif,  variant->vif_size);
        ASSERT_EQ(0, err);
 
-       mfc_attr.table = table_id;
-       err = nl_sendmsg_mfc(_metadata, self, RTM_NEWROUTE, &mfc_attr);
+       if (variant->family == AF_INET) {
+               mfc_attr.table = table_id;
+               err = nl_sendmsg_mfc(_metadata, self, variant, RTM_NEWROUTE, &mfc_attr);
+       } else {
+               err = setsockopt(self->raw_sk,
+                                variant->level, variant->opts[MRT_ADD_MFC - MRT_BASE],
+                                &self->mfc, variant->mfc_size);
+       }
        ASSERT_EQ(0, err);
 
        /* Flush mrt->vif_table[] and all caches. */
-       flags = MRT_FLUSH_VIFS | MRT_FLUSH_VIFS_STATIC |
-               MRT_FLUSH_MFC | MRT_FLUSH_MFC_STATIC;
        err = setsockopt(self->raw_sk,
                         variant->level, variant->opts[MRT_FLUSH - MRT_BASE],
-                        &flags,  sizeof(flags));
+                        &variant->flush_flags,  sizeof(variant->flush_flags));
        ASSERT_EQ(0, err);
 }
 
+XFAIL_ADD(ipmr, ipv6, mrt_add_mfc_netlink);
+XFAIL_ADD(ipmr, ipv6, mrt_add_mfc_netlink_proxy);
+XFAIL_ADD(ipmr, ipv6, mrt_add_mfc_netlink_no_vif);
+XFAIL_ADD(ipmr, ipv6, mrt_del_mfc_netlink_netns_dismantle);
+
 TEST_HARNESS_MAIN