linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Gleixner <tglx@linutronix.de>
To: David Miller <davem@davemloft.net>
Cc: linux-kernel@vger.kernel.org, peterz@infradead.org,
	mingo@kernel.org, bigeasy@linutronix.de,
	benh@kernel.crashing.org, fenghua.yu@intel.com,
	herbert@gondor.apana.org.au, jiangshanlai@gmail.com,
	lenb@kernel.org, mpe@ellerman.id.au, rjw@rjwysocki.net,
	tj@kernel.org, tony.luck@intel.com, viresh.kumar@linaro.org,
	sparclinux@vger.kernel.org
Subject: [patch V2 06/13] sparc/sysfs: Replace racy task affinity logic
Date: Thu, 13 Apr 2017 10:17:07 +0200 (CEST)	[thread overview]
Message-ID: <alpine.DEB.2.20.1704131001270.2408@nanos> (raw)
In-Reply-To: <20170412.215206.1568460664651298892.davem@davemloft.net>

The mmustat_enable sysfs file accessor functions must run code 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. concurrent affinity settings for that thread resulting in
code executing on the wrong CPU and overwriting the new affinity setting.

Replace it by using work_on_cpu() which guarantees to run the code on the
requested CPU.

Protection against CPU hotplug is not required as the open sysfs file
already prevents the removal from the CPU offline callback. Using the
hotplug protected version would actually be wrong because it would deadlock
against a CPU hotplug operation of the CPU associated to the sysfs file in
progress.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: David S. Miller <davem@davemloft.net>
Cc: sparclinux@vger.kernel.org
---

V2: Use NULL instead of 0 (David), fix compile breakage (build-bot)

 arch/sparc/kernel/sysfs.c |   39 +++++++++++----------------------------
 1 file changed, 11 insertions(+), 28 deletions(-)

Index: b/arch/sparc/kernel/sysfs.c
===================================================================
--- a/arch/sparc/kernel/sysfs.c
+++ b/arch/sparc/kernel/sysfs.c
@@ -98,27 +98,7 @@ static struct attribute_group mmu_stat_g
 	.name = "mmu_stats",
 };
 
-/* XXX convert to rusty's on_one_cpu */
-static unsigned long run_on_cpu(unsigned long cpu,
-			        unsigned long (*func)(unsigned long),
-				unsigned long arg)
-{
-	cpumask_t old_affinity;
-	unsigned long ret;
-
-	cpumask_copy(&old_affinity, &current->cpus_allowed);
-	/* should return -EINVAL to userspace */
-	if (set_cpus_allowed_ptr(current, cpumask_of(cpu)))
-		return 0;
-
-	ret = func(arg);
-
-	set_cpus_allowed_ptr(current, &old_affinity);
-
-	return ret;
-}
-
-static unsigned long read_mmustat_enable(unsigned long junk)
+static long read_mmustat_enable(void *data __maybe_unused)
 {
 	unsigned long ra = 0;
 
@@ -127,11 +107,11 @@ static unsigned long read_mmustat_enable
 	return ra != 0;
 }
 
-static unsigned long write_mmustat_enable(unsigned long val)
+static long write_mmustat_enable(void *data)
 {
-	unsigned long ra, orig_ra;
+	unsigned long ra, orig_ra, *val = data;
 
-	if (val)
+	if (*val)
 		ra = __pa(&per_cpu(mmu_stats, smp_processor_id()));
 	else
 		ra = 0UL;
@@ -142,7 +122,8 @@ static unsigned long write_mmustat_enabl
 static ssize_t show_mmustat_enable(struct device *s,
 				struct device_attribute *attr, char *buf)
 {
-	unsigned long val = run_on_cpu(s->id, read_mmustat_enable, 0);
+	long val = work_on_cpu(s->id, read_mmustat_enable, NULL);
+
 	return sprintf(buf, "%lx\n", val);
 }
 
@@ -150,13 +131,15 @@ static ssize_t store_mmustat_enable(stru
 			struct device_attribute *attr, const char *buf,
 			size_t count)
 {
-	unsigned long val, err;
-	int ret = sscanf(buf, "%lu", &val);
+	unsigned long val;
+	long err;
+	int ret;
 
+	ret = sscanf(buf, "%lu", &val);
 	if (ret != 1)
 		return -EINVAL;
 
-	err = run_on_cpu(s->id, write_mmustat_enable, val);
+	err = work_on_cpu(s->id, write_mmustat_enable, &val);
 	if (err)
 		return -EIO;
 

  reply	other threads:[~2017-04-13  8:17 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     ` Thomas Gleixner [this message]
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:sched/core] " tip-bot for Thomas Gleixner
2017-04-13 14:50     ` [patch V2 12/13] " 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=alpine.DEB.2.20.1704131001270.2408@nanos \
    --to=tglx@linutronix.de \
    --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=jiangshanlai@gmail.com \
    --cc=lenb@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=mpe@ellerman.id.au \
    --cc=peterz@infradead.org \
    --cc=rjw@rjwysocki.net \
    --cc=sparclinux@vger.kernel.org \
    --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;
as well as URLs for NNTP newsgroup(s).