From: Steven Rostedt <rostedt@goodmis.org>
To: Gregory Haskins <ghaskins@novell.com>
Cc: linux-kernel@vger.kernel.org,
Andrew Morton <akpm@linux-foundation.org>,
Ingo Molnar <mingo@redhat.com>,
Rusty Russell <rusty@rustcorp.com.au>
Subject: Re: [PATCH 1/14] cpumask: simplify sched_rt.c
Date: Tue, 03 Nov 2009 11:41:49 -0500 [thread overview]
Message-ID: <1257266509.26028.3343.camel@gandalf.stny.rr.com> (raw)
In-Reply-To: <200911031453.15350.rusty@rustcorp.com.au>
Greg,
I believe this was mostly your code. Can you review this change.
Thanks,
-- Steve
On Tue, 2009-11-03 at 14:53 +1030, Rusty Russell wrote:
> find_lowest_rq() wants to call pick_optimal_cpu() on the intersection
> of sched_domain_span(sd) and lowest_mask. Rather than doing a cpus_and
> into a temporary, we can open-code it.
>
> This actually makes the code slightly clearer, IMHO.
>
> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
> To: Steven Rostedt <rostedt@goodmis.org>
> Cc: Ingo Molnar <mingo@redhat.com>
> ---
> kernel/sched_rt.c | 59 +++++++++++++++++++++---------------------------------
> 1 file changed, 23 insertions(+), 36 deletions(-)
>
> diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c
> --- a/kernel/sched_rt.c
> +++ b/kernel/sched_rt.c
> @@ -1115,29 +1115,12 @@ static struct task_struct *pick_next_hig
>
> static DEFINE_PER_CPU(cpumask_var_t, local_cpu_mask);
>
> -static inline int pick_optimal_cpu(int this_cpu,
> - const struct cpumask *mask)
> -{
> - int first;
> -
> - /* "this_cpu" is cheaper to preempt than a remote processor */
> - if ((this_cpu != -1) && cpumask_test_cpu(this_cpu, mask))
> - return this_cpu;
> -
> - first = cpumask_first(mask);
> - if (first < nr_cpu_ids)
> - return first;
> -
> - return -1;
> -}
> -
> static int find_lowest_rq(struct task_struct *task)
> {
> struct sched_domain *sd;
> struct cpumask *lowest_mask = __get_cpu_var(local_cpu_mask);
> int this_cpu = smp_processor_id();
> int cpu = task_cpu(task);
> - cpumask_var_t domain_mask;
>
> if (task->rt.nr_cpus_allowed == 1)
> return -1; /* No other targets possible */
> @@ -1167,28 +1150,26 @@ static int find_lowest_rq(struct task_st
> * Otherwise, we consult the sched_domains span maps to figure
> * out which cpu is logically closest to our hot cache data.
> */
> - if (this_cpu == cpu)
> - this_cpu = -1; /* Skip this_cpu opt if the same */
> + if (!cpumask_test_cpu(this_cpu, lowest_mask))
> + this_cpu = -1; /* Skip this_cpu opt if not among lowest */
>
> - if (alloc_cpumask_var(&domain_mask, GFP_ATOMIC)) {
> - for_each_domain(cpu, sd) {
> - if (sd->flags & SD_WAKE_AFFINE) {
> - int best_cpu;
> + for_each_domain(cpu, sd) {
> + if (sd->flags & SD_WAKE_AFFINE) {
> + int best_cpu;
>
> - cpumask_and(domain_mask,
> - sched_domain_span(sd),
> - lowest_mask);
> + /*
> + * "this_cpu" is cheaper to preempt than a
> + * remote processor.
> + */
> + if (this_cpu != -1 &&
> + cpumask_test_cpu(this_cpu, sched_domain_span(sd)))
> + return this_cpu;
>
> - best_cpu = pick_optimal_cpu(this_cpu,
> - domain_mask);
> -
> - if (best_cpu != -1) {
> - free_cpumask_var(domain_mask);
> - return best_cpu;
> - }
> - }
> + best_cpu = cpumask_first_and(lowest_mask,
> + sched_domain_span(sd));
> + if (best_cpu < nr_cpu_ids)
> + return best_cpu;
> }
> - free_cpumask_var(domain_mask);
> }
>
> /*
> @@ -1196,7 +1177,13 @@ static int find_lowest_rq(struct task_st
> * just give the caller *something* to work with from the compatible
> * locations.
> */
> - return pick_optimal_cpu(this_cpu, lowest_mask);
> + if (this_cpu != -1)
> + return this_cpu;
> +
> + cpu = cpumask_any(lowest_mask);
> + if (cpu < nr_cpu_ids)
> + return cpu;
> + return -1;
> }
>
> /* Will lock the rq it finds */
>
next prev parent reply other threads:[~2009-11-03 16:41 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-03 4:23 Rusty Russell
2009-11-03 16:41 ` Steven Rostedt [this message]
2009-11-03 21:22 ` Gregory Haskins
2009-11-03 21:40 ` Gregory Haskins
2009-11-04 15:26 ` [tip:sched/core] cpumask: Simplify sched_rt.c tip-bot for Rusty Russell
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=1257266509.26028.3343.camel@gandalf.stny.rr.com \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=ghaskins@novell.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=rusty@rustcorp.com.au \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®