SCSI and FibreChannel Hotswap for linux 2.5.44-bk2

diff -uNr linux-2.5.44-bk2/drivers/scsi/hosts.c linux-2.5.44-bk2-scsi-hotswap/drivers/scsi/hosts.c
@@ -371,6 +371,7 @@
 	scsi_hosts_registered++;
 
 	spin_lock_init(&shost->default_lock);
+	sema_init (&shost->host_queue_sema, 1);
 	scsi_assign_lock(shost, &shost->default_lock);
 	atomic_set(&shost->host_active,0);
 

diff -uNr linux-2.5.44-bk2/drivers/scsi/hosts.h linux-2.5.44-bk2-scsi-hotswap/drivers/scsi/hosts.h
@@ -261,6 +261,12 @@
      */
     int can_queue;
 
+	/*
+	 * Used to determine the id to send the inquiry command to during
+	 * hot additions of FibreChannel targets
+	 */
+	int (*get_scsi_info_from_wwn)(int mode, unsigned long long wwn, int *host, int *channel, int *lun, int *id);
+
     /*
      * In many instances, especially where disconnect / reconnect are
      * supported, our host also has an ID on the SCSI bus.  If this is

@@ -364,6 +370,7 @@
      */
     struct list_head      sh_list;
     Scsi_Device           * host_queue;
+    struct semaphore	  host_queue_sema;
     struct list_head	  all_scsi_hosts;
     struct list_head	  my_devices;
 

921 lines not on this page · raw message

94 lines not on this page · raw message

diff -uNr linux-2.5.44-bk2/drivers/scsi/scsi.c linux-2.5.44-bk2-scsi-hotswap/drivers/scsi/scsi.c
@@ -407,6 +407,9 @@
 				 * allow us to more easily figure out whether we should
 				 * do anything here or not.
 				 */
+
+				down (&host->host_queue_sema);
+
 				for (SDpnt = host->host_queue;
 				     SDpnt;
 				     SDpnt = SDpnt->next) {

@@ -424,6 +427,9 @@
                                                 break;
                                         }
 				}
+
+				up (&host->host_queue_sema);
+
 				if (SDpnt) {
 					/*
 					 * Some other device in this cluster is busy.

@@ -1693,6 +1699,8 @@
 		len += size;
 		pos = begin + len;
 #endif
+		down (&HBA_ptr->host_queue_sema);
+
 		for (scd = HBA_ptr->host_queue; scd; scd = scd->next) {
 			proc_print_scsidevice(scd, buffer, &size, len);
 			len += size;

@@ -1705,6 +1713,8 @@
 			if (pos > offset + length)
 				goto stop_output;
 		}
+
+		up (&HBA_ptr->host_queue_sema);
 	}
 
 stop_output:

@@ -1863,6 +1873,8 @@
 		if (!HBA_ptr)
 			goto out;
 
+		down (&HBA_ptr->host_queue_sema);
+
 		for (scd = HBA_ptr->host_queue; scd; scd = scd->next) {
 			if ((scd->channel == channel
 			     && scd->id == id

@@ -1871,6 +1883,8 @@
 			}
 		}
 
+		up (&HBA_ptr->host_queue_sema);
+
 		err = -ENOSYS;
 		if (scd)
 			goto out;	/* We do not yet support unplugging */

@@ -1909,6 +1923,8 @@
 		if (!HBA_ptr)
 			goto out;
 
+		down (&HBA_ptr->host_queue_sema);
+
 		for (scd = HBA_ptr->host_queue; scd; scd = scd->next) {
 			if ((scd->channel == channel
 			     && scd->id == id

@@ -1917,6 +1933,8 @@
 			}
 		}
 
+		up (&HBA_ptr->host_queue_sema);
+
 		if (scd == NULL)
 			goto out;	/* there is no such device attached */
 

@@ -1950,9 +1968,14 @@
 			if (scd->prev != NULL)
 				scd->prev->next = scd->next;
 
+			down (&HBA_ptr->host_queue_sema);
+
 			if (HBA_ptr->host_queue == scd) {
 				HBA_ptr->host_queue = scd->next;
 			}
+
+			up (&HBA_ptr->host_queue_sema);
+
 			blk_cleanup_queue(&scd->request_queue);
 			if (scd->inquiry)
 				kfree(scd->inquiry);

@@ -2001,11 +2024,15 @@
 
 	for (shpnt = scsi_host_get_next(NULL); shpnt;
 	     shpnt = scsi_host_get_next(shpnt)) {
+		down (&shpnt->host_queue_sema);
+
 		for (SDpnt = shpnt->host_queue; SDpnt;
 		     SDpnt = SDpnt->next) {
 			if (tpnt->detect)
 				SDpnt->attached += (*tpnt->detect) (SDpnt);
 		}
+
+		up (&shpnt->host_queue_sema);
 	}
 
 	/*

@@ -2021,6 +2048,8 @@
 	 */
 	for (shpnt = scsi_host_get_next(NULL); shpnt;
 	     shpnt = scsi_host_get_next(shpnt)) {
+		down (&shpnt->host_queue_sema);
+
 		for (SDpnt = shpnt->host_queue; SDpnt;
 		     SDpnt = SDpnt->next) {
 			scsi_build_commandblocks(SDpnt);

@@ -2040,6 +2069,8 @@
 			else
 				scsi_release_commandblocks(SDpnt);
 		}
+
+		up (&shpnt->host_queue_sema);
 	}
 
 	MOD_INC_USE_COUNT;

@@ -2074,6 +2105,8 @@
 
 	for (shpnt = scsi_host_get_next(NULL); shpnt;
 	     shpnt = scsi_host_get_next(shpnt)) {
+		spin_lock (&shpnt->host_queue_sema);
+
 		for (SDpnt = shpnt->host_queue; SDpnt;
 		     SDpnt = SDpnt->next) {
 			if (tpnt->detach)

@@ -2090,6 +2123,8 @@
 				scsi_release_commandblocks(SDpnt);
 			}
 		}
+
+		up (&shpnt->host_queue_sema);
 	}
 	/*
 	 * Extract the template from the linked list.

@@ -2160,6 +2195,8 @@
 	for (shpnt = scsi_host_get_next(NULL); shpnt;
 	     shpnt = scsi_host_get_next(shpnt)) {
 		printk(KERN_INFO "h:c:t:l (dev sect nsect cnumsec sg) (ret all flg) (to/cmd to ito) cmd snse result\n");
+		down (&shpnt->host_queue_sema);
+
 		for (SDpnt = shpnt->host_queue; SDpnt; SDpnt = SDpnt->next) {
 			for (SCpnt = SDpnt->device_queue; SCpnt; SCpnt = SCpnt->next) {
 				/*  (0) h:c:t:l (dev sect nsect cnumsec sg) (ret all flg) (to/cmd to ito) cmd snse result %d %x      */

@@ -2191,6 +2228,8 @@
 				       SCpnt->result);
 			}
 		}
+
+		up (&shpnt->host_queue_sema);
 	}
 #endif	/* CONFIG_SCSI_LOGGING */ /* } */
 }

diff -uNr linux-2.5.44-bk2/drivers/scsi/scsi_error.c linux-2.5.44-bk2-scsi-hotswap/drivers/scsi/scsi_error.c
@@ -202,6 +202,8 @@
 	int devices_failed = 0;
 
 
+	down (&shost->host_queue_sema);
+
 	for (sdev = shost->host_queue; sdev; sdev = sdev->next) {
 		for (scmd = sc_list; scmd; scmd = scmd->bh_next) {
 			if (scmd->device == sdev) {

@@ -227,6 +229,8 @@
 		}
 	}
 
+	up (&shost->host_queue_sema);
+
 	SCSI_LOG_ERROR_RECOVERY(2, printk("Total of %d commands on %d"
 					  " devices require eh work\n",
 				  total_failures, devices_failed));

@@ -247,6 +251,8 @@
 	Scsi_Device *sdev;
 	Scsi_Cmnd *scmd;
 
+	down (&shost->host_queue_sema);
+
 	for (found = 0, sdev = shost->host_queue; sdev; sdev = sdev->next) {
 		for (scmd = sdev->device_queue; scmd; scmd = scmd->next) {
 			if (scsi_eh_eflags_chk(scmd, SCSI_EH_CMD_ERR)) {

@@ -283,6 +289,8 @@
 		}
 	}
 
+	up (&shost->host_queue_sema);
+
 	SCSI_LOG_ERROR_RECOVERY(1, scsi_eh_prt_fail_stats(*sc_list, shost));
 
 	if (shost->host_failed != found)

@@ -962,6 +970,8 @@
 
 	SCSI_LOG_ERROR_RECOVERY(3, printk("%s: Trying BDR\n", __FUNCTION__));
 
+	down (&shost->host_queue_sema);
+
 	for (sdev = shost->host_queue; sdev; sdev = sdev->next) {
 		for (scmd = sc_todo; scmd; scmd = scmd->bh_next)
 			if ((scmd->device == sdev) &&

@@ -985,6 +995,7 @@
 							scsi_eh_finish_cmd(scmd, shost);
 					}
 	}
+	up (&shost->host_queue_sema);
 
 	return shost->host_failed;
 }

@@ -1016,11 +1027,15 @@
 		/*
 		 * Mark all affected devices to expect a unit attention.
 		 */
+		down (&scmd->host->host_queue_sema);
+
 		for (sdev = scmd->host->host_queue; sdev; sdev = sdev->next)
 			if (scmd->channel == sdev->channel) {
 				sdev->was_reset = 1;
 				sdev->expecting_cc_ua = 1;
 			}
+
+		up (&scmd->host->host_queue_sema);
 	}
 	return rtn;
 }

@@ -1052,11 +1067,13 @@
 		/*
 		 * Mark all affected devices to expect a unit attention.
 		 */
+		down (&scmd->host->host_queue_sema);
 		for (sdev = scmd->host->host_queue; sdev; sdev = sdev->next)
 			if (scmd->channel == sdev->channel) {
 				sdev->was_reset = 1;
 				sdev->expecting_cc_ua = 1;
 			}
+		up (&scmd->host->host_queue_sema);
 	}
 	return rtn;
 }

@@ -1478,7 +1495,9 @@
 	 * now that error recovery is done, we will need to ensure that these
 	 * requests are started.
 	 */
+	down (&shost->host_queue_sema);
 	spin_lock_irqsave(shost->host_lock, flags);
+
 	for (sdev = shost->host_queue; sdev; sdev = sdev->next) {
 		request_queue_t *q = &sdev->request_queue;
 

@@ -1491,7 +1510,9 @@
 
 		q->request_fn(q);
 	}
+
 	spin_unlock_irqrestore(shost->host_lock, flags);
+	up (&shost->host_queue_sema);
 }
 
 /**

diff -uNr linux-2.5.44-bk2/drivers/scsi/scsi_lib.c linux-2.5.44-bk2-scsi-hotswap/drivers/scsi/scsi_lib.c
@@ -261,6 +261,8 @@
 	if (SDpnt->single_lun && blk_queue_empty(q) && SDpnt->device_busy ==0) {
 		request_queue_t *q;
 
+		down (&SHpnt->host_queue_sema);
+
 		for (SDpnt = SHpnt->host_queue; SDpnt; SDpnt = SDpnt->next) {
 			if (((SHpnt->can_queue > 0)
 			     && (SHpnt->host_busy >= SHpnt->can_queue))

@@ -273,6 +275,8 @@
 			q = &SDpnt->request_queue;
 			q->request_fn(q);
 		}
+
+		up (&SHpnt->host_queue_sema);
 	}
 
 	/*

@@ -285,6 +289,7 @@
 	 */
 	all_clear = 1;
 	if (SHpnt->some_device_starved) {
+		down (&SHpnt->host_queue_sema);
 		for (SDpnt = SHpnt->host_queue; SDpnt; SDpnt = SDpnt->next) {
 			request_queue_t *q;
 			if ((SHpnt->can_queue > 0 && (SHpnt->host_busy >= SHpnt->can_queue))

@@ -299,6 +304,7 @@
 			q->request_fn(q);
 			all_clear = 0;
 		}
+		up (&SHpnt->host_queue_sema);
 		if (SDpnt == NULL && all_clear) {
 			SHpnt->some_device_starved = 0;
 		}

@@ -1117,8 +1123,13 @@
 
 	SHpnt->host_self_blocked = FALSE;
 	/* Now that we are unblocked, try to start the queues. */
+
+	down (&SHpnt->host_queue_sema);
+
 	for (SDloop = SHpnt->host_queue; SDloop; SDloop = SDloop->next)
 		scsi_queue_next_request(&SDloop->request_queue, NULL);
+
+	up (&SHpnt->host_queue_sema);
 }
 
 /*

@@ -1145,12 +1156,17 @@
 void scsi_report_bus_reset(struct Scsi_Host * SHpnt, int channel)
 {
 	Scsi_Device *SDloop;
+
+	down (&SHpnt->host_queue_sema);
+
 	for (SDloop = SHpnt->host_queue; SDloop; SDloop = SDloop->next) {
 		if (channel == SDloop->channel) {
 			SDloop->was_reset = 1;
 			SDloop->expecting_cc_ua = 1;
 		}
 	}
+
+	up (&SHpnt->host_queue_sema);
 }
 
 /*

diff -uNr linux-2.5.44-bk2/drivers/scsi/scsi_scan.c linux-2.5.44-bk2-scsi-hotswap/drivers/scsi/scsi_scan.c
@@ -559,6 +559,8 @@
 		/*
 		 * Add it to the end of the shost->host_queue list.
 		 */
+		down (&shost->host_queue_sema);
+
 		if (shost->host_queue != NULL) {
 			sdev->prev = shost->host_queue;
 			while (sdev->prev->next != NULL)

@@ -567,6 +569,8 @@
 		} else
 			shost->host_queue = sdev;
 
+		up (&shost->host_queue_sema);
+
 	}
 	return (sdev);
 }

@@ -583,8 +587,12 @@
 {
 	if (sdev->prev != NULL)
 		sdev->prev->next = sdev->next;
-	else
+	else {
+		down (&sdev->host->host_queue_sema);
 		sdev->host->host_queue = sdev->next;
+		up (&sdev->host->host_queue_sema);
+	}
+
 	if (sdev->next != NULL)
 		sdev->next->prev = sdev->prev;
 

84 lines not on this page · raw message