From: Neil Zhang <zhangwm@marvell.com>
To: mingo@redhat.com, peterz@infradead.org
Cc: cxie4@marvell.com, linux-kernel@vger.kernel.org,
Neil Zhang <zhangwm@marvell.com>
Subject: [PATCH] sched/rt: don't enable runtime if already enabled
Date: Mon, 3 Dec 2012 16:01:15 +0800 [thread overview]
Message-ID: <1354521675-31245-1-git-send-email-zhangwm@marvell.com> (raw)
There are two paths will call __enable_runtime, they are enable_runtime
and rq_online. Don't enable runtime again if it is already enabled.
It can fix the following kernel BUG when do cpu hotplug while there
are realtime threads running.
[ 3347.091644] kernel BUG at kernel/sched/rt.c:687!
[ 3347.091674] Internal error: Oops - BUG: 0 [#1] PREEMPT SMP ARM
[ 3347.091674] Modules linked in: cidatattydev(O) gs_diag(O) diag(O) gs_modem(O) ccinetdev(O) cci_datastub(O) citty(O) msocke
[ 3347.091705] CPU: 1 Tainted: G O (3.4.5+ #439)
[ 3347.091735] PC is at __disable_runtime+0x1e4/0x240
[ 3347.091735] LR is at __disable_runtime+0x1dc/0x240
[ 3347.091735] pc : [<c0162124>] lr : [<c016211c>] psr:
a0000093
[ 3347.091735] sp : e0061dc8 ip : c0807861 fp : c07a9740
[ 3347.091766] r10: c1a0b740 r9 : ffffffff r8 : fd050f80
[ 3347.091766] r7 : 00000002 r6 : 000003f8 r5 : c1a13740 r4 : c1a137d8
[ 3347.091766] r3 : ffffffff r2 : e0061dbc r1 : c06b11b6 r0 : 00000037
[ 3347.091796] Flags: NzCv IRQs off FIQs on Mode SVC_32 ISA ARM Segment kernel
[ 3347.091796] Control: 10c53c7d Table: 21e5004a DAC: 00000015
Signed-off-by: Neil Zhang <zhangwm@marvell.com>
---
kernel/sched/rt.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
index 418feb0..6525e5b 100644
--- a/kernel/sched/rt.c
+++ b/kernel/sched/rt.c
@@ -722,9 +722,11 @@ static void __enable_runtime(struct rq *rq)
raw_spin_lock(&rt_b->rt_runtime_lock);
raw_spin_lock(&rt_rq->rt_runtime_lock);
- rt_rq->rt_runtime = rt_b->rt_runtime;
- rt_rq->rt_time = 0;
- rt_rq->rt_throttled = 0;
+ if (rt_rq->rt_runtime == RUNTIME_INF) {
+ rt_rq->rt_runtime = rt_b->rt_runtime;
+ rt_rq->rt_time = 0;
+ rt_rq->rt_throttled = 0;
+ }
raw_spin_unlock(&rt_rq->rt_runtime_lock);
raw_spin_unlock(&rt_b->rt_runtime_lock);
}
--
1.7.4.1
next reply other threads:[~2012-12-03 8:01 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-03 8:01 Neil Zhang [this message]
2012-12-04 9:31 ` Neil Zhang
2012-12-12 5:38 ` Neil Zhang
2012-12-12 9:39 ` Mike Galbraith
2012-12-28 10:01 ` Neil Zhang
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=1354521675-31245-1-git-send-email-zhangwm@marvell.com \
--to=zhangwm@marvell.com \
--cc=cxie4@marvell.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.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
all inboxes | Powered by JetHome®