From nobody Sat Jan 17 04:09:25 2026 X-Original-To: dev-commits-src-all@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 4dtNX52cRGz6PKp4 for ; Sat, 17 Jan 2026 04:09:25 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dtNX521MPz3V46 for ; Sat, 17 Jan 2026 04:09:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768622965; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ptvghc47ZLT3Qx0HNAN634W3viDPwCeuDX3WlrDpLBA=; b=yt4CSKmaUkl7Xvz9GGVvdw1XbxHL5ZMvERnJnWX0qxJWgthmcLfUa8Ej6MAJ5a0Nj5fTbM k7i6CXMY6r69JbCRYNAeMDV8YX/s+/ZxsOObTvM5oiT3y9ydPJAQh/34ctjEmd9TV7EhrJ 0aG596dTyyVlWtM3oF8n4vEVjsFc9xb4YuPUsES7n4wMP26I8x1AAaRFuXYzYEwP6L6IJt rXpBGgfIAkY/qdmbedE+UpxJEjSkp98ldp2rBL8Wkyvnzl3kCb0j8nwsNy6R5bdivkEls9 6iGFD7NtG7Xkv45pnpWnuAgnicqs2XYZSzPrH3M690w+xK/dRLADhWu6hOX84g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768622965; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ptvghc47ZLT3Qx0HNAN634W3viDPwCeuDX3WlrDpLBA=; b=JI/VftuIrdco5rRW+5NplnqHi8ikmDurc1DgnS6/JK+ZQDBrff4bITTm38TD4uaZ5qssSe BvHZHQtGWQKqPkhxHK2GMZ0kJ9I8yvtMObWqf5gMSylVCByl4IAB0XbzeJU0LItBw3rEFe 7GFP2fxGea6B1POakfCoFJeCMi6T2ptLBZdj1ksCIFsXAryegaW2xRWmFrg2pPb0y4vEax SXIZuGnnpcxOsYLyZFWKgLCemXZisq+c0ANHOYTlv5Xt9hMNaCG7YNiGnF8PfA6eD1wz2/ jgdPfeLhvtVtHFz+1ocYS0BTq8lIXedk//+pSrg7vw4MLNKuleh0FvRtWhXcQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768622965; a=rsa-sha256; cv=none; b=S3i/x+ntOBUIB+i9EL1aT/CCdHqm3Yj2J1T5b0L+FPLNo7f5uf5MMVPLai1LIYOGrOnxcZ qfmMsamTOdvsS02CQKY/UsPMqvJVyWJVDwrkVp8V9J9ngYR9+RxDLYEjX9EcyRLHk8hJ2x Q84gM8Fz0qHymsrySS8r7oB2LNaMWt0hmfkgEp6a4DEQEwPfNNuqKR4tL3TAQneTwjTsOo hHLjHlJv2RzHAUhYllDmxuVlm/Mn5DXhkZspaphKNb2JzE3Xl0g3T4C9YSXwsXJoJf5ojx 97WW3cTfR+0ToRfaHr2BbyYAWc8QmIW10JZT0TrKTwBF9kt90DBoueVKYg4+5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dtNX518Dnzl1Z for ; Sat, 17 Jan 2026 04:09:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2644b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 17 Jan 2026 04:09:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 1a7b74d3125f - main - ipfw: in a vnet destructor use NET_EPOCH_WAIT() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1a7b74d3125fef50a6d2dcc4442c80457c8d32e1 Auto-Submitted: auto-generated Date: Sat, 17 Jan 2026 04:09:25 +0000 Message-Id: <696b0b75.2644b.4c2bdc15@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=1a7b74d3125fef50a6d2dcc4442c80457c8d32e1 commit 1a7b74d3125fef50a6d2dcc4442c80457c8d32e1 Author: Gleb Smirnoff AuthorDate: 2026-01-17 03:57:03 +0000 Commit: Gleb Smirnoff CommitDate: 2026-01-17 04:09:02 +0000 ipfw: in a vnet destructor use NET_EPOCH_WAIT() The lock grab & drop predates epoch(9) introduction to the network stack and it doesn't provide a true guarantee that all threads that may use ipfw configuration have finished. Also the lock prevented from sleepable operations when freeing the rules. --- sys/netpfil/ipfw/ip_fw2.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/netpfil/ipfw/ip_fw2.c b/sys/netpfil/ipfw/ip_fw2.c index 5d5aeb7c2746..7c47a97e4953 100644 --- a/sys/netpfil/ipfw/ip_fw2.c +++ b/sys/netpfil/ipfw/ip_fw2.c @@ -3731,12 +3731,14 @@ vnet_ipfw_uninit(const void *unused) V_ipfw_vnet_ready = 0; /* tell new callers to go away */ /* - * disconnect from ipv4, ipv6, layer2 and sockopt. - * Then grab, release and grab again the WLOCK so we make - * sure the update is propagated and nobody will be in. + * Disconnect from ipv4, ipv6, layer2 and sockopt. pfil(9) hook + * removal is synchronized by the net epoch, but our destructors + * free the memory immediately, thus we need for the epoch sections + * to complete. */ ipfw_detach_hooks(); V_ip_fw_ctl_ptr = NULL; + NET_EPOCH_WAIT(); last = IS_DEFAULT_VNET(curvnet) ? 1 : 0; @@ -3745,12 +3747,10 @@ vnet_ipfw_uninit(const void *unused) ipfw_dyn_uninit(0); /* run the callout_drain */ reap = NULL; - IPFW_WLOCK(chain); for (i = 0; i < chain->n_rules; i++) ipfw_reap_add(chain, &reap, chain->map[i]); free(chain->map, M_IPFW); ipfw_destroy_skipto_cache(chain); - IPFW_WUNLOCK(chain); IPFW_UH_WUNLOCK(chain); ipfw_destroy_tables(chain, last); ipfw_eaction_uninit(chain, last);