From: Tom Rix <trix@redhat.com>
To: Steffen Klassert <steffen.klassert@secunet.com>,
herbert@gondor.apana.org.au, davem@davemloft.net,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
Joerg Vehlow <lkml@jv-coder.de>
Subject: [PATCH v2 1/1] xfrm : lock input tasklet skb queue
Date: Tue, 22 Oct 2019 17:22:04 -0700 [thread overview]
Message-ID: <CACVy4SUkfn4642Vne=c1yuWhne=2cutPZQ5XeXz_QBz1g67CrA@mail.gmail.com> (raw)
On PREEMPT_RT_FULL while running netperf, a corruption
of the skb queue causes an oops.
This appears to be caused by a race condition here
__skb_queue_tail(&trans->queue, skb);
tasklet_schedule(&trans->tasklet);
Where the queue is changed before the tasklet is locked by
tasklet_schedule.
The fix is to use the skb queue lock.
This is the original work of Joerg Vehlow <joerg.vehlow@aox-tech.de>
https://lkml.org/lkml/2019/9/9/111
xfrm_input: Protect queue with lock
During the skb_queue_splice_init the tasklet could have been preempted
and __skb_queue_tail called, which led to an inconsistent queue.
ifdefs for CONFIG_PREEMPT_RT_FULL added to reduce runtime effects
on the normal kernel.
Signed-off-by: Tom Rix <trix@redhat.com>
---
net/xfrm/xfrm_input.c | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/net/xfrm/xfrm_input.c b/net/xfrm/xfrm_input.c
index 9b599ed66d97..decd515f84cf 100644
--- a/net/xfrm/xfrm_input.c
+++ b/net/xfrm/xfrm_input.c
@@ -755,13 +755,21 @@ EXPORT_SYMBOL(xfrm_input_resume);
static void xfrm_trans_reinject(unsigned long data)
{
+#ifdef CONFIG_PREEMPT_RT_FULL
+ unsigned long flags;
+#endif
struct xfrm_trans_tasklet *trans = (void *)data;
struct sk_buff_head queue;
struct sk_buff *skb;
__skb_queue_head_init(&queue);
+#ifdef CONFIG_PREEMPT_RT_FULL
+ spin_lock_irqsave(&trans->queue.lock, flags);
+#endif
skb_queue_splice_init(&trans->queue, &queue);
-
+#ifdef CONFIG_PREEMPT_RT_FULL
+ spin_unlock_irqrestore(&trans->queue.lock, flags);
+#endif
while ((skb = __skb_dequeue(&queue)))
XFRM_TRANS_SKB_CB(skb)->finish(dev_net(skb->dev), NULL, skb);
}
@@ -778,7 +786,11 @@ int xfrm_trans_queue(struct sk_buff *skb,
return -ENOBUFS;
XFRM_TRANS_SKB_CB(skb)->finish = finish;
+#ifdef CONFIG_PREEMPT_RT_FULL
+ skb_queue_tail(&trans->queue, skb);
+#else
__skb_queue_tail(&trans->queue, skb);
+#endif
tasklet_schedule(&trans->tasklet);
return 0;
}
@@ -798,7 +810,11 @@ void __init xfrm_input_init(void)
struct xfrm_trans_tasklet *trans;
trans = &per_cpu(xfrm_trans_tasklet, i);
+#ifdef CONFIG_PREEMPT_RT_FULL
+ skb_queue_head_init(&trans->queue);
+#else
__skb_queue_head_init(&trans->queue);
+#endif
tasklet_init(&trans->tasklet, xfrm_trans_reinject,
(unsigned long)trans);
}
--
2.23.0
next reply other threads:[~2019-10-23 0:22 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-23 0:22 Tom Rix [this message]
2019-10-24 10:31 ` [PATCH v2 1/1] xfrm : lock input tasklet skb queue Steffen Klassert
2019-10-25 9:37 ` Joerg Vehlow
2019-10-25 9:47 ` Sebastian Andrzej Siewior
2019-10-25 10:14 ` Joerg Vehlow
2019-10-25 10:22 ` Sebastian Andrzej Siewior
2019-10-25 14:26 ` Tom Rix
2019-10-25 19:25 ` Sebastian Andrzej Siewior
2019-10-28 10:44 ` Joerg Vehlow
2019-10-28 15:15 ` Sebastian Andrzej Siewior
2019-10-29 7:33 ` Joerg Vehlow
2019-11-18 10:46 ` Sebastian Andrzej Siewior
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='CACVy4SUkfn4642Vne=c1yuWhne=2cutPZQ5XeXz_QBz1g67CrA@mail.gmail.com' \
--to=trix@redhat.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=linux-kernel@vger.kernel.org \
--cc=lkml@jv-coder.de \
--cc=netdev@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;
as well as URLs for NNTP newsgroup(s).