From nobody Fri Jan 21 05:19:01 2022 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 5A038195919E; Fri, 21 Jan 2022 05:19:02 +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 4Jg72s6sD3z3DvJ; Fri, 21 Jan 2022 05:19:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642742342; 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=8YZlgh2hh8wfUGwQINhtWO8ZIMgG9V/Ds+QCoAEEYzY=; b=Lz7GbsNRxOI09l+R5YN4/BV765n+e36V6hGOWrIKROlmulm7OmiNnj7IwDna4uVxC1rxLF TNjx9u+DVSB9vJl0RDVOdPD9sAlD0/SkMJWSmUIn9FMQasO1OiwZLk+1hxpokEUdaWFH4C kb/510DrRnJXiROLXGH0N5PnRe57p89hMudeegQwXjQVFPAnnhLcVr591xSrK4NCjsZ6MC 0Pg+by/Cf9zqZSB6qgNfiOmpF6hl4iOTg+GFgh/a58cgJk7bNPqFR3CXpCYwJntL0fHprn rn4/RJGdu0R/P6SX/vNuBqqhuy8fesLjeVdfi+7/NxuZ9HX+QcjaHzeTSZyOTg== 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 B1E9D160EF; Fri, 21 Jan 2022 05:19:01 +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 20L5J1d0029324; Fri, 21 Jan 2022 05:19:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20L5J1mJ029323; Fri, 21 Jan 2022 05:19:01 GMT (envelope-from git) Date: Fri, 21 Jan 2022 05:19:01 GMT Message-Id: <202201210519.20L5J1mJ029323@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: 9ce46cbc95d7 - main - ip_mroute: move ip_mrouter_done outside lock 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org 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: 9ce46cbc95d7a6fccb55af0d42cbb85c29f10639 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642742342; 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=8YZlgh2hh8wfUGwQINhtWO8ZIMgG9V/Ds+QCoAEEYzY=; b=Ai/l7/gcgo3QKMBT9VC4Db7yLlU5a5evGQNsfDjfsCQxFlhb2hMlMIpxcXnecRrJTFfENk rhV2dboC7cXNBmWr19k+QL6QuPUXqUH+E8HWC8X8wZJkvXo6x0KTNDy8DH/f3yHAjR1+on Q1xP6bZjgMXX9VTBHOQPVn7fmoNfoHYcNco+lbyeUvtBF9JDwCu6NZ4rvFsGGbrPv1RSMo 60Qtyfz7qjlsdY4wESBNx0ibPfIJe+vBLUXEGZ9MZHeJB5w3h1iuDmB6QgZlx9GG7qOOZR bkGwrYe4ZZgYlpWxhiWNfd3lom4KGtcnzdO6R4d1gUx1EQ3a3ks42HNwBR4dWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642742342; a=rsa-sha256; cv=none; b=H8KnBpkLx+ATXbo1Pkn7cDPhUiZLt3i96hf6klBm/67mXyh+YTf82knrpj8KNzqIfLjCNr bE+zU9koq3cPAbh385tT1IbAXh0L86UoQEsjArUdWsV8PiN7xGxoQZh9JeHJJFA8V8Ka34 C3DCFnLOzXpmysX3hp0JbllyBbDQP6JYSGTrG4D4TSdPwaWr9VqO6eGLIPOVCkDU1fvZ8d RdAme+CSIe/0ljXRNW4Jyi/m18WMnkq9RgO2ZbsLoZYxMBf2T1jqpR60j6UIfN4EE+ZOOB WEvPiVUkYCFjgTHrIartfWrAR7uXvEz/fXTpUjIQuAfjp091ApMPi016mQlvWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by wma: URL: https://cgit.FreeBSD.org/src/commit/?id=9ce46cbc95d7a6fccb55af0d42cbb85c29f10639 commit 9ce46cbc95d7a6fccb55af0d42cbb85c29f10639 Author: Wojciech Macek AuthorDate: 2022-01-21 05:15:08 +0000 Commit: Wojciech Macek CommitDate: 2022-01-21 05:17:19 +0000 ip_mroute: move ip_mrouter_done outside lock X_ip_mrouter_done might sleep, which triggers INVARIANTS to print additional errors on the screen. Move it outside the lock, but provide some basic synchronization to avoid race condition during module uninit/unload. Obtained from: Semihalf Sponsored by: Stormshield --- sys/netinet/ip_mroute.c | 11 ++++++++--- sys/netinet/ip_mroute.h | 4 +++- sys/netinet/raw_ip.c | 11 ++++++++--- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c index 8cd0b2ac7449..0566048621ad 100644 --- a/sys/netinet/ip_mroute.c +++ b/sys/netinet/ip_mroute.c @@ -300,7 +300,7 @@ VNET_DEFINE_STATIC(struct ifnet *, multicast_register_if); static u_long X_ip_mcast_src(int); static int X_ip_mforward(struct ip *, struct ifnet *, struct mbuf *, struct ip_moptions *); -static int X_ip_mrouter_done(void); +static int X_ip_mrouter_done(void *); static int X_ip_mrouter_get(struct socket *, struct sockopt *); static int X_ip_mrouter_set(struct socket *, struct sockopt *); static int X_legal_vif_num(int); @@ -431,7 +431,7 @@ X_ip_mrouter_set(struct socket *so, struct sockopt *sopt) break; case MRT_DONE: - error = ip_mrouter_done(); + error = ip_mrouter_done(NULL); break; case MRT_ADD_VIF: @@ -734,7 +734,7 @@ ip_mrouter_init(struct socket *so, int version) * Disable multicast forwarding. */ static int -X_ip_mrouter_done(void) +X_ip_mrouter_done(void *locked) { struct ifnet *ifp; u_long i; @@ -751,6 +751,11 @@ X_ip_mrouter_done(void) atomic_subtract_int(&ip_mrouter_cnt, 1); V_mrt_api_config = 0; + if (locked) { + struct epoch_tracker *mrouter_et = locked; + MROUTER_RUNLOCK_PARAM(mrouter_et); + } + MROUTER_WAIT(); /* Stop and drain task queue */ diff --git a/sys/netinet/ip_mroute.h b/sys/netinet/ip_mroute.h index 65c5bdd3a025..016d026d184c 100644 --- a/sys/netinet/ip_mroute.h +++ b/sys/netinet/ip_mroute.h @@ -363,12 +363,14 @@ struct sockopt; extern int (*ip_mrouter_set)(struct socket *, struct sockopt *); extern int (*ip_mrouter_get)(struct socket *, struct sockopt *); -extern int (*ip_mrouter_done)(void); +extern int (*ip_mrouter_done)(void *); extern int (*mrt_ioctl)(u_long, caddr_t, int); #define MROUTER_RLOCK_TRACKER struct epoch_tracker mrouter_et +#define MROUTER_RLOCK_PARAM_PTR &mrouter_et #define MROUTER_RLOCK() epoch_enter_preempt(net_epoch_preempt, &mrouter_et) #define MROUTER_RUNLOCK() epoch_exit_preempt(net_epoch_preempt, &mrouter_et) +#define MROUTER_RUNLOCK_PARAM(param) epoch_exit_preempt(net_epoch_preempt, param) #define MROUTER_WAIT() epoch_wait_preempt(net_epoch_preempt) #endif /* _KERNEL */ diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index 7c495745806e..08ce848a63f7 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -119,7 +119,7 @@ VNET_DEFINE(struct socket *, ip_mrouter); */ int (*ip_mrouter_set)(struct socket *, struct sockopt *); int (*ip_mrouter_get)(struct socket *, struct sockopt *); -int (*ip_mrouter_done)(void); +int (*ip_mrouter_done)(void *locked); int (*ip_mforward)(struct ip *, struct ifnet *, struct mbuf *, struct ip_moptions *); int (*mrt_ioctl)(u_long, caddr_t, int); @@ -879,18 +879,23 @@ static void rip_detach(struct socket *so) { struct inpcb *inp; + MROUTER_RLOCK_TRACKER; inp = sotoinpcb(so); KASSERT(inp != NULL, ("rip_detach: inp == NULL")); KASSERT(inp->inp_faddr.s_addr == INADDR_ANY, ("rip_detach: not closed")); + /* Disable mrouter first, lock released inside ip_mrouter_done */ + MROUTER_RLOCK(); + if (so == V_ip_mrouter && ip_mrouter_done) + ip_mrouter_done(MROUTER_RLOCK_PARAM_PTR); + INP_WLOCK(inp); INP_HASH_WLOCK(&V_ripcbinfo); rip_delhash(inp); INP_HASH_WUNLOCK(&V_ripcbinfo); - if (so == V_ip_mrouter && ip_mrouter_done) - ip_mrouter_done(); + if (ip_rsvp_force_done) ip_rsvp_force_done(so); if (so == V_ip_rsvpd)