Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 17 Apr 2026 12:43:06 +0000
From:      Mark Johnston <markj@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: c1b514c88c76 - main - in_mcast: Avoid calling sysctl_wire_old_buffer() in an epoch section
Message-ID:  <69e22ada.3f835.544104e5@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=c1b514c88c76a4de906775d47b06388e62ab6845

commit c1b514c88c76a4de906775d47b06388e62ab6845
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2026-04-17 12:42:54 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2026-04-17 12:42:54 +0000

    in_mcast: Avoid calling sysctl_wire_old_buffer() in an epoch section
    
    Wiring a virtual address range may require the thread to sleep, and this
    is not permitted in an epoch section.
    
    MFC after:      1 week
---
 sys/netinet/in_mcast.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/sys/netinet/in_mcast.c b/sys/netinet/in_mcast.c
index 9e93992f81e0..1e7985ac01d7 100644
--- a/sys/netinet/in_mcast.c
+++ b/sys/netinet/in_mcast.c
@@ -2853,6 +2853,11 @@ sysctl_ip_mcast_filters(SYSCTL_HANDLER_ARGS)
 		return (EINVAL);
 	}
 
+	retval = sysctl_wire_old_buffer(req,
+	    sizeof(uint32_t) + (in_mcast_maxgrpsrc * sizeof(struct in_addr)));
+	if (retval)
+		return (retval);
+
 	ifindex = name[0];
 	NET_EPOCH_ENTER(et);
 	ifp = ifnet_byindex(ifindex);
@@ -2863,13 +2868,6 @@ sysctl_ip_mcast_filters(SYSCTL_HANDLER_ARGS)
 		return (ENOENT);
 	}
 
-	retval = sysctl_wire_old_buffer(req,
-	    sizeof(uint32_t) + (in_mcast_maxgrpsrc * sizeof(struct in_addr)));
-	if (retval) {
-		NET_EPOCH_EXIT(et);
-		return (retval);
-	}
-
 	IN_MULTI_LIST_LOCK();
 
 	CK_STAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69e22ada.3f835.544104e5>