Date: Mon, 16 Feb 2026 19:47:35 +0000 From: Mark Johnston <markj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 20f81dcba998 - stable/14 - ip6_mroute: Make MF6CFIND a regular function Message-ID: <69937457.3fde9.c16fbe5@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=20f81dcba99874bef290745e39abb53f94a8474f commit 20f81dcba99874bef290745e39abb53f94a8474f Author: Mark Johnston <markj@FreeBSD.org> AuthorDate: 2026-02-02 14:57:20 +0000 Commit: Mark Johnston <markj@FreeBSD.org> CommitDate: 2026-02-16 16:09:28 +0000 ip6_mroute: Make MF6CFIND a regular function This is more natural and corresponds more closely to the v4 multicast routing code. No functional change intended. Reviewed by: glebius MFC after: 2 weeks Sponsored by: Stormshield Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D54983 (cherry picked from commit b370fcc716b9cfd4d08e291f0009f02452c84d64) --- sys/netinet6/ip6_mroute.c | 45 ++++++++++++++++++++------------------------- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c index 76e20b110d72..86b65fbbd047 100644 --- a/sys/netinet6/ip6_mroute.c +++ b/sys/netinet6/ip6_mroute.c @@ -297,26 +297,6 @@ VNET_DEFINE_STATIC(int, pim6); (g).s6_addr32[0] ^ (g).s6_addr32[1] ^ \ (g).s6_addr32[2] ^ (g).s6_addr32[3]) -/* - * Find a route for a given origin IPv6 address and Multicast group address. - */ -#define MF6CFIND(o, g, rt) do { \ - struct mf6c *_rt = mf6ctable[MF6CHASH(o,g)]; \ - rt = NULL; \ - while (_rt) { \ - if (IN6_ARE_ADDR_EQUAL(&_rt->mf6c_origin.sin6_addr, &(o)) && \ - IN6_ARE_ADDR_EQUAL(&_rt->mf6c_mcastgrp.sin6_addr, &(g)) && \ - (_rt->mf6c_stall == NULL)) { \ - rt = _rt; \ - break; \ - } \ - _rt = _rt->mf6c_next; \ - } \ - if (rt == NULL) { \ - MRT6STAT_INC(mrt6s_mfc_misses); \ - } \ -} while (/*CONSTCOND*/ 0) - /* * Macros to compute elapsed time efficiently * Borrowed from Van Jacobson's scheduling code @@ -367,6 +347,22 @@ static int X_ip6_mrouter_set(struct socket *, struct sockopt *); static int X_ip6_mrouter_get(struct socket *, struct sockopt *); static int X_mrt6_ioctl(u_long, caddr_t); +static struct mf6c * +mf6c_find(const struct in6_addr *origin, const struct in6_addr *group) +{ + MFC6_LOCK_ASSERT(); + + for (struct mf6c *rt = mf6ctable[MF6CHASH(*origin, *group)]; rt != NULL; + rt = rt->mf6c_next) { + if (IN6_ARE_ADDR_EQUAL(&rt->mf6c_origin.sin6_addr, origin) && + IN6_ARE_ADDR_EQUAL(&rt->mf6c_mcastgrp.sin6_addr, group) && + rt->mf6c_stall == NULL) + return (rt); + } + MRT6STAT_INC(mrt6s_mfc_misses); + return (NULL); +} + /* * Handle MRT setsockopt commands to modify the multicast routing tables. */ @@ -495,7 +491,7 @@ get_sg_cnt(struct sioc_sg_req6 *req) MFC6_LOCK(); - MF6CFIND(req->src.sin6_addr, req->grp.sin6_addr, rt); + rt = mf6c_find(&req->src.sin6_addr, &req->grp.sin6_addr); if (rt == NULL) { ret = ESRCH; } else { @@ -818,9 +814,8 @@ add_m6fc(struct mf6cctl *mfccp) MFC6_LOCK(); - MF6CFIND(mfccp->mf6cc_origin.sin6_addr, - mfccp->mf6cc_mcastgrp.sin6_addr, rt); - + rt = mf6c_find(&mfccp->mf6cc_origin.sin6_addr, + &mfccp->mf6cc_mcastgrp.sin6_addr); /* If an entry already exists, just update the fields */ if (rt) { MRT6_DLOG(DEBUG_MFC, "no upcall o %s g %s p %x", @@ -1115,7 +1110,7 @@ X_ip6_mforward(struct ip6_hdr *ip6, struct ifnet *ifp, struct mbuf *m) /* * Determine forwarding mifs from the forwarding cache table */ - MF6CFIND(ip6->ip6_src, ip6->ip6_dst, rt); + rt = mf6c_find(&ip6->ip6_src, &ip6->ip6_dst); MRT6STAT_INC(mrt6s_mfc_lookups); /* Entry exists, so forward if necessary */home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69937457.3fde9.c16fbe5>