Re: [PATCH]: Fix deadlock in USBIP driver (staging), linux-2.6.34-rc5
From: Eric Lescouet
Date: Thu Apr 22 2010 - 14:12:56 EST
Greg KH wrote:
[...]
Ok, but does the lock_kernel() call you just made actually prevent this
from happening? Isn't there some other lock you can use instead?
Right. lock_kernel() is not needed (was copy/paste).
The deadlock is avoided by not calling wait_for_completion()
when the code is executed by the "eh" thread itself.
Also, to have patches that we can apply, we need a "Signed-off-by:"
line. See the file, Documentation/SubmittingPatches for what this
means.
Understood.
Your email client wrapped the patch and made it unappliable :(
thanks,
greg k-h
Sorry about that. Please find below an hopefully better one.
Thanks,
Eric.
Signed-off-by: Eric Lescouet <eric@xxxxxxxxxxxx>
-------------
diff -Nur linux-2.6.34-rc5/drivers/staging/usbip/usbip_event.c linux-2.6.34-rc5.new/drivers/staging/usbip/usbip_event.c
--- linux-2.6.34-rc5/drivers/staging/usbip/usbip_event.c 2010-04-20 01:29:56.000000000 +0200
+++ linux-2.6.34-rc5.new/drivers/staging/usbip/usbip_event.c 2010-04-22 19:19:52.997889126 +0200
@@ -117,6 +117,9 @@
{
struct usbip_task *eh = &ud->eh;
+ if (eh->thread == current)
+ return; /* do not wait for myself */
+
wait_for_completion(&eh->thread_done);
usbip_dbg_eh("usbip_eh has finished\n");
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/