From owner-svn-src-head@freebsd.org Tue Dec 3 20:23:44 2019 Return-Path: Delivered-To: svn-src-head@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 A94741BC325; Tue, 3 Dec 2019 20:23:44 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from cell.glebi.us (glebi.us [162.251.186.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "cell.glebi.us", Issuer "cell.glebi.us" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 47SD2l47J8z3Q4X; Tue, 3 Dec 2019 20:23:43 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from cell.glebi.us (localhost [127.0.0.1]) by cell.glebi.us (8.15.2/8.15.2) with ESMTPS id xB3KNYKF025860 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Tue, 3 Dec 2019 12:23:34 -0800 (PST) (envelope-from glebius@freebsd.org) Received: (from glebius@localhost) by cell.glebi.us (8.15.2/8.15.2/Submit) id xB3KNXBa025859; Tue, 3 Dec 2019 12:23:33 -0800 (PST) (envelope-from glebius@freebsd.org) X-Authentication-Warning: cell.glebi.us: glebius set sender to glebius@freebsd.org using -f Date: Tue, 3 Dec 2019 12:23:33 -0800 From: Gleb Smirnoff To: Ryan Libby Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r355102 - head/sys/netinet6 Message-ID: <20191203202333.GA2706@FreeBSD.org> References: <201911252225.xAPMPAKk077489@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201911252225.xAPMPAKk077489@repo.freebsd.org> User-Agent: Mutt/1.12.2 (2019-09-21) X-Rspamd-Queue-Id: 47SD2l47J8z3Q4X X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-1.78 / 15.00]; local_wl_from(0.00)[freebsd.org]; NEURAL_HAM_MEDIUM(-0.90)[-0.904,0]; ASN(0.00)[asn:27348, ipnet:162.251.186.0/24, country:US]; NEURAL_HAM_LONG(-0.87)[-0.871,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Dec 2019 20:23:44 -0000 Ryan, On Mon, Nov 25, 2019 at 10:25:10PM +0000, Ryan Libby wrote: R> Author: rlibby R> Date: Mon Nov 25 22:25:10 2019 R> New Revision: 355102 R> URL: https://svnweb.freebsd.org/changeset/base/355102 R> R> Log: R> in6_joingroup_locked: need if_addr_lock around in6m_disconnect_locked R> R> It looks like the call that requires the lock was introduced in r337866. R> R> Reviewed by: hselasky R> Sponsored by: Dell EMC Isilon R> Differential Revision: https://reviews.freebsd.org/D20739 R> R> Modified: R> head/sys/netinet6/in6_mcast.c R> R> Modified: head/sys/netinet6/in6_mcast.c R> ============================================================================== R> --- head/sys/netinet6/in6_mcast.c Mon Nov 25 21:21:37 2019 (r355101) R> +++ head/sys/netinet6/in6_mcast.c Mon Nov 25 22:25:10 2019 (r355102) R> @@ -1267,6 +1267,7 @@ out_in6m_release: R> struct epoch_tracker et; R> R> CTR2(KTR_MLD, "%s: dropping ref on %p", __func__, inm); R> + IF_ADDR_WLOCK(ifp); R> NET_EPOCH_ENTER(et); R> CK_STAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { R> if (ifma->ifma_protospec == inm) { R> @@ -1277,6 +1278,7 @@ out_in6m_release: R> in6m_disconnect_locked(&inmh, inm); R> in6m_rele_locked(&inmh, inm); R> NET_EPOCH_EXIT(et); R> + IF_ADDR_WUNLOCK(ifp); R> } else { R> *pinm = inm; R> } It looks like after this change the epoch entrance in this block is superfluous and can be removed. -- Gleb Smirnoff