From nobody Mon Mar 28 11:38:37 2022 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 C12D51A402EF; Mon, 28 Mar 2022 11:38:38 +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 4KRrLQ067Rz3wKb; Mon, 28 Mar 2022 11:38:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648467518; 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=OBzJ4m7RZi9o/KVU8vaIkUL+mOiTDed/HrBsTfj2WwA=; b=NnWtswW8LKSLZA/vtW0nNmFgC0lxddgawS+o18qNjNzqCCPyQOP9mej0+opaYVPnh08XSM YJCO5hkn894lhkozvW8HBXKWnyZGworfcJ/RoykkPQxPAY1IYAuP+otew076aKE1bXZ9kh vZk62zF3+YKh4RLT+OdHkHm58q2gVgTOBqNChlzNRdk4xsHGN6zYTV8DWaOx3Tvueh1uBH Pw3d3VAjixX4Y3r9L+QBanVPUmbMf4PEdzvqSYTVxKgMMbp7W2G6HKh9jIOTtzcp1gDuwE +thLw1jjIavl393O1oTB11dtRwTzdsCs9UTtluyu8mClxUvRKElkne9yhJM/xA== 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 B03B61099; Mon, 28 Mar 2022 11:38:37 +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 22SBcbYN077038; Mon, 28 Mar 2022 11:38:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22SBcbEZ077037; Mon, 28 Mar 2022 11:38:37 GMT (envelope-from git) Date: Mon, 28 Mar 2022 11:38:37 GMT Message-Id: <202203281138.22SBcbEZ077037@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: 229bb65656ff - stable/13 - pf: add PF_UNLNKDRULES_ASSERT 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/13 X-Git-Reftype: branch X-Git-Commit: 229bb65656ff82ff4b487fba06532d6f4d5b71cd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648467518; 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=OBzJ4m7RZi9o/KVU8vaIkUL+mOiTDed/HrBsTfj2WwA=; b=aMTjGSJMOPWXcP/Hy/ldEMKglBhtn0t/3GwpE5n08LXU4ErATf1qfaccUZ0G9QWYSA053a XcWKuHR4C06rHz5YGBJWMhSPp8AHX6UGXA32q9PJ/7aK4/6/psVpH6oXuKqFWSvgU4tVbH bEGAUvoe0XBUDIWcJqN8epCtjJW3SMtQvvV3nm3ek4F8yKOK/G2Q0pemCIvP2X8ENCoTxR 24cBDgFXqlMXfCm0XJn8eXCuhYQTbrwgNnqQaJ7ksRVJmfjQ1ALGRH3KU/e0DRJA+iZKbe bqYluQwqsDDZaKRv6fVGuBztBwIDWMckBX44c/or4e91Mz+c5JWFxNX6wHmQ+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648467518; a=rsa-sha256; cv=none; b=RZhO0CwAjTeG7kGpRuFqs9fAhrKz6CnvmUnF1dQVqUDywDw4P2KJXxJ8K/UZMoQP7/j22F mbkcawhhTgAqF7JmR+SMZtOPu2ccsaG1OAKARS7BXGE97FpPN23D7CZvgrZDbDvO9EJY8D kSH1/+5kVpM7J7HL95uCqbvhwRQeu7477+Y34G1ePoJEjXzsnbkGy0/aT+RXjQD5vYgsiO WEyS9DsSRFE8LlzAjm1Y1bo49nYXkcuiu9YOjzr/aGk/XTSTfSuU1GcV0OOEYzHUbOg0ED RyWHTbE0dziJypN6/olVHkkJ3Jq5EYPaIgMqNFLtM5HocYpxSDEQSPuqCS55Aw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=229bb65656ff82ff4b487fba06532d6f4d5b71cd commit 229bb65656ff82ff4b487fba06532d6f4d5b71cd Author: Mateusz Guzik AuthorDate: 2022-02-28 10:37:30 +0000 Commit: Mateusz Guzik CommitDate: 2022-03-28 11:38:23 +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 4f9041c43bc0..c432f87dc272 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