Re: [PATCH 1/2] [SCSI] pm8001: Fix bogus interrupt state flag issue.
From: santosh prasad nayak
Date: Thu Mar 08 2012 - 15:48:44 EST
I did changes as per Mark's suggestion.
The following patch is only for review not a formal one.
After getting reviewed, I will send a formal patch
diff --git a/drivers/scsi/pm8001/pm8001_hwi.c b/drivers/scsi/pm8001/pm8001_hwi.c
index 3619f6e..9d82ee5 100644
--- a/drivers/scsi/pm8001/pm8001_hwi.c
+++ b/drivers/scsi/pm8001/pm8001_hwi.c
@@ -2093,6 +2093,7 @@ mpi_sata_completion(struct pm8001_hba_info
*pm8001_ha, void *piomb)
struct ata_task_resp *resp ;
u32 *sata_resp;
struct pm8001_device *pm8001_dev;
+ unsigned long flags;
psataPayload = (struct sata_completion_resp *)(piomb + 4);
status = le32_to_cpu(psataPayload->status);
@@ -2382,26 +2383,26 @@ mpi_sata_completion(struct pm8001_hba_info
*pm8001_ha, void *piomb)
ts->stat = SAS_DEV_NO_RESPONSE;
break;
}
- spin_lock_irq(&t->task_state_lock);
+ spin_lock_irqsave(&t->task_state_lock, flags);
t->task_state_flags &= ~SAS_TASK_STATE_PENDING;
t->task_state_flags &= ~SAS_TASK_AT_INITIATOR;
t->task_state_flags |= SAS_TASK_STATE_DONE;
if (unlikely((t->task_state_flags & SAS_TASK_STATE_ABORTED))) {
- spin_unlock_irq(&t->task_state_lock);
+ spin_unlock_irqrestore(&t->task_state_lock, flags);
PM8001_FAIL_DBG(pm8001_ha,
pm8001_printk("task 0x%p done with io_status 0x%x"
" resp 0x%x stat 0x%x but aborted by upper layer!\n",
t, status, ts->resp, ts->stat));
pm8001_ccb_task_free(pm8001_ha, t, ccb, tag);
} else if (t->uldd_task) {
- spin_unlock_irq(&t->task_state_lock);
+ spin_unlock_irqrestore(&t->task_state_lock, flags);
pm8001_ccb_task_free(pm8001_ha, t, ccb, tag);
mb();/* ditto */
spin_unlock_irq(&pm8001_ha->lock);
t->task_done(t);
spin_lock_irq(&pm8001_ha->lock);
} else if (!t->uldd_task) {
- spin_unlock_irq(&t->task_state_lock);
+ spin_unlock_irqrestore(&t->task_state_lock, flags);
pm8001_ccb_task_free(pm8001_ha, t, ccb, tag);
mb();/*ditto*/
spin_unlock_irq(&pm8001_ha->lock);
@@ -2423,6 +2424,7 @@ static void mpi_sata_event(struct
pm8001_hba_info *pm8001_ha , void *piomb)
u32 tag = le32_to_cpu(psataPayload->tag);
u32 port_id = le32_to_cpu(psataPayload->port_id);
u32 dev_id = le32_to_cpu(psataPayload->device_id);
+ unsigned long flags;
ccb = &pm8001_ha->ccb_info[tag];
t = ccb->task;
@@ -2593,26 +2595,26 @@ static void mpi_sata_event(struct
pm8001_hba_info *pm8001_ha , void *piomb)
ts->stat = SAS_OPEN_TO;
break;
}
- spin_lock_irq(&t->task_state_lock);
+ spin_lock_irqsave(&t->task_state_lock, flags);
t->task_state_flags &= ~SAS_TASK_STATE_PENDING;
t->task_state_flags &= ~SAS_TASK_AT_INITIATOR;
t->task_state_flags |= SAS_TASK_STATE_DONE;
if (unlikely((t->task_state_flags & SAS_TASK_STATE_ABORTED))) {
- spin_unlock_irq(&t->task_state_lock);
+ spin_unlock_irqrestore(&t->task_state_lock, flags);
PM8001_FAIL_DBG(pm8001_ha,
pm8001_printk("task 0x%p done with io_status 0x%x"
" resp 0x%x stat 0x%x but aborted by upper layer!\n",
t, event, ts->resp, ts->stat));
pm8001_ccb_task_free(pm8001_ha, t, ccb, tag);
} else if (t->uldd_task) {
- spin_unlock_irq(&t->task_state_lock);
+ spin_unlock_irqrestore(&t->task_state_lock, flags);
pm8001_ccb_task_free(pm8001_ha, t, ccb, tag);
mb();/* ditto */
spin_unlock_irq(&pm8001_ha->lock);
t->task_done(t);
spin_lock_irq(&pm8001_ha->lock);
} else if (!t->uldd_task) {
- spin_unlock_irq(&t->task_state_lock);
+ spin_unlock_irqrestore(&t->task_state_lock, flags);
pm8001_ccb_task_free(pm8001_ha, t, ccb, tag);
mb();/*ditto*/
spin_unlock_irq(&pm8001_ha->lock);
Regards
Santosh
On Thu, Mar 8, 2012 at 10:41 PM, Mark Salyzyn <mark_salyzyn@xxxxxxxxxxx> wrote:
> Comments embedded
>
> On Mar 8, 2012, at 11:50 AM, santosh prasad nayak wrote:
>
>> Hi Mark,
>>
>> Thanks for your review.
>>
>> Few queries:
>>
>> 1. Similar changes have been made in mpi_sata_completion() surrounding
>> spin_*lock_irq*(&t->task->state_lock)
>> Should those changes also need to revert back ?
>
> I was talking generically, yes, in both set of functions, everything associated with the task_state_lock. The change as described needs to be applied to both sets of functions.
>
>>> The change you did was not inert, and result in the IRQ being disabled upon exit should a
>>> SAS_TASK_STATE_ABORTED task state condition occur then following block will enable IRQ.
>>
>> 2. I could not get this point.
>> If "SAS_TASK_STATE_ABORTED" task state condition occurs then following
>> block will enable IRQ.
>>
>> if (unlikely((t->task_state_flags & SAS_TASK_STATE_ABORTED))) {
>> spin_unlock_irq(&t->task_state_lock);
>> // HERE IRQ will be enabled.
>> .......
>> pm8001_ccb_task_free(pm8001_ha, t, ccb, tag);
>> }
>
> Exactly, the IRQ is enabled, then the routine exits. All other paths leave the IRQ disabled (with a spin_lock_irq()).
>
>> 3. How bad will be "spin_lock_irq / spin_unlock_irq" in this case compared to
>> "spin_lock_irqsave / spin_unlock_irqrestore "
>
> Efficiency is not so much the requirement, but correctness. Yes, a spin_unlock(&t->task_state_lock) will do, but the 'world' likes to see the balance of flag save/restore, one should NOT make the assumption the interrupt is enabled or disabled upon entry, and should preserve such upon exit.
>
> Given this statement, perhaps for the case of the hacks surrounding the completion handler calls and host locks, one would do a save of the irq, unlock with irq enabled, lock, and then restore it back to the value upon entry. This is balanced. Your changes make the (correct) assumption that the irq is disabled upon entry. But pedantically incorrect, I'd take the extra steps, but I do not view that as a critical deficiency in your patch.
>
>> Regards
>> Santosh
>>
>>>
>>> I propose (annotated below) you leave the flags automatic variable, but uninitialized. The changes surrounding spin_*lock_irq*(&pm8001_ha->lock, flags) are OK, but revert back the changes surrounding the spin_*lock_irq*(&t->task->state_lock,flags) so that lock would be properly nested.
>>>
>>> To be pedantic, and to be more correct, this code should have spawned a work queue task to perform the t->task_done(t) operation in a separate thread rather than inline and precariously unlocked; but that would be beyond the scope of these changes and should be left for future work to decide if it is even necessary. Not sure how such a change would affect performance (using the work queue) ... so I am 'afraid' of pushing such a change in any case given the relatively reliable operation of this driver (and the dynamic nature of the changes Dan is making to the SATA side of things for instance ;-} ).
>>>
>>> I am sorry for taking so long to get to the task of reviewing this (and the previous) code. I look forward to your comments.
>>>
>>> Sincerely -- Mark Salyzyn
>>>
>>> On Feb 26, 2012, at 8:33 AM, santosh nayak wrote:
>>>
>>>> @@ -2207,7 +2206,6 @@ mpi_sata_completion(struct pm8001_hba_info *pm8001_ha, void *piomb)
>>>> static void mpi_sata_event(struct pm8001_hba_info *pm8001_ha , void *piomb)
>>>> {
>>>> struct sas_task *t;
>>>> - unsigned long flags = 0;
>>> MGS> unsigned long flags;
>>>> struct task_status_struct *ts;
>>>> struct pm8001_ccb_info *ccb;
>>>> struct pm8001_device *pm8001_dev;
>>>> @@ -2287,9 +2285,9 @@ static void mpi_sata_event(struct pm8001_hba_info *pm8001_ha , void *piomb)
>>>> ts->stat = SAS_QUEUE_FULL;
>>>> pm8001_ccb_task_free(pm8001_ha, t, ccb, tag);
>>>> mb();/*ditto*/
>>>> - spin_unlock_irqrestore(&pm8001_ha->lock, flags);
>>>> + spin_unlock_irq(&pm8001_ha->lock);
>>>> t->task_done(t);
>>>> - spin_lock_irqsave(&pm8001_ha->lock, flags);
>>>> + spin_lock_irq(&pm8001_ha->lock);
>>>> return;
>>>> }
>>>> break;
>>>> @@ -2387,31 +2385,31 @@ static void mpi_sata_event(struct pm8001_hba_info *pm8001_ha , void *piomb)
>>>> ts->stat = SAS_OPEN_TO;
>>>> break;
>>>> }
>>>> - spin_lock_irqsave(&t->task_state_lock, flags);
>>>> + spin_lock_irq(&t->task_state_lock);
>>> MGS> spin_lock_irqsave(&t->task_state_lock, flags);
>>>> t->task_state_flags &= ~SAS_TASK_STATE_PENDING;
>>>> t->task_state_flags &= ~SAS_TASK_AT_INITIATOR;
>>>> t->task_state_flags |= SAS_TASK_STATE_DONE;
>>>> if (unlikely((t->task_state_flags & SAS_TASK_STATE_ABORTED))) {
>>>> - spin_unlock_irqrestore(&t->task_state_lock, flags);
>>>> + spin_unlock_irq(&t->task_state_lock);
>>> MGS> spin_unlock_irqrestore(&t->task_state_lock, flags);
>>>> PM8001_FAIL_DBG(pm8001_ha,
>>>> pm8001_printk("task 0x%p done with io_status 0x%x"
>>>> " resp 0x%x stat 0x%x but aborted by upper layer!\n",
>>>> t, event, ts->resp, ts->stat));
>>>> pm8001_ccb_task_free(pm8001_ha, t, ccb, tag);
>>>> } else if (t->uldd_task) {
>>>> - spin_unlock_irqrestore(&t->task_state_lock, flags);
>>>> + spin_unlock_irq(&t->task_state_lock);
>>>> pm8001_ccb_task_free(pm8001_ha, t, ccb, tag);
>>>> mb();/* ditto */
>>>> - spin_unlock_irqrestore(&pm8001_ha->lock, flags);
>>>> + spin_unlock_irq(&pm8001_ha->lock);
>>>> t->task_done(t);
>>>> - spin_lock_irqsave(&pm8001_ha->lock, flags);
>>>> + spin_lock_irq(&pm8001_ha->lock);
>>>> } else if (!t->uldd_task) {
>>>> - spin_unlock_irqrestore(&t->task_state_lock, flags);
>>>> + spin_unlock_irq(&t->task_state_lock);
>>>> pm8001_ccb_task_free(pm8001_ha, t, ccb, tag);
>>>> mb();/*ditto*/
>>>> - spin_unlock_irqrestore(&pm8001_ha->lock, flags);
>>>> + spin_unlock_irq(&pm8001_ha->lock);
>>>> t->task_done(t);
>>>> - spin_lock_irqsave(&pm8001_ha->lock, flags);
>>>> + spin_lock_irq(&pm8001_ha->lock);
>>>> }
>>>> }
>
> --
> To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/