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

Commit-ID:  67cb85fdcee7fbc61c09c00360d1a4ae37641db4
Gitweb:     http://git.kernel.org/tip/67cb85fdcee7fbc61c09c00360d1a4ae37641db4
Author:     Thomas Gleixner <tglx@linutronix.de>
AuthorDate: Wed, 12 Apr 2017 22:07:29 +0200
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Sat, 15 Apr 2017 12:20:53 +0200

ia64/salinfo: Replace racy task affinity logic

Some of the file operations in /proc/sal require to run code on the
requested 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 using work_on_cpu_safe() which guarantees to run the code on
the requested CPU or to fail in case the CPU is offline.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: linux-ia64@vger.kernel.org
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: Lai Jiangshan <jiangshanlai@gmail.com>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
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/20170412201042.341863457@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

---
 arch/ia64/kernel/salinfo.c | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/arch/ia64/kernel/salinfo.c b/arch/ia64/kernel/salinfo.c
index d194d5c..63dc9cd 100644
--- a/arch/ia64/kernel/salinfo.c
+++ b/arch/ia64/kernel/salinfo.c
@@ -179,14 +179,14 @@ struct salinfo_platform_oemdata_parms {
 	const u8 *efi_guid;
 	u8 **oemdata;
 	u64 *oemdata_size;
-	int ret;
 };
 
-static void
+static long
 salinfo_platform_oemdata_cpu(void *context)
 {
 	struct salinfo_platform_oemdata_parms *parms = context;
-	parms->ret = salinfo_platform_oemdata(parms->efi_guid, parms->oemdata, parms->oemdata_size);
+
+	return salinfo_platform_oemdata(parms->efi_guid, parms->oemdata, parms->oemdata_size);
 }
 
 static void
@@ -380,16 +380,7 @@ salinfo_log_release(struct inode *inode, struct file *file)
 	return 0;
 }
 
-static void
-call_on_cpu(int cpu, void (*fn)(void *), void *arg)
-{
-	cpumask_t save_cpus_allowed = current->cpus_allowed;
-	set_cpus_allowed_ptr(current, cpumask_of(cpu));
-	(*fn)(arg);
-	set_cpus_allowed_ptr(current, &save_cpus_allowed);
-}
-
-static void
+static long
 salinfo_log_read_cpu(void *context)
 {
 	struct salinfo_data *data = context;
@@ -399,6 +390,7 @@ salinfo_log_read_cpu(void *context)
 	/* Clear corrected errors as they are read from SAL */
 	if (rh->severity == sal_log_severity_corrected)
 		ia64_sal_clear_state_info(data->type);
+	return 0;
 }
 
 static void
@@ -430,7 +422,7 @@ retry:
 	spin_unlock_irqrestore(&data_saved_lock, flags);
 
 	if (!data->saved_num)
-		call_on_cpu(cpu, salinfo_log_read_cpu, data);
+		work_on_cpu_safe(cpu, salinfo_log_read_cpu, data);
 	if (!data->log_size) {
 		data->state = STATE_NO_DATA;
 		cpumask_clear_cpu(cpu, &data->cpu_event);
@@ -459,11 +451,13 @@ salinfo_log_read(struct file *file, char __user *buffer, size_t count, loff_t *p
 	return simple_read_from_buffer(buffer, count, ppos, buf, bufsize);
 }
 
-static void
+static long
 salinfo_log_clear_cpu(void *context)
 {
 	struct salinfo_data *data = context;
+
 	ia64_sal_clear_state_info(data->type);
+	return 0;
 }
 
 static int
@@ -486,7 +480,7 @@ salinfo_log_clear(struct salinfo_data *data, int cpu)
 	rh = (sal_log_record_header_t *)(data->log_buffer);
 	/* Corrected errors have already been cleared from SAL */
 	if (rh->severity != sal_log_severity_corrected)
-		call_on_cpu(cpu, salinfo_log_clear_cpu, data);
+		work_on_cpu_safe(cpu, salinfo_log_clear_cpu, data);
 	/* clearing a record may make a new record visible */
 	salinfo_log_new_read(cpu, data);
 	if (data->state == STATE_LOG_RECORD) {
@@ -531,9 +525,8 @@ salinfo_log_write(struct file *file, const char __user *buffer, size_t count, lo
 				.oemdata = &data->oemdata,
 				.oemdata_size = &data->oemdata_size
 			};
-			call_on_cpu(cpu, salinfo_platform_oemdata_cpu, &parms);
-			if (parms.ret)
-				count = parms.ret;
+			count = work_on_cpu_safe(cpu, salinfo_platform_oemdata_cpu,
+						 &parms);
 		} else
 			data->oemdata_size = 0;
 	} else

  reply	other threads:[~2017-04-15 14:24 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-bot for Thomas Gleixner [this message]
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: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=tip-67cb85fdcee7fbc61c09c00360d1a4ae37641db4@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;
as well as URLs for NNTP newsgroup(s).