From nobody Mon Feb 10 14:47:46 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ys6r2452cz5mGTv; Mon, 10 Feb 2025 14:47:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys6r232Fvz4J0D; Mon, 10 Feb 2025 14:47:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739198866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rW6V+1HNR/zjxiUikLJOr1Ox7EvZq0aE6eoFkXx2oh8=; b=E1SSjzwuAoiifwHdeKOG7hG573CFT3U3EbkzW+aBU+hwfH8w0GNdRrz55yXqUXvIXDJAnx oHnVQji5InneRJlt+mPzsDgyE+JHwWBLiCcevVXWVzYVOXtr81gH5cMMSi9QtfYBc78GwX yqQcl3Wvem0OrNOzZEd6JavQWTelBAzyDylauCHEOQ9Xg23in09rcd7kS6DB8Znl56MgDK qWeEJxbRSJHTEGuzXH7BVUGKO7GWusqpegunsTGJWHUxNnJDDiXIX3C1+c8viHOU7acbrS fygM0ygjNKg0TphgOBKF29O9lSsrTQeQCl0ANp3JbRNN2dp02F3VWVSDqG0S3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739198866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rW6V+1HNR/zjxiUikLJOr1Ox7EvZq0aE6eoFkXx2oh8=; b=xXExqOIBZ4wBwKV8xucCkE41gMlVyo6N+eH45AoKqtInwXsI8ENYNuUQGrv0LaV7qSp/rS MdMq/rPizh2gJKIxtYh2ycsS/JQ3/UeJxoi/S/aHWuLNPNzANponkm2YaoK7cjAuxVkV9r hUZBevmFDFTIlgKLEu/9Pg3AR15MMB7H97A4ahjtf9kTvbxrpviqXy9sW/lvU/WhUSjEGJ 4OvklN/Hfx7sKGeSvUEY8tK5hDCIdZeSXKjpBJyvJF6Z+PWOMkfwTVFUMKTB0WjfaAFmTV PvmRHit3cxIruRGfgaPrIMpwuYXr38TahjAEWOZwgRNMR5PQemplDisNkI55gg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739198866; a=rsa-sha256; cv=none; b=b8W/0N3n9qgPoP4jv9QFgHfp1smWs9ae3ppaCBFmjhkT+7pAQqjoj1Nk0yXjCHYQU0BS77 Yr4x6AR0oqpzyrKcd8CynPTmWez6GyTb3v6WuDP0AJTl2tn9dd+8EHpRNEcPyqQwayxBPb uoVBxOmnA4jOXYouqkphbZUi7DHyU9XXW9gu9dCnDdmZmVjMJYONT5bFK2kr5CWScRLcNS 7uTiy6U5m+dFyUiuf5oODbDwHE2O5yYBcRI8lKogztIXLND7FJ/FHOqMqWpMKz2rKMmRVd symiIulqLtNlXDXuPZfv5ZJKYgZYW9CRni7r2eNSIvF/Hjp8/xwCqkrLtxtxeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ys6r22YtkzX7S; Mon, 10 Feb 2025 14:47:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51AElk5D010644; Mon, 10 Feb 2025 14:47:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AElkxO010641; Mon, 10 Feb 2025 14:47:46 GMT (envelope-from git) Date: Mon, 10 Feb 2025 14:47:46 GMT Message-Id: <202502101447.51AElkxO010641@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: efd368784eeb - main - mroute: serialize parallel teardown of the same vnet List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: efd368784eebcc62324f7e1884776a22a73c4688 Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=efd368784eebcc62324f7e1884776a22a73c4688 commit efd368784eebcc62324f7e1884776a22a73c4688 Author: Mateusz Guzik AuthorDate: 2025-02-10 14:44:39 +0000 Commit: Mateusz Guzik CommitDate: 2025-02-10 14:45:32 +0000 mroute: serialize parallel teardown of the same vnet Otherwise 2 threads calling here can crash the kernel. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netinet/ip_mroute.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c index 501b3e0d9a43..6e6ecd43e9fe 100644 --- a/sys/netinet/ip_mroute.c +++ b/sys/netinet/ip_mroute.c @@ -139,6 +139,13 @@ static MALLOC_DEFINE(M_MRTABLE, "mroutetbl", "multicast forwarding cache"); * structures. */ +static struct sx __exclusive_cache_line mrouter_teardown; +#define MRW_TEARDOWN_WLOCK() sx_xlock(&mrouter_teardown) +#define MRW_TEARDOWN_WUNLOCK() sx_xunlock(&mrouter_teardown) +#define MRW_TEARDOWN_LOCK_INIT() \ + sx_init(&mrouter_teardown, "IPv4 multicast forwarding teardown") +#define MRW_TEARDOWN_LOCK_DESTROY() sx_destroy(&mrouter_teardown) + static struct rwlock mrouter_lock; #define MRW_RLOCK() rw_rlock(&mrouter_lock) #define MRW_WLOCK() rw_wlock(&mrouter_lock) @@ -692,15 +699,18 @@ ip_mrouter_init(struct socket *so, int version) if (version != 1) return ENOPROTOOPT; + MRW_TEARDOWN_WLOCK(); MRW_WLOCK(); if (ip_mrouter_unloading) { MRW_WUNLOCK(); + MRW_TEARDOWN_WUNLOCK(); return ENOPROTOOPT; } if (V_ip_mrouter != NULL) { MRW_WUNLOCK(); + MRW_TEARDOWN_WUNLOCK(); return EADDRINUSE; } @@ -708,6 +718,7 @@ ip_mrouter_init(struct socket *so, int version) HASH_NOWAIT); if (V_mfchashtbl == NULL) { MRW_WUNLOCK(); + MRW_TEARDOWN_WUNLOCK(); return (ENOMEM); } @@ -717,6 +728,7 @@ ip_mrouter_init(struct socket *so, int version) M_NOWAIT, &V_bw_upcalls_ring_mtx); if (!V_bw_upcalls_ring) { MRW_WUNLOCK(); + MRW_TEARDOWN_WUNLOCK(); return (ENOMEM); } @@ -736,6 +748,7 @@ ip_mrouter_init(struct socket *so, int version) mtx_init(&V_buf_ring_mtx, "mroute buf_ring mtx", NULL, MTX_DEF); MRW_WUNLOCK(); + MRW_TEARDOWN_WUNLOCK(); CTR1(KTR_IPMF, "%s: done", __func__); @@ -754,8 +767,12 @@ X_ip_mrouter_done(void) vifi_t vifi; struct bw_upcall *bu; - if (V_ip_mrouter == NULL) + MRW_TEARDOWN_WLOCK(); + + if (V_ip_mrouter == NULL) { + MRW_TEARDOWN_WUNLOCK(); return (EINVAL); + } /* * Detach/disable hooks to the reset of the system. @@ -830,6 +847,7 @@ X_ip_mrouter_done(void) mtx_destroy(&V_buf_ring_mtx); MRW_WUNLOCK(); + MRW_TEARDOWN_WUNLOCK(); /* * Now drop our claim on promiscuous multicast on the interfaces recorded @@ -2809,6 +2827,7 @@ ip_mroute_modevent(module_t mod, int type, void *unused) switch (type) { case MOD_LOAD: + MRW_TEARDOWN_LOCK_INIT(); MRW_LOCK_INIT(); if_detach_event_tag = EVENTHANDLER_REGISTER(ifnet_departure_event, @@ -2880,6 +2899,7 @@ ip_mroute_modevent(module_t mod, int type, void *unused) rsvp_input_p = NULL; MRW_LOCK_DESTROY(); + MRW_TEARDOWN_LOCK_DESTROY(); break; default: