* [PATCH 5/9] UML - Add locking to xtime accesses
@ 2006-06-29 21:36 Jeff Dike
0 siblings, 0 replies; only message in thread
From: Jeff Dike @ 2006-06-29 21:36 UTC (permalink / raw)
To: akpm
Cc: linux-kernel, user-mode-linux-devel,
Paolo 'Blaisorblade' Giarrusso
do_timer must be called with xtime_lock held. I'm not sure
boot_timer_handler needs this, however I don't think it hurts: it simply
disables irq and takes a spinlock.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Index: linux-2.6.17/arch/um/kernel/time_kern.c
===================================================================
--- linux-2.6.17.orig/arch/um/kernel/time_kern.c 2006-06-29 10:37:16.000000000 -0400
+++ linux-2.6.17/arch/um/kernel/time_kern.c 2006-06-29 11:39:57.000000000 -0400
@@ -96,11 +96,15 @@ void time_init_kern(void)
void do_boot_timer_handler(struct sigcontext * sc)
{
+ unsigned long flags;
struct pt_regs regs;
CHOOSE_MODE((void) (UPT_SC(®s.regs) = sc),
(void) (regs.regs.skas.is_user = 0));
+
+ write_seqlock_irqsave(&xtime_lock, flags);
do_timer(®s);
+ write_sequnlock_irqrestore(&xtime_lock, flags);
}
static DEFINE_SPINLOCK(timer_spinlock);
@@ -125,15 +129,17 @@ irqreturn_t um_timer(int irq, void *dev,
unsigned long long nsecs;
unsigned long flags;
+ write_seqlock_irqsave(&xtime_lock, flags);
+
do_timer(regs);
- write_seqlock_irqsave(&xtime_lock, flags);
nsecs = get_time() + local_offset;
xtime.tv_sec = nsecs / NSEC_PER_SEC;
xtime.tv_nsec = nsecs - xtime.tv_sec * NSEC_PER_SEC;
+
write_sequnlock_irqrestore(&xtime_lock, flags);
- return(IRQ_HANDLED);
+ return IRQ_HANDLED;
}
long um_time(int __user *tloc)
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2006-06-29 21:38 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-06-29 21:36 [PATCH 5/9] UML - Add locking to xtime accesses Jeff Dike
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®