public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Peter Zijlstra <peterz@infradead.org>
To: Jeff Chua <jeff.chua.linux@gmail.com>
Cc: Nico Schottelius <nico-nospam@schottelius.org>,
	"Rafael J. Wysocki" <rjw@sisk.pl>,
	Nico Schottelius <nico-linux-20100709@schottelius.org>,
	Jesse Barnes <jbarnes@virtuousgeek.org>,
	LKML <linux-kernel@vger.kernel.org>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	Florian Pritz <flo@xssn.at>,
	Suresh Siddha <suresh.b.siddha@intel.com>,
	stable@kernel.org, Ingo Molnar <mingo@elte.hu>,
	"Brown, Len" <lenb@kernel.org>
Subject: [PATCH] x86, tsc: Fix a preemption leak in restore_sched_clock_state()
Date: Fri, 10 Sep 2010 22:32:53 +0200	[thread overview]
Message-ID: <1284150773.402.122.camel@laptop> (raw)
In-Reply-To: <AANLkTikKmsM2kunB_ocwRawLUiuP4-_nz-mPsiapw7TJ@mail.gmail.com>


D'0h !! *facepalm*

Shame on me for not spotting that sooner.

---
Subject: x86, tsc: Fix a preemption leak in restore_sched_clock_state()

A real life genuine preemption leak..

Reported-by: Jeff Chua <jeff.chua.linux@gmail.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
---
 arch/x86/kernel/tsc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
index 873a321..4496315 100644
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
@@ -655,7 +655,7 @@ void restore_sched_clock_state(void)
 
 	local_irq_save(flags);
 
-	get_cpu_var(cyc2ns_offset) = 0;
+	__get_cpu_var(cyc2ns_offset) = 0;
 	offset = cyc2ns_suspend - sched_clock();
 
 	for_each_possible_cpu(cpu)


  reply	other threads:[~2010-09-10 20:33 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-10  5:36 2.6.36-rc3 suspend issue (was: 2.6.35-rc4 / X201 issues) Jeff Chua
2010-09-10  7:48 ` Peter Zijlstra
2010-09-10 11:53   ` Jeff Chua
2010-09-10 12:05     ` Peter Zijlstra
2010-09-10 17:19       ` Jeff Chua
2010-09-10 20:32         ` Peter Zijlstra [this message]
2010-09-10 21:01           ` [PATCH] x86, tsc: Fix a preemption leak in restore_sched_clock_state() Suresh Siddha
2010-09-11  0:59             ` Jeff Chua
2010-09-11  7:49           ` [tip:sched/urgent] " tip-bot for Peter Zijlstra
2010-09-13  7:42             ` Nico Schottelius
2010-09-13  8:46               ` Ingo Molnar
2010-09-13 22:56                 ` Jeff Chua
2010-09-15  8:03                   ` Nico Schottelius
2010-09-28 11:59                     ` 2.6.36-rc3-00464-g84e1d83 resume issue (was: [tip:sched/urgent] x86, tsc: Fix a preemption leak in restore_sched_clock_state()) Nico Schottelius

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=1284150773.402.122.camel@laptop \
    --to=peterz@infradead.org \
    --cc=flo@xssn.at \
    --cc=jbarnes@virtuousgeek.org \
    --cc=jeff.chua.linux@gmail.com \
    --cc=lenb@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=nico-linux-20100709@schottelius.org \
    --cc=nico-nospam@schottelius.org \
    --cc=rjw@sisk.pl \
    --cc=stable@kernel.org \
    --cc=suresh.b.siddha@intel.com \
    --cc=torvalds@linux-foundation.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