diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2012-02-22 12:03:30 +0100 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-03-06 10:18:03 -0600 |
| commit | bb304561926d29d22818d798c29888509e08f005 (patch) | |
| tree | 9245c352d0df31bbfa2bc99ac6f3a763113b896b | |
| parent | c9ea2eb36b560d81a8389dffcef8c83e3a0cfd68 (diff) | |
seqlock: Prevent rt starvation
If a low prio writer gets preempted while holding the seqlock write
locked, a high prio reader spins forever on RT.
To prevent this let the reader grab the spinlock, so it blocks and
eventually boosts the writer. This way the writer can proceed and
endless spinning is prevented.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: stable-rt@vger.kernel.org
| -rw-r--r-- | include/linux/seqlock.h | 23 | ||||
| -rw-r--r-- | include/net/neighbour.h | 2 |
2 files changed, 24 insertions, 1 deletions
diff --git a/include/linux/seqlock.h b/include/linux/seqlock.h index b44048da105a..29ffd4f54d03 100644 --- a/include/linux/seqlock.h +++ b/include/linux/seqlock.h @@ -177,10 +177,33 @@ typedef struct { /* * Read side functions for starting and finalizing a read side section. */ +#ifndef CONFIG_PREEMPT_RT_FULL static inline unsigned read_seqbegin(const seqlock_t *sl) { return read_seqcount_begin(&sl->seqcount); } +#else +/* + * Starvation safe read side for RT + */ +static inline unsigned read_seqbegin(seqlock_t *sl) +{ + unsigned ret; + +repeat: + ret = sl->seqcount.sequence; + if (unlikely(ret & 1)) { + /* + * Take the lock and let the writer proceed (i.e. evtl + * boost it), otherwise we could loop here forever. + */ + spin_lock(&sl->lock); + spin_unlock(&sl->lock); + goto repeat; + } + return ret; +} +#endif static inline unsigned read_seqretry(const seqlock_t *sl, unsigned start) { diff --git a/include/net/neighbour.h b/include/net/neighbour.h index 2720884287c3..6fda9fa2ba98 100644 --- a/include/net/neighbour.h +++ b/include/net/neighbour.h @@ -385,7 +385,7 @@ struct neighbour_cb { #define NEIGH_CB(skb) ((struct neighbour_cb *)(skb)->cb) -static inline void neigh_ha_snapshot(char *dst, const struct neighbour *n, +static inline void neigh_ha_snapshot(char *dst, struct neighbour *n, const struct net_device *dev) { unsigned int seq; |