From nobody Sat Jan 22 13:35:28 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 C121F1982460; Sat, 22 Jan 2022 13:35:31 +0000 (UTC) (envelope-from kp@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 4Jgy1H555vz4lVN; Sat, 22 Jan 2022 13:35:31 +0000 (UTC) (envelope-from kp@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642858531; 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=V/VtYSVz79fa7BtvUIPYpELUgzaGQhhpw0NqMWI+iUU=; b=f0MRd3NutQT9oGaFN0hAE61gjDK8e/jR0X7UGFGtcCd9rUFZaROdeNN3x2ATlZ0gDDXCnk gasLGnaqWSYhwBolLXxtKM6N+6coJOjAB3DtxcePb9+k6aGVIDgvH5CB2+IsS95YRbNvMN xzflYFbz+EvbPWPgrJ3QB1af+gMO9k62tY++qS/IvVncAKIKXdbzfKp1fo1A49oIwIjWdk ZIKMPssJVPvJhUqaneQgMLMtrWXu0nu3FQsee0jiOAkqrVot7CePZVycnU+DiYXmBXfBMh Y9UYF2JZ1bJS3Ay16/yghjb2dt+qoGKXxH0ACXK7obfmfbcR8ZkfiSFGbVoNYg== 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 760A57217; Sat, 22 Jan 2022 13:35:31 +0000 (UTC) (envelope-from kp@freebsd.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id 567A41BD4E; Sat, 22 Jan 2022 14:35:29 +0100 (CET) Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable From: Kristof Provost 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 (1.0) Subject: Re: git: 889c60500d30 - main - ip_mroute: release epoch lock if mrouter is not configured Date: Sat, 22 Jan 2022 14:35:28 +0100 Message-Id: References: <202201221049.20MAn6Qn093231@gitrepo.freebsd.org> Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org In-Reply-To: <202201221049.20MAn6Qn093231@gitrepo.freebsd.org> To: Wojciech Macek X-Mailer: iPhone Mail (19C63) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642858531; 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=V/VtYSVz79fa7BtvUIPYpELUgzaGQhhpw0NqMWI+iUU=; b=p15U5cKT+YPMeIMDji/NmflR5XhDLE5uVu0wRSFGQUKCXC2wNmKCbLNuFEka1yYI3ODEE1 GL4DcLyoUPKsfRDnOrT4hGXhObPI7l3ch4NQ33aTwgS0tjGBfETkS5OTyBpkXpO8hlI+40 pvvngyMaIYlcVFwy98/BAoBnDbm9vT3ZHGBW+rrFQ8xF5LlCp+aM4tx4pBOiIhrhsJmSP7 uuaPza7r1SXLAQ/HQ4arJp60vIGQE1YfJOY/RKJ3Yr7VQv3rXvxnmPSKhUonqoO/IQYsO0 2mBpEB0RqVwlTJPaZEwl4xBw+OWZujTKcMlY1B/aHLaKOve9TKVXnJMZ38nvmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642858531; a=rsa-sha256; cv=none; b=pWEBwgqOSusoaklO99ztZmacRJxd18+UkvwgkA2UG0Ehb61ckcX7wwmECXQoob6mBlnegS 3K76+UV52N4oQelmXgCp5ZwNbba8hCtKPvev6WJDYia58IUTnE1zd9AgHYgi5uzoIR3O+c /AmEUYqCgMmKL+HYTT39/l/FFxOaoTz044F/rZTWMyR4SsC7O4HYweepNCGeOA2W75klly h5vcPT05iPEbrwQdrLBELRNEL5DAI301NHbHdo1GbHgUYWf71oUaE/+4qkqvP7Ao3ZyNbM NRM3+1BXbbsmL/BY/4yNjOUYZP2FnbYJ13TEgE9zTo40xKzuxI5F5wWLFho+ZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N I think there=E2=80=99s an early return in ip_mroiter_done() that doesn=E2=80= =99t unlock as well.=20 I=E2=80=99m also unsure if epoch provides the protection you=E2=80=99re look= ing for.=20 Kristof (On mobile, so short and no code pointers) > On 22 Jan 2022, at 11:49, Wojciech Macek wrote: >=20 > =EF=BB=BFThe branch main has been updated by wma: >=20 > URL: https://cgit.FreeBSD.org/src/commit/?id=3D889c60500d30c8fd3cbf597fd73= d5cd90f5fc7e7 >=20 > commit 889c60500d30c8fd3cbf597fd73d5cd90f5fc7e7 > Author: Wojciech Macek > AuthorDate: 2022-01-22 10:47:39 +0000 > Commit: Wojciech Macek > CommitDate: 2022-01-22 10:48:30 +0000 >=20 > ip_mroute: release epoch lock if mrouter is not configured >=20 > Add mising "else" branch to release a lock if mrouter is not > configured. >=20 > Obtained from: Semihalf > Sponsored by: Stormshield > --- > sys/netinet/raw_ip.c | 2 ++ > 1 file changed, 2 insertions(+) >=20 > diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c > index 08ce848a63f7..229716918875 100644 > --- a/sys/netinet/raw_ip.c > +++ b/sys/netinet/raw_ip.c > @@ -890,6 +890,8 @@ rip_detach(struct socket *so) > MROUTER_RLOCK(); > if (so =3D=3D V_ip_mrouter && ip_mrouter_done) > ip_mrouter_done(MROUTER_RLOCK_PARAM_PTR); > + else > + MROUTER_RUNLOCK(); >=20 > INP_WLOCK(inp); > INP_HASH_WLOCK(&V_ripcbinfo); >=20