public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: tip-bot for Thomas Gleixner <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: rjw@rjwysocki.net, tglx@linutronix.de, peterz@infradead.org,
	benh@kernel.crashing.org, linux-kernel@vger.kernel.org,
	fenghua.yu@intel.com, mpe@ellerman.id.au, mingo@kernel.org,
	viresh.kumar@linaro.org, lenb@kernel.org, hpa@zytor.com,
	davem@davemloft.net, tj@kernel.org, bigeasy@linutronix.de,
	jiangshanlai@gmail.com, tony.luck@intel.com,
	herbert@gondor.apana.org.au
Subject: [tip:sched/core] cpufreq/sparc-us2e: Replace racy task affinity logic
Date: Sat, 15 Apr 2017 07:21:45 -0700	[thread overview]
Message-ID: <tip-12699ac53a2e5fbd1fd7c164b11685d55c8aa28b@git.kernel.org> (raw)
In-Reply-To: <alpine.DEB.2.20.1704131020280.2408@nanos>

Commit-ID:  12699ac53a2e5fbd1fd7c164b11685d55c8aa28b
Gitweb:     http://git.kernel.org/tip/12699ac53a2e5fbd1fd7c164b11685d55c8aa28b
Author:     Thomas Gleixner <tglx@linutronix.de>
AuthorDate: Thu, 13 Apr 2017 10:22:43 +0200
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Sat, 15 Apr 2017 12:20:56 +0200

cpufreq/sparc-us2e: Replace racy task affinity logic

The access to the HBIRD_ESTAR_MODE register in the cpu frequency control
functions must happen on the target CPU. This is achieved by temporarily
setting the affinity of the calling user space thread to the requested CPU
and reset it to the original affinity afterwards.

That's racy vs. CPU hotplug and concurrent affinity settings for that
thread resulting in code executing on the wrong CPU and overwriting the
new affinity setting.

Replace it by a straight forward smp function call. 

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Sebastian Siewior <bigeasy@linutronix.de>
Cc: linux-pm@vger.kernel.org
Cc: Lai Jiangshan <jiangshanlai@gmail.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Tejun Heo <tj@kernel.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Len Brown <lenb@kernel.org>
Link: http://lkml.kernel.org/r/alpine.DEB.2.20.1704131020280.2408@nanos
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

---
 drivers/cpufreq/sparc-us2e-cpufreq.c | 45 +++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 24 deletions(-)

diff --git a/drivers/cpufreq/sparc-us2e-cpufreq.c b/drivers/cpufreq/sparc-us2e-cpufreq.c
index 35ddb6d..90f33ef 100644
--- a/drivers/cpufreq/sparc-us2e-cpufreq.c
+++ b/drivers/cpufreq/sparc-us2e-cpufreq.c
@@ -118,10 +118,6 @@ static void us2e_transition(unsigned long estar, unsigned long new_bits,
 			    unsigned long clock_tick,
 			    unsigned long old_divisor, unsigned long divisor)
 {
-	unsigned long flags;
-
-	local_irq_save(flags);
-
 	estar &= ~ESTAR_MODE_DIV_MASK;
 
 	/* This is based upon the state transition diagram in the IIe manual.  */
@@ -152,8 +148,6 @@ static void us2e_transition(unsigned long estar, unsigned long new_bits,
 	} else {
 		BUG();
 	}
-
-	local_irq_restore(flags);
 }
 
 static unsigned long index_to_estar_mode(unsigned int index)
@@ -229,48 +223,51 @@ static unsigned long estar_to_divisor(unsigned long estar)
 	return ret;
 }
 
+static void __us2e_freq_get(void *arg)
+{
+	unsigned long *estar = arg;
+
+	*estar = read_hbreg(HBIRD_ESTAR_MODE_ADDR);
+}
+
 static unsigned int us2e_freq_get(unsigned int cpu)
 {
-	cpumask_t cpus_allowed;
 	unsigned long clock_tick, estar;
 
-	cpumask_copy(&cpus_allowed, &current->cpus_allowed);
-	set_cpus_allowed_ptr(current, cpumask_of(cpu));
-
 	clock_tick = sparc64_get_clock_tick(cpu) / 1000;
-	estar = read_hbreg(HBIRD_ESTAR_MODE_ADDR);
-
-	set_cpus_allowed_ptr(current, &cpus_allowed);
+	if (smp_call_function_single(cpu, __us2e_freq_get, &estar, 1))
+		return 0;
 
 	return clock_tick / estar_to_divisor(estar);
 }
 
-static int us2e_freq_target(struct cpufreq_policy *policy, unsigned int index)
+static void __us2e_freq_target(void *arg)
 {
-	unsigned int cpu = policy->cpu;
+	unsigned int cpu = smp_processor_id();
+	unsigned int *index = arg;
 	unsigned long new_bits, new_freq;
 	unsigned long clock_tick, divisor, old_divisor, estar;
-	cpumask_t cpus_allowed;
-
-	cpumask_copy(&cpus_allowed, &current->cpus_allowed);
-	set_cpus_allowed_ptr(current, cpumask_of(cpu));
 
 	new_freq = clock_tick = sparc64_get_clock_tick(cpu) / 1000;
-	new_bits = index_to_estar_mode(index);
-	divisor = index_to_divisor(index);
+	new_bits = index_to_estar_mode(*index);
+	divisor = index_to_divisor(*index);
 	new_freq /= divisor;
 
 	estar = read_hbreg(HBIRD_ESTAR_MODE_ADDR);
 
 	old_divisor = estar_to_divisor(estar);
 
-	if (old_divisor != divisor)
+	if (old_divisor != divisor) {
 		us2e_transition(estar, new_bits, clock_tick * 1000,
 				old_divisor, divisor);
+	}
+}
 
-	set_cpus_allowed_ptr(current, &cpus_allowed);
+static int us2e_freq_target(struct cpufreq_policy *policy, unsigned int index)
+{
+	unsigned int cpu = policy->cpu;
 
-	return 0;
+	return smp_call_function_single(cpu, __us2e_freq_target, &index, 1);
 }
 
 static int __init us2e_freq_cpu_init(struct cpufreq_policy *policy)

  reply	other threads:[~2017-04-15 14:29 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-04-12 20:07 [patch 00/13] sched/treewide: Clean up various racy task affinity issues Thomas Gleixner
2017-04-12 20:07 ` [patch 01/13] ia64/topology: Remove cpus_allowed manipulation Thomas Gleixner
2017-04-15 14:15   ` [tip:sched/core] " tip-bot for Thomas Gleixner
2017-04-12 20:07 ` [patch 02/13] workqueue: Provide work_on_cpu_safe() Thomas Gleixner
2017-04-13 11:11   ` Dou Liyang
2017-04-13 21:28     ` Thomas Gleixner
2017-04-14  4:18   ` Tejun Heo
2017-04-14  8:54   ` Peter Zijlstra
2017-04-14  9:51     ` Thomas Gleixner
2017-04-14  9:56       ` Peter Zijlstra
2017-04-15 14:16   ` [tip:sched/core] " tip-bot for Thomas Gleixner
2017-04-12 20:07 ` [patch 03/13] ia64/salinfo: Replace racy task affinity logic Thomas Gleixner
2017-04-15 14:17   ` [tip:sched/core] " tip-bot for Thomas Gleixner
2017-04-12 20:07 ` [patch 04/13] ia64/sn/hwperf: " Thomas Gleixner
2017-04-12 20:53   ` [patch V 2 " Thomas Gleixner
2017-04-15 14:17     ` [tip:sched/core] " tip-bot for Thomas Gleixner
2017-04-12 20:07 ` [patch 05/13] powerpc/smp: Replace open coded " Thomas Gleixner
2017-04-13  5:47   ` Michael Ellerman
2017-04-15 14:18   ` [tip:sched/core] " tip-bot for Thomas Gleixner
2017-04-12 20:07 ` [patch 06/13] sparc/sysfs: Replace racy " Thomas Gleixner
2017-04-13  1:52   ` David Miller
2017-04-13  8:17     ` [patch V2 " Thomas Gleixner
2017-04-15 14:18       ` [tip:sched/core] " tip-bot for Thomas Gleixner
2017-04-12 20:07 ` [patch 07/13] ACPI/processor: Fix error handling in __acpi_processor_start() Thomas Gleixner
2017-04-15 14:19   ` [tip:sched/core] " tip-bot for Thomas Gleixner
2017-04-12 20:07 ` [patch 08/13] ACPI/processor: Replace racy task affinity logic Thomas Gleixner
2017-04-13 11:39   ` Peter Zijlstra
2017-04-13 12:01     ` Thomas Gleixner
2017-04-13 12:52       ` Peter Zijlstra
2017-04-15 14:19   ` [tip:sched/core] " tip-bot for Thomas Gleixner
2017-04-12 20:07 ` [patch 09/13] cpufreq/ia64: " Thomas Gleixner
2017-04-12 20:55   ` [patch V2 " Thomas Gleixner
2017-04-15 14:20     ` [tip:sched/core] " tip-bot for Thomas Gleixner
2017-04-13  2:42   ` [patch 09/13] " Viresh Kumar
2017-04-12 20:07 ` [patch 10/13] cpufreq/sh: " Thomas Gleixner
2017-04-13  2:46   ` Viresh Kumar
2017-04-15 14:20   ` [tip:sched/core] " tip-bot for Thomas Gleixner
2017-04-12 20:07 ` [patch 11/13] cpufreq/sparc-us3: " Thomas Gleixner
2017-04-13  2:48   ` Viresh Kumar
2017-04-15 14:21   ` [tip:sched/core] " tip-bot for Thomas Gleixner
2017-04-12 20:07 ` [patch 12/13] cpufreq/sparc-us2e: " Thomas Gleixner
2017-04-13  2:50   ` Viresh Kumar
2017-04-13  8:19   ` [patch V2 " Thomas Gleixner
2017-04-13  8:22     ` [patch V3 " Thomas Gleixner
2017-04-15 14:21       ` tip-bot for Thomas Gleixner [this message]
2017-04-13 14:50     ` [patch V2 " David Miller
2017-04-12 20:07 ` [patch 13/13] crypto: n2 - " Thomas Gleixner
2017-04-13  4:56   ` Herbert Xu
2017-04-13  8:20   ` [patch V2 " Thomas Gleixner
2017-04-13 14:51     ` David Miller
2017-04-15 14:22     ` [tip:sched/core] crypto: N2 " tip-bot for Thomas Gleixner
2017-04-13  9:02 ` [patch 00/13] sched/treewide: Clean up various racy task affinity issues Peter Zijlstra

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=tip-12699ac53a2e5fbd1fd7c164b11685d55c8aa28b@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=benh@kernel.crashing.org \
    --cc=bigeasy@linutronix.de \
    --cc=davem@davemloft.net \
    --cc=fenghua.yu@intel.com \
    --cc=herbert@gondor.apana.org.au \
    --cc=hpa@zytor.com \
    --cc=jiangshanlai@gmail.com \
    --cc=lenb@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=mpe@ellerman.id.au \
    --cc=peterz@infradead.org \
    --cc=rjw@rjwysocki.net \
    --cc=tglx@linutronix.de \
    --cc=tj@kernel.org \
    --cc=tony.luck@intel.com \
    --cc=viresh.kumar@linaro.org \
    /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