niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

soc/fsl/qbman: fix issue in qman_delete_cgr_safe()

Browse source 
The wait_for_completion() call in qman_delete_cgr_safe()
was triggering a scheduling while atomic bug, replacing the
kthread with a smp_call_function_single() call to fix it.

Signed-off-by: Madalin Bucur <madalin.bucur@nxp.com>
Signed-off-by: Roy Pledge <roy.pledge@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Madalin Bucur 2018-03-14 08:37:28 -05:00 • committed by David S. Miller
parent 4dcb31d464
commit 96f413f476
1 changed files with 5 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
drivers/soc/fsl/qbman/qman.c
View file

@ -2443,39 +2443,21 @@ struct cgr_comp {
struct completion completion; struct completion completion;
}; };
static int qman_delete_cgr_thread(void *p) static void qman_delete_cgr_smp_call(void *p)
{ {
struct cgr_comp *cgr_comp = (struct cgr_comp *)p; qman_delete_cgr((struct qman_cgr *)p);
int ret;
ret = qman_delete_cgr(cgr_comp->cgr);
complete(&cgr_comp->completion);
return ret;
} }
void qman_delete_cgr_safe(struct qman_cgr *cgr) void qman_delete_cgr_safe(struct qman_cgr *cgr)
{ {
struct task_struct *thread;
struct cgr_comp cgr_comp;
preempt_disable(); preempt_disable();
if (qman_cgr_cpus[cgr->cgrid] != smp_processor_id()) { if (qman_cgr_cpus[cgr->cgrid] != smp_processor_id()) {
init_completion(&cgr_comp.completion); smp_call_function_single(qman_cgr_cpus[cgr->cgrid],
cgr_comp.cgr = cgr; qman_delete_cgr_smp_call, cgr, true);
thread = kthread_create(qman_delete_cgr_thread, &cgr_comp,
"cgr_del");
if (IS_ERR(thread))
goto out;
kthread_bind(thread, qman_cgr_cpus[cgr->cgrid]);
wake_up_process(thread);
wait_for_completion(&cgr_comp.completion);
preempt_enable(); preempt_enable();
return; return;
} }
out:
qman_delete_cgr(cgr); qman_delete_cgr(cgr);
preempt_enable(); preempt_enable();
} }