From owner-dev-commits-src-all@freebsd.org Fri Aug 13 09:07:25 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A9A1F6529FB; Fri, 13 Aug 2021 09:07:25 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GmHkj4PGQz3Kc4; Fri, 13 Aug 2021 09:07:25 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 7F33F3722; Fri, 13 Aug 2021 09:07:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 17D97Pw3099604; Fri, 13 Aug 2021 09:07:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17D97Pk2099603; Fri, 13 Aug 2021 09:07:25 GMT (envelope-from git) Date: Fri, 13 Aug 2021 09:07:25 GMT Message-Id: <202108130907.17D97Pk2099603@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wojciech Macek Subject: git: f61cb12aac8d - main - mroute: fix locking issues MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wma X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f61cb12aac8df8179ac9cbd075272aed6524a505 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Aug 2021 09:07:25 -0000 The branch main has been updated by wma: URL: https://cgit.FreeBSD.org/src/commit/?id=f61cb12aac8df8179ac9cbd075272aed6524a505 commit f61cb12aac8df8179ac9cbd075272aed6524a505 Author: Wojciech Macek AuthorDate: 2021-08-11 07:04:20 +0000 Commit: Wojciech Macek CommitDate: 2021-08-13 09:06:17 +0000 mroute: fix locking issues In some cases the code may fall into deadlock. Avoid calling epoch_wait when W-lock is taken. Sponsored by: Stormshield Obtained from: Semihalf --- sys/netinet/ip_mroute.c | 58 ++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c index b614f74cf7d3..efb34af60d9c 100644 --- a/sys/netinet/ip_mroute.c +++ b/sys/netinet/ip_mroute.c @@ -77,6 +77,7 @@ __FBSDID("$FreeBSD$"); #define _PIM_VT 1 +#include #include #include #include @@ -100,6 +101,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -727,7 +729,7 @@ ip_mrouter_init(struct socket *so, int version) curvnet); V_ip_mrouter = so; - ip_mrouter_cnt++; + atomic_add_int(&ip_mrouter_cnt, 1); /* This is a mutex required by buf_ring init, but not used internally */ mtx_init(&V_buf_ring_mtx, "mroute buf_ring mtx", NULL, MTX_DEF); @@ -750,22 +752,20 @@ X_ip_mrouter_done(void) vifi_t vifi; struct bw_upcall *bu; - MRW_WLOCK(); - - if (V_ip_mrouter == NULL) { - MRW_WUNLOCK(); + if (V_ip_mrouter == NULL) return EINVAL; - } /* * Detach/disable hooks to the reset of the system. */ V_ip_mrouter = NULL; - ip_mrouter_cnt--; + atomic_subtract_int(&ip_mrouter_cnt, 1); V_mrt_api_config = 0; MROUTER_WAIT(); + MRW_WLOCK(); + upcall_thread_shutdown = 1; mtx_lock(&V_upcall_thread_mtx); cv_signal(&V_upcall_thread_cv); @@ -896,25 +896,17 @@ add_vif(struct vifctl *vifcp) struct ifnet *ifp; int error; - MRW_WLOCK(); - if (vifcp->vifc_vifi >= MAXVIFS) { - MRW_WUNLOCK(); + + if (vifcp->vifc_vifi >= MAXVIFS) return EINVAL; - } /* rate limiting is no longer supported by this code */ if (vifcp->vifc_rate_limit != 0) { log(LOG_ERR, "rate limiting is no longer supported\n"); - MRW_WUNLOCK(); return EINVAL; } - if (!in_nullhost(vifp->v_lcl_addr)) { - MRW_WUNLOCK(); - return EADDRINUSE; - } - if (in_nullhost(vifcp->vifc_lcl_addr)) { - MRW_WUNLOCK(); + + if (in_nullhost(vifcp->vifc_lcl_addr)) return EADDRNOTAVAIL; - } /* Find the interface with an address in AF_INET family */ if (vifcp->vifc_flags & VIFF_REGISTER) { @@ -932,7 +924,6 @@ add_vif(struct vifctl *vifcp) ifa = ifa_ifwithaddr((struct sockaddr *)&sin); if (ifa == NULL) { NET_EPOCH_EXIT(et); - MRW_WUNLOCK(); return EADDRNOTAVAIL; } ifp = ifa->ifa_ifp; @@ -942,7 +933,6 @@ add_vif(struct vifctl *vifcp) if ((vifcp->vifc_flags & VIFF_TUNNEL) != 0) { CTR1(KTR_IPMF, "%s: tunnels are no longer supported", __func__); - MRW_WUNLOCK(); return EOPNOTSUPP; } else if (vifcp->vifc_flags & VIFF_REGISTER) { ifp = V_multicast_register_if = if_alloc(IFT_LOOP); @@ -952,17 +942,24 @@ add_vif(struct vifctl *vifcp) V_reg_vif_num = vifcp->vifc_vifi; } } else { /* Make sure the interface supports multicast */ - if ((ifp->if_flags & IFF_MULTICAST) == 0) { - MRW_WUNLOCK(); + if ((ifp->if_flags & IFF_MULTICAST) == 0) return EOPNOTSUPP; - } /* Enable promiscuous reception of all IP multicasts from the if */ error = if_allmulti(ifp, 1); - if (error) { - MRW_WUNLOCK(); + if (error) return error; - } + } + + MRW_WLOCK(); + + if (!in_nullhost(vifp->v_lcl_addr)) { + if (ifp) + V_multicast_register_if = NULL; + MRW_WUNLOCK(); + if (ifp) + if_free(ifp); + return EADDRINUSE; } vifp->v_flags = vifcp->vifc_flags; @@ -1014,8 +1011,11 @@ del_vif_locked(vifi_t vifi) if (vifp->v_flags & VIFF_REGISTER) { V_reg_vif_num = VIFI_INVALID; - if_free(V_multicast_register_if); - V_multicast_register_if = NULL; + if (vifp->v_ifp) { + if (vifp->v_ifp == V_multicast_register_if) + V_multicast_register_if = NULL; + if_free(vifp->v_ifp); + } } mtx_destroy(&vifp->v_spin);