From: Steffen Klassert <steffen.klassert@secunet.com>
To: David Miller <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>
Cc: Herbert Xu <herbert@gondor.apana.org.au>,
Steffen Klassert <steffen.klassert@secunet.com>,
<netdev@vger.kernel.org>
Subject: [PATCH 09/11] xfrm: policy: use recently added helper in more places
Date: Mon, 9 Sep 2024 12:03:26 +0200 [thread overview]
Message-ID: <20240909100328.1838963-10-steffen.klassert@secunet.com> (raw)
In-Reply-To: <20240909100328.1838963-1-steffen.klassert@secunet.com>
From: Florian Westphal <fw@strlen.de>
No logical change intended.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
---
net/xfrm/xfrm_policy.c | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index b79ac453ea37..94859b2182ec 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -1276,11 +1276,7 @@ static void xfrm_hash_rebuild(struct work_struct *work)
struct xfrm_pol_inexact_bin *bin;
u8 dbits, sbits;
- if (policy->walk.dead)
- continue;
-
- dir = xfrm_policy_id2dir(policy->index);
- if (dir >= XFRM_POLICY_MAX)
+ if (xfrm_policy_is_dead_or_sk(policy))
continue;
if ((dir & XFRM_POLICY_MASK) == XFRM_POLICY_OUT) {
@@ -1331,13 +1327,8 @@ static void xfrm_hash_rebuild(struct work_struct *work)
/* re-insert all policies by order of creation */
list_for_each_entry_reverse(policy, &net->xfrm.policy_all, walk.all) {
- if (policy->walk.dead)
- continue;
- dir = xfrm_policy_id2dir(policy->index);
- if (dir >= XFRM_POLICY_MAX) {
- /* skip socket policies */
+ if (xfrm_policy_is_dead_or_sk(policy))
continue;
- }
hlist_del_rcu(&policy->bydst);
--
2.34.1
next prev parent reply other threads:[~2024-09-09 10:03 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-09 10:03 [PATCH 0/11] pull request (net-next): ipsec-next 2024-09-09 Steffen Klassert
2024-09-09 10:03 ` [PATCH 01/11] xfrm: Remove documentation WARN_ON to limit return values for offloaded SA Steffen Klassert
2024-09-09 10:03 ` [PATCH 02/11] net: add copy from skb_seq_state to buffer function Steffen Klassert
2024-09-09 10:03 ` [PATCH 03/11] xfrm: Correct spelling in xfrm.h Steffen Klassert
2024-09-09 10:03 ` [PATCH 04/11] selftests: add xfrm policy insertion speed test script Steffen Klassert
2024-09-09 10:03 ` [PATCH 05/11] xfrm: policy: don't iterate inexact policies twice at insert time Steffen Klassert
2024-09-09 10:03 ` [PATCH 06/11] xfrm: switch migrate to xfrm_policy_lookup_bytype Steffen Klassert
2024-09-09 11:01 ` Florian Westphal
2024-09-09 13:18 ` Steffen Klassert
2024-09-09 10:03 ` [PATCH 07/11] xfrm: policy: remove remaining use of inexact list Steffen Klassert
2024-09-09 10:03 ` [PATCH 08/11] xfrm: add SA information to the offloaded packet Steffen Klassert
2024-09-09 10:03 ` Steffen Klassert [this message]
2024-09-09 10:59 ` [PATCH 09/11] xfrm: policy: use recently added helper in more places Florian Westphal
2024-09-09 13:19 ` Steffen Klassert
2024-09-09 10:03 ` [PATCH 10/11] xfrm: minor update to sdb and xfrm_policy comments Steffen Klassert
2024-09-09 10:03 ` [PATCH 11/11] Revert "xfrm: add SA information to the offloaded packet" Steffen Klassert
2024-09-09 13:21 ` [PATCH 0/11] pull request (net-next): ipsec-next 2024-09-09 Steffen Klassert
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240909100328.1838963-10-steffen.klassert@secunet.com \
--to=steffen.klassert@secunet.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).