[PATCH 8/8] stop_machine: cleanup the usage of preemption counter in cpu_stopper_thread()

Path	csiph.com!news.mixmin.net!newsreader4.netcologne.de!news.netcologne.de!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod
From	Oleg Nesterov <oleg@redhat.com>
Newsgroups	linux.kernel
Subject	[PATCH 8/8] stop_machine: cleanup the usage of preemption counter in cpu_stopper_thread()
Date	Sun, 15 Nov 2015 19:40:03 +0100
Message-ID	<qvanx-4YI-47@gated-at.bofh.it> (permalink)
References	<qvanw-4YI-9@gated-at.bofh.it>
X-Original-To	Ingo Molnar <mingo@kernel.org>, Peter Zijlstra <peterz@infradead.org>
MIME-Version	1.0
Content-Type	text/plain; charset=us-ascii
Content-Disposition	inline
User-Agent	Mutt/1.5.18 (2008-05-17)
X-Scanned-By	MIMEDefang 2.68 on 10.5.11.23
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	66
Organization	linux.* mail to news gateway
X-Original-Cc	Milos Vyletel <milos@redhat.com>, Prarit Bhargava <prarit@redhat.com>, Tejun Heo <tj@kernel.org>, Thomas Gleixner <tglx@linutronix.de>, linux-kernel@vger.kernel.org
X-Original-Date	Sun, 15 Nov 2015 20:33:32 +0100
X-Original-Message-ID	<20151115193332.GA8281@redhat.com>
X-Original-References	<20151115193254.GA8225@redhat.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1269739

Show key headers only | View raw

1. Change this code to use preempt_count_inc/preempt_count_dec; this way
   it works even if CONFIG_PREEMPT_COUNT=n, and we avoid the unnecessary
   __preempt_schedule() check (stop_sched_class is not preemptible).

   And this makes clear that we only want to make preempt_count() != 0
   for __might_sleep() / schedule_debug().

2. Change WARN_ONCE() to use %pf to print the function name and remove
   kallsyms_lookup/ksym_buf.

3. Move "int ret" into the "if (work)" block, this looks more consistent.

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
---
 kernel/stop_machine.c |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c
index 7ff7ace..6110119 100644
--- a/kernel/stop_machine.c
+++ b/kernel/stop_machine.c
@@ -435,7 +435,6 @@ static void cpu_stopper_thread(unsigned int cpu)
 {
 	struct cpu_stopper *stopper = &per_cpu(cpu_stopper, cpu);
 	struct cpu_stop_work *work;
-	int ret;
 
 repeat:
 	work = NULL;
@@ -451,23 +450,19 @@ repeat:
 		cpu_stop_fn_t fn = work->fn;
 		void *arg = work->arg;
 		struct cpu_stop_done *done = work->done;
-		char ksym_buf[KSYM_NAME_LEN] __maybe_unused;
+		int ret;
 
-		/* cpu stop callbacks are not allowed to sleep */
-		preempt_disable();
+		/* cpu stop callbacks must not sleep, make in_atomic() == T */
+		preempt_count_inc();
 		ret = fn(arg);
 		if (done) {
 			if (ret)
 				done->ret = ret;
 			cpu_stop_signal_done(done);
 		}
-		/* restore preemption and check it's still balanced */
-		preempt_enable();
+		preempt_count_dec();
 		WARN_ONCE(preempt_count(),
-			  "cpu_stop: %s(%p) leaked preempt count\n",
-			  kallsyms_lookup((unsigned long)fn, NULL, NULL, NULL,
-					  ksym_buf), arg);
-
+			  "cpu_stop: %pf(%p) leaked preempt count\n", fn, arg);
 		goto repeat;
 	}
 }
-- 
1.5.5.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/

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH 8/8] stop_machine: cleanup the usage of preemption counter  in cpu_stopper_thread() Oleg Nesterov <oleg@redhat.com> - 2015-11-15 19:40 +0100
  Re: [PATCH 8/8] stop_machine: cleanup the usage of preemption  counter in cpu_stopper_thread() Tejun Heo <tj@kernel.org> - 2015-11-16 20:20 +0100
  [tip:sched/core] stop_machine:   Clean up the usage of the preemption counter in cpu_stopper_thread() tip-bot for Oleg Nesterov <tipbot@zytor.com> - 2015-11-23 17:30 +0100

csiph-web