* [patch 09/10] uml: fix ubd deadlock on SMP
@ 2004-10-12 0:18 ` blaisorblade_spam
0 siblings, 0 replies; 2+ messages in thread
From: blaisorblade_spam @ 2004-10-12 0:18 UTC (permalink / raw)
To: akpm
Cc: jdike, linux-kernel, user-mode-linux-devel, blaisorblade_spam, chrisw
From: BlaisorBlade <blaisorblade_spam@yahoo.it>, Chris Wright <chrisw@osdl.org>
Avoid deadlocking onto the request lock in the UBD driver, i.e. don't lock the
queue spinlock when called from the request function.
In detail:
Rename ubd_finish() to __ubd_finish() and remove ubd_io_lock from it.
Add wrapper, ubd_finish(), which grabs lock before calling __ubd_finish().
Update do_ubd_request to use the lock free __ubd_finish() to avoid
deadlock. Also, apparently prepare_request is called with ubd_io_lock
held, so remove locks there.
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
---
linux-2.6.9-current-paolo/arch/um/drivers/ubd_kern.c | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff -puN arch/um/drivers/ubd_kern.c~uml-ubd-deadlock-revised arch/um/drivers/ubd_kern.c
--- linux-2.6.9-current/arch/um/drivers/ubd_kern.c~uml-ubd-deadlock-revised 2004-10-12 01:22:16.360058936 +0200
+++ linux-2.6.9-current-paolo/arch/um/drivers/ubd_kern.c 2004-10-12 01:52:22.521480664 +0200
@@ -396,14 +396,13 @@ int thread_fd = -1;
*/
int intr_count = 0;
-static void ubd_finish(struct request *req, int error)
+/* call ubd_finish if you need to serialize */
+static void __ubd_finish(struct request *req, int error)
{
int nsect;
if(error){
- spin_lock(&ubd_io_lock);
end_request(req, 0);
- spin_unlock(&ubd_io_lock);
return;
}
nsect = req->current_nr_sectors;
@@ -412,11 +411,17 @@ static void ubd_finish(struct request *r
req->errors = 0;
req->nr_sectors -= nsect;
req->current_nr_sectors = 0;
- spin_lock(&ubd_io_lock);
end_request(req, 1);
+}
+
+static inline void ubd_finish(struct request *req, int error)
+{
+ spin_lock(&ubd_io_lock);
+ __ubd_finish(req, error);
spin_unlock(&ubd_io_lock);
}
+/* Called without ubd_io_lock held */
static void ubd_handler(void)
{
struct io_thread_req req;
@@ -965,6 +970,7 @@ static int prepare_mmap_request(struct u
return(0);
}
+/* Called with ubd_io_lock held */
static int prepare_request(struct request *req, struct io_thread_req *io_req)
{
struct gendisk *disk = req->rq_disk;
@@ -977,9 +983,7 @@ static int prepare_request(struct reques
if((rq_data_dir(req) == WRITE) && !dev->openflags.w){
printk("Write attempted on readonly ubd device %s\n",
disk->disk_name);
- spin_lock(&ubd_io_lock);
end_request(req, 0);
- spin_unlock(&ubd_io_lock);
return(1);
}
@@ -1029,6 +1033,7 @@ static int prepare_request(struct reques
return(0);
}
+/* Called with ubd_io_lock held */
static void do_ubd_request(request_queue_t *q)
{
struct io_thread_req io_req;
@@ -1040,7 +1045,7 @@ static void do_ubd_request(request_queue
err = prepare_request(req, &io_req);
if(!err){
do_io(&io_req);
- ubd_finish(req, io_req.error);
+ __ubd_finish(req, io_req.error);
}
}
}
_
^ permalink raw reply [flat|nested] 2+ messages in thread
* [uml-devel] [patch 09/10] uml: fix ubd deadlock on SMP
@ 2004-10-12 0:18 ` blaisorblade_spam
0 siblings, 0 replies; 2+ messages in thread
From: blaisorblade_spam @ 2004-10-12 0:18 UTC (permalink / raw)
To: akpm
Cc: jdike, linux-kernel, user-mode-linux-devel, blaisorblade_spam, chrisw
From: BlaisorBlade <blaisorblade_spam@yahoo.it>, Chris Wright <chrisw@osdl.org>
Avoid deadlocking onto the request lock in the UBD driver, i.e. don't lock the
queue spinlock when called from the request function.
In detail:
Rename ubd_finish() to __ubd_finish() and remove ubd_io_lock from it.
Add wrapper, ubd_finish(), which grabs lock before calling __ubd_finish().
Update do_ubd_request to use the lock free __ubd_finish() to avoid
deadlock. Also, apparently prepare_request is called with ubd_io_lock
held, so remove locks there.
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
---
linux-2.6.9-current-paolo/arch/um/drivers/ubd_kern.c | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff -puN arch/um/drivers/ubd_kern.c~uml-ubd-deadlock-revised arch/um/drivers/ubd_kern.c
--- linux-2.6.9-current/arch/um/drivers/ubd_kern.c~uml-ubd-deadlock-revised 2004-10-12 01:22:16.360058936 +0200
+++ linux-2.6.9-current-paolo/arch/um/drivers/ubd_kern.c 2004-10-12 01:52:22.521480664 +0200
@@ -396,14 +396,13 @@ int thread_fd = -1;
*/
int intr_count = 0;
-static void ubd_finish(struct request *req, int error)
+/* call ubd_finish if you need to serialize */
+static void __ubd_finish(struct request *req, int error)
{
int nsect;
if(error){
- spin_lock(&ubd_io_lock);
end_request(req, 0);
- spin_unlock(&ubd_io_lock);
return;
}
nsect = req->current_nr_sectors;
@@ -412,11 +411,17 @@ static void ubd_finish(struct request *r
req->errors = 0;
req->nr_sectors -= nsect;
req->current_nr_sectors = 0;
- spin_lock(&ubd_io_lock);
end_request(req, 1);
+}
+
+static inline void ubd_finish(struct request *req, int error)
+{
+ spin_lock(&ubd_io_lock);
+ __ubd_finish(req, error);
spin_unlock(&ubd_io_lock);
}
+/* Called without ubd_io_lock held */
static void ubd_handler(void)
{
struct io_thread_req req;
@@ -965,6 +970,7 @@ static int prepare_mmap_request(struct u
return(0);
}
+/* Called with ubd_io_lock held */
static int prepare_request(struct request *req, struct io_thread_req *io_req)
{
struct gendisk *disk = req->rq_disk;
@@ -977,9 +983,7 @@ static int prepare_request(struct reques
if((rq_data_dir(req) == WRITE) && !dev->openflags.w){
printk("Write attempted on readonly ubd device %s\n",
disk->disk_name);
- spin_lock(&ubd_io_lock);
end_request(req, 0);
- spin_unlock(&ubd_io_lock);
return(1);
}
@@ -1029,6 +1033,7 @@ static int prepare_request(struct reques
return(0);
}
+/* Called with ubd_io_lock held */
static void do_ubd_request(request_queue_t *q)
{
struct io_thread_req io_req;
@@ -1040,7 +1045,7 @@ static void do_ubd_request(request_queue
err = prepare_request(req, &io_req);
if(!err){
do_io(&io_req);
- ubd_finish(req, io_req.error);
+ __ubd_finish(req, io_req.error);
}
}
}
_
-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2004-10-12 0:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2004-10-12 0:18 [patch 09/10] uml: fix ubd deadlock on SMP blaisorblade_spam
2004-10-12 0:18 ` [uml-devel] " blaisorblade_spam
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.