[Xen-changelog] [xen stable-4.6] sched: avoid races on time values read from NOW()

[patchbot@xxxxxxx]

commit ddf41b82c3ff0ed252946162899599c1b40fbe03
Author:     Dario Faggioli <dario.faggioli@xxxxxxxxxx>
AuthorDate: Fri May 27 14:36:49 2016 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Fri May 27 14:36:49 2016 +0200

    sched: avoid races on time values read from NOW()
    
    or (even in cases where there is no race, e.g., outside
    of Credit2) avoid using a time sample which may be rather
    old, and hence stale.
    
    In fact, we should only sample NOW() from _inside_
    the critical region within which the value we read is
    used. If we don't, in case we have to spin for a while
    before entering the region, when actually using it:
    
     1) we will use something that, at the veryy least, is
        not really "now", because of the spinning,
    
     2) if someone else sampled NOW() during a critical
        region protected by the lock we are spinning on,
        and if we compare the two samples when we get
        inside our region, our one will be 'earlier',
        even if we actually arrived later, which is a
        race.
    
    In Credit2, we see an instance of 2), in runq_tickle(),
    when it is called by csched2_context_saved() as it samples
    NOW() before acquiring the runq lock. This makes things
    look like the time went backwards, and it confuses the
    algorithm (there's even a d2printk() about it, which would
    trigger all the time, if enabled).
    
    In RTDS, something similar happens in repl_timer_handler(),
    and there's another instance in schedule() (in generic code),
    so fix these cases too.
    
    While there, improve csched2_vcpu_wake() and and rt_vcpu_wake()
    a little as well (removing a pointless initialization, and
    moving the sampling a bit closer to its use). These two hunks
    entail no further functional changes.
    
    Signed-off-by: Dario Faggioli <dario.faggioli@xxxxxxxxxx>
    Reviewed-by: George Dunlap <george.dunlap@xxxxxxxxxx>
    Reviewed-by: Meng Xu <mengxu@xxxxxxxxxxxxx>
    
    RTDS: fix another instance of the 'read NOW()' race
    
    which was overlooked in 779511f4bf5ae ("sched: avoid
    races on time values read from NOW()").
    
    Reported-by: Jan Beulich <jbeulich@xxxxxxxx>
    Signed-off-by: Dario Faggioli <dario.faggioli@xxxxxxxxxx>
    Reviewed-by: Meng Xu <mengxu@xxxxxxxxxxxxx>
    master commit: 779511f4bf5ae34820a85e4eb20d50c60f69e977
    master date: 2016-05-23 14:39:51 +0200
    master commit: 4074e4ebe9115ac4986f963a13feada3e0560460
    master date: 2016-05-25 14:33:57 +0200
---
 xen/common/sched_credit2.c | 4 ++--
 xen/common/sched_rt.c      | 7 +++++--
 xen/common/schedule.c      | 4 +++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/xen/common/sched_credit2.c b/xen/common/sched_credit2.c
index 75e0321..96d1465 100644
--- a/xen/common/sched_credit2.c
+++ b/xen/common/sched_credit2.c
@@ -958,7 +958,7 @@ static void
 csched2_vcpu_wake(const struct scheduler *ops, struct vcpu *vc)
 {
     struct csched2_vcpu * const svc = CSCHED2_VCPU(vc);
-    s_time_t now = 0;
+    s_time_t now;
 
     /* Schedule lock should be held at this point. */
 
@@ -1015,8 +1015,8 @@ static void
 csched2_context_saved(const struct scheduler *ops, struct vcpu *vc)
 {
     struct csched2_vcpu * const svc = CSCHED2_VCPU(vc);
-    s_time_t now = NOW();
     spinlock_t *lock = vcpu_schedule_lock_irq(vc);
+    s_time_t now = NOW();
 
     BUG_ON( !is_idle_vcpu(vc) && svc->rqd != RQD(ops, vc->processor));
 
diff --git a/xen/common/sched_rt.c b/xen/common/sched_rt.c
index da590ee..3c951a1 100644
--- a/xen/common/sched_rt.c
+++ b/xen/common/sched_rt.c
@@ -621,7 +621,7 @@ static void
 rt_vcpu_insert(const struct scheduler *ops, struct vcpu *vc)
 {
     struct rt_vcpu *svc = rt_vcpu(vc);
-    s_time_t now = NOW();
+    s_time_t now;
     spinlock_t *lock;
 
     /* not addlocate idle vcpu to dom vcpu list */
@@ -629,6 +629,8 @@ rt_vcpu_insert(const struct scheduler *ops, struct vcpu *vc)
         return;
 
     lock = vcpu_schedule_lock_irq(vc);
+
+    now = NOW();
     if ( now >= svc->cur_deadline )
         rt_update_deadline(now, svc);
 
@@ -1035,7 +1037,7 @@ static void
 rt_vcpu_wake(const struct scheduler *ops, struct vcpu *vc)
 {
     struct rt_vcpu * const svc = rt_vcpu(vc);
-    s_time_t now = NOW();
+    s_time_t now;
     struct rt_private *prv = rt_priv(ops);
     struct rt_vcpu *snext = NULL; /* highest priority on RunQ */
     struct rt_dom *sdom = NULL;
@@ -1071,6 +1073,7 @@ rt_vcpu_wake(const struct scheduler *ops, struct vcpu *vc)
         return;
     }
 
+    now = NOW();
     if ( now >= svc->cur_deadline)
         rt_update_deadline(now, svc);
 
diff --git a/xen/common/schedule.c b/xen/common/schedule.c
index 49bced4..2beebe8 100644
--- a/xen/common/schedule.c
+++ b/xen/common/schedule.c
@@ -1213,7 +1213,7 @@ static void vcpu_periodic_timer_work(struct vcpu *v)
 static void schedule(void)
 {
     struct vcpu          *prev = current, *next = NULL;
-    s_time_t              now = NOW();
+    s_time_t              now;
     struct scheduler     *sched;
     unsigned long        *tasklet_work = &this_cpu(tasklet_work_to_do);
     bool_t                tasklet_work_scheduled = 0;
@@ -1248,6 +1248,8 @@ static void schedule(void)
 
     lock = pcpu_schedule_lock_irq(cpu);
 
+    now = NOW();
+
     stop_timer(&sd->s_timer);
     
     /* get policy-specific decision on scheduling... */
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.6

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog