public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Florian Westphal <fw@strlen.de>,
	Steffen Klassert <steffen.klassert@secunet.com>,
	Sasha Levin <sashal@kernel.org>
Subject: [PATCH AUTOSEL 4.14 04/19] xfrm: policy: use hlist rcu variants on insert
Date: Tue, 30 Oct 2018 09:28:09 -0400	[thread overview]
Message-ID: <20181030132824.218056-4-sashal@kernel.org> (raw)
In-Reply-To: <20181030132824.218056-1-sashal@kernel.org>

From: Florian Westphal <fw@strlen.de>

[ Upstream commit 9dffff200fd178f11dd50eb1fd8ccd0650c9284e ]

bydst table/list lookups use rcu, so insertions must use rcu versions.

Fixes: a7c44247f704e ("xfrm: policy: make xfrm_policy_lookup_bytype lockless")
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 net/xfrm/xfrm_policy.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index 2fb7a78308e1..f60ff9b6a731 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -626,9 +626,9 @@ static void xfrm_hash_rebuild(struct work_struct *work)
 				break;
 		}
 		if (newpos)
-			hlist_add_behind(&policy->bydst, newpos);
+			hlist_add_behind_rcu(&policy->bydst, newpos);
 		else
-			hlist_add_head(&policy->bydst, chain);
+			hlist_add_head_rcu(&policy->bydst, chain);
 	}
 
 	spin_unlock_bh(&net->xfrm.xfrm_policy_lock);
@@ -767,9 +767,9 @@ int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl)
 			break;
 	}
 	if (newpos)
-		hlist_add_behind(&policy->bydst, newpos);
+		hlist_add_behind_rcu(&policy->bydst, newpos);
 	else
-		hlist_add_head(&policy->bydst, chain);
+		hlist_add_head_rcu(&policy->bydst, chain);
 	__xfrm_policy_link(policy, dir);
 
 	/* After previous checking, family can either be AF_INET or AF_INET6 */
-- 
2.17.1


  parent reply	other threads:[~2018-10-30 13:28 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-30 13:28 [PATCH AUTOSEL 4.14 01/19] bpf: do not blindly change rlimit in reuseport net selftest Sasha Levin
2018-10-30 13:28 ` [PATCH AUTOSEL 4.14 02/19] Revert "perf tools: Fix PMU term format max value calculation" Sasha Levin
2018-10-30 13:28 ` [PATCH AUTOSEL 4.14 03/19] net/mlx5: Take only bit 24-26 of wqe.pftype_wq for page fault type Sasha Levin
2018-10-30 13:28 ` Sasha Levin [this message]
2018-10-30 13:28 ` [PATCH AUTOSEL 4.14 05/19] perf vendor events intel: Fix wrong filter_band* values for uncore events Sasha Levin
2018-10-30 13:28 ` [PATCH AUTOSEL 4.14 06/19] sparc: Fix single-pcr perf event counter management Sasha Levin
2018-10-30 13:28 ` [PATCH AUTOSEL 4.14 07/19] sparc: Throttle perf events properly Sasha Levin
2018-10-30 13:28 ` [PATCH AUTOSEL 4.14 08/19] sparc64: Make proc_id signed Sasha Levin
2018-10-30 13:28 ` [PATCH AUTOSEL 4.14 09/19] net: fec: don't dump RX FIFO register when not available Sasha Levin
2018-10-30 13:28 ` [PATCH AUTOSEL 4.14 10/19] sched/fair: Fix the min_vruntime update logic in dequeue_entity() Sasha Levin
2018-10-30 13:28 ` [PATCH AUTOSEL 4.14 11/19] perf tools: Fix use of alternatives to find JDIR Sasha Levin
2018-10-30 13:28 ` [PATCH AUTOSEL 4.14 12/19] perf cpu_map: Align cpu map synthesized events properly Sasha Levin
2018-10-30 13:28 ` [PATCH AUTOSEL 4.14 13/19] x86/fpu: Remove second definition of fpu in __fpu__restore_sig() Sasha Levin
2018-10-30 13:28 ` [PATCH AUTOSEL 4.14 14/19] net: qla3xxx: Remove overflowing shift statement Sasha Levin
2018-10-30 13:28 ` [PATCH AUTOSEL 4.14 15/19] virtio_net: avoid using netif_tx_disable() for serializing tx routine Sasha Levin
2018-10-30 13:28 ` [PATCH AUTOSEL 4.14 16/19] r8169: fix NAPI handling under high load Sasha Levin
2018-10-30 13:28 ` [PATCH AUTOSEL 4.14 17/19] selftests: ftrace: Add synthetic event syntax testcase Sasha Levin
2018-10-30 14:58   ` Steven Rostedt
2018-10-30 18:21     ` Sasha Levin
2018-11-01 17:34       ` Masami Hiramatsu
2018-10-30 13:28 ` [PATCH AUTOSEL 4.14 18/19] net: fix pskb_trim_rcsum_slow() with odd trim offset Sasha Levin
2018-10-30 13:28 ` [PATCH AUTOSEL 4.14 19/19] i2c: rcar: cleanup DMA for all kinds of failure Sasha Levin

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=20181030132824.218056-4-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=fw@strlen.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    --cc=steffen.klassert@secunet.com \
    /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