From: Claudio Jeker Subject: ip6 mrouter use rtable for its state To: tech@openbsd.org Date: Mon, 16 Nov 2026 13:16:35 +0100 This converts the IPv6 side of the multicast routing code to store the state in struct rtable. Since we now only need to track the mrt socket I decided to remove the SMR indirection I had planned before. Instead inline struct ip6_mrouter into the rtable state. Doing this simplifies the code a lot. The code uses the same locking so this just changes how to access the mrt socket. This works because struct rtable is immortal (it is never freed) so the returned pointer can not become stale. -- :wq Claudio Index: net/rtable.c =================================================================== RCS file: /cvs/src/sys/net/rtable.c,v diff -u -p -r1.96 rtable.c --- net/rtable.c 4 Nov 2026 08:51:52 -0000 1.96 +++ net/rtable.c 16 Nov 2026 10:16:29 -0000 @@ -301,18 +301,6 @@ rtable_get_mrouter(unsigned int rtableid return (SMR_PTR_GET(&rt->rt_mrouter)); } -struct ip6_mrouter * -rtable_get_mrouter6(unsigned int rtableid) -{ - struct rtable *rt; - - SMR_ASSERT_CRITICAL(); - - if ((rt = rtable_entry(rtableid)) == NULL) - return (NULL); - return (SMR_PTR_GET(&rt->rt_mrouter6)); -} - struct ip_mrouter * rtable_set_mrouter(unsigned int rtableid, struct ip_mrouter *new) { @@ -332,21 +320,16 @@ rtable_set_mrouter(unsigned int rtableid } struct ip6_mrouter * -rtable_set_mrouter6(unsigned int rtableid, struct ip6_mrouter *new) +rtable_get_mrouter6(unsigned int rtableid) { - struct ip6_mrouter *old; + struct ip6_mrouter *mrt6 = NULL; struct rtable *rt; smr_read_enter(); - rt = rtable_entry(rtableid); + if ((rt = rtable_entry(rtableid)) != NULL) + mrt6 = &rt->rt_mrouter6; smr_read_leave(); - if (rt == NULL) - return (NULL); - - old = SMR_PTR_GET_LOCKED(&rt->rt_mrouter6); - SMR_PTR_SET_LOCKED(&rt->rt_mrouter6, new); - - return (old); + return (mrt6); } void Index: net/rtable.h =================================================================== RCS file: /cvs/src/sys/net/rtable.h,v diff -u -p -r1.37 rtable.h --- net/rtable.h 4 Nov 2026 08:51:52 -0000 1.37 +++ net/rtable.h 16 Nov 2026 10:33:10 -0000 @@ -31,14 +31,13 @@ #define RT_ROOT(rt) (0) struct art; -struct ip_mrouter; -struct ip6_mrouter; /* * Locks used to protect struct members in this file: * I immutable after creation * N net lock * S SMR pointer + * R AF specific multicast router lock * X only adjusted while the table is empty or unused * * The next three structs live here rather than in rtable.c because @@ -46,6 +45,12 @@ struct ip6_mrouter; * change here is a netstat change. See usr.bin/netstat/route.c. */ +/* state struct for the multicast routing support */ +struct ip_mrouter; +struct ip6_mrouter { + struct socket *mrt_socket; /* [R] */ +}; + /* One address family's table within a routing table. */ struct rtidx { struct rwlock r_lock; @@ -59,7 +64,7 @@ struct rtable { unsigned int rt_rdomain; /* [X] */ unsigned int rt_loifidx; /* [X] */ struct ip_mrouter *rt_mrouter; /* [S] */ - struct ip6_mrouter *rt_mrouter6; /* [S] */ + struct ip6_mrouter rt_mrouter6; struct rtidx rt_idx[0]; /* af2idx_max entries */ }; @@ -89,7 +94,6 @@ unsigned int rtable_loindex(unsigned in struct ip_mrouter *rtable_get_mrouter(unsigned int); struct ip6_mrouter *rtable_get_mrouter6(unsigned int); struct ip_mrouter *rtable_set_mrouter(unsigned int, struct ip_mrouter *); -struct ip6_mrouter *rtable_set_mrouter6(unsigned int, struct ip6_mrouter*); void rtable_l2set(unsigned int, unsigned int, unsigned int); int rtable_setsource(unsigned int, int, struct sockaddr *); Index: netinet6/ip6_mroute.c =================================================================== RCS file: /cvs/src/sys/netinet6/ip6_mroute.c,v diff -u -p -r1.160 ip6_mroute.c --- netinet6/ip6_mroute.c 6 Nov 2026 06:12:15 -0000 1.160 +++ netinet6/ip6_mroute.c 16 Nov 2026 10:30:03 -0000 @@ -132,7 +132,6 @@ void phyint_send6(struct ifnet *, struct struct rwlock mrt6_routerlock = RWLOCK_INITIALIZER("mrouter6"); struct rttimer_queue mrt6_timer; -struct socket *mrt6_mrouter[RT_TABLEID_MAX + 1]; /* [R] */ int ip6_mrtproto; /* [I] for netstat only */ struct cpumem *mrt6counters; @@ -191,6 +190,7 @@ ip6_mrouter_set(int cmd, struct socket * int ip6_mrouter_get(int cmd, struct socket *so, struct mbuf *m) { + struct ip6_mrouter *mrouter; struct inpcb *inp = sotoinpcb(so); unsigned int rtableid = inp->inp_rtableid; int error; @@ -199,7 +199,8 @@ ip6_mrouter_get(int cmd, struct socket * rw_enter_read(&mrt6_routerlock); - if (so != mrt6_mrouter[rtableid]) { + mrouter = rtable_get_mrouter6(rtableid); + if (mrouter == NULL || so != mrouter->mrt_socket) { error = EPROTONOSUPPORT; goto out; } @@ -218,7 +219,10 @@ ip6_mrouter_get(int cmd, struct socket * int ip6_mrouter_active(u_int rtableid) { - return (READ_ONCE(mrt6_mrouter[rtableid]) != NULL); + struct ip6_mrouter *mrouter; + + mrouter = rtable_get_mrouter6(rtableid); + return (mrouter != NULL && READ_ONCE(mrouter->mrt_socket) != NULL); } void @@ -236,6 +240,7 @@ mrt6_init(void) int mrt6_ioctl(struct socket *so, u_long cmd, caddr_t data) { + struct ip6_mrouter *mrouter; struct inpcb *inp; unsigned int rtableid; int error; @@ -251,7 +256,8 @@ mrt6_ioctl(struct socket *so, u_long cmd rw_enter_read(&mrt6_routerlock); - if (so != mrt6_mrouter[rtableid]) { + mrouter = rtable_get_mrouter6(rtableid); + if (mrouter == NULL || so != mrouter->mrt_socket) { error = EPROTONOSUPPORT; goto out; } @@ -551,6 +557,7 @@ mrt6_sysctl_mfc(void *oldp, size_t *oldl int ip6_mrouter_init(struct socket *so, int v, int cmd) { + struct ip6_mrouter *mrouter; struct inpcb *inp = sotoinpcb(so); unsigned int rtableid = inp->inp_rtableid; @@ -565,11 +572,12 @@ ip6_mrouter_init(struct socket *so, int rw_enter_write(&mrt6_routerlock); - if (mrt6_mrouter[rtableid] != NULL) { + mrouter = rtable_get_mrouter6(rtableid); + if (mrouter == NULL || mrouter->mrt_socket != NULL) { rw_exit_write(&mrt6_routerlock); return (EADDRINUSE); } - mrt6_mrouter[rtableid] = soref(so); + mrouter->mrt_socket = soref(so); rw_exit_write(&mrt6_routerlock); @@ -593,6 +601,7 @@ mrouter6_rtwalk_delete(struct rtentry *r int ip6_mrouter_done(struct socket *so) { + struct ip6_mrouter *mrouter; struct inpcb *inp = sotoinpcb(so); struct ifnet *ifp; unsigned int rtableid = inp->inp_rtableid; @@ -602,7 +611,8 @@ ip6_mrouter_done(struct socket *so) rw_enter_write(&mrt6_routerlock); - if (so != mrt6_mrouter[rtableid]) { + mrouter = rtable_get_mrouter6(rtableid); + if (mrouter == NULL || so != mrouter->mrt_socket) { rw_exit_write(&mrt6_routerlock); return (EPROTONOSUPPORT); } @@ -628,7 +638,7 @@ ip6_mrouter_done(struct socket *so) ip6_mrouter_detach(ifp); } - mrt6_mrouter[rtableid] = NULL; + mrouter->mrt_socket = NULL; sorele(so); rw_exit_write(&mrt6_routerlock); @@ -664,6 +674,7 @@ ip6_mrouter_detach(struct ifnet *ifp) int add_m6if(struct socket *so, struct mif6ctl *mifcp) { + struct ip6_mrouter *mrouter; struct inpcb *inp = sotoinpcb(so); struct mif6 *mifp; struct ifnet *ifp; @@ -674,7 +685,8 @@ add_m6if(struct socket *so, struct mif6c soassertlocked(so); rw_enter_read(&mrt6_routerlock); - if (so != mrt6_mrouter[rtableid]) { + mrouter = rtable_get_mrouter6(rtableid); + if (mrouter == NULL || so != mrouter->mrt_socket) { rw_exit_read(&mrt6_routerlock); return (EPROTONOSUPPORT); } @@ -734,6 +746,7 @@ add_m6if(struct socket *so, struct mif6c int del_m6if(struct socket *so, mifi_t *mifip) { + struct ip6_mrouter *mrouter; struct inpcb *inp = sotoinpcb(so); struct ifnet *ifp; unsigned int rtableid = inp->inp_rtableid; @@ -741,7 +754,8 @@ del_m6if(struct socket *so, mifi_t *mifi soassertlocked(so); rw_enter_read(&mrt6_routerlock); - if (so != mrt6_mrouter[rtableid]) { + mrouter = rtable_get_mrouter6(rtableid); + if (mrouter == NULL || so != mrouter->mrt_socket) { rw_exit_read(&mrt6_routerlock); return (EPROTONOSUPPORT); } @@ -925,13 +939,15 @@ mf6c_add(struct mf6cctl *mfccp, struct i int add_m6fc(struct socket *so, struct mf6cctl *mfccp) { + struct ip6_mrouter *mrouter; struct inpcb *inp = sotoinpcb(so); unsigned int rtableid = inp->inp_rtableid; soassertlocked(so); rw_enter_read(&mrt6_routerlock); - if (so != mrt6_mrouter[rtableid]) { + mrouter = rtable_get_mrouter6(rtableid); + if (mrouter == NULL || so != mrouter->mrt_socket) { rw_exit_read(&mrt6_routerlock); return (EPROTONOSUPPORT); } @@ -945,6 +961,7 @@ add_m6fc(struct socket *so, struct mf6cc int del_m6fc(struct socket *so, struct mf6cctl *mfccp) { + struct ip6_mrouter *mrouter; struct inpcb *inp = sotoinpcb(so); struct rtentry *rt; unsigned int rtableid = inp->inp_rtableid; @@ -952,7 +969,8 @@ del_m6fc(struct socket *so, struct mf6cc soassertlocked(so); rw_enter_read(&mrt6_routerlock); - if (so != mrt6_mrouter[rtableid]) { + mrouter = rtable_get_mrouter6(rtableid); + if (mrouter == NULL || so != mrouter->mrt_socket) { rw_exit_read(&mrt6_routerlock); return (EPROTONOSUPPORT); } @@ -1049,8 +1067,10 @@ ip6_mforward(struct ip6_hdr *ip6, struct mrt6stat_inc(mrt6s_no_route); { + struct ip6_mrouter *mrouter; struct sockaddr_in6 sin6 = { sizeof(sin6), AF_INET6 }; struct mrt6msg *im; + struct socket *so = NULL; if ((mifp = ifp->if_mcast6) == NULL) return EHOSTUNREACH; @@ -1074,9 +1094,12 @@ ip6_mforward(struct ip6_hdr *ip6, struct im->im6_mbz = 0; im->im6_mif = mifp->m6_mifi; + mrouter = rtable_get_mrouter6(rtableid); + if (mrouter != NULL) + so = mrouter->mrt_socket; + sin6.sin6_addr = ip6->ip6_src; - if (socket6_send(mrt6_mrouter[rtableid], mm, - &sin6) < 0) { + if (socket6_send(so, mm, &sin6) < 0) { rw_exit_read(&mrt6_routerlock); log(LOG_WARNING, "ip6_mforward: mrt6_mrouter " "socket queue full\n"); Index: netinet6/ip6_var.h =================================================================== RCS file: /cvs/src/sys/netinet6/ip6_var.h,v diff -u -p -r1.132 ip6_var.h --- netinet6/ip6_var.h 17 Sep 2026 15:56:59 -0000 1.132 +++ netinet6/ip6_var.h 16 Nov 2026 09:28:33 -0000 @@ -274,7 +274,6 @@ extern int ip6_mcast_pmtu; /* path MTU extern int ip6_neighborgcthresh; /* Threshold # of NDP entries for GC */ extern int ip6_maxdynroutes; /* Max # of routes created via redirect */ -extern struct socket *ip6_mrouter[RT_TABLEID_MAX + 1]; /* multicast routing daemon */ extern int ip6_sendredirects; /* send IP redirects when forwarding? */ extern int ip6_maxfragpackets; /* Maximum packets in reassembly queue */ extern int ip6_maxfrags; /* Maximum fragments in reassembly queue */