From nobody Mon Mar 28 11:37:57 2022 X-Original-To: dev-commits-src-branches@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 5C7131A3FB40; Mon, 28 Mar 2022 11:37:58 +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 4KRrKf1vhpz3vs7; Mon, 28 Mar 2022 11:37:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648467478; 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=yNVS6PqWZ0CrxjK3qGuPS7pEvNSJlkrrRpMOAiNM1MQ=; b=DgqTh8icMZWwXlp2N3yFKxKkXtDTPZt0/GM4j7cw+uNXaMEukISm+KXlk2zIN96/wZw1cs bRef7eUC7MTe0lBJ4UakcdTqzYusRpgsDDoVX/eZGi5yJuhulet3WOMS0EUxQFPsTaxbaq +nC2VNMJ6DGgk9QIGdgbyepZDGnwndcj6pqqZ+ThltCyxJ48JmWhrTGa9xSlB9uLPh37pu OttWhjDGmqJmklpRDmKV9Y1lULkzsT7Vq2nzWQDVVWak6KmC7T28eBeLLbThse1XvohfNa d1CWgwFBK9ecEUVD7XUDNTtSoxU6SU4ZqplTcqWwjF7OYe3FdwFCbbDe7EMygQ== 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 14252E3B; Mon, 28 Mar 2022 11:37:58 +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 22SBbvjD076816; Mon, 28 Mar 2022 11:37:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22SBbvZe076815; Mon, 28 Mar 2022 11:37:57 GMT (envelope-from git) Date: Mon, 28 Mar 2022 11:37:57 GMT Message-Id: <202203281137.22SBbvZe076815@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Guzik Subject: git: 951218e5d960 - stable/12 - pf: add PF_UNLNKDRULES_ASSERT List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 951218e5d96092ef220fbc2399d8828609527942 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648467478; 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=yNVS6PqWZ0CrxjK3qGuPS7pEvNSJlkrrRpMOAiNM1MQ=; b=K8mTGtqBTtX3aZJ1SZNsKTrsyrHWoV1FOnWPKz2PuH0Uy1/uTOum0FURVQfv5UgFvjMo5K 4SMFVBuvzZUQZr6hN0atbs9iOGtQUk0aq+/ijzwcHnGPoTmbuW17Agt7a7fT3AstLRaHaM PO06Lz+irQrY3EB5mIPTeqyGFYRAqt0LUQtUAMUdaLbKAMo0vhvQa9xDouI06XYQkkfrD0 /dbwC/sSwbuvl5+/N1QYlBAEVWFGpKPsepEOfdZH9zYfcLWFH9ji5v63Hld7xC4aczmPzm iQCol2myzUuEXKsmTILatqlI3On8AWaznt0UDQU7JAK3oz3aAGBBjKvAoo10sQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648467478; a=rsa-sha256; cv=none; b=Ayfw8oLuxY0EPuhSSGnutPW7T36989aoKARvRoLrKt8+3/912YQnvcuXUTSsQuCP9/RS4m OYH5XlmiP/ZPmfRhG9phbt+xknb9di5wEwsy8gFPS3UfFfDQXV1pitpkUCcrIKwFL4yg87 zHtiJZAEP9/VAgZqh3tZcgO6obkwUQj+gl3Q40hpTfmQvwQ7Ifhrht9Wf0bZk7wCVF6Obc UsH+gPGZ6S1O1+M03t4Euq/1YHGuM+iJpmT7RuqyZmyTSti9y9HBQNIqE6ZpfVag8XpULw nxeHp5qFtsqLib5lc/Mk/tE354jPhM3z9Unp2IXPnyE8f/KW+W/kunb3Lz/CVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=951218e5d96092ef220fbc2399d8828609527942 commit 951218e5d96092ef220fbc2399d8828609527942 Author: Mateusz Guzik AuthorDate: 2022-02-28 10:37:30 +0000 Commit: Mateusz Guzik CommitDate: 2022-03-28 11:37:37 +0000 pf: add PF_UNLNKDRULES_ASSERT Reviewed by: kp Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit f11b6505f14600d350dfa427f61abb8d1c7e1db4) --- sys/net/pfvar.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 22ba2623a6c4..5b8ab84502bd 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -349,6 +349,7 @@ struct pfi_dynaddr { extern struct mtx_padalign pf_unlnkdrules_mtx; #define PF_UNLNKDRULES_LOCK() mtx_lock(&pf_unlnkdrules_mtx) #define PF_UNLNKDRULES_UNLOCK() mtx_unlock(&pf_unlnkdrules_mtx) +#define PF_UNLNKDRULES_ASSERT() mtx_assert(&pf_unlnkdrules_mtx, MA_OWNED) extern struct rmlock pf_rules_lock; #define PF_RULES_RLOCK_TRACKER struct rm_priotracker _pf_rules_tracker