Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1221340 > unrolled thread

Re: [PATCH] sched: make policy-testing consistent in core

Started byHenrik Austad <henrik@austad.us>
First post2015-09-09 11:40 +0200
Last post2015-09-18 10:50 +0200
Articles 4 — 3 participants

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  Re: [PATCH] sched: make policy-testing consistent in core Henrik Austad <henrik@austad.us> - 2015-09-09 11:40 +0200
    Re: [PATCH] sched: make policy-testing consistent in core Peter Zijlstra <peterz@infradead.org> - 2015-09-09 15:40 +0200
      [PATCH] sched: make policy-testing consistent in core Henrik Austad <henrik@austad.us> - 2015-09-09 17:10 +0200
        [tip:sched/core] sched/core: Make policy-testing consistent tip-bot for Henrik Austad <tipbot@zytor.com> - 2015-09-18 10:50 +0200

#1221340 — Re: [PATCH] sched: make policy-testing consistent in core

FromHenrik Austad <henrik@austad.us>
Date2015-09-09 11:40 +0200
SubjectRe: [PATCH] sched: make policy-testing consistent in core
Message-ID<q6K1b-7xZ-15@gated-at.bofh.it>

[Multipart message — attachments visible in raw view] — view raw

As per-irc request

*prod*

thanks!
-Henrik

On Thu, Aug 20, 2015 at 03:54:02PM +0200, Henrik Austad wrote:
> Most of the policy-tests are done via the <class>_policy() helpers with
> the notable exception of idle. A new wrapper for valid_policy() has also
> been added to improve readability  in set_load_weight().
> 
> This commit does not change the logical behavior of the scheduler core.
> 
> Signed-off-by: Henrik Austad <henrik@austad.us>
> CC: Ingo Molnar <mingo@redhat.com>
> CC: Peter Zijlstra <peterz@infradead.org>
> CC: linux-kernel@vger.kernel.org
> ---
>  kernel/sched/core.c  | 9 +++------
>  kernel/sched/sched.h | 9 +++++++++
>  2 files changed, 12 insertions(+), 6 deletions(-)
> 
> diff --git a/kernel/sched/core.c b/kernel/sched/core.c
> index 78b4bad10081..476a30e5632a 100644
> --- a/kernel/sched/core.c
> +++ b/kernel/sched/core.c
> @@ -816,7 +816,7 @@ static void set_load_weight(struct task_struct *p)
>  	/*
>  	 * SCHED_IDLE tasks get minimal weight:
>  	 */
> -	if (p->policy == SCHED_IDLE) {
> +	if (idle_policy(p->policy)) {
>  		load->weight = scale_load(WEIGHT_IDLEPRIO);
>  		load->inv_weight = WMULT_IDLEPRIO;
>  		return;
> @@ -3684,10 +3684,7 @@ recheck:
>  	} else {
>  		reset_on_fork = !!(attr->sched_flags & SCHED_FLAG_RESET_ON_FORK);
>  
> -		if (policy != SCHED_DEADLINE &&
> -				policy != SCHED_FIFO && policy != SCHED_RR &&
> -				policy != SCHED_NORMAL && policy != SCHED_BATCH &&
> -				policy != SCHED_IDLE)
> +		if (!valid_policy(policy))
>  			return -EINVAL;
>  	}
>  
> @@ -3743,7 +3740,7 @@ recheck:
>  		 * Treat SCHED_IDLE as nice 20. Only allow a switch to
>  		 * SCHED_NORMAL if the RLIMIT_NICE would normally permit it.
>  		 */
> -		if (p->policy == SCHED_IDLE && policy != SCHED_IDLE) {
> +		if (idle_policy(p->policy) && !idle_policy(policy)) {
>  			if (!can_nice(p, task_nice(p)))
>  				return -EPERM;
>  		}
> diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
> index 84d48790bb6d..fe7cb34cc55b 100644
> --- a/kernel/sched/sched.h
> +++ b/kernel/sched/sched.h
> @@ -84,6 +84,10 @@ static inline void update_cpu_load_active(struct rq *this_rq) { }
>   */
>  #define RUNTIME_INF	((u64)~0ULL)
>  
> +static inline int idle_policy(int policy)
> +{
> +	return policy == SCHED_IDLE;
> +}
>  static inline int fair_policy(int policy)
>  {
>  	return policy == SCHED_NORMAL || policy == SCHED_BATCH;
> @@ -98,6 +102,11 @@ static inline int dl_policy(int policy)
>  {
>  	return policy == SCHED_DEADLINE;
>  }
> +static inline bool valid_policy(int policy)
> +{
> +	return idle_policy(policy) || fair_policy(policy) ||
> +		rt_policy(policy) || dl_policy(policy);
> +}
>  
>  static inline int task_has_rt_policy(struct task_struct *p)
>  {
> -- 
> 1.9.1
> 

-- 
Henrik Austad

[toc] | [next] | [standalone]

#1221463

FromPeter Zijlstra <peterz@infradead.org>
Date2015-09-09 15:40 +0200
Message-ID<q6NLv-4vi-59@gated-at.bofh.it>
In reply to#1221340
On Wed, Sep 09, 2015 at 11:32:43AM +0200, Henrik Austad wrote:
> As per-irc request
> 
> *prod*

I see no objection to his; but it appears I never actually received the
original patch. Do you mind resending so I can apply?


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1221516

FromHenrik Austad <henrik@austad.us>
Date2015-09-09 17:10 +0200
Message-ID<q6Pay-6Er-9@gated-at.bofh.it>
In reply to#1221463
Most of the policy-tests are done via the <class>_policy() helpers with
the notable exception of idle. A new wrapper for valid_policy() has also
been added to improve readability  in set_load_weight().

This commit does not change the logical behavior of the scheduler core.

Signed-off-by: Henrik Austad <henrik@austad.us>
CC: Ingo Molnar <mingo@redhat.com>
CC: Peter Zijlstra <peterz@infradead.org>
CC: linux-kernel@vger.kernel.org
---
 kernel/sched/core.c  | 9 +++------
 kernel/sched/sched.h | 9 +++++++++
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 3595403921bd..889ce337a83a 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -814,7 +814,7 @@ static void set_load_weight(struct task_struct *p)
 	/*
 	 * SCHED_IDLE tasks get minimal weight:
 	 */
-	if (p->policy == SCHED_IDLE) {
+	if (idle_policy(p->policy)) {
 		load->weight = scale_load(WEIGHT_IDLEPRIO);
 		load->inv_weight = WMULT_IDLEPRIO;
 		return;
@@ -3736,10 +3736,7 @@ recheck:
 	} else {
 		reset_on_fork = !!(attr->sched_flags & SCHED_FLAG_RESET_ON_FORK);
 
-		if (policy != SCHED_DEADLINE &&
-				policy != SCHED_FIFO && policy != SCHED_RR &&
-				policy != SCHED_NORMAL && policy != SCHED_BATCH &&
-				policy != SCHED_IDLE)
+		if (!valid_policy(policy))
 			return -EINVAL;
 	}
 
@@ -3795,7 +3792,7 @@ recheck:
 		 * Treat SCHED_IDLE as nice 20. Only allow a switch to
 		 * SCHED_NORMAL if the RLIMIT_NICE would normally permit it.
 		 */
-		if (p->policy == SCHED_IDLE && policy != SCHED_IDLE) {
+		if (idle_policy(p->policy) && !idle_policy(policy)) {
 			if (!can_nice(p, task_nice(p)))
 				return -EPERM;
 		}
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index 68cda117574c..597349055c3a 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -84,6 +84,10 @@ static inline void update_cpu_load_active(struct rq *this_rq) { }
  */
 #define RUNTIME_INF	((u64)~0ULL)
 
+static inline int idle_policy(int policy)
+{
+	return policy == SCHED_IDLE;
+}
 static inline int fair_policy(int policy)
 {
 	return policy == SCHED_NORMAL || policy == SCHED_BATCH;
@@ -98,6 +102,11 @@ static inline int dl_policy(int policy)
 {
 	return policy == SCHED_DEADLINE;
 }
+static inline bool valid_policy(int policy)
+{
+	return idle_policy(policy) || fair_policy(policy) ||
+		rt_policy(policy) || dl_policy(policy);
+}
 
 static inline int task_has_rt_policy(struct task_struct *p)
 {
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1227650 — [tip:sched/core] sched/core: Make policy-testing consistent

Fromtip-bot for Henrik Austad <tipbot@zytor.com>
Date2015-09-18 10:50 +0200
Subject[tip:sched/core] sched/core: Make policy-testing consistent
Message-ID<q9ZwK-5W4-1@gated-at.bofh.it>
In reply to#1221516
Commit-ID:  20f9cd2acb1d74a8bf4b4087267f586e6ecdbc03
Gitweb:     http://git.kernel.org/tip/20f9cd2acb1d74a8bf4b4087267f586e6ecdbc03
Author:     Henrik Austad <henrik@austad.us>
AuthorDate: Wed, 9 Sep 2015 17:00:41 +0200
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Fri, 18 Sep 2015 09:23:13 +0200

sched/core: Make policy-testing consistent

Most of the policy-tests are done via the <class>_policy() helpers with
the notable exception of idle. A new wrapper for valid_policy() has also
been added to improve readability  in set_load_weight().

This commit does not change the logical behavior of the scheduler core.

Signed-off-by: Henrik Austad <henrik@austad.us>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Link: http://lkml.kernel.org/r/1441810841-4756-1-git-send-email-henrik@austad.us
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 kernel/sched/core.c  | 9 +++------
 kernel/sched/sched.h | 9 +++++++++
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 6ab415a..1b30b5b 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -817,7 +817,7 @@ static void set_load_weight(struct task_struct *p)
 	/*
 	 * SCHED_IDLE tasks get minimal weight:
 	 */
-	if (p->policy == SCHED_IDLE) {
+	if (idle_policy(p->policy)) {
 		load->weight = scale_load(WEIGHT_IDLEPRIO);
 		load->inv_weight = WMULT_IDLEPRIO;
 		return;
@@ -3733,10 +3733,7 @@ recheck:
 	} else {
 		reset_on_fork = !!(attr->sched_flags & SCHED_FLAG_RESET_ON_FORK);
 
-		if (policy != SCHED_DEADLINE &&
-				policy != SCHED_FIFO && policy != SCHED_RR &&
-				policy != SCHED_NORMAL && policy != SCHED_BATCH &&
-				policy != SCHED_IDLE)
+		if (!valid_policy(policy))
 			return -EINVAL;
 	}
 
@@ -3792,7 +3789,7 @@ recheck:
 		 * Treat SCHED_IDLE as nice 20. Only allow a switch to
 		 * SCHED_NORMAL if the RLIMIT_NICE would normally permit it.
 		 */
-		if (p->policy == SCHED_IDLE && policy != SCHED_IDLE) {
+		if (idle_policy(p->policy) && !idle_policy(policy)) {
 			if (!can_nice(p, task_nice(p)))
 				return -EPERM;
 		}
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index 167ab48..3845a71 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -84,6 +84,10 @@ static inline void update_cpu_load_active(struct rq *this_rq) { }
  */
 #define RUNTIME_INF	((u64)~0ULL)
 
+static inline int idle_policy(int policy)
+{
+	return policy == SCHED_IDLE;
+}
 static inline int fair_policy(int policy)
 {
 	return policy == SCHED_NORMAL || policy == SCHED_BATCH;
@@ -98,6 +102,11 @@ static inline int dl_policy(int policy)
 {
 	return policy == SCHED_DEADLINE;
 }
+static inline bool valid_policy(int policy)
+{
+	return idle_policy(policy) || fair_policy(policy) ||
+		rt_policy(policy) || dl_policy(policy);
+}
 
 static inline int task_has_rt_policy(struct task_struct *p)
 {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web