svn commit: r312665 - stable/11/sys/kern
Andriy Gapon
avg at FreeBSD.org
Mon Jan 23 08:34:43 UTC 2017
Author: avg
Date: Mon Jan 23 08:34:41 2017
New Revision: 312665
URL: https://svnweb.freebsd.org/changeset/base/312665
Log:
MFC r312426: fix a thread preemption regression in schedulers introduced
in r270423
Modified:
stable/11/sys/kern/sched_4bsd.c
stable/11/sys/kern/sched_ule.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/kern/sched_4bsd.c
==============================================================================
--- stable/11/sys/kern/sched_4bsd.c Mon Jan 23 07:32:47 2017 (r312664)
+++ stable/11/sys/kern/sched_4bsd.c Mon Jan 23 08:34:41 2017 (r312665)
@@ -968,8 +968,8 @@ sched_switch(struct thread *td, struct t
sched_load_rem();
td->td_lastcpu = td->td_oncpu;
- preempted = !((td->td_flags & TDF_SLICEEND) ||
- (flags & SWT_RELINQUISH));
+ preempted = (td->td_flags & TDF_SLICEEND) == 0 &&
+ (flags & SW_PREEMPT) != 0;
td->td_flags &= ~(TDF_NEEDRESCHED | TDF_SLICEEND);
td->td_owepreempt = 0;
td->td_oncpu = NOCPU;
Modified: stable/11/sys/kern/sched_ule.c
==============================================================================
--- stable/11/sys/kern/sched_ule.c Mon Jan 23 07:32:47 2017 (r312664)
+++ stable/11/sys/kern/sched_ule.c Mon Jan 23 08:34:41 2017 (r312665)
@@ -1898,8 +1898,8 @@ sched_switch(struct thread *td, struct t
ts->ts_rltick = ticks;
td->td_lastcpu = td->td_oncpu;
td->td_oncpu = NOCPU;
- preempted = !((td->td_flags & TDF_SLICEEND) ||
- (flags & SWT_RELINQUISH));
+ preempted = (td->td_flags & TDF_SLICEEND) == 0 &&
+ (flags & SW_PREEMPT) != 0;
td->td_flags &= ~(TDF_NEEDRESCHED | TDF_SLICEEND);
td->td_owepreempt = 0;
if (!TD_IS_IDLETHREAD(td))
More information about the svn-src-stable-11
mailing list