hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NTB: Fix incorrect clean up routine in ntb_perf 

The clean up routine when we failed to allocate kthread is not cleaning
up all the threads, only the same one over and over again.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Dave Jiang <dave.jiang@intel.com>
Acked-by: Allen Hubbe <Allen.Hubbe@emc.com>
Signed-off-by: Jon Mason <jdmason@kudzu.us>
This commit is contained in:
Dave Jiang 2016-03-18 16:39:47 -07:00 committed by Jon Mason
parent ddc8f6feec
commit 838850ee0b
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/ntb/test/ntb_perf.c
View File

@ -559,6 +559,21 @@ static ssize_t debugfs_run_read(struct file *filp, char __user *ubuf,
return ret; return ret;
} }
static void threads_cleanup(struct perf_ctx *perf)
{
struct pthr_ctx *pctx;
int i;
perf->run = false;
for (i = 0; i < MAX_THREADS; i++) {
pctx = &perf->pthr_ctx[i];
if (pctx->thread) {
kthread_stop(pctx->thread);
pctx->thread = NULL;
}
}
}
static ssize_t debugfs_run_write(struct file *filp, const char __user *ubuf, static ssize_t debugfs_run_write(struct file *filp, const char __user *ubuf,
size_t count, loff_t *offp) size_t count, loff_t *offp)
{ {
@ -574,17 +589,9 @@ static ssize_t debugfs_run_write(struct file *filp, const char __user *ubuf,
if (atomic_read(&perf->tsync) == 0) if (atomic_read(&perf->tsync) == 0)
perf->run = false; perf->run = false;
if (perf->run) { if (perf->run)
/* lets stop the threads */ threads_cleanup(perf);
perf->run = false; else {
for (i = 0; i < MAX_THREADS; i++) {
if (perf->pthr_ctx[i].thread) {
kthread_stop(perf->pthr_ctx[i].thread);
perf->pthr_ctx[i].thread = NULL;
} else
break;
}
} else {
perf->run = true; perf->run = true;
if (perf->perf_threads > MAX_THREADS) { if (perf->perf_threads > MAX_THREADS) {
@ -616,13 +623,8 @@ static ssize_t debugfs_run_write(struct file *filp, const char __user *ubuf,
(void *)pctx, (void *)pctx,
node, "ntb_perf %d", i); node, "ntb_perf %d", i);
if (IS_ERR(pctx->thread)) { if (IS_ERR(pctx->thread)) {
perf->run = false; pctx->thread = NULL;
for (i = 0; i < MAX_THREADS; i++) { goto err;
if (pctx->thread) {
kthread_stop(pctx->thread);
pctx->thread = NULL;
}
}
} else } else
wake_up_process(pctx->thread); wake_up_process(pctx->thread);
@ -633,6 +635,10 @@ static ssize_t debugfs_run_write(struct file *filp, const char __user *ubuf,
} }
return count; return count;
err:
threads_cleanup(perf);
return -ENXIO;
} }
static const struct file_operations ntb_perf_debugfs_run = { static const struct file_operations ntb_perf_debugfs_run = {