Cleanups and improvements
Damien Le Moal
maintainerv2 cover Cleanups and improvements
Improve ata_change_queue_depth() to have its behavior with libsas managed devices consistent with libata managed devices. Also add a couple of simple cleanups to use defined helper functions instead of open coding device flags checks.
Changes from v1:
- Improved comments in the code changes introduced in patch 1
- Fixed typos in the commit message of patch 2 and 3
- Added Review tags from Hannes and John
Damien Le Moal (3):
ata: libata-sata: Improve ata_change_queue_depth()
ata: libata-eh: Use ata_ncq_enabled() in ata_eh_speed_down()
ata: libata-scsi: Use ata_ncq_supported in ata_scsi_dev_config()
drivers/ata/libata-eh.c | 4 +--- drivers/ata/libata-sata.c | 31 +++++++++++++++++++++---------- drivers/ata/libata-scsi.c | 2 +- 3 files changed, 23 insertions(+), 14 deletions(-)
Signature · 1 line
2.40.1
Damien Le Moal
maintainerPATCH v2 1/3 ata: libata-sata: Improve ata_change_queue_depth()
ata_change_queue_depth() implements different behaviors for ATA devices managed by libsas than for those managed by libata directly. Specifically, if a user attempts to set a device queue depth to a value larger than 32 (ATA_MAX_QUEUE), the queue depth is capped to the maximum and set to 32 for libsas managed devices whereas for libata managed devices, the queue depth is unchanged and an error returned to the user. This is due to the fact that for libsas devices, sdev->host->can_queue may indicate the host (HBA) maximum number of commands that can be queued rather than the device maximum queue depth.
Change ata_change_queue_depth() to provide a consistent behavior for all devices by changing the queue depth capping code to a check that the user provided value does not exceed the device maximum queue depth. This check is moved before the code clearing or setting the ATA_DFLAG_NCQ_OFF flag to ensure that this flag is not modified when an invlaid queue depth is provided.
While at it, two other small improvements are added:
1) Use ata_ncq_supported() instead of ata_ncq_enabled() and clear the ATA_DFLAG_NCQ_OFF flag only and only if needed.
2) If the user provided queue depth is equal to the current queue depth, do not return an error as that is useless.
Overall, the behavior of ata_change_queue_depth() for libata managed devices is unchanged. The behavior with libsas managed devices becomes consistent with libata managed devices.
--- drivers/ata/libata-sata.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-)
drivers/ata/libata-sata.c +21 -10
@@ -1035,6 +1035,7 @@ int ata_change_queue_depth(struct ata_port *ap, struct scsi_device *sdev, {struct ata_device *dev;unsigned long flags; +int max_queue_depth;spin_lock_irqsave (ap->lock, flags);
@@ -1044,22 +1045,32 @@ int ata_change_queue_depth(struct ata_port *ap, struct scsi_device *sdev,return sdev->queue_depth; } -/* NCQ enabled? */ - dev->flags &= ~ATA_DFLAG_NCQ_OFF ; -if (queue_depth ==1 || !ata_ncq_enabled (dev)) { +/* +* Make sure that the queue depth requested does not exceed the device +* capabilities. +*/ + max_queue_depth =min (ATA_MAX_QUEUE , sdev->host->can_queue); + max_queue_depth =min (max_queue_depth,ata_id_queue_depth (dev->id)); +if (queue_depth > max_queue_depth) { +spin_unlock_irqrestore (ap->lock, flags); +return -EINVAL ; + } + +/* +* If NCQ is not supported by the device or if the target queue depth +* is 1 (to disable drive side command queueing), turn off NCQ. +*/ +if (queue_depth ==1 || !ata_ncq_supported (dev)) { dev->flags |=ATA_DFLAG_NCQ_OFF ; queue_depth =1 ; + }else { + dev->flags &= ~ATA_DFLAG_NCQ_OFF ; }spin_unlock_irqrestore (ap->lock, flags); -/* limit and apply queue depth */ - queue_depth =min (queue_depth, sdev->host->can_queue); - queue_depth =min (queue_depth,ata_id_queue_depth (dev->id)); - queue_depth =min (queue_depth,ATA_MAX_QUEUE ); - -if (sdev->queue_depth == queue_depth) -return -EINVAL ; +if (queue_depth == sdev->queue_depth) +return sdev->queue_depth;return scsi_change_queue_depth (sdev, queue_depth); }
Signature · 1 line
2.40.1
Damien Le Moal
maintainerPATCH v2 2/3 ata: libata-eh: Use ata_ncq_enabled() in ata_eh_speed_down()
In reply to Damien Le MoalIn ata_eh_speed_down(), instead of hard-coding the test on the device flags to detect if NCQ is supported and enabled, use ata_ncq_enabled().
--- drivers/ata/libata-eh.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/ata/libata-eh.c +1 -3
@@ -1817,9 +1817,7 @@ static unsigned int ata_eh_speed_down(struct ata_device *dev, verdict =ata_eh_speed_down_verdict (dev);/* turn off NCQ? */ -if ((verdict &ATA_EH_SPDN_NCQ_OFF ) && - (dev->flags & (ATA_DFLAG_PIO |ATA_DFLAG_NCQ | -ATA_DFLAG_NCQ_OFF )) ==ATA_DFLAG_NCQ ) { +if ((verdict &ATA_EH_SPDN_NCQ_OFF ) &&ata_ncq_enabled (dev)) { dev->flags |=ATA_DFLAG_NCQ_OFF ;ata_dev_warn (dev,"NCQ disabled due to excessive errors\n" ); goto done;
Signature · 1 line
2.40.1
Damien Le Moal
maintainerPATCH v2 3/3 ata: libata-scsi: Use ata_ncq_supported in ata_scsi_dev_config()
In reply to Damien Le MoalIn ata_scsi_dev_config(), instead of hard-coding the test to check if an ATA device supports NCQ by looking at the ATA_DFLAG_NCQ flag, use ata_ncq_supported().
--- drivers/ata/libata-scsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ata/libata-scsi.c +1 -1
@@ -1122,7 +1122,7 @@ int ata_scsi_dev_config(struct scsi_device *sdev, struct ata_device *dev)if (dev->flags &ATA_DFLAG_AN )set_bit (SDEV_EVT_MEDIA_CHANGE , sdev->supported_events); -if (dev->flags &ATA_DFLAG_NCQ ) +if (ata_ncq_supported (dev)) depth =min (sdev->host->can_queue,ata_id_queue_depth (dev->id)); depth =min (ATA_MAX_QUEUE , depth);scsi_change_queue_depth (sdev, depth);
Signature · 1 line
2.40.1
Re: [PATCH v2 1/3] ata: libata-sata: Improve ata_change_queue_depth()
In reply to Damien Le MoalLooks good,
Re: [PATCH v2 2/3] ata: libata-eh: Use ata_ncq_enabled() in ata_eh_speed_down()
In reply to Damien Le MoalLooks good,
Re: [PATCH v2 3/3] ata: libata-scsi: Use ata_ncq_supported in ata_scsi_dev_config()
In reply to Damien Le MoalQuoted 23 lines · Damien Le Moal
In
ata_scsi_dev_config(), instead of hard-coding the test to check if an ATA device supports NCQ by looking at theATA_DFLAG_NCQflag, useata_ncq_supported().Signed-off-by Damien Le Moal <[email protected]>Reviewed-by Hannes Reinecke <[email protected]>--- drivers/ata/libata-scsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/ata/libata-scsi.c +1
-1@@ -1122,7 +1122,7 @@ int ata_scsi_dev_config(struct scsi_device *sdev, struct ata_device *dev)if (dev->flags &ATA_DFLAG_AN )set_bit (SDEV_EVT_MEDIA_CHANGE , sdev->supported_events); -if (dev->flags &ATA_DFLAG_NCQ ) +if (ata_ncq_supported (dev)) depth =min (sdev->host->can_queue,ata_id_queue_depth (dev->id)); depth =min (ATA_MAX_QUEUE , depth);scsi_change_queue_depth (sdev, depth);
Re: [PATCH v2 2/3] ata: libata-eh: Use ata_ncq_enabled() in ata_eh_speed_down()
In reply to Damien Le MoalQuoted 5 lines · Damien Le Moal
In
ata_eh_speed_down(), instead of hard-coding the test on the device flags to detect if NCQ is supported and enabled, useata_ncq_enabled().Signed-off-by Damien Le Moal<[email protected]>Reviewed-by Hannes Reinecke<[email protected]>
ughh..I reviewed v1 since this was sent, so:
Johannes Thumshirn
Reviewed-byRe: [PATCH v2 3/3] ata: libata-scsi: Use ata_ncq_supported in ata_scsi_dev_config()
In reply to Johannes ThumshirnLooks good,
Re: [PATCH v2 3/3] ata: libata-scsi: Use ata_ncq_supported in ata_scsi_dev_config()
In reply to Damien Le MoalQuoted 7 lines · Damien Le Moal
In
ata_scsi_dev_config(), instead of hard-coding the test to check if an ATA device supports NCQ by looking at theATA_DFLAG_NCQflag, useata_ncq_supported().Signed-off-by Damien Le Moal<[email protected]>Reviewed-by Hannes Reinecke<[email protected]>---