From owner-svn-src-all@freebsd.org Mon Oct 14 16:37:42 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 D21D0FFF7A; Mon, 14 Oct 2019 16:37:42 +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 46sPP252S9z4YjR; Mon, 14 Oct 2019 16:37:42 +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 8F5627F9F; Mon, 14 Oct 2019 16:37:42 +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 x9EGbgsu034167; Mon, 14 Oct 2019 16:37:42 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9EGbgQW034166; Mon, 14 Oct 2019 16:37:42 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201910141637.x9EGbgQW034166@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Mon, 14 Oct 2019 16:37:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r353495 - in head/sys/netpfil/ipfw: . nptv6 X-SVN-Group: head X-SVN-Commit-Author: glebius X-SVN-Commit-Paths: in head/sys/netpfil/ipfw: . nptv6 X-SVN-Commit-Revision: 353495 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: Mon, 14 Oct 2019 16:37:42 -0000 Author: glebius Date: Mon Oct 14 16:37:41 2019 New Revision: 353495 URL: https://svnweb.freebsd.org/changeset/base/353495 Log: Use epoch(9) directly instead of obsoleted KPI. Modified: head/sys/netpfil/ipfw/ip_fw_nat.c head/sys/netpfil/ipfw/nptv6/nptv6.c Modified: head/sys/netpfil/ipfw/ip_fw_nat.c ============================================================================== --- head/sys/netpfil/ipfw/ip_fw_nat.c Mon Oct 14 16:37:00 2019 (r353494) +++ head/sys/netpfil/ipfw/ip_fw_nat.c Mon Oct 14 16:37:41 2019 (r353495) @@ -114,10 +114,12 @@ ifaddr_change(void *arg __unused, struct ifnet *ifp) IPFW_UH_WLOCK(chain); /* Check every nat entry... */ LIST_FOREACH(ptr, &chain->nat, _next) { + struct epoch_tracker et; + /* ...using nic 'ifp->if_xname' as dynamic alias address. */ if (strncmp(ptr->if_name, ifp->if_xname, IF_NAMESIZE) != 0) continue; - if_addr_rlock(ifp); + NET_EPOCH_ENTER(et); CK_STAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) { if (ifa->ifa_addr == NULL) continue; @@ -129,7 +131,7 @@ ifaddr_change(void *arg __unused, struct ifnet *ifp) LibAliasSetAddress(ptr->lib, ptr->ip); IPFW_WUNLOCK(chain); } - if_addr_runlock(ifp); + NET_EPOCH_EXIT(et); } IPFW_UH_WUNLOCK(chain); } Modified: head/sys/netpfil/ipfw/nptv6/nptv6.c ============================================================================== --- head/sys/netpfil/ipfw/nptv6/nptv6.c Mon Oct 14 16:37:00 2019 (r353494) +++ head/sys/netpfil/ipfw/nptv6/nptv6.c Mon Oct 14 16:37:41 2019 (r353495) @@ -534,6 +534,7 @@ static void nptv6_find_prefix(struct ip_fw_chain *ch, struct nptv6_cfg *cfg, struct ifnet *ifp) { + struct epoch_tracker et; struct ifaddr *ifa; struct in6_ifaddr *ia; @@ -545,7 +546,7 @@ nptv6_find_prefix(struct ip_fw_chain *ch, struct nptv6 if (ifp == NULL) return; } - if_addr_rlock(ifp); + NET_EPOCH_ENTER(et); CK_STAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) { if (ifa->ifa_addr->sa_family != AF_INET6) continue; @@ -558,7 +559,7 @@ nptv6_find_prefix(struct ip_fw_chain *ch, struct nptv6 nptv6_set_external(cfg, &ia->ia_addr.sin6_addr); break; } - if_addr_runlock(ifp); + NET_EPOCH_EXIT(et); if_rele(ifp); }