From nobody Fri Jan 21 13:01:22 2022 X-Original-To: dev-commits-src-main@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 44A5E195BF14; Fri, 21 Jan 2022 13:01:27 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JgKJQ5n7kz4j8g; Fri, 21 Jan 2022 13:01:26 +0000 (UTC) (envelope-from kp@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642770086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=r8nRW5J/Pwh01OUXZTbutL8/dmAThHseMvvbW1h3gqE=; b=DpLLdTZFyoDX8G9Se8q0IT7PGayCHKTfP2Md52tjHfC/2xz2cg51kUWjP8H+bD7j7bChj9 +YIAIlXYdc+27QL3q2uwV1nmOOLkneo0kW36zUD6APKiEERGg6YRIdHjBYq2R3GmNlSWyq kKS8qEZY+JO8bTji05xXTzTct8VanQUBQ6VUtO2MmYajihbf9po9m/5oA9uslEOSzKVBA7 3n6EDm5AYqQptnP6F39Gg2zdetmQdYlqGkSGjTX5luO3KLGvVIpt8HPpphQkGnN2eT5zsU EkekRGPI2B50xbGSrmimLjyZEwEYVrMy4qPYj9hWlXtaPysDRpodf3nBPHxo6w== Received: from venus.codepro.be (venus.codepro.be [5.9.86.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx1.codepro.be", Issuer "R3" (verified OK)) (Authenticated sender: kp) by smtp.freebsd.org (Postfix) with ESMTPSA id 7B4FB2ACC5; Fri, 21 Jan 2022 13:01:26 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id 13EAD1A92E; Fri, 21 Jan 2022 14:01:24 +0100 (CET) From: Kristof Provost To: Wojciech Macek Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 9ce46cbc95d7 - main - ip_mroute: move ip_mrouter_done outside lock Date: Fri, 21 Jan 2022 14:01:22 +0100 X-Mailer: MailMate (1.14r5852) Message-ID: <7A991003-0F24-4C8C-81FD-84F39FC78D8A@FreeBSD.org> In-Reply-To: <202201210519.20L5J1mJ029323@gitrepo.freebsd.org> References: <202201210519.20L5J1mJ029323@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642770086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=r8nRW5J/Pwh01OUXZTbutL8/dmAThHseMvvbW1h3gqE=; b=jjgY3i4/FkS/xh9rrnFxVOZQOBbfLki43DQNcfS/dxzz91lB44JNw/EhtPVDmQruxTYIuM 7mvaJ/h81hbGcxIutE/2kvRfOqDBY+Lnnfo5HrgFAueso1qtUMj4MtwZTn+S6YJBx9HV4j 1iqYExNzM4yPscVBPc6HUzjnLGZoGF4ZPVAOV28w8s1RbVEq0DeU/XLYkRe02dUQcRxcUV rQBIZSi/d7QOQOJzzvMmvjPBMxEaBShH7eXK0BsuLGsWe/LkGRC/F9C6juFyu3QUMHUhyw SXuQUF3WCwMpLEicINTjwfAFFgnHtfh59XaZaZ3c9LTH4F8y+a+FVTvK0RAY/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642770086; a=rsa-sha256; cv=none; b=E6BVwurhN2ZWXcEjQOhZhbTpV563aZYDgcoQ73DOfB8ycP9f492ti+uY92m1YhVd+j8spZ HhFGZ13FX5b0pVhwHuN8/YFBgSSkWY1KBOwNI7PRLAEF8qeYriG4n6YBAbSh4aYhBnnUH0 jU/mRChayPegyl5276Z1/ShtiFnG07yiFoNZzxVg2hhDtlC2MOlVSECghkuZJZHH13/U2w rpfFVPilb2bwKXHkIsc63nQn2fQ8jREngnlsuDNhSotTttxgnt9RlJJ4y29HA2kGVDZYq9 zAHOrfggP9Jszrtu7pOuY7fLg1IIKldkPhqdnGKSQ+KPfB/vT8boOZd5ZnU0bQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N Hi Wojciech, On 21 Jan 2022, at 6:19, Wojciech Macek wrote: > The branch main has been updated by wma: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D9ce46cbc95d7a6fccb55af0d= 42cbb85c29f10639 > > 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 I suspect this change causes panics like this one: https://ci.freebsd.org= /job/FreeBSD-main-amd64-test/20437/consoleText > 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_regist= er_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 =3D ip_mrouter_done(); > + error =3D 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 =3D 0; > > + if (locked) { > + struct epoch_tracker *mrouter_et =3D 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, &mroute= r_et) > #define MROUTER_RUNLOCK() epoch_exit_preempt(net_epoch_preempt, &mrout= er_et) > +#define MROUTER_RUNLOCK_PARAM(param) epoch_exit_preempt(net_epoch_pree= mpt, 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 =3D sotoinpcb(so); > KASSERT(inp !=3D NULL, ("rip_detach: inp =3D=3D NULL")); > KASSERT(inp->inp_faddr.s_addr =3D=3D INADDR_ANY, > ("rip_detach: not closed")); > > + /* Disable mrouter first, lock released inside ip_mrouter_done */ > + MROUTER_RLOCK(); > + if (so =3D=3D V_ip_mrouter && ip_mrouter_done) > + ip_mrouter_done(MROUTER_RLOCK_PARAM_PTR); > + I believe this is the problem. If we do not enter ip_mrouter_done() here we=E2=80=99ll exit the function= without exiting epoch. The epoch tracker on the stack will be overwritte= n, and that could produce the panic we see in ci.freebsd.org. Best regards, Kristof