From nobody Mon Apr 20 16:50:22 2026 X-Original-To: dev-commits-src-main@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 4fzs1B5jWkz6Ww3V for ; Mon, 20 Apr 2026 16:50:22 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fzs1B32BTz3N9Y for ; Mon, 20 Apr 2026 16:50:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776703822; 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=tTx9iNK+B4hb/QNxp82lHRFOayF/x5ioVC1251FvnUc=; b=bZj4IYzq9NXtxNFbezBZmWl7ss3VZM/p9ZlArGf2mV55ntdPiLhyWiNP/rENb1uoI3adZp iY9MJia3utCJ32agLFPGeXYX/ZlnAEH5yYMDcwK85+e+EGtiC+DZt3w6Fdqd73F5e1/1ev 56Sxwkuv811jiq4t9kVAYQffeavudj+TKSosxOE8JFvhEKKh895spS4Z/j3t2sO/S+c4jo hBqWzpCIPfR9Mb1SKdc5hR/QPU8HSOvG+eFkZTa52Dtp+ISIu37cmZNXsLl1yGghgzxaBV rDjmU4BlPEs1AouyXM+pzIyZkTbrG8Leml4v43x4oLxAm/mSJwNyEPbwnGSN4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776703822; a=rsa-sha256; cv=none; b=KwefMW2iwkFnzao4+TWZXtGsCjnbOWNvhlNgRdB41TfZPkzXfDVNhnzUdXNGXw+Kum9Grh JVVnBPtilJ87CB7M5zGFsG1SPcUJZ05iQ0J12zIo4Iami5dQoiRxgidq1dOXX2Tta90eBE OvIXJOk5VjFNeSJhQWziJ/l5jpui3u1BhRT20JLNwtXcI1bRGKcyGxr4GQnboWrA9Q8MK6 D0DUDJhag27TiVCjLYWHJF05Qe0/U+nOGXqu8oah4yVbFNFmOoovwZBmuAHqVgR0gW39CJ WV+OkJLxFoueOxPB1J7dxQN8xilO+uAmkYq/gX2EH6eu9keeyGrTxQsqbD1Wmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776703822; 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=tTx9iNK+B4hb/QNxp82lHRFOayF/x5ioVC1251FvnUc=; b=JbY9aw4db1LD21bKcwvILHbpFVnBaVzMKIjyJmJ4p14FGOm28VllqyuNJ4oBiTUHqRiZ13 2lP2CvFxFXNhGQw/fPrfLu1X2bsxQtbYrKVcavbYEEg75b3GLsCIp6U7BAvlfJNHmWcwTe A/Ouq2tjaKXgV/Bsy9K3TYyoVFdUne/W17d6JFZOgXbl77sIZ6uUQ+C2VoKHwGOBqQj0+N h/IyN76D77+snrPomYRcL2RMv4dFtmlcfRN/8yKPMyyhwdKN1VykXJbJd0/qCGqXWdMmJ8 wFX5Y4y2StZWRK0/9K9Q9VDMy6Q/wL1IHEXezrlyAHqE+W0qDH2CiFZHGES59g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fzs1B1rKbz14js for ; Mon, 20 Apr 2026 16:50:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3aa5a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 20 Apr 2026 16:50:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: ffad36e1d700 - main - pf: Use MTX_DUPOK to initialize hash chain mutexes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org 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/main X-Git-Reftype: branch X-Git-Commit: ffad36e1d7002a7da751856b28eb50c36b137abb Auto-Submitted: auto-generated Date: Mon, 20 Apr 2026 16:50:22 +0000 Message-Id: <69e6594e.3aa5a.1af1cad4@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ffad36e1d7002a7da751856b28eb50c36b137abb commit ffad36e1d7002a7da751856b28eb50c36b137abb Author: Mark Johnston AuthorDate: 2026-04-20 16:48:40 +0000 Commit: Mark Johnston CommitDate: 2026-04-20 16:50:05 +0000 pf: Use MTX_DUPOK to initialize hash chain mutexes pf_udp_mapping_insert() may lock more than one row at a time. Fixes: cd5ff4e841fb ("pf: use hashalloc(9) for key, id, src-node and udp-endpoint hashes") Reviewed by: kp Differential Revision: https://reviews.freebsd.org/D56501 --- sys/netpfil/pf/pf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 4576ad6e41de..dea40816e30f 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -1497,6 +1497,7 @@ retry_waitok2: UMA_ALIGN_PTR, 0); ha.size = V_pf_udpendpointhashsize; ha.lname = "pf_udpendpointhash"; + ha.lopts = MTX_DEF | MTX_DUPOK; ha.mflags = M_NOWAIT; retry_waitok3: V_pf_udpendpointhash = hashalloc(&ha);