Date: Sun, 03 May 2026 15:45:42 +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: 3e7157f4adc6 - stable/15 - in_mcast: Avoid calling sysctl_wire_old_buffer() in an epoch section Message-ID: <69f76da6.1e5b0.3f06f11b@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3e7157f4adc67920a6ff9b96347658546a9ea089 commit 3e7157f4adc67920a6ff9b96347658546a9ea089 Author: Mark Johnston <markj@FreeBSD.org> AuthorDate: 2026-04-17 12:42:54 +0000 Commit: Mark Johnston <markj@FreeBSD.org> CommitDate: 2026-05-03 14:40:10 +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 (cherry picked from commit c1b514c88c76a4de906775d47b06388e62ab6845) --- 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 08c536bc71c0..da6a43eb8800 100644 --- a/sys/netinet/in_mcast.c +++ b/sys/netinet/in_mcast.c @@ -2871,6 +2871,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); @@ -2881,13 +2886,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?69f76da6.1e5b0.3f06f11b>