From nobody Tue Nov 22 12:23:33 2022 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 4NGk1x5pqpz4hWVp; Tue, 22 Nov 2022 12:23:33 +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 4NGk1x4p1Dz43wJ; Tue, 22 Nov 2022 12:23:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669119813; 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=8M/5+tqm2oPy2TklTzbvtVmT5rFzoMyUiym4T7GUD2o=; b=sEMlJLLmPtnCm0S96MsSK7hjAPOTOj2CpoTlgA0YiQbGZjWFe7GyL7FubBv9wVjgQn/9vk 3JMHN5j+t5bdBUUgbJHUuJZZCfeRs2xsxS9pMcoi6Cc9LjLoCmtGglEZmcIUsSRRzLgvyx eXkX6mbQI0Tm717K67q3Ba9wwUd34VaIdiM/ebVOpzyF+y0QJ24xbbRULL7joPFjvho7QD 84WvTSNx8AjjhoqbvHZ863ydlggQ4E3YLrx9SRjJoYYaZFQfhqNSdN0Zaaqf5qs8Zqe5Ei mTdI9WgMBQ0YeQMuRE0Q05YhXjLx1P8Ps4xp79x8QdYiVIyOQzCF8/DQ32y7cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669119813; 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=8M/5+tqm2oPy2TklTzbvtVmT5rFzoMyUiym4T7GUD2o=; b=Ex/EsOcd0g1ENoLlRQxN/t5mO3Cj0Zm+R9BeY8ezwsC4ofthA0oEXDNj67S4A44hMoD03t ZTkIs3LQArzvW/dumdT9e453/VBg0ToMBwQOje+WAAAD9fgVzRt2uUvDJujfsyJksWUAjd MOCqfgNijqwZSTILRfw/7GHXSbi6M5MM4L/+A/FEYPr+RJUEODoinWflIwrFnT9K8k6YuY 3kOJdVTK8eQ2icwFJDoWMuDA9b5+KQ3jl8nc0ycc73ORJzNzc2eFoNrEGlYg0zyiEhwYCB 68yf5ZqVabhbW12rLyMdURUuti1AvRJAO5t2WruTCbfQ5FpQG2yqg12BFX2srg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669119813; a=rsa-sha256; cv=none; b=Ps9GPd+kdFJGvuseLiSil4qgFir3Pq/v+ZTM448lZ0yYK6UdUhDq09ei3c8PgqjxTZUSTS 3Y14cgwDu6QIPCIDuaDwBbU2+yC6dsjpVjX5oJ07jLv5Zcqf09/Jf4xT0I8/RNOZscViAs 88Hhzpn5xBOr/11msZ81UWjcn9v20Q2mzrMHwSvV8Tl82II5ipQGARlvcexYZdPS35wZcO bH79RWoDcegnrVTa57ZITCp/GjpNNL4C/veIpHHl55G4dtwxcC8QFvI36LD7pXSXduZmEG mojuJ6mL+LNxJmNevz6k5/AbWDM8TR2/tZtAmM6sZRsxtzoqVRlNlpvDMcrDhw== 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 4NGk1x3t9vzjSj; Tue, 22 Nov 2022 12:23:33 +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 2AMCNXbc099191; Tue, 22 Nov 2022 12:23:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AMCNXl4099190; Tue, 22 Nov 2022 12:23:33 GMT (envelope-from git) Date: Tue, 22 Nov 2022 12:23:33 GMT Message-Id: <202211221223.2AMCNXl4099190@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: c1bfe8c593f9 - main - ipsec: add key_havesp_any 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: c1bfe8c593f9047ff00c1204e4f086256af45bc2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=c1bfe8c593f9047ff00c1204e4f086256af45bc2 commit c1bfe8c593f9047ff00c1204e4f086256af45bc2 Author: Mateusz Guzik AuthorDate: 2022-09-07 20:05:38 +0000 Commit: Mateusz Guzik CommitDate: 2022-11-22 12:23:08 +0000 ipsec: add key_havesp_any Saves on work in a common case of checking both directions. Note further work in the area is impending to elide these in the common case to begin with. Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D36485 --- sys/netipsec/ipsec.c | 10 ++-------- sys/netipsec/key.c | 7 +++++++ sys/netipsec/key.h | 1 + sys/netipsec/subr_ipsec.c | 3 +-- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/sys/netipsec/ipsec.c b/sys/netipsec/ipsec.c index d0217723bca6..94eb68658e30 100644 --- a/sys/netipsec/ipsec.c +++ b/sys/netipsec/ipsec.c @@ -666,10 +666,7 @@ ipsec4_capability(struct mbuf *m, u_int cap) return (0); case IPSEC_CAP_OPERABLE: /* Do we have active security policies? */ - if (key_havesp(IPSEC_DIR_INBOUND) != 0 || - key_havesp(IPSEC_DIR_OUTBOUND) != 0) - return (1); - return (0); + return (key_havesp_any()); }; return (EOPNOTSUPP); } @@ -835,10 +832,7 @@ ipsec6_capability(struct mbuf *m, u_int cap) return (0); case IPSEC_CAP_OPERABLE: /* Do we have active security policies? */ - if (key_havesp(IPSEC_DIR_INBOUND) != 0 || - key_havesp(IPSEC_DIR_OUTBOUND) != 0) - return (1); - return (0); + return (key_havesp_any()); }; return (EOPNOTSUPP); } diff --git a/sys/netipsec/key.c b/sys/netipsec/key.c index 093db4fb9126..98bd97f465bf 100644 --- a/sys/netipsec/key.c +++ b/sys/netipsec/key.c @@ -811,6 +811,13 @@ key_havesp(u_int dir) return (TAILQ_FIRST(&V_sptree[dir]) != NULL); } +int +key_havesp_any(void) +{ + + return (V_spd_size != 0); +} + /* %%% IPsec policy management */ /* * Return current SPDB generation. diff --git a/sys/netipsec/key.h b/sys/netipsec/key.h index 4d0f4b1ea512..81e30ecdc010 100644 --- a/sys/netipsec/key.h +++ b/sys/netipsec/key.h @@ -56,6 +56,7 @@ void key_addref(struct secpolicy *); void key_freesp(struct secpolicy **); int key_spdacquire(struct secpolicy *); int key_havesp(u_int); +int key_havesp_any(void); void key_bumpspgen(void); uint32_t key_getspgen(void); uint32_t key_newreqid(void); diff --git a/sys/netipsec/subr_ipsec.c b/sys/netipsec/subr_ipsec.c index 3eac9d6aaad0..56ddf71ae87a 100644 --- a/sys/netipsec/subr_ipsec.c +++ b/sys/netipsec/subr_ipsec.c @@ -401,8 +401,7 @@ ipsec_kmod_capability(struct ipsec_support * const sc, struct mbuf *m, * call key_havesp() without additional synchronizations. */ if (cap == IPSEC_CAP_OPERABLE) - return (key_havesp(IPSEC_DIR_INBOUND) != 0 || - key_havesp(IPSEC_DIR_OUTBOUND) != 0); + return (key_havesp_any()); return (ipsec_kmod_caps(sc, m, cap)); }