From: Christoph Hellwig <hch@lst.de>
To: jejb@steeleye.com
Cc: linux-scsi@vger.kernel.org
Subject: [PATCH 1/2] fix EH thread teardown
Date: Wed, 7 Sep 2005 15:51:05 +0200 [thread overview]
Message-ID: <20050907135105.GA16340@lst.de> (raw)
As Rolf Eike Beer noted we might not actually get to the
kthread_should_stop() because we are waiting in the semaphore forever.
I didn't get a rmmod hang because of this, but my instrumentation showed
the thread defitiyly didn't exit.
So make sure to wake the EH thread before the kthread_stop, and to plug
the reaming race check kthead_should_stop() a second time just before
calling down_interruptible().
Index: scsi-misc-2.6/drivers/scsi/hosts.c
===================================================================
--- scsi-misc-2.6.orig/drivers/scsi/hosts.c 2005-09-07 14:21:44.000000000 +0200
+++ scsi-misc-2.6/drivers/scsi/hosts.c 2005-09-07 14:22:33.000000000 +0200
@@ -226,8 +226,10 @@
struct Scsi_Host *shost = dev_to_shost(dev);
struct device *parent = dev->parent;
- if (shost->ehandler)
+ if (shost->ehandler) {
+ up(shost->eh_wait);
kthread_stop(shost->ehandler);
+ }
if (shost->work_q)
destroy_workqueue(shost->work_q);
Index: scsi-misc-2.6/drivers/scsi/scsi_error.c
===================================================================
--- scsi-misc-2.6.orig/drivers/scsi/scsi_error.c 2005-09-07 14:21:44.000000000 +0200
+++ scsi-misc-2.6/drivers/scsi/scsi_error.c 2005-09-07 14:22:58.000000000 +0200
@@ -1591,7 +1591,7 @@
SCSI_LOG_ERROR_RECOVERY(3, printk("Wake up parent of"
" scsi_eh_%d\n",shost->host_no));
- while (1) {
+ while (!kthread_should_stop()) {
/*
* If we get a signal, it means we are supposed to go
* away and die. This typically happens if the user is
next reply other threads:[~2005-09-07 13:51 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-09-07 13:51 Christoph Hellwig [this message]
2005-09-07 14:01 ` [PATCH 1/2] fix EH thread teardown Rolf Eike Beer
2005-09-08 15:26 ` Rolf Eike Beer
-- strict thread matches above, loose matches on Subject: below --
2005-09-13 16:50 Alan Stern
2005-09-13 17:01 ` Rolf Eike Beer
2005-09-13 19:03 ` Alan Stern
2005-09-13 19:05 ` Christoph Hellwig
2005-09-13 20:57 ` Alan Stern
2005-09-14 16:24 ` Alan Stern
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050907135105.GA16340@lst.de \
--to=hch@lst.de \
--cc=jejb@steeleye.com \
--cc=linux-scsi@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox