aacraid: Patchset for aacraid driver version 41052

From: Raghava Aditya Renukunta <[email protected]>

The method to allocate and free FIB's in the present code utilizes spinlocks.Multiple IO's have to wait on the spinlock to acquire or free fibs creating a performance bottleneck.

An alternative solution would be to use block layer tags to keep track of the fibs allocated and freed. To this end aac_fib_alloc_tag was created to utilize the blk layer tags to plug into the Fib pool.These functions are used exclusively in the IO path. 8 fibs are reserved for the use of AIF management software and utilize the previous spinlock based implementations.

Changes in V2:
Removed aac_fib_free_tag since it was a stub function Moved population of fib fields that are constant to aac_fib_setup

Changes in V3:
None

Signed-off-by Raghava Aditya Renukunta <[email protected]>

---
 drivers/scsi/aacraid/aachba.c  | 27 ++++++++++++---------------
 drivers/scsi/aacraid/aacraid.h |  1 +
 drivers/scsi/aacraid/commsup.c | 32 +++++++++++++++++++++++++++++---
 drivers/scsi/aacraid/dpcsup.c  |  2 --
 drivers/scsi/aacraid/linit.c   |  2 ++
 5 files changed, 44 insertions(+), 20 deletions(-)

drivers/scsi/aacraid/aachba.c +12 -15

index e4c2437..7dfd0fa 100644
@@ -323,7 +323,6 @@ static inline int aac_valid_context(struct scsi_cmnd *scsicmd,
 	if (unlikely(!scsicmd || !scsicmd->scsi_done)) {
 		dprintk((KERN_WARNING "aac_valid_context: scsi command corrupt\n"));
 		aac_fib_complete(fibptr);
-		aac_fib_free(fibptr);
 		return 0;
 	}
 	scsicmd->SCp.phase = AAC_OWNER_MIDLEVEL;

@@ -331,7 +330,6 @@ static inline int aac_valid_context(struct scsi_cmnd *scsicmd,
 	if (unlikely(!device || !scsi_device_online(device))) {
 		dprintk((KERN_WARNING "aac_valid_context: scsi device corrupt\n"));
 		aac_fib_complete(fibptr);
-		aac_fib_free(fibptr);
 		return 0;
 	}
 	return 1;

@@ -541,7 +539,6 @@ static void get_container_name_callback(void *context, struct fib * fibptr)
 	scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_GOOD;
 
 	aac_fib_complete(fibptr);
-	aac_fib_free(fibptr);
 	scsicmd->scsi_done(scsicmd);
 }
 

@@ -557,7 +554,8 @@ static int aac_get_container_name(struct scsi_cmnd * scsicmd)
 
 	dev = (struct aac_dev *)scsicmd->device->host->hostdata;
 
-	if (!(cmd_fibcontext = aac_fib_alloc(dev)))
+	cmd_fibcontext = aac_fib_alloc_tag(dev, scsicmd);
+	if (!cmd_fibcontext)
 		return -ENOMEM;
 
 	aac_fib_init(cmd_fibcontext);

@@ -586,7 +584,6 @@ static int aac_get_container_name(struct scsi_cmnd * scsicmd)
 
 	printk(KERN_WARNING "aac_get_container_name: aac_fib_send failed with status: %d.\n", status);
 	aac_fib_complete(cmd_fibcontext);
-	aac_fib_free(cmd_fibcontext);
 	return -1;
 }
 

@@ -1024,7 +1021,6 @@ static void get_container_serial_callback(void *context, struct fib * fibptr)
 	scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_GOOD;
 
 	aac_fib_complete(fibptr);
-	aac_fib_free(fibptr);
 	scsicmd->scsi_done(scsicmd);
 }
 

@@ -1040,7 +1036,8 @@ static int aac_get_container_serial(struct scsi_cmnd * scsicmd)
 
 	dev = (struct aac_dev *)scsicmd->device->host->hostdata;
 
-	if (!(cmd_fibcontext = aac_fib_alloc(dev)))
+	cmd_fibcontext = aac_fib_alloc_tag(dev, scsicmd);
+	if (!cmd_fibcontext)
 		return -ENOMEM;
 
 	aac_fib_init(cmd_fibcontext);

@@ -1068,7 +1065,6 @@ static int aac_get_container_serial(struct scsi_cmnd * scsicmd)
 
 	printk(KERN_WARNING "aac_get_container_serial: aac_fib_send failed with status: %d.\n", status);
 	aac_fib_complete(cmd_fibcontext);
-	aac_fib_free(cmd_fibcontext);
 	return -1;
 }
 

@@ -1869,7 +1865,6 @@ static void io_callback(void *context, struct fib * fibptr)
 		break;
 	}
 	aac_fib_complete(fibptr);
-	aac_fib_free(fibptr);
 
 	scsicmd->scsi_done(scsicmd);
 }

@@ -1954,7 +1949,8 @@ static int aac_read(struct scsi_cmnd * scsicmd)
 	/*
 	 *	Alocate and initialize a Fib
 	 */
-	if (!(cmd_fibcontext = aac_fib_alloc(dev))) {
+	cmd_fibcontext = aac_fib_alloc_tag(dev, scsicmd);
+	if (!cmd_fibcontext) {
 		printk(KERN_WARNING "aac_read: fib allocation failed\n");
 		return -1;
 	}

@@ -2051,7 +2047,8 @@ static int aac_write(struct scsi_cmnd * scsicmd)
 	/*
 	 *	Allocate and initialize a Fib then setup a BlockWrite command
 	 */
-	if (!(cmd_fibcontext = aac_fib_alloc(dev))) {
+	cmd_fibcontext = aac_fib_alloc_tag(dev, scsicmd);
+	if (!cmd_fibcontext) {
 		/* FIB temporarily unavailable,not catastrophic failure */
 
 		/* scsicmd->result = DID_ERROR << 16;

@@ -2285,7 +2282,7 @@ static int aac_start_stop(struct scsi_cmnd *scsicmd)
 	/*
 	 *	Allocate and initialize a Fib
 	 */
-	cmd_fibcontext = aac_fib_alloc(aac);
+	cmd_fibcontext = aac_fib_alloc_tag(aac, scsicmd);
 	if (!cmd_fibcontext)
 		return SCSI_MLQUEUE_HOST_BUSY;
 

@@ -3157,7 +3154,6 @@ static void aac_srb_callback(void *context, struct fib * fibptr)
 	scsicmd->result |= le32_to_cpu(srbreply->scsi_status);
 
 	aac_fib_complete(fibptr);
-	aac_fib_free(fibptr);
 	scsicmd->scsi_done(scsicmd);
 }
 

@@ -3187,9 +3183,10 @@ static int aac_send_srb_fib(struct scsi_cmnd* scsicmd)
 	/*
 	 *	Allocate and initialize a Fib then setup a BlockWrite command
 	 */
-	if (!(cmd_fibcontext = aac_fib_alloc(dev))) {
+	cmd_fibcontext = aac_fib_alloc_tag(dev, scsicmd);
+	if (!cmd_fibcontext)
 		return -1;
-	}
+
 	status = aac_adapter_scsi(cmd_fibcontext, scsicmd);
 
 	/*

drivers/scsi/aacraid/aacraid.h +1 -0

index 074878b..f51f0a0 100644
@@ -2114,6 +2114,7 @@ int aac_acquire_irq(struct aac_dev *dev);
 void aac_free_irq(struct aac_dev *dev);
 const char *aac_driverinfo(struct Scsi_Host *);
 struct fib *aac_fib_alloc(struct aac_dev *dev);
+struct fib *aac_fib_alloc_tag(struct aac_dev *dev, struct scsi_cmnd *scmd);
 int aac_fib_setup(struct aac_dev *dev);
 void aac_fib_map_free(struct aac_dev *dev);
 void aac_fib_free(struct fib * context);

drivers/scsi/aacraid/commsup.c +29 -3

index a1f90fe..6b286b3 100644
@@ -137,6 +137,7 @@ int aac_fib_setup(struct aac_dev * dev)
 		i++, fibptr++)
 	{
 		fibptr->flags = 0;
+		fibptr->size = sizeof(struct fib);
 		fibptr->dev = dev;
 		fibptr->hw_fib_va = hw_fib;
 		fibptr->data = (void *) fibptr->hw_fib_va->data;

@@ -156,13 +157,38 @@ int aac_fib_setup(struct aac_dev * dev)
 	 */
 	dev->fibs[dev->scsi_host_ptr->can_queue + AAC_NUM_MGT_FIB - 1].next = NULL;
 	/*
-	 *	Enable this to debug out of queue space
-	 */
-	dev->free_fib = &dev->fibs[0];
+	*	Set 8 fibs aside for management tools
+	*/
+	dev->free_fib = &dev->fibs[dev->scsi_host_ptr->can_queue];
 	return 0;
 }
 
 /**
+ *	aac_fib_alloc_tag	-	allocate a fib
+ *	@dev: Adapter to allocate the fib for
+ *
+ *	Allocate a fib from the adapter fib pool using tags
+ *	from the blk layer.
+ */
+
+struct fib *aac_fib_alloc_tag(struct aac_dev *dev, struct scsi_cmnd *scmd)
+{
+	struct fib *fibptr;
+
+	fibptr = &dev->fibs[scmd->request->tag];
+	/*
+	 *	Null out fields that depend on being zero at the start of
+	 *	each I/O
+	 */
+	fibptr->hw_fib_va->header.XferState = 0;
+	fibptr->type = FSAFS_NTC_FIB_CONTEXT;
+	fibptr->callback_data = NULL;
+	fibptr->callback = NULL;
+
+	return fibptr;
+}
+
+/**
  *	aac_fib_alloc	-	allocate a fib
  *	@dev: Adapter to allocate the fib for
  *

drivers/scsi/aacraid/dpcsup.c +0 -2

index da9d993..d677b52 100644
@@ -394,7 +394,6 @@ unsigned int aac_intr_normal(struct aac_dev *dev, u32 index,
 				fib->callback(fib->callback_data, fib);
 			} else {
 				aac_fib_complete(fib);
-				aac_fib_free(fib);
 			}
 		} else {
 			unsigned long flagv;

@@ -416,7 +415,6 @@ unsigned int aac_intr_normal(struct aac_dev *dev, u32 index,
 				fib->done = 0;
 				spin_unlock_irqrestore(&fib->event_lock, flagv);
 				aac_fib_complete(fib);
-				aac_fib_free(fib);
 			}
 
 		}

drivers/scsi/aacraid/linit.c +2 -0

index 76eaa38..129a515 100644
@@ -454,6 +454,8 @@ static int aac_slave_configure(struct scsi_device *sdev)
 	} else
 		scsi_change_queue_depth(sdev, 1);
 
+		sdev->tagged_supported = 1;
+
 	return 0;
 }
 

Signature · 1 line

1.9.1

From: Raghava Aditya Renukunta <[email protected]>

The method to allocate and free FIB's in the present code utilizes spinlocks.Multiple IO's have to wait on the spinlock to acquire or free fibs creating a performance bottleneck.

An alternative solution would be to use block layer tags to keep track of the fibs allocated and freed. To this end aac_fib_alloc_tag was created to utilize the blk layer tags to plug into the Fib pool.These functions are used exclusively in the IO path. 8 fibs are reserved for the use of AIF management software and utilize the previous spinlock based implementations.

Changes in V2:
Removed aac_fib_free_tag since it was a stub function Moved population of fib fields that are constant to aac_fib_setup

Changes in V3:
None

Signed-off-by Raghava Aditya Renukunta <[email protected]>

---
 drivers/scsi/aacraid/aachba.c  | 27 ++++++++++++---------------
 drivers/scsi/aacraid/aacraid.h |  1 +
 drivers/scsi/aacraid/commsup.c | 32 +++++++++++++++++++++++++++++---
 drivers/scsi/aacraid/dpcsup.c  |  2 --
 drivers/scsi/aacraid/linit.c   |  2 ++
 5 files changed, 44 insertions(+), 20 deletions(-)

drivers/scsi/aacraid/aachba.c +0 -3

index e4c2437..7dfd0fa 100644
@@ -323,7 +323,6 @@ static inline int aac_valid_context(struct scsi_cmnd *scsicmd,
 	if (unlikely(!scsicmd || !scsicmd->scsi_done)) {
 		dprintk((KERN_WARNING "aac_valid_context: scsi command corrupt\n"));
 		aac_fib_complete(fibptr);
-		aac_fib_free(fibptr);
 		return 0;
 	}
 	scsicmd->SCp.phase = AAC_OWNER_MIDLEVEL;

@@ -331,7 +330,6 @@ static inline int aac_valid_context(struct scsi_cmnd *scsicmd,
 	if (unlikely(!device || !scsi_device_online(device))) {
 		dprintk((KERN_WARNING "aac_valid_context: scsi device corrupt\n"));
 		aac_fib_complete(fibptr);
-		aac_fib_free(fibptr);
 		return 0;
 	}
 	return 1;

@@ -541,7 +539,6 @@ static void get_container_name_callback(void *context, struct fib * fibptr)
 	scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_GOOD;
 
 	aac_fib_complete(fibptr);
-	aac_fib_free(fibptr);
 	scsicmd->scsi_done(scsicmd);
 }
 

drivers/scsi/aacraid/aachba.c +10 -11

 	aac_fib_init(cmd_fibcontext);

@@ -586,7 +584,6 @@ static int aac_get_container_name(struct scsi_cmnd * scsicmd)
 
 	printk(KERN_WARNING "aac_get_container_name: aac_fib_send failed with status: %d.\n", status);
 	aac_fib_complete(cmd_fibcontext);
-	aac_fib_free(cmd_fibcontext);
 	return -1;
 }
 

@@ -1024,7 +1021,6 @@ static void get_container_serial_callback(void *context, struct fib * fibptr)
 	scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_GOOD;
 
 	aac_fib_complete(fibptr);
-	aac_fib_free(fibptr);
 	scsicmd->scsi_done(scsicmd);
 }
 

@@ -1040,7 +1036,8 @@ static int aac_get_container_serial(struct scsi_cmnd * scsicmd)
 
 	dev = (struct aac_dev *)scsicmd->device->host->hostdata;
 
-	if (!(cmd_fibcontext = aac_fib_alloc(dev)))
+	cmd_fibcontext = aac_fib_alloc_tag(dev, scsicmd);
+	if (!cmd_fibcontext)
 		return -ENOMEM;
 
 	aac_fib_init(cmd_fibcontext);

@@ -1068,7 +1065,6 @@ static int aac_get_container_serial(struct scsi_cmnd * scsicmd)
 
 	printk(KERN_WARNING "aac_get_container_serial: aac_fib_send failed with status: %d.\n", status);
 	aac_fib_complete(cmd_fibcontext);
-	aac_fib_free(cmd_fibcontext);
 	return -1;
 }
 

@@ -1869,7 +1865,6 @@ static void io_callback(void *context, struct fib * fibptr)
 		break;
 	}
 	aac_fib_complete(fibptr);
-	aac_fib_free(fibptr);
 
 	scsicmd->scsi_done(scsicmd);
 }

@@ -1954,7 +1949,8 @@ static int aac_read(struct scsi_cmnd * scsicmd)
 	/*
 	 *	Alocate and initialize a Fib
 	 */
-	if (!(cmd_fibcontext = aac_fib_alloc(dev))) {
+	cmd_fibcontext = aac_fib_alloc_tag(dev, scsicmd);
+	if (!cmd_fibcontext) {
 		printk(KERN_WARNING "aac_read: fib allocation failed\n");
 		return -1;
 	}

@@ -2051,7 +2047,8 @@ static int aac_write(struct scsi_cmnd * scsicmd)
 	/*
 	 *	Allocate and initialize a Fib then setup a BlockWrite command
 	 */
-	if (!(cmd_fibcontext = aac_fib_alloc(dev))) {
+	cmd_fibcontext = aac_fib_alloc_tag(dev, scsicmd);
+	if (!cmd_fibcontext) {
 		/* FIB temporarily unavailable,not catastrophic failure */
 
 		/* scsicmd->result = DID_ERROR << 16;

@@ -2285,7 +2282,7 @@ static int aac_start_stop(struct scsi_cmnd *scsicmd)
 	/*
 	 *	Allocate and initialize a Fib
 	 */
-	cmd_fibcontext = aac_fib_alloc(aac);
+	cmd_fibcontext = aac_fib_alloc_tag(aac, scsicmd);
 	if (!cmd_fibcontext)
 		return SCSI_MLQUEUE_HOST_BUSY;
 

@@ -3157,7 +3154,6 @@ static void aac_srb_callback(void *context, struct fib * fibptr)
 	scsicmd->result |= le32_to_cpu(srbreply->scsi_status);
 
 	aac_fib_complete(fibptr);
-	aac_fib_free(fibptr);
 	scsicmd->scsi_done(scsicmd);
 }
 

@@ -3187,9 +3183,10 @@ static int aac_send_srb_fib(struct scsi_cmnd* scsicmd)
 	/*
 	 *	Allocate and initialize a Fib then setup a BlockWrite command
 	 */
-	if (!(cmd_fibcontext = aac_fib_alloc(dev))) {
+	cmd_fibcontext = aac_fib_alloc_tag(dev, scsicmd);
+	if (!cmd_fibcontext)
 		return -1;
-	}
+
 	status = aac_adapter_scsi(cmd_fibcontext, scsicmd);
 
 	/*

drivers/scsi/aacraid/aacraid.h +1 -0

index 074878b..f51f0a0 100644
@@ -2114,6 +2114,7 @@ int aac_acquire_irq(struct aac_dev *dev);
 void aac_free_irq(struct aac_dev *dev);
 const char *aac_driverinfo(struct Scsi_Host *);
 struct fib *aac_fib_alloc(struct aac_dev *dev);
+struct fib *aac_fib_alloc_tag(struct aac_dev *dev, struct scsi_cmnd *scmd);
 int aac_fib_setup(struct aac_dev *dev);
 void aac_fib_map_free(struct aac_dev *dev);
 void aac_fib_free(struct fib * context);

drivers/scsi/aacraid/commsup.c +29 -3

index a1f90fe..6b286b3 100644
@@ -137,6 +137,7 @@ int aac_fib_setup(struct aac_dev * dev)
 		i++, fibptr++)
 	{
 		fibptr->flags = 0;
+		fibptr->size = sizeof(struct fib);
 		fibptr->dev = dev;
 		fibptr->hw_fib_va = hw_fib;
 		fibptr->data = (void *) fibptr->hw_fib_va->data;

@@ -156,13 +157,38 @@ int aac_fib_setup(struct aac_dev * dev)
 	 */
 	dev->fibs[dev->scsi_host_ptr->can_queue + AAC_NUM_MGT_FIB - 1].next = NULL;
 	/*
-	 *	Enable this to debug out of queue space
-	 */
-	dev->free_fib = &dev->fibs[0];
+	*	Set 8 fibs aside for management tools
+	*/
+	dev->free_fib = &dev->fibs[dev->scsi_host_ptr->can_queue];
 	return 0;
 }
 
 /**
+ *	aac_fib_alloc_tag	-	allocate a fib
+ *	@dev: Adapter to allocate the fib for
+ *
+ *	Allocate a fib from the adapter fib pool using tags
+ *	from the blk layer.
+ */
+
+struct fib *aac_fib_alloc_tag(struct aac_dev *dev, struct scsi_cmnd *scmd)
+{
+	struct fib *fibptr;
+
+	fibptr = &dev->fibs[scmd->request->tag];
+	/*
+	 *	Null out fields that depend on being zero at the start of
+	 *	each I/O
+	 */
+	fibptr->hw_fib_va->header.XferState = 0;
+	fibptr->type = FSAFS_NTC_FIB_CONTEXT;
+	fibptr->callback_data = NULL;
+	fibptr->callback = NULL;
+
+	return fibptr;
+}
+
+/**
  *	aac_fib_alloc	-	allocate a fib
  *	@dev: Adapter to allocate the fib for
  *

drivers/scsi/aacraid/dpcsup.c +0 -2

index da9d993..d677b52 100644
@@ -394,7 +394,6 @@ unsigned int aac_intr_normal(struct aac_dev *dev, u32 index,
 				fib->callback(fib->callback_data, fib);
 			} else {
 				aac_fib_complete(fib);
-				aac_fib_free(fib);
 			}
 		} else {
 			unsigned long flagv;

@@ -416,7 +415,6 @@ unsigned int aac_intr_normal(struct aac_dev *dev, u32 index,
 				fib->done = 0;
 				spin_unlock_irqrestore(&fib->event_lock, flagv);
 				aac_fib_complete(fib);
-				aac_fib_free(fib);
 			}
 
 		}

drivers/scsi/aacraid/linit.c +2 -0

index 76eaa38..129a515 100644
@@ -454,6 +454,8 @@ static int aac_slave_configure(struct scsi_device *sdev)
 	} else
 		scsi_change_queue_depth(sdev, 1);
 
+		sdev->tagged_supported = 1;
+
 	return 0;
 }
 

From: Raghava Aditya Renukunta <[email protected]>

Added support for PCI EEH(extended error handling).

Changes in V2:
Made local functions static
Removed call to aac_fib_free_tag
Set adapter_shutdown flag when PCI error detected

Changes in V3:
None

Signed-off-by Raghava Aditya Renukunta <[email protected]>

Reviewed-by Tomas Henzl <[email protected]>

---
 drivers/scsi/aacraid/aacraid.h |   1 +
 drivers/scsi/aacraid/linit.c   | 140 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 141 insertions(+)

drivers/scsi/aacraid/aacraid.h +1 -0

index fff1306..2916288 100644
@@ -1235,6 +1235,7 @@ struct aac_dev
 	struct msix_entry	msixentry[AAC_MAX_MSIX];
 	struct aac_msix_ctx	aac_msix[AAC_MAX_MSIX]; /* context */
 	u8			adapter_shutdown;
+	u32			handle_pci_error;
 };
 
 #define aac_adapter_interrupt(dev) \

drivers/scsi/aacraid/linit.c +140 -0

index 129a515..08c6835 100644
@@ -38,6 +38,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/pci.h>
+#include <linux/aer.h>
 #include <linux/pci-aspm.h>
 #include <linux/slab.h>
 #include <linux/mutex.h>

@@ -1298,6 +1299,9 @@ static int aac_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
 		goto out_deinit;
 	scsi_scan_host(shost);
 
+	pci_enable_pcie_error_reporting(pdev);
+	pci_save_state(pdev);
+
 	return 0;
 
  out_deinit:

@@ -1501,6 +1505,141 @@ static void aac_remove_one(struct pci_dev *pdev)
 	}
 }
 
+static void aac_flush_ios(struct aac_dev *aac)
+{
+	int i;
+	struct scsi_cmnd *cmd;
+
+	for (i = 0; i < aac->scsi_host_ptr->can_queue; i++) {
+		cmd = (struct scsi_cmnd *)aac->fibs[i].callback_data;
+		if (cmd && (cmd->SCp.phase == AAC_OWNER_FIRMWARE)) {
+			scsi_dma_unmap(cmd);
+
+			if (aac->handle_pci_error)
+				cmd->result = DID_NO_CONNECT << 16;
+			else
+				cmd->result = DID_RESET << 16;
+
+			cmd->scsi_done(cmd);
+		}
+	}
+}
+
+static pci_ers_result_t aac_pci_error_detected(struct pci_dev *pdev,
+					enum pci_channel_state error)
+{
+	struct Scsi_Host *shost = pci_get_drvdata(pdev);
+	struct aac_dev *aac = shost_priv(shost);
+
+	dev_err(&pdev->dev, "aacraid: PCI error detected %x\n", error);
+
+	switch (error) {
+	case pci_channel_io_normal:
+		return PCI_ERS_RESULT_CAN_RECOVER;
+	case pci_channel_io_frozen:
+
+		aac->handle_pci_error = 1;
+		aac->adapter_shutdown = 1;
+
+		scsi_block_requests(aac->scsi_host_ptr);
+		aac_flush_ios(aac);
+		aac_release_resources(aac);
+
+		pci_disable_pcie_error_reporting(pdev);
+		aac_adapter_ioremap(aac, 0);
+
+		return PCI_ERS_RESULT_NEED_RESET;
+	case pci_channel_io_perm_failure:
+		aac->handle_pci_error = 1;
+		aac->adapter_shutdown = 1;
+
+		aac_flush_ios(aac);
+		return PCI_ERS_RESULT_DISCONNECT;
+	}
+
+	return PCI_ERS_RESULT_NEED_RESET;
+}
+
+static pci_ers_result_t aac_pci_mmio_enabled(struct pci_dev *pdev)
+{
+	dev_err(&pdev->dev, "aacraid: PCI error - mmio enabled\n");
+	return PCI_ERS_RESULT_NEED_RESET;
+}
+
+static pci_ers_result_t aac_pci_slot_reset(struct pci_dev *pdev)
+{
+	dev_err(&pdev->dev, "aacraid: PCI error - slot reset\n");
+	pci_restore_state(pdev);
+	if (pci_enable_device(pdev)) {
+		dev_warn(&pdev->dev,
+			"aacraid: failed to enable slave\n");
+		goto fail_device;
+	}
+
+	pci_set_master(pdev);
+
+	if (pci_enable_device_mem(pdev)) {
+		dev_err(&pdev->dev, "pci_enable_device_mem failed\n");
+		goto fail_device;
+	}
+
+	return PCI_ERS_RESULT_RECOVERED;
+
+fail_device:
+	dev_err(&pdev->dev, "aacraid: PCI error - slot reset failed\n");
+	return PCI_ERS_RESULT_DISCONNECT;
+}
+
+
+static void aac_pci_resume(struct pci_dev *pdev)
+{
+	struct Scsi_Host *shost = pci_get_drvdata(pdev);
+	struct scsi_device *sdev = NULL;
+	struct aac_dev *aac = (struct aac_dev *)shost_priv(shost);
+
+	pci_cleanup_aer_uncorrect_error_status(pdev);
+
+	if (aac_adapter_ioremap(aac, aac->base_size)) {
+
+		dev_err(&pdev->dev, "aacraid: ioremap failed\n");
+		/* remap failed, go back ... */
+		aac->comm_interface = AAC_COMM_PRODUCER;
+		if (aac_adapter_ioremap(aac, AAC_MIN_FOOTPRINT_SIZE)) {
+			dev_warn(&pdev->dev,
+				"aacraid: unable to map adapter.\n");
+
+			return;
+		}
+	}
+
+	msleep(10000);
+
+	aac_acquire_resources(aac);
+
+	/*
+	 * reset this flag to unblock ioctl() as it was set
+	 * at aac_send_shutdown() to block ioctls from upperlayer
+	 */
+	aac->adapter_shutdown = 0;
+	aac->handle_pci_error = 0;
+
+	shost_for_each_device(sdev, shost)
+		if (sdev->sdev_state == SDEV_OFFLINE)
+			sdev->sdev_state = SDEV_RUNNING;
+	scsi_unblock_requests(aac->scsi_host_ptr);
+	scsi_scan_host(aac->scsi_host_ptr);
+	pci_save_state(pdev);
+
+	dev_err(&pdev->dev, "aacraid: PCI error - resume\n");
+}
+
+static struct pci_error_handlers aac_pci_err_handler = {
+	.error_detected		= aac_pci_error_detected,
+	.mmio_enabled		= aac_pci_mmio_enabled,
+	.slot_reset		= aac_pci_slot_reset,
+	.resume			= aac_pci_resume,
+};
+
 static struct pci_driver aac_pci_driver = {
 	.name		= AAC_DRIVERNAME,
 	.id_table	= aac_pci_tbl,

@@ -1511,6 +1650,7 @@ static struct pci_driver aac_pci_driver = {
 	.resume		= aac_resume,
 #endif
 	.shutdown	= aac_shutdown,
+	.err_handler    = &aac_pci_err_handler,
 };
 
 static int __init aac_init(void)

Signature · 1 line

1.9.1

From: Raghava Aditya Renukunta <[email protected]>

During EEH recovery number of online CPU's might change thereby changing the number of MSIx vectors. Since each fib is allocated to a vector, changes in the number of vectors causes fib to be sent thru invalid vectors.In addition the correct number of MSIx vectors is not updated in the INIT struct sent to the controller, when it is reinitialized.

Fixed by reassigning vectors to fibs based on the updated number of MSIx vectors and updating the INIT structure before sending to controller.

Changes in V2:
Replaced fib vector allocation code with aac_fib_vector_assign

Changes in V3:
None

Fixes MSI-X vector calculation for suspend/resume

Cc [email protected]

Signed-off-by Raghava Aditya Renukunta <[email protected]>

Reviewed-by Shane Seymour <[email protected]>

---
 drivers/scsi/aacraid/linit.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

drivers/scsi/aacraid/linit.c +11 -1

index 08c6835..6d79181 100644
@@ -1410,8 +1410,18 @@ static int aac_acquire_resources(struct aac_dev *dev)
 
 	aac_adapter_enable_int(dev);
 
-	if (!dev->sync_mode)
+	/*max msix may change  after EEH
+	 * Re-assign vectors to fibs
+	 */
+	aac_fib_vector_assign(dev);
+
+	if (!dev->sync_mode) {
+		/* After EEH recovery or suspend resume, max_msix count
+		 * may change, therfore updating in init as well.
+		 */
 		aac_adapter_start(dev);
+		dev->init->Sa_MSIXVectors = cpu_to_le32(dev->max_msix);
+	}
 	return 0;
 
 error_iounmap:

Signature · 1 line

1.9.1

From: Raghava Aditya Renukunta <[email protected]>

Series 7 does not support PCI hot reset used by EEH.

Enabled fundamental reset only for Series 7

Changes in V2:
None

Changes in V3:
None

Signed-off-by Raghava Aditya Renukunta <[email protected]>

Reviewed-by Johannes Thumshirn <[email protected]>

---
 drivers/scsi/aacraid/linit.c | 6 ++++++
 1 file changed, 6 insertions(+)

drivers/scsi/aacraid/linit.c +6 -0

index 6d79181..6944560 100644
@@ -1135,6 +1135,12 @@ static int aac_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
 	u64 dmamask;
 	extern int aac_sync_mode;
 
+	/*
+	 * Only series 7 needs freset.
+	 */
+	 if (pdev->device == PMC_DEVICE_S7)
+		pdev->needs_freset = 1;
+
 	list_for_each_entry(aac, &aac_devices, entry) {
 		if (aac->id > unique_id)
 			break;

From: Raghava Aditya Renukunta <[email protected]>

while driver removal is in progress or PCI shutdown is invoked, driver kills AIF aacraid thread, but IOCTL requests from the management tools re-start AIF thread leading to IOP_RESET.

Fixed by setting adapter_shutdown flag when PCI shutdown is invoked.

Changes in V2:
Set adapter_shutdown flag before shutdown command is sent to \
controller

Changes in V3:
Call aac_send_shut_shutdown first thing in __aac_shutdown Convert adapter_shutdown to atomic_t variable to prevent \
SMP coherency issues(race conditions)

Signed-off-by Raghava Aditya Renukunta <[email protected]>

---
 drivers/scsi/aacraid/aacraid.h  |  2 +-
 drivers/scsi/aacraid/comminit.c |  6 +++---
 drivers/scsi/aacraid/linit.c    | 15 ++++++++-------
 3 files changed, 12 insertions(+), 11 deletions(-)

drivers/scsi/aacraid/aacraid.h +1 -1

index 2916288..3473668 100644
@@ -1234,7 +1234,7 @@ struct aac_dev
 	int			msi_enabled;	/* MSI/MSI-X enabled */
 	struct msix_entry	msixentry[AAC_MAX_MSIX];
 	struct aac_msix_ctx	aac_msix[AAC_MAX_MSIX]; /* context */
-	u8			adapter_shutdown;
+	atomic_t		adapter_shutdown;
 	u32			handle_pci_error;
 };
 

drivers/scsi/aacraid/comminit.c +3 -3

index 0e954e3..d361673 100644
@@ -212,8 +212,9 @@ int aac_send_shutdown(struct aac_dev * dev)
 		return -ENOMEM;
 	aac_fib_init(fibctx);
 
-	cmd = (struct aac_close *) fib_data(fibctx);
+	atomic_set(&dev->adapter_shutdown, 1);
 
+	cmd = (struct aac_close *) fib_data(fibctx);
 	cmd->command = cpu_to_le32(VM_CloseAll);
 	cmd->cid = cpu_to_le32(0xfffffffe);
 

@@ -229,7 +230,6 @@ int aac_send_shutdown(struct aac_dev * dev)
 	/* FIB should be freed only after getting the response from the F/W */
 	if (status != -ERESTARTSYS)
 		aac_fib_free(fibctx);
-	dev->adapter_shutdown = 1;
 	if ((dev->pdev->device == PMC_DEVICE_S7 ||
 	     dev->pdev->device == PMC_DEVICE_S8 ||
 	     dev->pdev->device == PMC_DEVICE_S9) &&

@@ -468,7 +468,7 @@ struct aac_dev *aac_init_adapter(struct aac_dev *dev)
 	}
 	dev->max_msix = 0;
 	dev->msi_enabled = 0;
-	dev->adapter_shutdown = 0;
+	atomic_set(&dev->adapter_shutdown, 0);
 	if ((!aac_adapter_sync_cmd(dev, GET_COMM_PREFERRED_SETTINGS,
 	  0, 0, 0, 0, 0, 0,
 	  status+0, status+1, status+2, status+3, status+4))

drivers/scsi/aacraid/linit.c +8 -7

index 6944560..27b3fcd 100644
@@ -706,7 +706,7 @@ static long aac_cfg_ioctl(struct file *file,
 	int ret;
 	struct aac_dev *aac;
 	aac = (struct aac_dev *)file->private_data;
-	if (!capable(CAP_SYS_RAWIO) || aac->adapter_shutdown)
+	if (!capable(CAP_SYS_RAWIO) || atomic_read(&aac->adapter_shutdown))
 		return -EPERM;
 	mutex_lock(&aac_mutex);
 	ret = aac_do_ioctl(file->private_data, cmd, (void __user *)arg);

@@ -1078,6 +1078,8 @@ static void __aac_shutdown(struct aac_dev * aac)
 	int i;
 	int cpu;
 
+	aac_send_shutdown(aac);
+
 	if (aac->aif_thread) {
 		int i;
 		/* Clear out events first */

@@ -1089,7 +1091,7 @@ static void __aac_shutdown(struct aac_dev * aac)
 		}
 		kthread_stop(aac->thread);
 	}
-	aac_send_shutdown(aac);
+
 	aac_adapter_disable_int(aac);
 	cpu = cpumask_first(cpu_online_mask);
 	if (aac->pdev->device == PMC_DEVICE_S6 ||

@@ -1474,7 +1476,7 @@ static int aac_resume(struct pci_dev *pdev)
 	* reset this flag to unblock ioctl() as it was set at
 	* aac_send_shutdown() to block ioctls from upperlayer
 	*/
-	aac->adapter_shutdown = 0;
+	atomic_set(&aac->adapter_shutdown, 0);
 	scsi_unblock_requests(shost);
 
 	return 0;

@@ -1553,9 +1555,8 @@ static pci_ers_result_t aac_pci_error_detected(struct pci_dev *pdev,
 	case pci_channel_io_normal:
 		return PCI_ERS_RESULT_CAN_RECOVER;
 	case pci_channel_io_frozen:
-
 		aac->handle_pci_error = 1;
-		aac->adapter_shutdown = 1;
+		atomic_set(&aac->adapter_shutdown, 1);
 
 		scsi_block_requests(aac->scsi_host_ptr);
 		aac_flush_ios(aac);

@@ -1567,7 +1568,7 @@ static pci_ers_result_t aac_pci_error_detected(struct pci_dev *pdev,
 		return PCI_ERS_RESULT_NEED_RESET;
 	case pci_channel_io_perm_failure:
 		aac->handle_pci_error = 1;
-		aac->adapter_shutdown = 1;
+		atomic_set(&aac->adapter_shutdown, 1);
 
 		aac_flush_ios(aac);
 		return PCI_ERS_RESULT_DISCONNECT;

@@ -1636,7 +1637,7 @@ static void aac_pci_resume(struct pci_dev *pdev)
 	 * reset this flag to unblock ioctl() as it was set
 	 * at aac_send_shutdown() to block ioctls from upperlayer
 	 */
-	aac->adapter_shutdown = 0;
+	atomic_set(&aac->adapter_shutdown, 0);
 	aac->handle_pci_error = 0;
 
 	shost_for_each_device(sdev, shost)

Signature · 1 line

1.9.1

From: Raghava Aditya Renukunta <[email protected]>

while driver removal is in progress or PCI shutdown is invoked, driver kills AIF aacraid thread, but IOCTL requests from the management tools re-start AIF thread leading to IOP_RESET.

Fixed by setting adapter_shutdown flag when PCI shutdown is invoked.

Changes in V2:
Set adapter_shutdown flag before shutdown command is sent to \
controller

Changes in V3:
Call aac_send_shut_shutdown first thing in __aac_shutdown Convert adapter_shutdown to atomic_t variable to prevent \
SMP coherency issues(race conditions)

Signed-off-by Raghava Aditya Renukunta <[email protected]>

---
 drivers/scsi/aacraid/aacraid.h  |  2 +-
 drivers/scsi/aacraid/comminit.c |  6 +++---
 drivers/scsi/aacraid/linit.c    | 15 ++++++++-------
 3 files changed, 12 insertions(+), 11 deletions(-)

drivers/scsi/aacraid/aacraid.h +1 -1

index 2916288..3473668 100644
@@ -1234,7 +1234,7 @@ struct aac_dev
 	int			msi_enabled;	/* MSI/MSI-X enabled */
 	struct msix_entry	msixentry[AAC_MAX_MSIX];
 	struct aac_msix_ctx	aac_msix[AAC_MAX_MSIX]; /* context */
-	u8			adapter_shutdown;
+	atomic_t		adapter_shutdown;
 	u32			handle_pci_error;
 };
 

drivers/scsi/aacraid/comminit.c +3 -3

index 0e954e3..d361673 100644
@@ -212,8 +212,9 @@ int aac_send_shutdown(struct aac_dev * dev)
 		return -ENOMEM;
 	aac_fib_init(fibctx);
 
-	cmd = (struct aac_close *) fib_data(fibctx);
+	atomic_set(&dev->adapter_shutdown, 1);
 
+	cmd = (struct aac_close *) fib_data(fibctx);
 	cmd->command = cpu_to_le32(VM_CloseAll);
 	cmd->cid = cpu_to_le32(0xfffffffe);
 

@@ -229,7 +230,6 @@ int aac_send_shutdown(struct aac_dev * dev)
 	/* FIB should be freed only after getting the response from the F/W */
 	if (status != -ERESTARTSYS)
 		aac_fib_free(fibctx);
-	dev->adapter_shutdown = 1;
 	if ((dev->pdev->device == PMC_DEVICE_S7 ||
 	     dev->pdev->device == PMC_DEVICE_S8 ||
 	     dev->pdev->device == PMC_DEVICE_S9) &&

@@ -468,7 +468,7 @@ struct aac_dev *aac_init_adapter(struct aac_dev *dev)
 	}
 	dev->max_msix = 0;
 	dev->msi_enabled = 0;
-	dev->adapter_shutdown = 0;
+	atomic_set(&dev->adapter_shutdown, 0);
 	if ((!aac_adapter_sync_cmd(dev, GET_COMM_PREFERRED_SETTINGS,
 	  0, 0, 0, 0, 0, 0,
 	  status+0, status+1, status+2, status+3, status+4))

drivers/scsi/aacraid/linit.c +8 -7

index 6944560..27b3fcd 100644
@@ -706,7 +706,7 @@ static long aac_cfg_ioctl(struct file *file,
 	int ret;
 	struct aac_dev *aac;
 	aac = (struct aac_dev *)file->private_data;
-	if (!capable(CAP_SYS_RAWIO) || aac->adapter_shutdown)
+	if (!capable(CAP_SYS_RAWIO) || atomic_read(&aac->adapter_shutdown))
 		return -EPERM;
 	mutex_lock(&aac_mutex);
 	ret = aac_do_ioctl(file->private_data, cmd, (void __user *)arg);

@@ -1078,6 +1078,8 @@ static void __aac_shutdown(struct aac_dev * aac)
 	int i;
 	int cpu;
 
+	aac_send_shutdown(aac);
+
 	if (aac->aif_thread) {
 		int i;
 		/* Clear out events first */

@@ -1089,7 +1091,7 @@ static void __aac_shutdown(struct aac_dev * aac)
 		}
 		kthread_stop(aac->thread);
 	}
-	aac_send_shutdown(aac);
+
 	aac_adapter_disable_int(aac);
 	cpu = cpumask_first(cpu_online_mask);
 	if (aac->pdev->device == PMC_DEVICE_S6 ||

@@ -1474,7 +1476,7 @@ static int aac_resume(struct pci_dev *pdev)
 	* reset this flag to unblock ioctl() as it was set at
 	* aac_send_shutdown() to block ioctls from upperlayer
 	*/
-	aac->adapter_shutdown = 0;
+	atomic_set(&aac->adapter_shutdown, 0);
 	scsi_unblock_requests(shost);
 
 	return 0;

@@ -1553,9 +1555,8 @@ static pci_ers_result_t aac_pci_error_detected(struct pci_dev *pdev,
 	case pci_channel_io_normal:
 		return PCI_ERS_RESULT_CAN_RECOVER;
 	case pci_channel_io_frozen:
-
 		aac->handle_pci_error = 1;
-		aac->adapter_shutdown = 1;
+		atomic_set(&aac->adapter_shutdown, 1);
 
 		scsi_block_requests(aac->scsi_host_ptr);
 		aac_flush_ios(aac);

@@ -1567,7 +1568,7 @@ static pci_ers_result_t aac_pci_error_detected(struct pci_dev *pdev,
 		return PCI_ERS_RESULT_NEED_RESET;
 	case pci_channel_io_perm_failure:
 		aac->handle_pci_error = 1;
-		aac->adapter_shutdown = 1;
+		atomic_set(&aac->adapter_shutdown, 1);
 
 		aac_flush_ios(aac);
 		return PCI_ERS_RESULT_DISCONNECT;

@@ -1636,7 +1637,7 @@ static void aac_pci_resume(struct pci_dev *pdev)
 	 * reset this flag to unblock ioctl() as it was set
 	 * at aac_send_shutdown() to block ioctls from upperlayer
 	 */
-	aac->adapter_shutdown = 0;
+	atomic_set(&aac->adapter_shutdown, 0);
 	aac->handle_pci_error = 0;
 
 	shost_for_each_device(sdev, shost)

-----Original Message-----
From: Tomas Henzl [mailto:[email protected]]
Sent: Tuesday, January 19, 2016 8:14 AM
To: Raghava Aditya Renukunta; [email protected]; [email protected]; [email protected]
Cc: Mahesh Rajashekhara; Murthy Bhat; Gana Sridaran; aacraid@pmc- sierra.com; Scott Benesh; [email protected]; [email protected]; David Carroll
Subject: Re: [PATCH V3 7/9] aacraid: Fix AIF triggered IOP_RESET

Quoted 8 lines · Raghava Aditya Renukunta

From: Raghava Aditya Renukunta <[email protected]>

while driver removal is in progress or PCI shutdown is invoked, driver kills AIF aacraid thread, but IOCTL requests from the management tools re-start AIF thread leading to IOP_RESET.

Fixed by setting adapter_shutdown flag when PCI shutdown is invoked.

Quoted 8 lines

Changes in V2:
Set adapter_shutdown flag before shutdown command is sent to \
controller

Changes in V3:
Call aac_send_shut_shutdown first thing in __aac_shutdown Convert adapter_shutdown to atomic_t variable to prevent \
SMP coherency issues(race conditions)

Hi,
I don't think that an atomic variable can change it, imagine that thread just passed your test in aac_cfg_ioctl and another thread enter a bit later the adapter_shutdown so both - an I/O and your shutdown code
will run in parallel.
Also you need to fix your compat_ioctl path too.

--tm

Quoted 2 lines

Signed-off-by Raghava Aditya Renukunta

<[email protected]>

Review

Quoted 20 lines

---
 drivers/scsi/aacraid/aacraid.h  |  2 +-
 drivers/scsi/aacraid/comminit.c |  6 +++---
 drivers/scsi/aacraid/linit.c    | 15 ++++++++-------
 3 files changed, 12 insertions(+), 11 deletions(-)

drivers/scsi/aacraid/aacraid.h +1 -1

index 2916288..3473668 100644
@@ -1234,7 +1234,7 @@ struct aac_dev
 	int			msi_enabled;	/* MSI/MSI-X enabled */
 	struct msix_entry	msixentry[AAC_MAX_MSIX];
 	struct aac_msix_ctx	aac_msix[AAC_MAX_MSIX]; /* context */
-	u8			adapter_shutdown;
+	atomic_t		adapter_shutdown;
 	u32			handle_pci_error;
 };
 

(quoted diff) +0 -0

b/drivers/scsi/aacraid/comminit.c

Quoted 15 lines

index 0e954e3..d361673 100644

drivers/scsi/aacraid/comminit.c +2 -1

@@ -212,8 +212,9 @@ int aac_send_shutdown(struct aac_dev * dev)
 		return -ENOMEM;
 	aac_fib_init(fibctx);
 
-	cmd = (struct aac_close *) fib_data(fibctx);
+	atomic_set(&dev->adapter_shutdown, 1);
 
+	cmd = (struct aac_close *) fib_data(fibctx);
 	cmd->command = cpu_to_le32(VM_CloseAll);
 	cmd->cid = cpu_to_le32(0xfffffffe);
 

drivers/scsi/aacraid/comminit.c int aac_send_shutdown(struct aac_dev * dev) · line 230

Quoted 1 line

drivers/scsi/aacraid/comminit.c +0 -0

@@ -229,7 +230,6 @@ int aac_send_shutdown(struct aac_dev * dev)
 	/* FIB should be freed only after getting the response from the F/W

*/

drivers/scsi/aacraid/comminit.c struct aac_dev *aac_init_adapter(struct aac_dev

Quoted 7 lines

drivers/scsi/aacraid/comminit.c +0 -1

 	if (status != -ERESTARTSYS)
 		aac_fib_free(fibctx);
-	dev->adapter_shutdown = 1;
 	if ((dev->pdev->device == PMC_DEVICE_S7 ||
 	     dev->pdev->device == PMC_DEVICE_S8 ||
 	     dev->pdev->device == PMC_DEVICE_S9) &&

@@ -468,7 +468,7 @@ struct aac_dev *aac_init_adapter(struct aac_dev

*dev)

drivers/scsi/aacraid/comminit.c struct aac_dev *aac_init_adapter(struct aac_dev *dev)

Quoted 6 lines

drivers/scsi/aacraid/comminit.c +1 -1

 	}
 	dev->max_msix = 0;
 	dev->msi_enabled = 0;
-	dev->adapter_shutdown = 0;
+	atomic_set(&dev->adapter_shutdown, 0);
 	if ((!aac_adapter_sync_cmd(dev,

GET_COMM_PREFERRED_SETTINGS,

drivers/scsi/aacraid/linit.c static pci_ers_result_t

Quoted 44 lines

drivers/scsi/aacraid/comminit.c +0 -0

 	  0, 0, 0, 0, 0, 0,
 	  status+0, status+1, status+2, status+3, status+4))

drivers/scsi/aacraid/linit.c +1 -1

index 6944560..27b3fcd 100644
@@ -706,7 +706,7 @@ static long aac_cfg_ioctl(struct file *file,
 	int ret;
 	struct aac_dev *aac;
 	aac = (struct aac_dev *)file->private_data;
-	if (!capable(CAP_SYS_RAWIO) || aac->adapter_shutdown)
+	if (!capable(CAP_SYS_RAWIO) || atomic_read(&aac-
 adapter_shutdown))
 		return -EPERM;
 	mutex_lock(&aac_mutex);

drivers/scsi/aacraid/linit.c +4 -2

 	ret = aac_do_ioctl(file->private_data, cmd, (void __user *)arg);

@@ -1078,6 +1078,8 @@ static void __aac_shutdown(struct aac_dev * aac)
 	int i;
 	int cpu;
 
+	aac_send_shutdown(aac);
+
 	if (aac->aif_thread) {
 		int i;
 		/* Clear out events first */

@@ -1089,7 +1091,7 @@ static void __aac_shutdown(struct aac_dev * aac)
 		}
 		kthread_stop(aac->thread);
 	}
-	aac_send_shutdown(aac);
+
 	aac_adapter_disable_int(aac);
 	cpu = cpumask_first(cpu_online_mask);
 	if (aac->pdev->device == PMC_DEVICE_S6 ||

@@ -1474,7 +1476,7 @@ static int aac_resume(struct pci_dev *pdev)
 	* reset this flag to unblock ioctl() as it was set at
 	* aac_send_shutdown() to block ioctls from upperlayer
 	*/
-	aac->adapter_shutdown = 0;
+	atomic_set(&aac->adapter_shutdown, 0);
 	scsi_unblock_requests(shost);
 
 	return 0;

@@ -1553,9 +1555,8 @@ static pci_ers_result_t

aac_pci_error_detected(struct pci_dev *pdev,

drivers/scsi/aacraid/linit.c static pci_ers_result_t

Quoted 11 lines

drivers/scsi/aacraid/linit.c +1 -2

 	case pci_channel_io_normal:
 		return PCI_ERS_RESULT_CAN_RECOVER;
 	case pci_channel_io_frozen:
-
 		aac->handle_pci_error = 1;
-		aac->adapter_shutdown = 1;
+		atomic_set(&aac->adapter_shutdown, 1);
 
 		scsi_block_requests(aac->scsi_host_ptr);
 		aac_flush_ios(aac);

@@ -1567,7 +1568,7 @@ static pci_ers_result_t

aac_pci_error_detected(struct pci_dev *pdev,

Quoted 17 lines

drivers/scsi/aacraid/linit.c +2 -2

 		return PCI_ERS_RESULT_NEED_RESET;
 	case pci_channel_io_perm_failure:
 		aac->handle_pci_error = 1;
-		aac->adapter_shutdown = 1;
+		atomic_set(&aac->adapter_shutdown, 1);
 
 		aac_flush_ios(aac);
 		return PCI_ERS_RESULT_DISCONNECT;

@@ -1636,7 +1637,7 @@ static void aac_pci_resume(struct pci_dev *pdev)
 	 * reset this flag to unblock ioctl() as it was set
 	 * at aac_send_shutdown() to block ioctls from upperlayer
 	 */
-	aac->adapter_shutdown = 0;
+	atomic_set(&aac->adapter_shutdown, 0);
 	aac->handle_pci_error = 0;
 
 	shost_for_each_device(sdev, shost)

Quoted 36 lines

-----Original Message-----
From: Tomas Henzl [mailto:[email protected]]
Sent: Tuesday, January 19, 2016 8:14 AM
To: Raghava Aditya Renukunta; [email protected]; [email protected]; [email protected]
Cc: Mahesh Rajashekhara; Murthy Bhat; Gana Sridaran; aacraid@pmc- sierra.com; Scott Benesh; [email protected]; [email protected]; David Carroll
Subject: Re: [PATCH V3 7/9] aacraid: Fix AIF triggered IOP_RESET

Quoted 8 lines · Raghava Aditya Renukunta

From: Raghava Aditya Renukunta <[email protected]>

while driver removal is in progress or PCI shutdown is invoked, driver kills AIF aacraid thread, but IOCTL requests from the management tools re-start AIF thread leading to IOP_RESET.

Fixed by setting adapter_shutdown flag when PCI shutdown is invoked.

Quoted 8 lines

Changes in V2:
Set adapter_shutdown flag before shutdown command is sent to \
controller

Changes in V3:
Call aac_send_shut_shutdown first thing in __aac_shutdown Convert adapter_shutdown to atomic_t variable to prevent \
SMP coherency issues(race conditions)

Hi,
I don't think that an atomic variable can change it, imagine that thread just passed your test in aac_cfg_ioctl and another thread enter a bit later the adapter_shutdown so both - an I/O and your shutdown code
will run in parallel.
Also you need to fix your compat_ioctl path too.

Quoted 1 line

--tm

Hello Tomas,
Yes that would not solve this problem.
I can think of 2 solutions

1.Place a delay after setting adapter_shutdown and before sending the actual shutdown command in aac_send_shutdown. This way any impending commands will be processed before the adapter actually receives the shutdown command. Since management commands are sync only , shutdown command will be sent last. This solution uses an estimation of the delay

2.Since commands are sync , place a check in aac_fib_send to block
commands once adapter_shutdown is set(only shutdown command will be sent thru)

I am more inclined to go with option 2.

Regards,
Raghava Aditya

Quoted 128 lines

Quoted 1 line

Signed-off-by Raghava Aditya Renukunta

<[email protected]>

Review

Quoted 20 lines

---
 drivers/scsi/aacraid/aacraid.h  |  2 +-
 drivers/scsi/aacraid/comminit.c |  6 +++---
 drivers/scsi/aacraid/linit.c    | 15 ++++++++-------
 3 files changed, 12 insertions(+), 11 deletions(-)

drivers/scsi/aacraid/aacraid.h +1 -1

index 2916288..3473668 100644
@@ -1234,7 +1234,7 @@ struct aac_dev
 	int			msi_enabled;	/* MSI/MSI-X enabled */
 	struct msix_entry	msixentry[AAC_MAX_MSIX];
 	struct aac_msix_ctx	aac_msix[AAC_MAX_MSIX]; /* context */
-	u8			adapter_shutdown;
+	atomic_t		adapter_shutdown;
 	u32			handle_pci_error;
 };
 

(quoted diff) +0 -0

b/drivers/scsi/aacraid/comminit.c

Quoted 15 lines

index 0e954e3..d361673 100644

drivers/scsi/aacraid/comminit.c +2 -1

@@ -212,8 +212,9 @@ int aac_send_shutdown(struct aac_dev * dev)
 		return -ENOMEM;
 	aac_fib_init(fibctx);
 
-	cmd = (struct aac_close *) fib_data(fibctx);
+	atomic_set(&dev->adapter_shutdown, 1);
 
+	cmd = (struct aac_close *) fib_data(fibctx);
 	cmd->command = cpu_to_le32(VM_CloseAll);
 	cmd->cid = cpu_to_le32(0xfffffffe);
 

drivers/scsi/aacraid/comminit.c int aac_send_shutdown(struct aac_dev * dev) · line 230

Quoted 1 line

drivers/scsi/aacraid/comminit.c +0 -0

@@ -229,7 +230,6 @@ int aac_send_shutdown(struct aac_dev * dev)
 	/* FIB should be freed only after getting the response from the F/W

*/

drivers/scsi/aacraid/comminit.c struct aac_dev *aac_init_adapter(struct aac_dev

Quoted 7 lines

drivers/scsi/aacraid/comminit.c +0 -1

 	if (status != -ERESTARTSYS)
 		aac_fib_free(fibctx);
-	dev->adapter_shutdown = 1;
 	if ((dev->pdev->device == PMC_DEVICE_S7 ||
 	     dev->pdev->device == PMC_DEVICE_S8 ||
 	     dev->pdev->device == PMC_DEVICE_S9) &&

@@ -468,7 +468,7 @@ struct aac_dev *aac_init_adapter(struct aac_dev

*dev)

drivers/scsi/aacraid/comminit.c struct aac_dev *aac_init_adapter(struct aac_dev · line 472

Quoted 6 lines

drivers/scsi/aacraid/comminit.c +1 -1

 	}
 	dev->max_msix = 0;
 	dev->msi_enabled = 0;
-	dev->adapter_shutdown = 0;
+	atomic_set(&dev->adapter_shutdown, 0);
 	if ((!aac_adapter_sync_cmd(dev,

GET_COMM_PREFERRED_SETTINGS,

drivers/scsi/aacraid/linit.c static pci_ers_result_t

Quoted 44 lines

drivers/scsi/aacraid/comminit.c +0 -0

 	  0, 0, 0, 0, 0, 0,
 	  status+0, status+1, status+2, status+3, status+4))

drivers/scsi/aacraid/linit.c +1 -1

index 6944560..27b3fcd 100644
@@ -706,7 +706,7 @@ static long aac_cfg_ioctl(struct file *file,
 	int ret;
 	struct aac_dev *aac;
 	aac = (struct aac_dev *)file->private_data;
-	if (!capable(CAP_SYS_RAWIO) || aac->adapter_shutdown)
+	if (!capable(CAP_SYS_RAWIO) || atomic_read(&aac-
 adapter_shutdown))
 		return -EPERM;
 	mutex_lock(&aac_mutex);

drivers/scsi/aacraid/linit.c +4 -2

 	ret = aac_do_ioctl(file->private_data, cmd, (void __user *)arg);

@@ -1078,6 +1078,8 @@ static void __aac_shutdown(struct aac_dev * aac)
 	int i;
 	int cpu;
 
+	aac_send_shutdown(aac);
+
 	if (aac->aif_thread) {
 		int i;
 		/* Clear out events first */

@@ -1089,7 +1091,7 @@ static void __aac_shutdown(struct aac_dev * aac)
 		}
 		kthread_stop(aac->thread);
 	}
-	aac_send_shutdown(aac);
+
 	aac_adapter_disable_int(aac);
 	cpu = cpumask_first(cpu_online_mask);
 	if (aac->pdev->device == PMC_DEVICE_S6 ||

@@ -1474,7 +1476,7 @@ static int aac_resume(struct pci_dev *pdev)
 	* reset this flag to unblock ioctl() as it was set at
 	* aac_send_shutdown() to block ioctls from upperlayer
 	*/
-	aac->adapter_shutdown = 0;
+	atomic_set(&aac->adapter_shutdown, 0);
 	scsi_unblock_requests(shost);
 
 	return 0;

@@ -1553,9 +1555,8 @@ static pci_ers_result_t

aac_pci_error_detected(struct pci_dev *pdev,

drivers/scsi/aacraid/linit.c static pci_ers_result_t

Quoted 11 lines

drivers/scsi/aacraid/linit.c +1 -2

 	case pci_channel_io_normal:
 		return PCI_ERS_RESULT_CAN_RECOVER;
 	case pci_channel_io_frozen:
-
 		aac->handle_pci_error = 1;
-		aac->adapter_shutdown = 1;
+		atomic_set(&aac->adapter_shutdown, 1);
 
 		scsi_block_requests(aac->scsi_host_ptr);
 		aac_flush_ios(aac);

@@ -1567,7 +1568,7 @@ static pci_ers_result_t

aac_pci_error_detected(struct pci_dev *pdev,

Quoted 16 lines

drivers/scsi/aacraid/linit.c +2 -2

 		return PCI_ERS_RESULT_NEED_RESET;
 	case pci_channel_io_perm_failure:
 		aac->handle_pci_error = 1;
-		aac->adapter_shutdown = 1;
+		atomic_set(&aac->adapter_shutdown, 1);
 
 		aac_flush_ios(aac);
 		return PCI_ERS_RESULT_DISCONNECT;

@@ -1636,7 +1637,7 @@ static void aac_pci_resume(struct pci_dev *pdev)
 	 * reset this flag to unblock ioctl() as it was set
 	 * at aac_send_shutdown() to block ioctls from upperlayer
 	 */
-	aac->adapter_shutdown = 0;
+	atomic_set(&aac->adapter_shutdown, 0);
 	aac->handle_pci_error = 0;
 

Quoted 1 line

drivers/scsi/aacraid/linit.c static void aac_pci_resume(struct pci_dev *pdev) · line 1643

Quoted 1 line

drivers/scsi/aacraid/linit.c +0 -0

 	shost_for_each_device(sdev, shost)

--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

-----Original Message-----
From: Tomas Henzl [mailto:[email protected]]
Sent: Friday, January 22, 2016 5:15 AM
To: Raghava Aditya Renukunta; [email protected]; [email protected]; [email protected]
Cc: Mahesh Rajashekhara; Murthy Bhat; Gana Sridaran; aacraid@pmc- sierra.com; Scott Benesh; [email protected]; [email protected]; zzzDavid Carroll
Subject: Re: [PATCH V3 7/9] aacraid: Fix AIF triggered IOP_RESET

Quoted 5 lines · Raghava Aditya Renukunta

Quoted 5 lines

-----Original Message-----
From: Tomas Henzl [mailto:[email protected]]
Sent: Tuesday, January 19, 2016 8:14 AM
To: Raghava Aditya Renukunta;

[email protected];

Quoted 3 lines

Quoted 3 lines

[email protected]; [email protected]
Cc: Mahesh Rajashekhara; Murthy Bhat; Gana Sridaran; aacraid@pmc- sierra.com; Scott Benesh; [email protected];

[email protected];

Quoted 5 lines

Quoted 5 lines

David Carroll
Subject: Re: [PATCH V3 7/9] aacraid: Fix AIF triggered IOP_RESET

Quoted 1 line · Raghava Aditya Renukunta

From: Raghava Aditya Renukunta

<[email protected]>

Quoted 11 lines

Quoted 11 lines

Quoted 11 lines

while driver removal is in progress or PCI shutdown is invoked, driver kills AIF aacraid thread, but IOCTL requests from the management tools re-start AIF thread leading to IOP_RESET.

Fixed by setting adapter_shutdown flag when PCI shutdown is invoked.

Changes in V2:
Set adapter_shutdown flag before shutdown command is sent to \
controller

Quoted 8 lines

Quoted 8 lines

Quoted 4 lines

Changes in V3:
Call aac_send_shut_shutdown first thing in __aac_shutdown Convert adapter_shutdown to atomic_t variable to prevent \
SMP coherency issues(race conditions)

Hi,
I don't think that an atomic variable can change it, imagine that thread just passed your test in aac_cfg_ioctl and another thread enter a bit later the adapter_shutdown so both - an I/O and your

shutdown

Quoted 10 lines

Quoted 5 lines

code
will run in parallel.
Also you need to fix your compat_ioctl path too.

--tm

Hello Tomas,
Yes that would not solve this problem.
I can think of 2 solutions

1.Place a delay after setting adapter_shutdown and before sending the

actual

Quoted 1 line

shutdown command in aac_send_shutdown. This way any impending

commands will be

Quoted 1 line

processed before the adapter actually receives the shutdown command.

Since management

Quoted 1 line

commands are sync only , shutdown command will be sent last. This

solution uses an

Quoted 4 lines

estimation of the delay

2.Since commands are sync , place a check in aac_fib_send to block
commands once adapter_shutdown is set(only shutdown command will

be sent thru)

This option looks better but I guess you still can find a tiny race window. What do you think about a mutual exclusive access using a mutex, do you think this could work?

drivers/scsi/aacraid/commctrl.c +2 -0

index 54195a117f..b9505c58db 100644
@@ -858,6 +858,8 @@ int aac_do_ioctl(struct aac_dev * dev, int cmd, void
 __user *arg)
 	/*
 	 *	HBA gets first crack
 	 */
+	if (dev->adapter_shutdown)
+		return -EACCES;
 
 	status = aac_dev_ioctl(dev, cmd, arg);

drivers/scsi/aacraid/commctrl.c +0 -0

 	if (status != -ENOTTY)

drivers/scsi/aacraid/comminit.c +0 -0

index 0e954e37f0..02535c07a4 100644

drivers/scsi/aacraid/comminit.c +0 -1

 	cmd = (struct aac_close *) fib_data(fibctx);
 
 	cmd->command = cpu_to_le32(VM_CloseAll);

@@ -229,7 +233,6 @@ int aac_send_shutdown(struct aac_dev * dev)
 	/* FIB should be freed only after getting the response from the F/W
 */
 	if (status != -ERESTARTSYS)
 		aac_fib_free(fibctx);
-	dev->adapter_shutdown = 1;
 	if ((dev->pdev->device == PMC_DEVICE_S7 ||
 	     dev->pdev->device == PMC_DEVICE_S8 ||

drivers/scsi/aacraid/comminit.c +0 -0

 	     dev->pdev->device == PMC_DEVICE_S9) &&

drivers/scsi/aacraid/linit.c +2 -1

index 6944560e22..a87880ab32 100644
@@ -706,8 +706,9 @@ static long aac_cfg_ioctl(struct file *file,
 	int ret;
 	struct aac_dev *aac;
 	aac = (struct aac_dev *)file->private_data;
-	if (!capable(CAP_SYS_RAWIO) || aac->adapter_shutdown)
+	if (!capable(CAP_SYS_RAWIO))
 		return -EPERM;
+
 	mutex_lock(&aac_mutex);
 	ret = aac_do_ioctl(file->private_data, cmd, (void __user *)arg);
 	mutex_unlock(&aac_mutex);

Quoted 71 lines

I am more inclined to go with option 2.

Regards,
Raghava Aditya

Quoted 64 lines

Quoted 1 line

Signed-off-by Raghava Aditya Renukunta

<[email protected]>

Review

Quoted 20 lines

---
 drivers/scsi/aacraid/aacraid.h  |  2 +-
 drivers/scsi/aacraid/comminit.c |  6 +++---
 drivers/scsi/aacraid/linit.c    | 15 ++++++++-------
 3 files changed, 12 insertions(+), 11 deletions(-)

drivers/scsi/aacraid/aacraid.h +1 -1

index 2916288..3473668 100644
@@ -1234,7 +1234,7 @@ struct aac_dev
 	int			msi_enabled;	/* MSI/MSI-X enabled */
 	struct msix_entry	msixentry[AAC_MAX_MSIX];
 	struct aac_msix_ctx	aac_msix[AAC_MAX_MSIX]; /* context */
-	u8			adapter_shutdown;
+	atomic_t		adapter_shutdown;
 	u32			handle_pci_error;
 };
 

(quoted diff) +0 -0

b/drivers/scsi/aacraid/comminit.c

Quoted 15 lines

index 0e954e3..d361673 100644

drivers/scsi/aacraid/comminit.c +2 -1

@@ -212,8 +212,9 @@ int aac_send_shutdown(struct aac_dev * dev)
 		return -ENOMEM;
 	aac_fib_init(fibctx);
 
-	cmd = (struct aac_close *) fib_data(fibctx);
+	atomic_set(&dev->adapter_shutdown, 1);
 
+	cmd = (struct aac_close *) fib_data(fibctx);
 	cmd->command = cpu_to_le32(VM_CloseAll);
 	cmd->cid = cpu_to_le32(0xfffffffe);
 

drivers/scsi/aacraid/comminit.c int aac_send_shutdown(struct aac_dev * dev) · line 230

Quoted 1 line

drivers/scsi/aacraid/comminit.c +0 -0

@@ -229,7 +230,6 @@ int aac_send_shutdown(struct aac_dev * dev)
 	/* FIB should be freed only after getting the response from the F/W

*/

drivers/scsi/aacraid/comminit.c struct aac_dev *aac_init_adapter(struct aac_dev

Quoted 7 lines

drivers/scsi/aacraid/comminit.c +0 -1

 	if (status != -ERESTARTSYS)
 		aac_fib_free(fibctx);
-	dev->adapter_shutdown = 1;
 	if ((dev->pdev->device == PMC_DEVICE_S7 ||
 	     dev->pdev->device == PMC_DEVICE_S8 ||
 	     dev->pdev->device == PMC_DEVICE_S9) &&

@@ -468,7 +468,7 @@ struct aac_dev *aac_init_adapter(struct aac_dev

*dev)

drivers/scsi/aacraid/comminit.c struct aac_dev *aac_init_adapter(struct aac_dev · line 472

Quoted 6 lines

drivers/scsi/aacraid/comminit.c +1 -1

 	}
 	dev->max_msix = 0;
 	dev->msi_enabled = 0;
-	dev->adapter_shutdown = 0;
+	atomic_set(&dev->adapter_shutdown, 0);
 	if ((!aac_adapter_sync_cmd(dev,

GET_COMM_PREFERRED_SETTINGS,

Quoted 9 lines

drivers/scsi/aacraid/comminit.c +0 -0

 	  0, 0, 0, 0, 0, 0,
 	  status+0, status+1, status+2, status+3, status+4))

drivers/scsi/aacraid/linit.c +0 -0

index 6944560..27b3fcd 100644
@@ -706,7 +706,7 @@ static long aac_cfg_ioctl(struct file *file,
 	int ret;
 	struct aac_dev *aac;

Quoted 8 lines

Quoted 8 lines

drivers/scsi/aacraid/linit.c static void __aac_shutdown(struct aac_dev *

Quoted 8 lines

drivers/scsi/aacraid/linit.c +1 -1

 	aac = (struct aac_dev *)file->private_data;
-	if (!capable(CAP_SYS_RAWIO) || aac->adapter_shutdown)
+	if (!capable(CAP_SYS_RAWIO) || atomic_read(&aac-
 adapter_shutdown))
 		return -EPERM;
 	mutex_lock(&aac_mutex);

drivers/scsi/aacraid/linit.c +0 -0

 	ret = aac_do_ioctl(file->private_data, cmd, (void __user *)arg);

@@ -1078,6 +1078,8 @@ static void __aac_shutdown(struct aac_dev *

aac)

Quoted 9 lines

Quoted 9 lines

drivers/scsi/aacraid/linit.c static void __aac_shutdown(struct aac_dev *

Quoted 9 lines

drivers/scsi/aacraid/linit.c +2 -0

 	int i;
 	int cpu;
 
+	aac_send_shutdown(aac);
+
 	if (aac->aif_thread) {
 		int i;
 		/* Clear out events first */

@@ -1089,7 +1091,7 @@ static void __aac_shutdown(struct aac_dev *

aac)

Quoted 37 lines

Quoted 37 lines

drivers/scsi/aacraid/linit.c static pci_ers_result_t

Quoted 18 lines

drivers/scsi/aacraid/linit.c +2 -2

 		}
 		kthread_stop(aac->thread);
 	}
-	aac_send_shutdown(aac);
+
 	aac_adapter_disable_int(aac);
 	cpu = cpumask_first(cpu_online_mask);
 	if (aac->pdev->device == PMC_DEVICE_S6 ||

@@ -1474,7 +1476,7 @@ static int aac_resume(struct pci_dev *pdev)
 	* reset this flag to unblock ioctl() as it was set at
 	* aac_send_shutdown() to block ioctls from upperlayer
 	*/
-	aac->adapter_shutdown = 0;
+	atomic_set(&aac->adapter_shutdown, 0);
 	scsi_unblock_requests(shost);
 
 	return 0;

@@ -1553,9 +1555,8 @@ static pci_ers_result_t

aac_pci_error_detected(struct pci_dev *pdev,

drivers/scsi/aacraid/linit.c static pci_ers_result_t

Quoted 11 lines

drivers/scsi/aacraid/linit.c +1 -2

 	case pci_channel_io_normal:
 		return PCI_ERS_RESULT_CAN_RECOVER;
 	case pci_channel_io_frozen:
-
 		aac->handle_pci_error = 1;
-		aac->adapter_shutdown = 1;
+		atomic_set(&aac->adapter_shutdown, 1);
 
 		scsi_block_requests(aac->scsi_host_ptr);
 		aac_flush_ios(aac);

@@ -1567,7 +1568,7 @@ static pci_ers_result_t

aac_pci_error_detected(struct pci_dev *pdev,

Quoted 6 lines

drivers/scsi/aacraid/linit.c +1 -1

 		return PCI_ERS_RESULT_NEED_RESET;
 	case pci_channel_io_perm_failure:
 		aac->handle_pci_error = 1;
-		aac->adapter_shutdown = 1;
+		atomic_set(&aac->adapter_shutdown, 1);
 

Quoted 3 lines

Quoted 3 lines

drivers/scsi/aacraid/linit.c static void aac_pci_resume(struct pci_dev

Quoted 3 lines

drivers/scsi/aacraid/linit.c +0 -0

 		aac_flush_ios(aac);
 		return PCI_ERS_RESULT_DISCONNECT;

@@ -1636,7 +1637,7 @@ static void aac_pci_resume(struct pci_dev

*pdev)

Quoted 12 lines

Quoted 8 lines

drivers/scsi/aacraid/linit.c static void aac_pci_resume(struct pci_dev · line 1643

Quoted 8 lines

drivers/scsi/aacraid/linit.c +1 -1

 	 * reset this flag to unblock ioctl() as it was set
 	 * at aac_send_shutdown() to block ioctls from upperlayer
 	 */
-	aac->adapter_shutdown = 0;
+	atomic_set(&aac->adapter_shutdown, 0);
 	aac->handle_pci_error = 0;
 
 	shost_for_each_device(sdev, shost)

--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Quoted 5 lines

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Tomas" == Tomas Henzl <[email protected]> writes:

2.Since commands are sync , place a check in aac_fib_send to block commands once adapter_shutdown is set(only shutdown command will be sent thru)

-----Original Message-----
From: Martin K. Petersen [mailto:[email protected]]
Sent: Tuesday, January 26, 2016 6:31 PM
To: Raghava Aditya Renukunta
Cc: Tomas Henzl; [email protected]; [email protected]; [email protected]; Mahesh Rajashekhara; Murthy Bhat; Gana Sridaran; [email protected]; Scott Benesh; [email protected]; [email protected]; zzzDavid Carroll
Subject: Re: [PATCH V3 7/9] aacraid: Fix AIF triggered IOP_RESET

Quoted 4 lines

Quoted 4 lines

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Tomas" == Tomas Henzl <[email protected]> writes:

2.Since commands are sync , place a check in aac_fib_send to block commands once adapter_shutdown is set(only shutdown command will

be

Quoted 1 line

Quoted 1 line

sent thru)

Tomas> This option looks better but I guess you still can find a tiny Tomas> race window. What do you think about a mutual exclusive access Tomas> using a mutex, do you think this could work?

[...]

Raghava?

--
Martin K. Petersen Oracle Linux Engineering

From: Raghava Aditya Renukunta <[email protected]>

During EEH PCI hotplug activity kernel unloads and loads the driver, causing character device to be unregistered(aac_remove_one).When the driver is loaded back using aac_probe_one the character device needs to be registered again for the AIF management tools to work.

Fixed by adding code to register character device in aac_probe_one if it is unregistered in aac_remove_one.

Changes in V2:
Added macros to track character device state

Changes in V3:
None

Signed-off-by Raghava Aditya Renukunta <[email protected]>

Reviewed-by Shane Seymour <[email protected]>

---
 drivers/scsi/aacraid/aacraid.h |  7 +++++++
 drivers/scsi/aacraid/linit.c   | 21 ++++++++++++++-------
 2 files changed, 21 insertions(+), 7 deletions(-)

drivers/scsi/aacraid/aacraid.h +7 -0

index 3473668..4b669ef 100644
@@ -94,6 +94,13 @@ enum {
 #define aac_phys_to_logical(x)  ((x)+1)
 #define aac_logical_to_phys(x)  ((x)?(x)-1:0)
 
+/*
+ * These macros are for keeping track of
+ * character device state.
+ */
+#define AAC_CHARDEV_UNREGISTERED	(-1)
+#define AAC_CHARDEV_NEEDS_REINIT	(-2)
+
 /* #define AAC_DETAILED_STATUS_INFO */
 
 struct diskparm

drivers/scsi/aacraid/linit.c +14 -7

index 27b3fcd..057c07c 100644
@@ -80,7 +80,7 @@ MODULE_VERSION(AAC_DRIVER_FULL_VERSION);
 
 static DEFINE_MUTEX(aac_mutex);
 static LIST_HEAD(aac_devices);
-static int aac_cfg_major = -1;
+static int aac_cfg_major = AAC_CHARDEV_UNREGISTERED;
 char aac_driver_version[] = AAC_DRIVER_FULL_VERSION;
 
 /*

@@ -1125,6 +1125,13 @@ static void __aac_shutdown(struct aac_dev * aac)
 	else if (aac->max_msix > 1)
 		pci_disable_msix(aac->pdev);
 }
+static void aac_init_char(void)
+{
+	aac_cfg_major = register_chrdev(0, "aac", &aac_cfg_fops);
+	if (aac_cfg_major < 0) {
+		pr_err("aacraid: unable to register \"aac\" device.\n");
+	}
+}
 
 static int aac_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
 {

@@ -1182,6 +1189,9 @@ static int aac_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
 	shost->max_cmd_len = 16;
 	shost->use_cmd_list = 1;
 
+	if (aac_cfg_major == AAC_CHARDEV_NEEDS_REINIT)
+		aac_init_char();
+
 	aac = (struct aac_dev *)shost->hostdata;
 	aac->base_start = pci_resource_start(pdev, 0);
 	aac->scsi_host_ptr = shost;

@@ -1519,7 +1529,7 @@ static void aac_remove_one(struct pci_dev *pdev)
 	pci_disable_device(pdev);
 	if (list_empty(&aac_devices)) {
 		unregister_chrdev(aac_cfg_major, "aac");
-		aac_cfg_major = -1;
+		aac_cfg_major = AAC_CHARDEV_NEEDS_REINIT;
 	}
 }
 

@@ -1681,11 +1691,8 @@ static int __init aac_init(void)
 	if (error < 0)
 		return error;
 
-	aac_cfg_major = register_chrdev( 0, "aac", &aac_cfg_fops);
-	if (aac_cfg_major < 0) {
-		printk(KERN_WARNING
-			"aacraid: unable to register \"aac\" device.\n");
-	}
+	aac_init_char();
+
 
 	return 0;
 }

Signature · 1 line

1.9.1

From: Raghava Aditya Renukunta <[email protected]>

During EEH PCI hotplug activity kernel unloads and loads the driver, causing character device to be unregistered(aac_remove_one).When the driver is loaded back using aac_probe_one the character device needs to be registered again for the AIF management tools to work.

Fixed by adding code to register character device in aac_probe_one if it is unregistered in aac_remove_one.

Changes in V2:
Added macros to track character device state

Changes in V3:
None

Signed-off-by Raghava Aditya Renukunta <[email protected]>

Reviewed-by Shane Seymour <[email protected]>

---
 drivers/scsi/aacraid/aacraid.h |  7 +++++++
 drivers/scsi/aacraid/linit.c   | 21 ++++++++++++++-------
 2 files changed, 21 insertions(+), 7 deletions(-)

drivers/scsi/aacraid/aacraid.h +7 -0

index 3473668..4b669ef 100644
@@ -94,6 +94,13 @@ enum {
 #define aac_phys_to_logical(x)  ((x)+1)
 #define aac_logical_to_phys(x)  ((x)?(x)-1:0)
 
+/*
+ * These macros are for keeping track of
+ * character device state.
+ */
+#define AAC_CHARDEV_UNREGISTERED	(-1)
+#define AAC_CHARDEV_NEEDS_REINIT	(-2)
+
 /* #define AAC_DETAILED_STATUS_INFO */
 
 struct diskparm

drivers/scsi/aacraid/linit.c +14 -7

index 27b3fcd..057c07c 100644
@@ -80,7 +80,7 @@ MODULE_VERSION(AAC_DRIVER_FULL_VERSION);
 
 static DEFINE_MUTEX(aac_mutex);
 static LIST_HEAD(aac_devices);
-static int aac_cfg_major = -1;
+static int aac_cfg_major = AAC_CHARDEV_UNREGISTERED;
 char aac_driver_version[] = AAC_DRIVER_FULL_VERSION;
 
 /*

@@ -1125,6 +1125,13 @@ static void __aac_shutdown(struct aac_dev * aac)
 	else if (aac->max_msix > 1)
 		pci_disable_msix(aac->pdev);
 }
+static void aac_init_char(void)
+{
+	aac_cfg_major = register_chrdev(0, "aac", &aac_cfg_fops);
+	if (aac_cfg_major < 0) {
+		pr_err("aacraid: unable to register \"aac\" device.\n");
+	}
+}
 
 static int aac_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
 {

@@ -1182,6 +1189,9 @@ static int aac_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
 	shost->max_cmd_len = 16;
 	shost->use_cmd_list = 1;
 
+	if (aac_cfg_major == AAC_CHARDEV_NEEDS_REINIT)
+		aac_init_char();
+
 	aac = (struct aac_dev *)shost->hostdata;
 	aac->base_start = pci_resource_start(pdev, 0);
 	aac->scsi_host_ptr = shost;

@@ -1519,7 +1529,7 @@ static void aac_remove_one(struct pci_dev *pdev)
 	pci_disable_device(pdev);
 	if (list_empty(&aac_devices)) {
 		unregister_chrdev(aac_cfg_major, "aac");
-		aac_cfg_major = -1;
+		aac_cfg_major = AAC_CHARDEV_NEEDS_REINIT;
 	}
 }
 

@@ -1681,11 +1691,8 @@ static int __init aac_init(void)
 	if (error < 0)
 		return error;
 
-	aac_cfg_major = register_chrdev( 0, "aac", &aac_cfg_fops);
-	if (aac_cfg_major < 0) {
-		printk(KERN_WARNING
-			"aacraid: unable to register \"aac\" device.\n");
-	}
+	aac_init_char();
+
 
 	return 0;
 }

-----Original Message-----
From: Tomas Henzl [mailto:[email protected]]
Sent: Wednesday, January 20, 2016 5:41 AM
To: Raghava Aditya Renukunta; [email protected]; [email protected]; [email protected]
Cc: Mahesh Rajashekhara; Murthy Bhat; Gana Sridaran; aacraid@pmc- sierra.com; Scott Benesh; [email protected]; [email protected]; zzzDavid Carroll
Subject: Re: [PATCH V3 8/9] aacraid: Fix character device re-initialization

Quoted 10 lines · Raghava Aditya Renukunta

From: Raghava Aditya Renukunta <[email protected]>

During EEH PCI hotplug activity kernel unloads and loads the driver, causing character device to be unregistered(aac_remove_one).When the driver is loaded back using aac_probe_one the character device needs to be registered again for the AIF management tools to work.

Fixed by adding code to register character device in aac_probe_one if it is unregistered in aac_remove_one.

Quoted 7 lines

Changes in V2:
Added macros to track character device state

Changes in V3:
None

Signed-off-by Raghava Aditya Renukunta

<[email protected]>

Quoted 1 line

Reviewed-by Shane Seymour <[email protected]>

Hi Raghava,
when aacraid is loaded (modprobe) without an controller attached to the system
the driver loads and creates the character device. Later when you hotplug a device and remove again we see the driver loaded but now without the char device. I'd prefer consistency here - either create the char device when the first controller is probed (preferred) or do not remove it until the driver exits.
This is not a nack, just a wish that you changed it in next series.

--tm

drivers/scsi/aacraid/linit.c static void __aac_shutdown(struct aac_dev *

Quoted 37 lines

---
 drivers/scsi/aacraid/aacraid.h |  7 +++++++
 drivers/scsi/aacraid/linit.c   | 21 ++++++++++++++-------
 2 files changed, 21 insertions(+), 7 deletions(-)

drivers/scsi/aacraid/aacraid.h +7 -0

index 3473668..4b669ef 100644
@@ -94,6 +94,13 @@ enum {
 #define aac_phys_to_logical(x)  ((x)+1)
 #define aac_logical_to_phys(x)  ((x)?(x)-1:0)
 
+/*
+ * These macros are for keeping track of
+ * character device state.
+ */
+#define AAC_CHARDEV_UNREGISTERED	(-1)
+#define AAC_CHARDEV_NEEDS_REINIT	(-2)
+
 /* #define AAC_DETAILED_STATUS_INFO */
 
 struct diskparm

drivers/scsi/aacraid/linit.c +1 -1

index 27b3fcd..057c07c 100644
@@ -80,7 +80,7 @@ MODULE_VERSION(AAC_DRIVER_FULL_VERSION);
 
 static DEFINE_MUTEX(aac_mutex);
 static LIST_HEAD(aac_devices);
-static int aac_cfg_major = -1;
+static int aac_cfg_major = AAC_CHARDEV_UNREGISTERED;
 char aac_driver_version[] = AAC_DRIVER_FULL_VERSION;
 
 /*

@@ -1125,6 +1125,13 @@ static void __aac_shutdown(struct aac_dev *

aac)

drivers/scsi/aacraid/linit.c static void __aac_shutdown(struct aac_dev * aac)

Quoted 12 lines

drivers/scsi/aacraid/linit.c +7 -0

 	else if (aac->max_msix > 1)
 		pci_disable_msix(aac->pdev);
 }
+static void aac_init_char(void)
+{
+	aac_cfg_major = register_chrdev(0, "aac", &aac_cfg_fops);
+	if (aac_cfg_major < 0) {
+		pr_err("aacraid: unable to register \"aac\" device.\n");
+	}
+}
 
 static int aac_probe_one(struct pci_dev *pdev, const struct pci_device_id

*id)

drivers/scsi/aacraid/linit.c static int aac_probe_one(struct pci_dev *pdev,

Quoted 2 lines

drivers/scsi/aacraid/linit.c +0 -0

 {

@@ -1182,6 +1189,9 @@ static int aac_probe_one(struct pci_dev *pdev,

const struct pci_device_id *id)

drivers/scsi/aacraid/linit.c static void aac_remove_one(struct pci_dev

Quoted 10 lines

drivers/scsi/aacraid/linit.c +3 -0

 	shost->max_cmd_len = 16;
 	shost->use_cmd_list = 1;
 
+	if (aac_cfg_major == AAC_CHARDEV_NEEDS_REINIT)
+		aac_init_char();
+
 	aac = (struct aac_dev *)shost->hostdata;
 	aac->base_start = pci_resource_start(pdev, 0);
 	aac->scsi_host_ptr = shost;

@@ -1519,7 +1529,7 @@ static void aac_remove_one(struct pci_dev

*pdev)

Quoted 22 lines

drivers/scsi/aacraid/linit.c +3 -6

 	pci_disable_device(pdev);
 	if (list_empty(&aac_devices)) {
 		unregister_chrdev(aac_cfg_major, "aac");
-		aac_cfg_major = -1;
+		aac_cfg_major = AAC_CHARDEV_NEEDS_REINIT;
 	}
 }
 

@@ -1681,11 +1691,8 @@ static int __init aac_init(void)
 	if (error < 0)
 		return error;
 
-	aac_cfg_major = register_chrdev( 0, "aac", &aac_cfg_fops);
-	if (aac_cfg_major < 0) {
-		printk(KERN_WARNING
-			"aacraid: unable to register \"aac\" device.\n");
-	}
+	aac_init_char();
+
 
 	return 0;
 }

Hello Tomas,

Quoted 40 lines

-----Original Message-----
From: Tomas Henzl [mailto:[email protected]]
Sent: Wednesday, January 20, 2016 5:41 AM
To: Raghava Aditya Renukunta; [email protected]; [email protected]; [email protected]
Cc: Mahesh Rajashekhara; Murthy Bhat; Gana Sridaran; aacraid@pmc- sierra.com; Scott Benesh; [email protected]; [email protected]; zzzDavid Carroll
Subject: Re: [PATCH V3 8/9] aacraid: Fix character device re-initialization

Quoted 10 lines · Raghava Aditya Renukunta

From: Raghava Aditya Renukunta <[email protected]>

During EEH PCI hotplug activity kernel unloads and loads the driver, causing character device to be unregistered(aac_remove_one).When the driver is loaded back using aac_probe_one the character device needs to be registered again for the AIF management tools to work.

Fixed by adding code to register character device in aac_probe_one if it is unregistered in aac_remove_one.

Quoted 7 lines

Changes in V2:
Added macros to track character device state

Changes in V3:
None

Signed-off-by Raghava Aditya Renukunta

<[email protected]>

Quoted 1 line

Reviewed-by Shane Seymour <[email protected]>

Hi Raghava,
when aacraid is loaded (modprobe) without an controller attached to the system
the driver loads and creates the character device. Later when you hotplug a device and remove again we see the driver loaded but now without the char device. I'd prefer consistency here - either create the char device when the first controller is probed (preferred) or do not remove it until the driver exits.
This is not a nack, just a wish that you changed it in next series.

Quoted 1 line

--tm

Yes I will make the necessary changes so that character device is created when The controller is probed, and when the driver is removed (aac_remove_one),delete the character device. I will keep the character device during resume and suspend.

Do you want to do this in the next version of the patches or the next series of patches after this one is Accepted. ?

Regards,
Raghava Aditya

Quoted 85 lines

drivers/scsi/aacraid/linit.c static void __aac_shutdown(struct aac_dev *

Quoted 37 lines

---
 drivers/scsi/aacraid/aacraid.h |  7 +++++++
 drivers/scsi/aacraid/linit.c   | 21 ++++++++++++++-------
 2 files changed, 21 insertions(+), 7 deletions(-)

drivers/scsi/aacraid/aacraid.h +7 -0

index 3473668..4b669ef 100644
@@ -94,6 +94,13 @@ enum {
 #define aac_phys_to_logical(x)  ((x)+1)
 #define aac_logical_to_phys(x)  ((x)?(x)-1:0)
 
+/*
+ * These macros are for keeping track of
+ * character device state.
+ */
+#define AAC_CHARDEV_UNREGISTERED	(-1)
+#define AAC_CHARDEV_NEEDS_REINIT	(-2)
+
 /* #define AAC_DETAILED_STATUS_INFO */
 
 struct diskparm

drivers/scsi/aacraid/linit.c +1 -1

index 27b3fcd..057c07c 100644
@@ -80,7 +80,7 @@ MODULE_VERSION(AAC_DRIVER_FULL_VERSION);
 
 static DEFINE_MUTEX(aac_mutex);
 static LIST_HEAD(aac_devices);
-static int aac_cfg_major = -1;
+static int aac_cfg_major = AAC_CHARDEV_UNREGISTERED;
 char aac_driver_version[] = AAC_DRIVER_FULL_VERSION;
 
 /*

@@ -1125,6 +1125,13 @@ static void __aac_shutdown(struct aac_dev *

aac)

drivers/scsi/aacraid/linit.c static void __aac_shutdown(struct aac_dev * aac)

Quoted 12 lines

drivers/scsi/aacraid/linit.c +7 -0

 	else if (aac->max_msix > 1)
 		pci_disable_msix(aac->pdev);
 }
+static void aac_init_char(void)
+{
+	aac_cfg_major = register_chrdev(0, "aac", &aac_cfg_fops);
+	if (aac_cfg_major < 0) {
+		pr_err("aacraid: unable to register \"aac\" device.\n");
+	}
+}
 
 static int aac_probe_one(struct pci_dev *pdev, const struct pci_device_id

*id)

drivers/scsi/aacraid/linit.c static int aac_probe_one(struct pci_dev *pdev,

Quoted 2 lines

drivers/scsi/aacraid/linit.c +0 -0

 {

@@ -1182,6 +1189,9 @@ static int aac_probe_one(struct pci_dev *pdev,

const struct pci_device_id *id)

drivers/scsi/aacraid/linit.c static void aac_remove_one(struct pci_dev

Quoted 10 lines

drivers/scsi/aacraid/linit.c +3 -0

 	shost->max_cmd_len = 16;
 	shost->use_cmd_list = 1;
 
+	if (aac_cfg_major == AAC_CHARDEV_NEEDS_REINIT)
+		aac_init_char();
+
 	aac = (struct aac_dev *)shost->hostdata;
 	aac->base_start = pci_resource_start(pdev, 0);
 	aac->scsi_host_ptr = shost;

@@ -1519,7 +1529,7 @@ static void aac_remove_one(struct pci_dev

*pdev)

Quoted 20 lines

drivers/scsi/aacraid/linit.c +3 -6

 	pci_disable_device(pdev);
 	if (list_empty(&aac_devices)) {
 		unregister_chrdev(aac_cfg_major, "aac");
-		aac_cfg_major = -1;
+		aac_cfg_major = AAC_CHARDEV_NEEDS_REINIT;
 	}
 }
 

@@ -1681,11 +1691,8 @@ static int __init aac_init(void)
 	if (error < 0)
 		return error;
 
-	aac_cfg_major = register_chrdev( 0, "aac", &aac_cfg_fops);
-	if (aac_cfg_major < 0) {
-		printk(KERN_WARNING
-			"aacraid: unable to register \"aac\" device.\n");
-	}
+	aac_init_char();
+
 

Quoted 2 lines

drivers/scsi/aacraid/linit.c static int __init aac_init(void) · line 1698

Quoted 2 lines

drivers/scsi/aacraid/linit.c +0 -0

 	return 0;
 }

--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

-----Original Message-----
From: Tomas Henzl [mailto:[email protected]]
Sent: Friday, January 22, 2016 5:08 AM
To: Raghava Aditya Renukunta; [email protected]; [email protected]; [email protected]
Cc: Mahesh Rajashekhara; Murthy Bhat; Gana Sridaran; aacraid@pmc- sierra.com; Scott Benesh; [email protected]; [email protected]; zzzDavid Carroll
Subject: Re: [PATCH V3 8/9] aacraid: Fix character device re-initialization

Quoted 6 lines · Raghava Aditya Renukunta

Hello Tomas,

Quoted 4 lines

-----Original Message-----
From: Tomas Henzl [mailto:[email protected]]
Sent: Wednesday, January 20, 2016 5:41 AM
To: Raghava Aditya Renukunta;

[email protected];

Quoted 3 lines

Quoted 3 lines

[email protected]; [email protected]
Cc: Mahesh Rajashekhara; Murthy Bhat; Gana Sridaran; aacraid@pmc- sierra.com; Scott Benesh; [email protected];

[email protected];

Quoted 5 lines

Quoted 5 lines

zzzDavid Carroll
Subject: Re: [PATCH V3 8/9] aacraid: Fix character device re-initialization

Quoted 1 line · Raghava Aditya Renukunta

From: Raghava Aditya Renukunta

<[email protected]>

Quoted 3 lines

Quoted 3 lines

Quoted 3 lines

During EEH PCI hotplug activity kernel unloads and loads the driver, causing character device to be unregistered(aac_remove_one).When

the

Quoted 12 lines

Quoted 12 lines

Quoted 12 lines

driver is loaded back using aac_probe_one the character device needs to be registered again for the AIF management tools to work.

Fixed by adding code to register character device in aac_probe_one if it is unregistered in aac_remove_one.

Changes in V2:
Added macros to track character device state

Changes in V3:
None

Quoted 7 lines

Quoted 7 lines

Quoted 1 line

Signed-off-by Raghava Aditya Renukunta

<[email protected]>

Quoted 1 line

Reviewed-by Shane Seymour <[email protected]>

Hi Raghava,
when aacraid is loaded (modprobe) without an controller attached to the system
the driver loads and creates the character device. Later when you hotplug

a

Quoted 9 lines

Quoted 7 lines

device and remove again we see the driver loaded but now without the char device. I'd prefer consistency here - either create the char device when the first controller is probed (preferred) or do not remove it until the driver exits.
This is not a nack, just a wish that you changed it in next series.

--tm

Yes I will make the necessary changes so that character device is created

when

Quoted 1 line

The controller is probed, and when the driver is removed

(aac_remove_one),delete

Quoted 1 line

the character device. I will keep the character device during resume and

suspend.

Quoted 2 lines

Do you want to do this in the next version of the patches or the next series

of patches after this one is

Quoted 1 line

Accepted. ?

sure, next series is fine, as I wrote already

Quoted 54 lines

Regards,
Raghava Aditya

Quoted 49 lines

drivers/scsi/aacraid/linit.c static void __aac_shutdown(struct aac_dev *

Quoted 37 lines

---
 drivers/scsi/aacraid/aacraid.h |  7 +++++++
 drivers/scsi/aacraid/linit.c   | 21 ++++++++++++++-------
 2 files changed, 21 insertions(+), 7 deletions(-)

drivers/scsi/aacraid/aacraid.h +7 -0

index 3473668..4b669ef 100644
@@ -94,6 +94,13 @@ enum {
 #define aac_phys_to_logical(x)  ((x)+1)
 #define aac_logical_to_phys(x)  ((x)?(x)-1:0)
 
+/*
+ * These macros are for keeping track of
+ * character device state.
+ */
+#define AAC_CHARDEV_UNREGISTERED	(-1)
+#define AAC_CHARDEV_NEEDS_REINIT	(-2)
+
 /* #define AAC_DETAILED_STATUS_INFO */
 
 struct diskparm

drivers/scsi/aacraid/linit.c +1 -1

index 27b3fcd..057c07c 100644
@@ -80,7 +80,7 @@ MODULE_VERSION(AAC_DRIVER_FULL_VERSION);
 
 static DEFINE_MUTEX(aac_mutex);
 static LIST_HEAD(aac_devices);
-static int aac_cfg_major = -1;
+static int aac_cfg_major = AAC_CHARDEV_UNREGISTERED;
 char aac_driver_version[] = AAC_DRIVER_FULL_VERSION;
 
 /*

@@ -1125,6 +1125,13 @@ static void __aac_shutdown(struct aac_dev *

aac)

Quoted 11 lines

drivers/scsi/aacraid/linit.c +7 -0

 	else if (aac->max_msix > 1)
 		pci_disable_msix(aac->pdev);
 }
+static void aac_init_char(void)
+{
+	aac_cfg_major = register_chrdev(0, "aac", &aac_cfg_fops);
+	if (aac_cfg_major < 0) {
+		pr_err("aacraid: unable to register \"aac\" device.\n");
+	}
+}
 

Quoted 1 line

Quoted 1 line

drivers/scsi/aacraid/linit.c static void __aac_shutdown(struct aac_dev * · line 1136

Quoted 1 line

drivers/scsi/aacraid/linit.c +0 -0

 static int aac_probe_one(struct pci_dev *pdev, const struct

pci_device_id

Quoted 41 lines

Quoted 35 lines

*id)

drivers/scsi/aacraid/linit.c static int aac_probe_one(struct pci_dev *pdev,

Quoted 2 lines

drivers/scsi/aacraid/linit.c +0 -0

 {

@@ -1182,6 +1189,9 @@ static int aac_probe_one(struct pci_dev *pdev,

const struct pci_device_id *id)

drivers/scsi/aacraid/linit.c static void aac_remove_one(struct pci_dev

Quoted 10 lines

drivers/scsi/aacraid/linit.c +3 -0

 	shost->max_cmd_len = 16;
 	shost->use_cmd_list = 1;
 
+	if (aac_cfg_major == AAC_CHARDEV_NEEDS_REINIT)
+		aac_init_char();
+
 	aac = (struct aac_dev *)shost->hostdata;
 	aac->base_start = pci_resource_start(pdev, 0);
 	aac->scsi_host_ptr = shost;

@@ -1519,7 +1529,7 @@ static void aac_remove_one(struct pci_dev

*pdev)

Quoted 20 lines

drivers/scsi/aacraid/linit.c +3 -6

 	pci_disable_device(pdev);
 	if (list_empty(&aac_devices)) {
 		unregister_chrdev(aac_cfg_major, "aac");
-		aac_cfg_major = -1;
+		aac_cfg_major = AAC_CHARDEV_NEEDS_REINIT;
 	}
 }
 

@@ -1681,11 +1691,8 @@ static int __init aac_init(void)
 	if (error < 0)
 		return error;
 
-	aac_cfg_major = register_chrdev( 0, "aac", &aac_cfg_fops);
-	if (aac_cfg_major < 0) {
-		printk(KERN_WARNING
-			"aacraid: unable to register \"aac\" device.\n");
-	}
+	aac_init_char();
+
 

Quoted 2 lines

drivers/scsi/aacraid/linit.c static int __init aac_init(void) · line 1698

Quoted 2 lines

drivers/scsi/aacraid/linit.c +0 -0

 	return 0;
 }

--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html