* [PATCH v2 1/6] kthread: Add the helper macro kthread_run_on_cpu()
2021-10-21 12:27 [PATCH v2 0/6] kthread: Add the helper macro kthread_run_on_cpu() Cai Huoqing
@ 2021-10-21 12:27 ` Cai Huoqing
2021-10-21 12:27 ` [PATCH v2 2/6] RDMA/siw: Make use of " Cai Huoqing
` (5 subsequent siblings)
6 siblings, 0 replies; 11+ messages in thread
From: Cai Huoqing @ 2021-10-21 12:27 UTC (permalink / raw)
To: caihuoqing
Cc: Bernard Metzler, Doug Ledford, Jason Gunthorpe, Davidlohr Bueso,
Paul E. McKenney, Josh Triplett, Steven Rostedt,
Mathieu Desnoyers, Lai Jiangshan, Joel Fernandes, Ingo Molnar,
Daniel Bristot de Oliveira, linux-rdma, linux-kernel, rcu
the helper macro kthread_run_on_cpu() inculdes
kthread_create_on_cpu/wake_up_process().
In some cases, use kthread_run_on_cpu() directly instead of
kthread_create_on_node/kthread_bind/wake_up_process() or
kthread_create_on_cpu/wake_up_process() or
kthreadd_create/kthread_bind/wake_up_process() to simplify the code.
Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
---
v1->v2:
*Remove cpu_to_node from kthread_create_on_cpu params.
*Updated the macro description comment.
include/linux/kthread.h | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/include/linux/kthread.h b/include/linux/kthread.h
index 346b0f269161..dfd125523aa9 100644
--- a/include/linux/kthread.h
+++ b/include/linux/kthread.h
@@ -56,6 +56,27 @@ bool kthread_is_per_cpu(struct task_struct *k);
__k; \
})
+/**
+ * kthread_run_on_cpu - create and wake a cpu bound thread.
+ * @threadfn: the function to run until signal_pending(current).
+ * @data: data ptr for @threadfn.
+ * @cpu: The cpu on which the thread should be bound,
+ * @namefmt: printf-style name for the thread. Format is restricted
+ * to "name.*%u". Code fills in cpu number.
+ *
+ * Description: Convenient wrapper for kthread_create_on_cpu()
+ * followed by wake_up_process(). Returns the kthread or
+ * ERR_PTR(-ENOMEM).
+ */
+#define kthread_run_on_cpu(threadfn, data, cpu, namefmt) \
+({ \
+ struct task_struct *__k \
+ = kthread_create_on_cpu(threadfn, data, cpu, namefmt); \
+ if (!IS_ERR(__k)) \
+ wake_up_process(__k); \
+ __k; \
+})
+
void free_kthread_struct(struct task_struct *k);
void kthread_bind(struct task_struct *k, unsigned int cpu);
void kthread_bind_mask(struct task_struct *k, const struct cpumask *mask);
--
2.25.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH v2 2/6] RDMA/siw: Make use of the helper macro kthread_run_on_cpu()
2021-10-21 12:27 [PATCH v2 0/6] kthread: Add the helper macro kthread_run_on_cpu() Cai Huoqing
2021-10-21 12:27 ` [PATCH v2 1/6] " Cai Huoqing
@ 2021-10-21 12:27 ` Cai Huoqing
2021-10-21 22:56 ` kernel test robot
2021-10-21 12:27 ` [PATCH v2 3/6] ring-buffer: " Cai Huoqing
` (4 subsequent siblings)
6 siblings, 1 reply; 11+ messages in thread
From: Cai Huoqing @ 2021-10-21 12:27 UTC (permalink / raw)
To: caihuoqing
Cc: Bernard Metzler, Doug Ledford, Jason Gunthorpe, Davidlohr Bueso,
Paul E. McKenney, Josh Triplett, Steven Rostedt,
Mathieu Desnoyers, Lai Jiangshan, Joel Fernandes, Ingo Molnar,
Daniel Bristot de Oliveira, linux-rdma, linux-kernel, rcu
Repalce kthread_create/kthread_bind/wake_up_process()
with kthread_run_on_cpu() to simplify the code.
Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
---
drivers/infiniband/sw/siw/siw_main.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/infiniband/sw/siw/siw_main.c b/drivers/infiniband/sw/siw/siw_main.c
index 9093e6a80b26..e5c586913d0b 100644
--- a/drivers/infiniband/sw/siw/siw_main.c
+++ b/drivers/infiniband/sw/siw/siw_main.c
@@ -98,15 +98,14 @@ static int siw_create_tx_threads(void)
continue;
siw_tx_thread[cpu] =
- kthread_create(siw_run_sq, (unsigned long *)(long)cpu,
- "siw_tx/%d", cpu);
+ kthread_run_on_cpu(siw_run_sq,
+ (unsigned long *)(long)cpu,
+ cpu, "siw_tx/%u");
if (IS_ERR(siw_tx_thread[cpu])) {
siw_tx_thread[cpu] = NULL;
continue;
}
- kthread_bind(siw_tx_thread[cpu], cpu);
- wake_up_process(siw_tx_thread[cpu]);
assigned++;
}
return assigned;
--
2.25.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH v2 2/6] RDMA/siw: Make use of the helper macro kthread_run_on_cpu()
2021-10-21 12:27 ` [PATCH v2 2/6] RDMA/siw: Make use of " Cai Huoqing
@ 2021-10-21 22:56 ` kernel test robot
0 siblings, 0 replies; 11+ messages in thread
From: kernel test robot @ 2021-10-21 22:56 UTC (permalink / raw)
To: Cai Huoqing
Cc: llvm, kbuild-all, Bernard Metzler, Doug Ledford, Jason Gunthorpe,
Davidlohr Bueso, Paul E. McKenney, Josh Triplett, Steven Rostedt,
Mathieu Desnoyers, Lai Jiangshan
[-- Attachment #1: Type: text/plain, Size: 1822 bytes --]
Hi Cai,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on tip/perf/core]
[also build test ERROR on rdma/for-next paulmck-rcu/dev linus/master v5.15-rc6 next-20211021]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Cai-Huoqing/kthread-Add-the-helper-macro-kthread_run_on_cpu/20211021-202912
base: https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git 26da4abfb38201c3cbe127daeded76d4c2bc9077
config: hexagon-randconfig-r045-20211021 (attached as .config)
compiler: clang version 14.0.0 (https://github.com/llvm/llvm-project 3cea2505fd8d99a9ba0cb625aecfe28a47c4e3f8)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/76b990017d9057e8fbd8cd83be5e3791c79df13e
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Cai-Huoqing/kthread-Add-the-helper-macro-kthread_run_on_cpu/20211021-202912
git checkout 76b990017d9057e8fbd8cd83be5e3791c79df13e
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 ARCH=hexagon
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All errors (new ones prefixed by >>, old ones prefixed by <<):
>> ERROR: modpost: "kthread_create_on_cpu" [drivers/infiniband/sw/siw/siw.ko] undefined!
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 27702 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v2 3/6] ring-buffer: Make use of the helper macro kthread_run_on_cpu()
2021-10-21 12:27 [PATCH v2 0/6] kthread: Add the helper macro kthread_run_on_cpu() Cai Huoqing
2021-10-21 12:27 ` [PATCH v2 1/6] " Cai Huoqing
2021-10-21 12:27 ` [PATCH v2 2/6] RDMA/siw: Make use of " Cai Huoqing
@ 2021-10-21 12:27 ` Cai Huoqing
2021-10-21 12:27 ` [PATCH v2 4/6] rcutorture: " Cai Huoqing
` (3 subsequent siblings)
6 siblings, 0 replies; 11+ messages in thread
From: Cai Huoqing @ 2021-10-21 12:27 UTC (permalink / raw)
To: caihuoqing
Cc: Bernard Metzler, Doug Ledford, Jason Gunthorpe, Davidlohr Bueso,
Paul E. McKenney, Josh Triplett, Steven Rostedt,
Mathieu Desnoyers, Lai Jiangshan, Joel Fernandes, Ingo Molnar,
Daniel Bristot de Oliveira, linux-rdma, linux-kernel, rcu
Repalce kthread_create/kthread_bind/wake_up_process()
with kthread_run_on_cpu() to simplify the code.
Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
---
kernel/trace/ring_buffer.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index c5a3fbf19617..afb306e21e5b 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -5898,16 +5898,13 @@ static __init int test_ringbuffer(void)
rb_data[cpu].buffer = buffer;
rb_data[cpu].cpu = cpu;
rb_data[cpu].cnt = cpu;
- rb_threads[cpu] = kthread_create(rb_test, &rb_data[cpu],
- "rbtester/%d", cpu);
+ rb_threads[cpu] = kthread_run_on_cpu(rb_test, &rb_data[cpu],
+ cpu, "rbtester/%u");
if (WARN_ON(IS_ERR(rb_threads[cpu]))) {
pr_cont("FAILED\n");
ret = PTR_ERR(rb_threads[cpu]);
goto out_free;
}
-
- kthread_bind(rb_threads[cpu], cpu);
- wake_up_process(rb_threads[cpu]);
}
/* Now create the rb hammer! */
--
2.25.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH v2 4/6] rcutorture: Make use of the helper macro kthread_run_on_cpu()
2021-10-21 12:27 [PATCH v2 0/6] kthread: Add the helper macro kthread_run_on_cpu() Cai Huoqing
` (2 preceding siblings ...)
2021-10-21 12:27 ` [PATCH v2 3/6] ring-buffer: " Cai Huoqing
@ 2021-10-21 12:27 ` Cai Huoqing
2021-10-21 12:27 ` [PATCH v2 5/6] trace/osnoise: " Cai Huoqing
` (2 subsequent siblings)
6 siblings, 0 replies; 11+ messages in thread
From: Cai Huoqing @ 2021-10-21 12:27 UTC (permalink / raw)
To: caihuoqing
Cc: Bernard Metzler, Doug Ledford, Jason Gunthorpe, Davidlohr Bueso,
Paul E. McKenney, Josh Triplett, Steven Rostedt,
Mathieu Desnoyers, Lai Jiangshan, Joel Fernandes, Ingo Molnar,
Daniel Bristot de Oliveira, linux-rdma, linux-kernel, rcu
Repalce kthread_create_on_node//kthread_bind/wake_up_process()
with kthread_run_on_cpu() to simplify the code.
Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
---
kernel/rcu/rcutorture.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
index 503e14e62e8f..6c3ba8c0d7ff 100644
--- a/kernel/rcu/rcutorture.c
+++ b/kernel/rcu/rcutorture.c
@@ -2025,9 +2025,8 @@ static int rcutorture_booster_init(unsigned int cpu)
mutex_lock(&boost_mutex);
rcu_torture_disable_rt_throttle();
VERBOSE_TOROUT_STRING("Creating rcu_torture_boost task");
- boost_tasks[cpu] = kthread_create_on_node(rcu_torture_boost, NULL,
- cpu_to_node(cpu),
- "rcu_torture_boost");
+ boost_tasks[cpu] = kthread_run_on_cpu(rcu_torture_boost, NULL,
+ cpu, "rcu_torture_boost_%u");
if (IS_ERR(boost_tasks[cpu])) {
retval = PTR_ERR(boost_tasks[cpu]);
VERBOSE_TOROUT_STRING("rcu_torture_boost task create failed");
@@ -2036,8 +2035,6 @@ static int rcutorture_booster_init(unsigned int cpu)
mutex_unlock(&boost_mutex);
return retval;
}
- kthread_bind(boost_tasks[cpu], cpu);
- wake_up_process(boost_tasks[cpu]);
mutex_unlock(&boost_mutex);
return 0;
}
--
2.25.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH v2 5/6] trace/osnoise: Make use of the helper macro kthread_run_on_cpu()
2021-10-21 12:27 [PATCH v2 0/6] kthread: Add the helper macro kthread_run_on_cpu() Cai Huoqing
` (3 preceding siblings ...)
2021-10-21 12:27 ` [PATCH v2 4/6] rcutorture: " Cai Huoqing
@ 2021-10-21 12:27 ` Cai Huoqing
2021-10-21 12:27 ` [PATCH v2 6/6] trace/hwlat: " Cai Huoqing
2021-10-21 16:31 ` [PATCH v2 0/6] kthread: Add " Bart Van Assche
6 siblings, 0 replies; 11+ messages in thread
From: Cai Huoqing @ 2021-10-21 12:27 UTC (permalink / raw)
To: caihuoqing
Cc: Bernard Metzler, Doug Ledford, Jason Gunthorpe, Davidlohr Bueso,
Paul E. McKenney, Josh Triplett, Steven Rostedt,
Mathieu Desnoyers, Lai Jiangshan, Joel Fernandes, Ingo Molnar,
Daniel Bristot de Oliveira, linux-rdma, linux-kernel, rcu
Repalce kthread_create_on_cpu/wake_up_process()
with kthread_run_on_cpu() to simplify the code.
Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
---
v1->v2: Update changelog.
kernel/trace/trace_osnoise.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/kernel/trace/trace_osnoise.c b/kernel/trace/trace_osnoise.c
index ce053619f289..cbd78fd5e491 100644
--- a/kernel/trace/trace_osnoise.c
+++ b/kernel/trace/trace_osnoise.c
@@ -1525,7 +1525,7 @@ static int start_kthread(unsigned int cpu)
#else
snprintf(comm, 24, "osnoise/%d", cpu);
#endif
- kthread = kthread_create_on_cpu(main, NULL, cpu, comm);
+ kthread = kthread_run_on_cpu(main, NULL, cpu, comm);
if (IS_ERR(kthread)) {
pr_err(BANNER "could not start sampling thread\n");
@@ -1534,7 +1534,6 @@ static int start_kthread(unsigned int cpu)
}
per_cpu(per_cpu_osnoise_var, cpu).kthread = kthread;
- wake_up_process(kthread);
return 0;
}
--
2.25.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH v2 6/6] trace/hwlat: Make use of the helper macro kthread_run_on_cpu()
2021-10-21 12:27 [PATCH v2 0/6] kthread: Add the helper macro kthread_run_on_cpu() Cai Huoqing
` (4 preceding siblings ...)
2021-10-21 12:27 ` [PATCH v2 5/6] trace/osnoise: " Cai Huoqing
@ 2021-10-21 12:27 ` Cai Huoqing
2021-10-21 16:31 ` Bart Van Assche
2021-10-21 16:31 ` [PATCH v2 0/6] kthread: Add " Bart Van Assche
6 siblings, 1 reply; 11+ messages in thread
From: Cai Huoqing @ 2021-10-21 12:27 UTC (permalink / raw)
To: caihuoqing
Cc: Bernard Metzler, Doug Ledford, Jason Gunthorpe, Davidlohr Bueso,
Paul E. McKenney, Josh Triplett, Steven Rostedt,
Mathieu Desnoyers, Lai Jiangshan, Joel Fernandes, Ingo Molnar,
Daniel Bristot de Oliveira, linux-rdma, linux-kernel, rcu
Repalce kthread_create_on_cpu/wake_up_process()
with kthread_run_on_cpu() to simplify the code.
Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
---
v1->v2: Update changelog.
kernel/trace/trace_hwlat.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/kernel/trace/trace_hwlat.c b/kernel/trace/trace_hwlat.c
index 1b83d75eb103..0e555335f095 100644
--- a/kernel/trace/trace_hwlat.c
+++ b/kernel/trace/trace_hwlat.c
@@ -491,18 +491,14 @@ static void stop_per_cpu_kthreads(void)
static int start_cpu_kthread(unsigned int cpu)
{
struct task_struct *kthread;
- char comm[24];
- snprintf(comm, 24, "hwlatd/%d", cpu);
-
- kthread = kthread_create_on_cpu(kthread_fn, NULL, cpu, comm);
+ kthread = kthread_run_on_cpu(kthread_fn, NULL, cpu, "hwlatd/%u");
if (IS_ERR(kthread)) {
pr_err(BANNER "could not start sampling thread\n");
return -ENOMEM;
}
per_cpu(hwlat_per_cpu_data, cpu).kthread = kthread;
- wake_up_process(kthread);
return 0;
}
--
2.25.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH v2 6/6] trace/hwlat: Make use of the helper macro kthread_run_on_cpu()
2021-10-21 12:27 ` [PATCH v2 6/6] trace/hwlat: " Cai Huoqing
@ 2021-10-21 16:31 ` Bart Van Assche
0 siblings, 0 replies; 11+ messages in thread
From: Bart Van Assche @ 2021-10-21 16:31 UTC (permalink / raw)
To: Cai Huoqing
Cc: Bernard Metzler, Doug Ledford, Jason Gunthorpe, Davidlohr Bueso,
Paul E. McKenney, Josh Triplett, Steven Rostedt,
Mathieu Desnoyers, Lai Jiangshan, Joel Fernandes, Ingo Molnar,
Daniel Bristot de Oliveira, linux-rdma, linux-kernel, rcu
On 10/21/21 5:27 AM, Cai Huoqing wrote:
> Repalce kthread_create_on_cpu/wake_up_process()
Repalce -> Replace ?
Thanks,
Bart.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2 0/6] kthread: Add the helper macro kthread_run_on_cpu()
2021-10-21 12:27 [PATCH v2 0/6] kthread: Add the helper macro kthread_run_on_cpu() Cai Huoqing
` (5 preceding siblings ...)
2021-10-21 12:27 ` [PATCH v2 6/6] trace/hwlat: " Cai Huoqing
@ 2021-10-21 16:31 ` Bart Van Assche
6 siblings, 0 replies; 11+ messages in thread
From: Bart Van Assche @ 2021-10-21 16:31 UTC (permalink / raw)
To: Cai Huoqing
Cc: Bernard Metzler, Doug Ledford, Jason Gunthorpe, Davidlohr Bueso,
Paul E. McKenney, Josh Triplett, Steven Rostedt,
Mathieu Desnoyers, Lai Jiangshan, Joel Fernandes, Ingo Molnar,
Daniel Bristot de Oliveira, linux-rdma, linux-kernel, rcu
On 10/21/21 5:27 AM, Cai Huoqing wrote:
> the helper macro kthread_run_on_cpu() inculdes
Consider using a spelling checker (inculdes -> includes).
Thanks,
Bart.
^ permalink raw reply [flat|nested] 11+ messages in thread