be2iscsi: Fix to handle request_irq failure
Subsystems (2)
PATCH 8/20 be2iscsi: Fix to handle request_irq failure
This patch handles request_irq failures by properly cleaning up
--- drivers/scsi/be2iscsi/be_main.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-)
drivers/scsi/be2iscsi/be_main.c +19 -1
@@ -616,7 +616,7 @@ static int beiscsi_init_irqs(struct beiscsi_hba *phba)struct pci_dev *pcidev = phba->pcidev;struct hwi_controller *phwi_ctrlr;struct hwi_context_memory *phwi_context; -int ret, msix_vec, i =0 ; +int ret, msix_vec, i, j;char desc[32 ]; phwi_ctrlr = phba->phwi_ctrlr;
@@ -628,10 +628,24 @@ static int beiscsi_init_irqs(struct beiscsi_hba *phba) msix_vec = phba->msix_entries[i].vector; ret =request_irq (msix_vec, be_isr_msix,0 , desc, &phwi_context->be_eq[i]); +if (ret) { +shost_printk (KERN_ERR , phba->shost, +"beiscsi_init_irqs-Failed to" +"register msix for i = %d\n" , i); +if (!i) +return ret; + goto free_msix_irqs; + } } msix_vec = phba->msix_entries[i].vector; ret =request_irq (msix_vec, be_isr_mcc,0 ,"beiscsi_msix_mcc" , &phwi_context->be_eq[i]); +if (ret) { +shost_printk (KERN_ERR , phba->shost,"beiscsi_init_irqs-" +"Failed to register beiscsi_msix_mcc\n" ); + goto free_msix_irqs; + } + }else { ret =request_irq (pcidev->irq, be_isr,IRQF_SHARED ,"beiscsi" , phba);
@@ -642,6 +656,10 @@ static int beiscsi_init_irqs(struct beiscsi_hba *phba) } }return 0 ; +free_msix_irqs: +for (j = i; j ==0 ; j++) +free_irq (msix_vec, &phwi_context->be_eq[j]); +return ret; } static void hwi_ring_cq_db(struct beiscsi_hba *phba,
Signature · 1 line
1.6.5.2
Quoted 26 lines · Jayamohan Kallickal
This patch handles
request_irqfailures by properly cleaning upSigned-off-by Jayamohan Kallickal<[email protected]>--- drivers/scsi/be2iscsi/be_main.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-)drivers/scsi/be2iscsi/be_main.c +3
-1@@ -616,7 +616,7 @@ static int beiscsi_init_irqs(struct beiscsi_hba *phba)struct pci_dev *pcidev = phba->pcidev;struct hwi_controller *phwi_ctrlr;struct hwi_context_memory *phwi_context; -int ret, msix_vec, i =0 ; +int ret, msix_vec, i, j;char desc[32 ]; phwi_ctrlr = phba->phwi_ctrlr;@@ -628,10 +628,24 @@ static int beiscsi_init_irqs(struct beiscsi_hba *phba) msix_vec = phba->msix_entries[i].vector; ret =request_irq (msix_vec, be_isr_msix,0 , desc, &phwi_context->be_eq[i]); +if (ret) { + shost_printk(KERN_ERR, phba->shost,
drivers/scsi/be2iscsi/be_main.c static int beiscsi_init_irqs(struct beiscsi_hba *phba) · line 642
Quoted 10 lines
drivers/scsi/be2iscsi/be_main.c +6
-0+"beiscsi_init_irqs-Failed to" + "register msix for i = %d\n", i); +if (!i) +return ret; + goto free_msix_irqs; + } } msix_vec = phba->msix_entries[i].vector; ret =request_irq (msix_vec, be_isr_mcc,0 ,"beiscsi_msix_mcc" , &phwi_context->be_eq[i]);
Is that loop and indexing right if num_online_cpus == MAX_CPUS. It looks like you would have only MAX_CPUS - 1 where other times you would have num_online_cpus. Is that what you wanted or did you want to allocate the be_eq array MAX_CPUS + 1 and then set phba->num_cpus = MAX_CPUS in the case they are equal or greater than.
Quoted 10 lines
drivers/scsi/be2iscsi/be_main.c +6
-0+if (ret) { +shost_printk (KERN_ERR , phba->shost,"beiscsi_init_irqs-" +"Failed to register beiscsi_msix_mcc\n" ); + goto free_msix_irqs; + } + }else { ret =request_irq (pcidev->irq, be_isr,IRQF_SHARED ,"beiscsi" , phba);
drivers/scsi/be2iscsi/be_main.c static int beiscsi_init_irqs(struct beiscsi_hba *phba) · line 660
Quoted 5 lines
drivers/scsi/be2iscsi/be_main.c +2
-0@@ -642,6 +656,10 @@ static int beiscsi_init_irqs(struct beiscsi_hba *phba) } }return 0 ; +free_msix_irqs: +for (j = i; j ==0 ; j++)
I think that should be j = i - 1, because be_eq[i] was the one failed to get setup.
Quoted 5 lines
drivers/scsi/be2iscsi/be_main.c +2
-0+free_irq (msix_vec,&phwi_context->be_eq[j]); +return ret; } static void hwi_ring_cq_db(struct beiscsi_hba *phba,
_____
From: Mike Christie [mailto:[email protected]]
To: Jayamohan Kalickal [mailto:[email protected]]
Cc: [email protected], [email protected]
Sent: Tue, 13 Jul 2010 00:46:57 -0700
Subject: Re: [PATCH 08/20] be2iscsi: Fix to handle request_irq failure
Quoted 26 lines · Jayamohan Kallickal
This patch handles
request_irqfailures by properly cleaning upSigned-off-by Jayamohan Kallickal<[email protected]>--- drivers/scsi/be2iscsi/be_main.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-)drivers/scsi/be2iscsi/be_main.c +3
-1@@ -616,7 +616,7 @@ static int beiscsi_init_irqs(struct beiscsi_hba *phba)struct pci_dev *pcidev = phba->pcidev;struct hwi_controller *phwi_ctrlr;struct hwi_context_memory *phwi_context; -int ret, msix_vec, i =0 ; +int ret, msix_vec, i, j;char desc[32 ]; phwi_ctrlr = phba->phwi_ctrlr;@@ -628,10 +628,24 @@ static int beiscsi_init_irqs(struct beiscsi_hba *phba) msix_vec = phba->msix_entries[i].vector; ret =request_irq (msix_vec, be_isr_msix,0 , desc, &phwi_context->be_eq[i]); +if (ret) { + shost_printk(KERN_ERR, phba->shost,
drivers/scsi/be2iscsi/be_main.c static int beiscsi_init_irqs(struct beiscsi_hba *phba) · line 642
Quoted 10 lines
drivers/scsi/be2iscsi/be_main.c +6
-0+"beiscsi_init_irqs-Failed to" + "register msix for i = %d\n", i); +if (!i) +return ret; + goto free_msix_irqs; + } } msix_vec = phba->msix_entries[i].vector; ret =request_irq (msix_vec, be_isr_mcc,0 ,"beiscsi_msix_mcc" , &phwi_context->be_eq[i]);
Is that loop and indexing right if num_online_cpus == MAX_CPUS. It looks like you would have only MAX_CPUS - 1 where other times you would have num_online_cpus. Is that what you wanted or did you want to allocate the be_eq array MAX_CPUS + 1 and then set phba->num_cpus = MAX_CPUS in the case they are equal or greater than.
Yes, that's what I wanted. I want the num_cpus to not exceed MAX_CPUS-1.
Quoted 10 lines
drivers/scsi/be2iscsi/be_main.c +6
-0+if (ret) { +shost_printk (KERN_ERR , phba->shost,"beiscsi_init_irqs-" +"Failed to register beiscsi_msix_mcc\n" ); + goto free_msix_irqs; + } + }else { ret =request_irq (pcidev->irq, be_isr,IRQF_SHARED ,"beiscsi" , phba);
drivers/scsi/be2iscsi/be_main.c static int beiscsi_init_irqs(struct beiscsi_hba *phba) · line 660
Quoted 5 lines
drivers/scsi/be2iscsi/be_main.c +2
-0@@ -642,6 +656,10 @@ static int beiscsi_init_irqs(struct beiscsi_hba *phba) } }return 0 ; +free_msix_irqs: +for (j = i; j ==0 ; j++)
I think that should be j = i - 1, because be_eq[i] was the one failed to get setup.
Agreed
drivers/scsi/be2iscsi/be_main.c static int beiscsi_init_irqs(struct beiscsi_hba *phba) · line 665
Quoted 5 lines
drivers/scsi/be2iscsi/be_main.c +2
-0+free_irq (msix_vec,&phwi_context->be_eq[j]); +return ret; } static void hwi_ring_cq_db(struct beiscsi_hba *phba,
___________________________________________________________________________________
This message, together with any attachment(s), contains confidential and proprietary information of ServerEngines Corporation and is intended only for the designated recipient(s) named above. Any unauthorized review, printing, retention, copying, disclosure or distribution is strictly prohibited. If you are not the intended recipient of this message, please immediately advise the sender by reply email message and delete all copies of this message and any attachment(s). Thank you.