From owner-svn-src-all@freebsd.org Thu Oct 17 17:02:51 2019 Return-Path: Delivered-To: svn-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 663BC157838; Thu, 17 Oct 2019 17:02:51 +0000 (UTC) (envelope-from glebius@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46vFpg20kmz4Qyn; Thu, 17 Oct 2019 17:02:51 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2870023942; Thu, 17 Oct 2019 17:02:51 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x9HH2pFU007890; Thu, 17 Oct 2019 17:02:51 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9HH2ppi007889; Thu, 17 Oct 2019 17:02:51 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201910171702.x9HH2ppi007889@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Thu, 17 Oct 2019 17:02:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r353687 - head/sys/netinet X-SVN-Group: head X-SVN-Commit-Author: glebius X-SVN-Commit-Paths: head/sys/netinet X-SVN-Commit-Revision: 353687 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Oct 2019 17:02:51 -0000 Author: glebius Date: Thu Oct 17 17:02:50 2019 New Revision: 353687 URL: https://svnweb.freebsd.org/changeset/base/353687 Log: Quickly fix up r353683: enter the epoch before calling into netisr_dispatch(). Modified: head/sys/netinet/igmp.c Modified: head/sys/netinet/igmp.c ============================================================================== --- head/sys/netinet/igmp.c Thu Oct 17 16:38:44 2019 (r353686) +++ head/sys/netinet/igmp.c Thu Oct 17 17:02:50 2019 (r353687) @@ -2174,6 +2174,7 @@ igmp_slowtimo_vnet(void) static int igmp_v1v2_queue_report(struct in_multi *inm, const int type) { + struct epoch_tracker et; struct ifnet *ifp; struct igmp *igmp; struct ip *ip; @@ -2223,7 +2224,9 @@ igmp_v1v2_queue_report(struct in_multi *inm, const int m->m_flags |= M_IGMP_LOOP; CTR2(KTR_IGMPV3, "%s: netisr_dispatch(NETISR_IGMP, %p)", __func__, m); + NET_EPOCH_ENTER(et); netisr_dispatch(NETISR_IGMP, m); + NET_EPOCH_EXIT(et); return (0); }