* [PATCH] stop_machine: remove try_stop_cpus helper
@ 2019-12-14 19:51 Yangtao Li
2019-12-16 13:29 ` Peter Zijlstra
2019-12-17 12:39 ` [tip: sched/core] " tip-bot2 for Yangtao Li
0 siblings, 2 replies; 3+ messages in thread
From: Yangtao Li @ 2019-12-14 19:51 UTC (permalink / raw)
To: tglx, heiko.carstens, peterz, bhelgaas, schwidefsky,
mark.rutland, paulmck
Cc: linux-kernel, Yangtao Li
try_stop_cpus is not used after this:
commit c190c3b16c0f ("rcu: Switch synchronize_sched_expedited() to
stop_one_cpu()")
So remove it.
Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
---
include/linux/stop_machine.h | 7 -------
kernel/stop_machine.c | 30 ------------------------------
2 files changed, 37 deletions(-)
diff --git a/include/linux/stop_machine.h b/include/linux/stop_machine.h
index f9a0c6189852..648298f877da 100644
--- a/include/linux/stop_machine.h
+++ b/include/linux/stop_machine.h
@@ -33,7 +33,6 @@ int stop_two_cpus(unsigned int cpu1, unsigned int cpu2, cpu_stop_fn_t fn, void *
bool stop_one_cpu_nowait(unsigned int cpu, cpu_stop_fn_t fn, void *arg,
struct cpu_stop_work *work_buf);
int stop_cpus(const struct cpumask *cpumask, cpu_stop_fn_t fn, void *arg);
-int try_stop_cpus(const struct cpumask *cpumask, cpu_stop_fn_t fn, void *arg);
void stop_machine_park(int cpu);
void stop_machine_unpark(int cpu);
void stop_machine_yield(const struct cpumask *cpumask);
@@ -90,12 +89,6 @@ static inline int stop_cpus(const struct cpumask *cpumask,
return -ENOENT;
}
-static inline int try_stop_cpus(const struct cpumask *cpumask,
- cpu_stop_fn_t fn, void *arg)
-{
- return stop_cpus(cpumask, fn, arg);
-}
-
#endif /* CONFIG_SMP */
/*
diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c
index 1fe34a9fabc2..5d68ec4c4015 100644
--- a/kernel/stop_machine.c
+++ b/kernel/stop_machine.c
@@ -453,36 +453,6 @@ int stop_cpus(const struct cpumask *cpumask, cpu_stop_fn_t fn, void *arg)
return ret;
}
-/**
- * try_stop_cpus - try to stop multiple cpus
- * @cpumask: cpus to stop
- * @fn: function to execute
- * @arg: argument to @fn
- *
- * Identical to stop_cpus() except that it fails with -EAGAIN if
- * someone else is already using the facility.
- *
- * CONTEXT:
- * Might sleep.
- *
- * RETURNS:
- * -EAGAIN if someone else is already stopping cpus, -ENOENT if
- * @fn(@arg) was not executed at all because all cpus in @cpumask were
- * offline; otherwise, 0 if all executions of @fn returned 0, any non
- * zero return value if any returned non zero.
- */
-int try_stop_cpus(const struct cpumask *cpumask, cpu_stop_fn_t fn, void *arg)
-{
- int ret;
-
- /* static works are used, process one request at a time */
- if (!mutex_trylock(&stop_cpus_mutex))
- return -EAGAIN;
- ret = __stop_cpus(cpumask, fn, arg);
- mutex_unlock(&stop_cpus_mutex);
- return ret;
-}
-
static int cpu_stop_should_run(unsigned int cpu)
{
struct cpu_stopper *stopper = &per_cpu(cpu_stopper, cpu);
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] stop_machine: remove try_stop_cpus helper
2019-12-14 19:51 [PATCH] stop_machine: remove try_stop_cpus helper Yangtao Li
@ 2019-12-16 13:29 ` Peter Zijlstra
2019-12-17 12:39 ` [tip: sched/core] " tip-bot2 for Yangtao Li
1 sibling, 0 replies; 3+ messages in thread
From: Peter Zijlstra @ 2019-12-16 13:29 UTC (permalink / raw)
To: Yangtao Li
Cc: tglx, heiko.carstens, bhelgaas, schwidefsky, mark.rutland,
paulmck, linux-kernel
On Sat, Dec 14, 2019 at 07:51:07PM +0000, Yangtao Li wrote:
> try_stop_cpus is not used after this:
>
> commit c190c3b16c0f ("rcu: Switch synchronize_sched_expedited() to
> stop_one_cpu()")
>
> So remove it.
Thanks!
^ permalink raw reply [flat|nested] 3+ messages in thread
* [tip: sched/core] stop_machine: remove try_stop_cpus helper
2019-12-14 19:51 [PATCH] stop_machine: remove try_stop_cpus helper Yangtao Li
2019-12-16 13:29 ` Peter Zijlstra
@ 2019-12-17 12:39 ` tip-bot2 for Yangtao Li
1 sibling, 0 replies; 3+ messages in thread
From: tip-bot2 for Yangtao Li @ 2019-12-17 12:39 UTC (permalink / raw)
To: linux-tip-commits; +Cc: Yangtao Li, Peter Zijlstra (Intel), x86, LKML
The following commit has been merged into the sched/core branch of tip:
Commit-ID: a5e37de90e67ac1072a9a44bd0cec9f5e98ded08
Gitweb: https://git.kernel.org/tip/a5e37de90e67ac1072a9a44bd0cec9f5e98ded08
Author: Yangtao Li <tiny.windzz@gmail.com>
AuthorDate: Sat, 14 Dec 2019 19:51:07
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Tue, 17 Dec 2019 13:32:51 +01:00
stop_machine: remove try_stop_cpus helper
try_stop_cpus is not used after this:
commit c190c3b16c0f ("rcu: Switch synchronize_sched_expedited() to
stop_one_cpu()")
So remove it.
Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20191214195107.26480-1-tiny.windzz@gmail.com
---
include/linux/stop_machine.h | 7 -------
kernel/stop_machine.c | 30 ------------------------------
2 files changed, 37 deletions(-)
diff --git a/include/linux/stop_machine.h b/include/linux/stop_machine.h
index f9a0c61..648298f 100644
--- a/include/linux/stop_machine.h
+++ b/include/linux/stop_machine.h
@@ -33,7 +33,6 @@ int stop_two_cpus(unsigned int cpu1, unsigned int cpu2, cpu_stop_fn_t fn, void *
bool stop_one_cpu_nowait(unsigned int cpu, cpu_stop_fn_t fn, void *arg,
struct cpu_stop_work *work_buf);
int stop_cpus(const struct cpumask *cpumask, cpu_stop_fn_t fn, void *arg);
-int try_stop_cpus(const struct cpumask *cpumask, cpu_stop_fn_t fn, void *arg);
void stop_machine_park(int cpu);
void stop_machine_unpark(int cpu);
void stop_machine_yield(const struct cpumask *cpumask);
@@ -90,12 +89,6 @@ static inline int stop_cpus(const struct cpumask *cpumask,
return -ENOENT;
}
-static inline int try_stop_cpus(const struct cpumask *cpumask,
- cpu_stop_fn_t fn, void *arg)
-{
- return stop_cpus(cpumask, fn, arg);
-}
-
#endif /* CONFIG_SMP */
/*
diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c
index 1fe34a9..5d68ec4 100644
--- a/kernel/stop_machine.c
+++ b/kernel/stop_machine.c
@@ -453,36 +453,6 @@ int stop_cpus(const struct cpumask *cpumask, cpu_stop_fn_t fn, void *arg)
return ret;
}
-/**
- * try_stop_cpus - try to stop multiple cpus
- * @cpumask: cpus to stop
- * @fn: function to execute
- * @arg: argument to @fn
- *
- * Identical to stop_cpus() except that it fails with -EAGAIN if
- * someone else is already using the facility.
- *
- * CONTEXT:
- * Might sleep.
- *
- * RETURNS:
- * -EAGAIN if someone else is already stopping cpus, -ENOENT if
- * @fn(@arg) was not executed at all because all cpus in @cpumask were
- * offline; otherwise, 0 if all executions of @fn returned 0, any non
- * zero return value if any returned non zero.
- */
-int try_stop_cpus(const struct cpumask *cpumask, cpu_stop_fn_t fn, void *arg)
-{
- int ret;
-
- /* static works are used, process one request at a time */
- if (!mutex_trylock(&stop_cpus_mutex))
- return -EAGAIN;
- ret = __stop_cpus(cpumask, fn, arg);
- mutex_unlock(&stop_cpus_mutex);
- return ret;
-}
-
static int cpu_stop_should_run(unsigned int cpu)
{
struct cpu_stopper *stopper = &per_cpu(cpu_stopper, cpu);
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-12-17 12:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-14 19:51 [PATCH] stop_machine: remove try_stop_cpus helper Yangtao Li
2019-12-16 13:29 ` Peter Zijlstra
2019-12-17 12:39 ` [tip: sched/core] " tip-bot2 for Yangtao Li
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).