Skip to contentSkip to conversation

Make sure mdthreads will always respond to kthread_stop

PATCH New NeilBrown 1 participant 1 message Oct 25, 2005 1 message not in the archive MD RAID

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): 20051025141735.30947.patches@notabene

NeilBrown

author
#1 lore raw

PATCH 1/1 Make sure mdthreads will always respond to kthread_stop

I know it's kinda-late but I just found another hiccup caused by the changeover to kthreads in md. There is another situation where it can be hard to stop and md array because a thread doesn't respond to a shutdown request properly.

If this patch, against 2.6.14-rc5-git4, could slip into 2.6.14, I'd appreciate it, (if not, I expect 2.6.14.1 will be ok).

All it does is treat 'kthread_should_stop' the same as 'signal_pending', both of which mean "time to stop what you are doing.

Thanks,
NeilBrown

---

There are still a couple of cases where md threads (the resync/recovery thread) is not interruptible since the change to use kthreads. All places there it tests "signal_pending", it should also test kthread_should_stop, as with this patch.

Signed-off-by Neil Brown <[email protected]>

### Diffstat output

 ./drivers/md/md.c |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/md/md.c renamed from drivers/md/md.c~current~ +6 -4
diff ./drivers/md/md.c~current~ ./drivers/md/md.c
@@ -3568,7 +3568,8 @@ static void md_do_sync(mddev_t *mddev)
 		mddev->curr_resync = 2;
 
 	try_again:
-		if (signal_pending(current)) {
+		if (signal_pending(current) ||
+		    kthread_should_stop()) {
 			flush_signals(current);
 			set_bit(MD_RECOVERY_INTR, &mddev->recovery);
 			goto skip;

@@ -3590,8 +3591,9 @@ static void md_do_sync(mddev_t *mddev)
 					 */
 					continue;
 				prepare_to_wait(&resync_wait, &wq, TASK_INTERRUPTIBLE);
-				if (!signal_pending(current)
-				    && mddev2->curr_resync >= mddev->curr_resync) {
+				if (!signal_pending(current) &&
+				    !kthread_should_stop() &&
+				    mddev2->curr_resync >= mddev->curr_resync) {
 					printk(KERN_INFO "md: delaying resync of %s"
 					       " until %s has finished resync (they"
 					       " share one or more physical units)\n",

@@ -3697,7 +3699,7 @@ static void md_do_sync(mddev_t *mddev)
 		}
 
 
-		if (signal_pending(current)) {
+		if (signal_pending(current) || kthread_should_stop()) {
 			/*
 			 * got a signal, exit.
 			 */