On Mon, May 07, 2018 at 05:01:34PM -0400, Johannes Weiner wrote: > diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h > index 15750c222ca2..1658477466d5 100644 > --- a/kernel/sched/sched.h > +++ b/kernel/sched/sched.h > @@ -919,6 +921,8 @@ DECLARE_PER_CPU_SHARED_ALIGNED(struct rq, runqueues); > #define cpu_curr(cpu) (cpu_rq(cpu)->curr) > #define raw_rq() raw_cpu_ptr(&runqueues) > > +extern void update_rq_clock(struct rq *rq); > + > static inline u64 __rq_clock_broken(struct rq *rq) > { > return READ_ONCE(rq->clock); > @@ -1037,6 +1041,86 @@ static inline void rq_repin_lock(struct rq *rq, struct rq_flags *rf) > #endif > } > > +struct rq *__task_rq_lock(struct task_struct *p, struct rq_flags *rf) > + __acquires(rq->lock); > + > +struct rq *task_rq_lock(struct task_struct *p, struct rq_flags *rf) > + __acquires(p->pi_lock) > + __acquires(rq->lock); > + > +static inline void __task_rq_unlock(struct rq *rq, struct rq_flags *rf) > + __releases(rq->lock) > +{ > + rq_unpin_lock(rq, rf); > + raw_spin_unlock(&rq->lock); > +} > + > +static inline void > +task_rq_unlock(struct rq *rq, struct task_struct *p, struct rq_flags *rf) > + __releases(rq->lock) > + __releases(p->pi_lock) > +{ > + rq_unpin_lock(rq, rf); > + raw_spin_unlock(&rq->lock); > + raw_spin_unlock_irqrestore(&p->pi_lock, rf->flags); > +} > + > +static inline void > +rq_lock_irqsave(struct rq *rq, struct rq_flags *rf) > + __acquires(rq->lock) > +{ > + raw_spin_lock_irqsave(&rq->lock, rf->flags); > + rq_pin_lock(rq, rf); > +} > + > +static inline void > +rq_lock_irq(struct rq *rq, struct rq_flags *rf) > + __acquires(rq->lock) > +{ > + raw_spin_lock_irq(&rq->lock); > + rq_pin_lock(rq, rf); > +} > + > +static inline void > +rq_lock(struct rq *rq, struct rq_flags *rf) > + __acquires(rq->lock) > +{ > + raw_spin_lock(&rq->lock); > + rq_pin_lock(rq, rf); > +} > + > +static inline void > +rq_relock(struct rq *rq, struct rq_flags *rf) > + __acquires(rq->lock) > +{ > + raw_spin_lock(&rq->lock); > + rq_repin_lock(rq, rf); > +} > + > +static inline void > +rq_unlock_irqrestore(struct rq *rq, struct rq_flags *rf) > + __releases(rq->lock) > +{ > + rq_unpin_lock(rq, rf); > + raw_spin_unlock_irqrestore(&rq->lock, rf->flags); > +} > + > +static inline void > +rq_unlock_irq(struct rq *rq, struct rq_flags *rf) > + __releases(rq->lock) > +{ > + rq_unpin_lock(rq, rf); > + raw_spin_unlock_irq(&rq->lock); > +} > + > +static inline void > +rq_unlock(struct rq *rq, struct rq_flags *rf) > + __releases(rq->lock) > +{ > + rq_unpin_lock(rq, rf); > + raw_spin_unlock(&rq->lock); > +} > + > #ifdef CONFIG_NUMA > enum numa_topology_type { > NUMA_DIRECT, > @@ -1670,8 +1754,6 @@ static inline void sub_nr_running(struct rq *rq, unsigned count) > sched_update_tick_dependency(rq); > } > > -extern void update_rq_clock(struct rq *rq); > - > extern void activate_task(struct rq *rq, struct task_struct *p, int flags); > extern void deactivate_task(struct rq *rq, struct task_struct *p, int flags); > > @@ -1752,86 +1834,6 @@ static inline void sched_rt_avg_update(struct rq *rq, u64 rt_delta) { } > static inline void sched_avg_update(struct rq *rq) { } > #endif > > -struct rq *__task_rq_lock(struct task_struct *p, struct rq_flags *rf) > - __acquires(rq->lock); > - > -struct rq *task_rq_lock(struct task_struct *p, struct rq_flags *rf) > - __acquires(p->pi_lock) > - __acquires(rq->lock); > - > -static inline void __task_rq_unlock(struct rq *rq, struct rq_flags *rf) > - __releases(rq->lock) > -{ > - rq_unpin_lock(rq, rf); > - raw_spin_unlock(&rq->lock); > -} > - > -static inline void > -task_rq_unlock(struct rq *rq, struct task_struct *p, struct rq_flags *rf) > - __releases(rq->lock) > - __releases(p->pi_lock) > -{ > - rq_unpin_lock(rq, rf); > - raw_spin_unlock(&rq->lock); > - raw_spin_unlock_irqrestore(&p->pi_lock, rf->flags); > -} > - > -static inline void > -rq_lock_irqsave(struct rq *rq, struct rq_flags *rf) > - __acquires(rq->lock) > -{ > - raw_spin_lock_irqsave(&rq->lock, rf->flags); > - rq_pin_lock(rq, rf); > -} > - > -static inline void > -rq_lock_irq(struct rq *rq, struct rq_flags *rf) > - __acquires(rq->lock) > -{ > - raw_spin_lock_irq(&rq->lock); > - rq_pin_lock(rq, rf); > -} > - > -static inline void > -rq_lock(struct rq *rq, struct rq_flags *rf) > - __acquires(rq->lock) > -{ > - raw_spin_lock(&rq->lock); > - rq_pin_lock(rq, rf); > -} > - > -static inline void > -rq_relock(struct rq *rq, struct rq_flags *rf) > - __acquires(rq->lock) > -{ > - raw_spin_lock(&rq->lock); > - rq_repin_lock(rq, rf); > -} > - > -static inline void > -rq_unlock_irqrestore(struct rq *rq, struct rq_flags *rf) > - __releases(rq->lock) > -{ > - rq_unpin_lock(rq, rf); > - raw_spin_unlock_irqrestore(&rq->lock, rf->flags); > -} > - > -static inline void > -rq_unlock_irq(struct rq *rq, struct rq_flags *rf) > - __releases(rq->lock) > -{ > - rq_unpin_lock(rq, rf); > - raw_spin_unlock_irq(&rq->lock); > -} > - > -static inline void > -rq_unlock(struct rq *rq, struct rq_flags *rf) > - __releases(rq->lock) > -{ > - rq_unpin_lock(rq, rf); > - raw_spin_unlock(&rq->lock); > -} > - > #ifdef CONFIG_SMP > #ifdef CONFIG_PREEMPT > What's all this churn about? -- To unsubscribe from this list: send the line "unsubscribe cgroups" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html