From owner-dev-commits-src-all@freebsd.org Mon Aug 16 13:02:27 2021 Return-Path: Delivered-To: dev-commits-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 8EC2B6749DC; Mon, 16 Aug 2021 13:02:27 +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 4GpDpW31VSz4RXg; Mon, 16 Aug 2021 13:02:27 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 4E3B61BD5; Mon, 16 Aug 2021 13:02:27 +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 17GD2RTo092854; Mon, 16 Aug 2021 13:02:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17GD2Rot092853; Mon, 16 Aug 2021 13:02:27 GMT (envelope-from git) Date: Mon, 16 Aug 2021 13:02:27 GMT Message-Id: <202108161302.17GD2Rot092853@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 3c785b12e096 - stable/13 - in6: Enter the net epoch in in6_tmpaddrtimer() MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3c785b12e09612f100462e8f960236865cd47a88 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Aug 2021 13:02:27 -0000 The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3c785b12e09612f100462e8f960236865cd47a88 commit 3c785b12e09612f100462e8f960236865cd47a88 Author: Mark Johnston AuthorDate: 2021-08-09 17:14:23 +0000 Commit: Mark Johnston CommitDate: 2021-08-16 13:01:39 +0000 in6: Enter the net epoch in in6_tmpaddrtimer() We need to do so to safely traverse the ifnet list. Reviewed by: bz Sponsored by: The FreeBSD Foundation (cherry picked from commit 8ee0826f75136f6ac6443f32c582882bc31abd73) --- sys/netinet6/in6_ifattach.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c index 8d027e2fb1d9..629509f61ac1 100644 --- a/sys/netinet6/in6_ifattach.c +++ b/sys/netinet6/in6_ifattach.c @@ -828,6 +828,7 @@ void in6_tmpaddrtimer(void *arg) { CURVNET_SET((struct vnet *) arg); + struct epoch_tracker et; struct nd_ifinfo *ndi; u_int8_t nullbuf[8]; struct ifnet *ifp; @@ -837,6 +838,7 @@ in6_tmpaddrtimer(void *arg) V_ip6_temp_regen_advance) * hz, in6_tmpaddrtimer, curvnet); bzero(nullbuf, sizeof(nullbuf)); + NET_EPOCH_ENTER(et); CK_STAILQ_FOREACH(ifp, &V_ifnet, if_link) { if (ifp->if_afdata[AF_INET6] == NULL) continue; @@ -850,7 +852,7 @@ in6_tmpaddrtimer(void *arg) ndi->randomseed1, ndi->randomid); } } - + NET_EPOCH_EXIT(et); CURVNET_RESTORE(); }