Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9490a249 authored by Konstantin Khlebnikov's avatar Konstantin Khlebnikov Committed by Olav Haugan
Browse files

sched/preempt: Fix cond_resched_lock() and cond_resched_softirq()



These functions check should_resched() before unlocking spinlock/bh-enable:
preempt_count always non-zero => should_resched() always returns false.
cond_resched_lock() worked iff spin_needbreak is set.

This patch adds argument "preempt_offset" to should_resched().

preempt_count offset constants for that:

  PREEMPT_DISABLE_OFFSET  - offset after preempt_disable()
  PREEMPT_LOCK_OFFSET     - offset after spin_lock()
  SOFTIRQ_DISABLE_OFFSET  - offset after local_bh_distable()
  SOFTIRQ_LOCK_OFFSET     - offset after spin_lock_bh()

Change-Id: I5fd0ceea8ad4c3dfa686343a4f8cf1430343ac7a
Signed-off-by: default avatarKonstantin Khlebnikov <khlebnikov@yandex-team.ru>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Alexander Graf <agraf@suse.de>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: David Vrabel <david.vrabel@citrix.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Fixes: bdb43806 ("sched: Extract the basic add/sub preempt_count modifiers")
Link: http://lkml.kernel.org/r/20150715095204.12246.98268.stgit@buzz


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Git-commit: fe32d3cd5e8eb0f82e459763374aa80797023403
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git


[ohaugan@codeaurora.org: Fixed trivial merge conflict]
Signed-off-by: default avatarOlav Haugan <ohaugan@codeaurora.org>
parent 635bf973
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment