* [PATCH] scsi_error: disable eh_deadline if no host_reset_handler is set
@ 2013-12-12 11:08 Hannes Reinecke
2014-01-07 13:33 ` Ewan Milne
0 siblings, 1 reply; 4+ messages in thread
From: Hannes Reinecke @ 2013-12-12 11:08 UTC (permalink / raw)
To: James Bottomley; +Cc: linux-scsi, Hannes Reinecke, Ewan Milne
When the host template doesn't declare an eh_host_reset_handler
the eh_deadline mechanism is pointless and will set the
device to offline. So disable eh_deadline if no
eh_host_reset_handler is present.
Cc: Ewan Milne <emilne@redhat.com>
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
drivers/scsi/hosts.c | 2 +-
drivers/scsi/scsi_sysfs.c | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
index 6966def..351afa4 100644
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -396,7 +396,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
shost->unchecked_isa_dma = sht->unchecked_isa_dma;
shost->use_clustering = sht->use_clustering;
shost->ordered_tag = sht->ordered_tag;
- if (shost_eh_deadline == -1)
+ if (shost_eh_deadline == -1 || !sht->eh_host_reset_handler)
shost->eh_deadline = -1;
else if ((ulong) shost_eh_deadline * HZ > INT_MAX) {
shost_printk(KERN_WARNING, shost,
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index 9117d0b..7434e26 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -300,7 +300,9 @@ store_shost_eh_deadline(struct device *dev, struct device_attribute *attr,
int ret = -EINVAL;
unsigned long deadline, flags;
- if (shost->transportt && shost->transportt->eh_strategy_handler)
+ if (shost->transportt &&
+ (shost->transportt->eh_strategy_handler ||
+ !shost->transportt->eh_host_reset_handler))
return ret;
if (!strncmp(buf, "off", strlen("off")))
--
1.7.12.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] scsi_error: disable eh_deadline if no host_reset_handler is set
2013-12-12 11:08 [PATCH] scsi_error: disable eh_deadline if no host_reset_handler is set Hannes Reinecke
@ 2014-01-07 13:33 ` Ewan Milne
2014-01-17 15:04 ` Hannes Reinecke
0 siblings, 1 reply; 4+ messages in thread
From: Ewan Milne @ 2014-01-07 13:33 UTC (permalink / raw)
To: Hannes Reinecke; +Cc: James Bottomley, linux-scsi
On Thu, 2013-12-12 at 12:08 +0100, Hannes Reinecke wrote:
> When the host template doesn't declare an eh_host_reset_handler
> the eh_deadline mechanism is pointless and will set the
> device to offline. So disable eh_deadline if no
> eh_host_reset_handler is present.
>
> Cc: Ewan Milne <emilne@redhat.com>
> Signed-off-by: Hannes Reinecke <hare@suse.de>
> ---
> drivers/scsi/hosts.c | 2 +-
> drivers/scsi/scsi_sysfs.c | 4 +++-
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
> index 6966def..351afa4 100644
> --- a/drivers/scsi/hosts.c
> +++ b/drivers/scsi/hosts.c
> @@ -396,7 +396,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
> shost->unchecked_isa_dma = sht->unchecked_isa_dma;
> shost->use_clustering = sht->use_clustering;
> shost->ordered_tag = sht->ordered_tag;
> - if (shost_eh_deadline == -1)
> + if (shost_eh_deadline == -1 || !sht->eh_host_reset_handler)
> shost->eh_deadline = -1;
> else if ((ulong) shost_eh_deadline * HZ > INT_MAX) {
> shost_printk(KERN_WARNING, shost,
> diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
> index 9117d0b..7434e26 100644
> --- a/drivers/scsi/scsi_sysfs.c
> +++ b/drivers/scsi/scsi_sysfs.c
> @@ -300,7 +300,9 @@ store_shost_eh_deadline(struct device *dev, struct device_attribute *attr,
> int ret = -EINVAL;
> unsigned long deadline, flags;
>
> - if (shost->transportt && shost->transportt->eh_strategy_handler)
> + if (shost->transportt &&
> + (shost->transportt->eh_strategy_handler ||
> + !shost->transportt->eh_host_reset_handler))
I think this bit is supposed to be:
if ((shost->transportt &&
shost->transportt->eh_strategy_handler) ||
!shost->hostt->eh_host_reset_handler)
return ret;
because the field is in the scsi_host_template structure, right?
But, otherwise, this patch is necessary because some drivers don't
implement host reset (e.g. hpsa).
-Ewan
> return ret;
>
> if (!strncmp(buf, "off", strlen("off")))
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] scsi_error: disable eh_deadline if no host_reset_handler is set
2014-01-07 13:33 ` Ewan Milne
@ 2014-01-17 15:04 ` Hannes Reinecke
0 siblings, 0 replies; 4+ messages in thread
From: Hannes Reinecke @ 2014-01-17 15:04 UTC (permalink / raw)
To: emilne; +Cc: James Bottomley, linux-scsi
On 01/07/2014 02:33 PM, Ewan Milne wrote:
> On Thu, 2013-12-12 at 12:08 +0100, Hannes Reinecke wrote:
>> When the host template doesn't declare an eh_host_reset_handler
>> the eh_deadline mechanism is pointless and will set the
>> device to offline. So disable eh_deadline if no
>> eh_host_reset_handler is present.
>>
>> Cc: Ewan Milne <emilne@redhat.com>
>> Signed-off-by: Hannes Reinecke <hare@suse.de>
>> ---
>> drivers/scsi/hosts.c | 2 +-
>> drivers/scsi/scsi_sysfs.c | 4 +++-
>> 2 files changed, 4 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
>> index 6966def..351afa4 100644
>> --- a/drivers/scsi/hosts.c
>> +++ b/drivers/scsi/hosts.c
>> @@ -396,7 +396,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
>> shost->unchecked_isa_dma = sht->unchecked_isa_dma;
>> shost->use_clustering = sht->use_clustering;
>> shost->ordered_tag = sht->ordered_tag;
>> - if (shost_eh_deadline == -1)
>> + if (shost_eh_deadline == -1 || !sht->eh_host_reset_handler)
>> shost->eh_deadline = -1;
>> else if ((ulong) shost_eh_deadline * HZ > INT_MAX) {
>> shost_printk(KERN_WARNING, shost,
>> diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
>> index 9117d0b..7434e26 100644
>> --- a/drivers/scsi/scsi_sysfs.c
>> +++ b/drivers/scsi/scsi_sysfs.c
>> @@ -300,7 +300,9 @@ store_shost_eh_deadline(struct device *dev, struct device_attribute *attr,
>> int ret = -EINVAL;
>> unsigned long deadline, flags;
>>
>> - if (shost->transportt && shost->transportt->eh_strategy_handler)
>> + if (shost->transportt &&
>> + (shost->transportt->eh_strategy_handler ||
>> + !shost->transportt->eh_host_reset_handler))
>
> I think this bit is supposed to be:
>
> if ((shost->transportt &&
> shost->transportt->eh_strategy_handler) ||
> !shost->hostt->eh_host_reset_handler)
> return ret;
>
> because the field is in the scsi_host_template structure, right?
>
Right. Obviously.
I'll be sending an updated patch.
Cheers,
Hannes
--
Dr. Hannes Reinecke zSeries & Storage
hare@suse.de +49 911 74053 688
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg)
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] scsi_error: disable eh_deadline if no host_reset_handler is set
@ 2014-01-17 15:05 Hannes Reinecke
0 siblings, 0 replies; 4+ messages in thread
From: Hannes Reinecke @ 2014-01-17 15:05 UTC (permalink / raw)
To: James Bottomley; +Cc: linux-scsi, Hannes Reinecke, Ewan Milne
When the host template doesn't declare an eh_host_reset_handler
the eh_deadline mechanism is pointless and will set the
device to offline. So disable eh_deadline if no
eh_host_reset_handler is present.
Cc: Ewan Milne <emilne@redhat.com>
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
drivers/scsi/hosts.c | 2 +-
drivers/scsi/scsi_sysfs.c | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
index f28ea07..3cbb57a 100644
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -398,7 +398,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
shost->ordered_tag = sht->ordered_tag;
shost->no_write_same = sht->no_write_same;
- if (shost_eh_deadline == -1)
+ if (shost_eh_deadline == -1 || !sht->eh_host_reset_handler)
shost->eh_deadline = -1;
else if ((ulong) shost_eh_deadline * HZ > INT_MAX) {
shost_printk(KERN_WARNING, shost,
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index 9117d0b..f2151cd 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -300,7 +300,9 @@ store_shost_eh_deadline(struct device *dev, struct device_attribute *attr,
int ret = -EINVAL;
unsigned long deadline, flags;
- if (shost->transportt && shost->transportt->eh_strategy_handler)
+ if (shost->transportt &&
+ (shost->transportt->eh_strategy_handler ||
+ !shost->hostt->eh_host_reset_handler))
return ret;
if (!strncmp(buf, "off", strlen("off")))
--
1.7.12.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-01-17 15:05 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-12 11:08 [PATCH] scsi_error: disable eh_deadline if no host_reset_handler is set Hannes Reinecke
2014-01-07 13:33 ` Ewan Milne
2014-01-17 15:04 ` Hannes Reinecke
-- strict thread matches above, loose matches on Subject: below --
2014-01-17 15:05 Hannes Reinecke
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).