LKML Archive on lore.kernel.org
 help / color / Atom feed
From: Steven Rostedt <rostedt@goodmis.org>
To: Thomas Gleixner <tglx@linutronix.de>
Cc: Mike Galbraith <umgwanakikbuti@gmail.com>,
	Ronny Meeus <ronny.meeus@gmail.com>,
	LKML <linux-kernel@vger.kernel.org>,
	Peter Zijlstra <peterz@infradead.org>
Subject: Re: [PATCH] sched: Handle priority boosted tasks proper in setscheduler()
Date: Tue, 5 May 2015 12:29:20 -0400
Message-ID: <20150505122920.7861907d@gandalf.local.home> (raw)
In-Reply-To: <alpine.DEB.2.11.1505051806060.4225@nanos>

On Tue, 5 May 2015 18:08:01 +0200 (CEST)
Thomas Gleixner <tglx@linutronix.de> wrote:

> Reported-by: Ronny Meeus <ronny.meeus@gmail.com>
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> ---
>  kernel/locking/rtmutex.c |   10 ++++++----
>  kernel/sched/core.c      |   11 +++++------
>  2 files changed, 11 insertions(+), 10 deletions(-)
> 
> Index: tip/kernel/locking/rtmutex.c
> ===================================================================
> --- tip.orig/kernel/locking/rtmutex.c
> +++ tip/kernel/locking/rtmutex.c
> @@ -265,15 +265,17 @@ struct task_struct *rt_mutex_get_top_tas
>  }
>  
>  /*
> - * Called by sched_setscheduler() to check whether the priority change
> - * is overruled by a possible priority boosting.
> + * Called by sched_setscheduler() to get the priority which will be
> + * effective after the change.
>   */
>  int rt_mutex_check_prio(struct task_struct *task, int newprio)
>  {
>  	if (!task_has_pi_waiters(task))
> -		return 0;
> +		return newprio;
>  
> -	return task_top_pi_waiter(task)->task->prio <= newprio;
> +	if (task_top_pi_waiter(task)->task->prio <= newprio)
> +		return task_top_pi_waiter(task)->task->prio;
> +	return newprio;
>  }
>  
>  /*
> Index: tip/kernel/sched/core.c
> ===================================================================
> --- tip.orig/kernel/sched/core.c
> +++ tip/kernel/sched/core.c
> @@ -3414,7 +3414,7 @@ static int __sched_setscheduler(struct t
>  	int newprio = dl_policy(attr->sched_policy) ? MAX_DL_PRIO - 1 :
>  		      MAX_RT_PRIO - 1 - attr->sched_priority;
>  	int retval, oldprio, oldpolicy = -1, queued, running;
> -	int policy = attr->sched_policy;
> +	int new_effective_prio, policy = attr->sched_policy;
>  	unsigned long flags;
>  	const struct sched_class *prev_class;
>  	struct rq *rq;
> @@ -3596,15 +3596,14 @@ change:
>  	oldprio = p->prio;
>  
>  	/*
> -	 * Special case for priority boosted tasks.
> -	 *
> -	 * If the new priority is lower or equal (user space view)
> -	 * than the current (boosted) priority, we just store the new
> +	 * Take priority boosted tasks into account. If the new
> +	 * effective priority is unchanged, we just store the new
>  	 * normal parameters and do not touch the scheduler class and
>  	 * the runqueue. This will be done when the task deboost
>  	 * itself.
>  	 */
> -	if (rt_mutex_check_prio(p, newprio)) {
> +	new_effective_prio = rt_mutex_check_prio(p, newprio);
> +	if (new_effective_prio == oldprio) {

When I first heard of this problem, I started writing code to fix this
and came up with pretty much the exact same answer.

I got pulled onto other things so I never finished it, but one thing
that worried me about this fix is this:

	T1 - FIFO policy (prio = 10)
	  lock(rtmutex);

	T2 (prio = 20)
	  lock(rtmutex)
	    boost T1 (prio = 20)

        TI (prio = 20)
	  sys_sched_setscheduler(prio = 30)
	  TI (prio = 30)

	T1 (prio = 30)
	  sys_sched_setscheduler(SCHED_OTHER)
	  new_effective_prio = 20, oldprio = 30

Before the code stopped at the rt_mutex_check_prio(), but now it
continues. Will having the policy change cause problems here?

-- Steve


>  		__setscheduler_params(p, attr);
>  		task_rq_unlock(rq, p, &flags);
>  		return 0;


  reply index

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-05 16:08 Thomas Gleixner
2015-05-05 16:29 ` Steven Rostedt [this message]
2015-05-05 16:31   ` Thomas Gleixner
2015-05-05 16:42     ` Steven Rostedt
2015-05-05 16:50       ` Thomas Gleixner
2015-05-05 17:01         ` Steven Rostedt
2015-05-05 17:49           ` [PATCH V2] " Thomas Gleixner
2015-05-05 20:20             ` Steven Rostedt
2015-05-08 13:18 ` [tip:sched/core] " tip-bot for Thomas Gleixner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150505122920.7861907d@gandalf.local.home \
    --to=rostedt@goodmis.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=peterz@infradead.org \
    --cc=ronny.meeus@gmail.com \
    --cc=tglx@linutronix.de \
    --cc=umgwanakikbuti@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

LKML Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/lkml/0 lkml/git/0.git
	git clone --mirror https://lore.kernel.org/lkml/1 lkml/git/1.git
	git clone --mirror https://lore.kernel.org/lkml/2 lkml/git/2.git
	git clone --mirror https://lore.kernel.org/lkml/3 lkml/git/3.git
	git clone --mirror https://lore.kernel.org/lkml/4 lkml/git/4.git
	git clone --mirror https://lore.kernel.org/lkml/5 lkml/git/5.git
	git clone --mirror https://lore.kernel.org/lkml/6 lkml/git/6.git
	git clone --mirror https://lore.kernel.org/lkml/7 lkml/git/7.git
	git clone --mirror https://lore.kernel.org/lkml/8 lkml/git/8.git
	git clone --mirror https://lore.kernel.org/lkml/9 lkml/git/9.git
	git clone --mirror https://lore.kernel.org/lkml/10 lkml/git/10.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 lkml lkml/ https://lore.kernel.org/lkml \
		linux-kernel@vger.kernel.org
	public-inbox-index lkml

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-kernel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git