Merge tag 'ata-7.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux

Pull ata fixes from Niklas Cassel:

 - Allow re-enabling NCQ, after EH disabled it, by writing the current
   queue depth to the queue_depth sysfs attribute (Igor)

 - Retry failed non-NCQ commands when their sense data asks for a
   retry, as is already done for NCQ commands. Previously, such
   non-NCQ commands were never retried (me)

 - Only check the power mode of ATA and ZAC devices before putting
   them in standby mode (on suspend, shutdown or device removal).
   libata never puts other devices, such as ATAPI devices, in standby
   mode, and some ATAPI devices reject the CHECK POWER MODE command
   (Giuseppe)

 - Fix several bugs in the MODE SELECT translation.

   Reject parameter lists with data after the mode page before the
   mode page is handled. Previously, a rejected command could leave
   the CDL enabled state tracked by libata out of sync with the
   device, and data after the control mode page was silently ignored.

   Reject mode pages with SUBPAGE CODE FFh, and mode pages with the
   SPF bit set but SUBPAGE CODE 00h, which were incorrectly accepted.

   The commit that passes the whole mode page to the MODE SELECT
   handlers might look like a cleanup, but it is a fix, and thus has
   a Fixes tag: the FIELD POINTER pointed 2 bytes (page_0 format) or
   4 bytes (sub_page format) before the invalid byte in the mode page
   (me, Shao)

 - Disable the enclosure management (SEMB) port of the Marvell
   88SM9705 port multiplier. The port never answers SRST, and the
   resulting EH retries delayed disk discovery by minutes (Marco)

 - Reject data-in commands, e.g. INQUIRY, submitted via SG_IO with a
   data-out buffer, whose pages may be pinned without write access.
   Writing a reply to such a buffer could oops the kernel (Zhao)

* tag 'ata-7.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux:
  ata: libata-scsi: reject data-in commands with a data-out buffer
  ata: libata-pmp: disable the SEMB port on Marvell 88SM9705
  ata: libata-scsi: set the field pointer when rejecting CDL
  ata: libata-scsi: pass the whole mode page to the MODE SELECT handlers
  ata: libata-scsi: fix MODE SELECT field pointer for block descriptor length
  ata: libata-scsi: fix MODE SELECT field pointer for unsupported subpages
  ata: libata-scsi: reject MODE SELECT mode pages with a wrong SPF bit
  ata: libata-scsi: do not accept subpage code FFh in MODE SELECT
  ata: libata-scsi: fix MODE SELECT handling of data after the mode page
  ata: libata-core: Check device support before querying power state
  ata: libata-eh: Retry non-NCQ commands when their sense data asks for it
  ata: libata-sata: allow re-enabling NCQ with the same queue_depth
This commit is contained in:
Linus Torvalds
2026-11-08 11:59:25 -08:00
5 changed files with 168 additions and 78 deletions
+4 -4
View File
@@ -2059,6 +2059,10 @@ void ata_dev_power_set_standby(struct ata_device *dev)
struct ata_taskfile tf;
unsigned int err_mask;
/* Issue STANDBY IMMEDIATE command only if supported by the device */
if (!ata_dev_power_init_tf(dev, &tf, false))
return;
/* If the device is already sleeping or in standby, do nothing. */
if ((dev->flags & ATA_DFLAG_SLEEPING) ||
!ata_dev_power_is_active(dev))
@@ -2077,10 +2081,6 @@ void ata_dev_power_set_standby(struct ata_device *dev)
system_entering_hibernation())
return;
/* Issue STANDBY IMMEDIATE command only if supported by the device */
if (!ata_dev_power_init_tf(dev, &tf, false))
return;
ata_dev_notice(dev, "Entering standby power mode\n");
err_mask = ata_exec_internal(dev, &tf, NULL, DMA_NONE, NULL, 0, 0);
+14 -2
View File
@@ -4080,8 +4080,20 @@ void ata_eh_finish(struct ata_port *ap)
ata_eh_qc_complete(qc);
}
} else {
if (qc->flags & ATA_QCFLAG_SENSE_VALID ||
qc->flags & ATA_QCFLAG_EH_SUCCESS_CMD) {
if (qc->flags & ATA_QCFLAG_SENSE_VALID &&
qc->flags & ATA_QCFLAG_RETRY) {
/*
* The sense data asks for a retry, see
* ata_eh_analyze_tf(). ata_eh_link_autopsy()
* cleared qc->err_mask, so ata_eh_qc_retry()
* would increment scmd->allowed. Leave
* scmd->allowed alone, so that upper layer
* only retries the command if it has not
* already been retried too many times.
*/
__ata_eh_qc_complete(qc);
} else if (qc->flags & ATA_QCFLAG_SENSE_VALID ||
qc->flags & ATA_QCFLAG_EH_SUCCESS_CMD) {
ata_eh_qc_complete(qc);
} else {
/* feed zero TF to sense generation */
+14
View File
@@ -482,6 +482,20 @@ static void sata_pmp_quirks(struct ata_port *ap)
if (link->pmp == 4)
link->flags |= ATA_LFLAG_DISABLED;
}
} else if (vendor == 0x1b4b && devid == 0x9705) {
/*
* Marvell 88SM9705 quirks
*
* 1-to-5 PMP with an extra SEMB port. It reports 6 ports and
* port 5 is the SEMB, which never answers SRST: EH spends about
* a minute per round retrying it, and disk discovery waits for
* that. Seen behind a Marvell 88SE9235 in the Synology DX1215
* and DX1222.
*/
ata_for_each_link(link, ap, EDGE) {
if (link->pmp == 5)
link->flags |= ATA_LFLAG_DISABLED;
}
}
}
+1 -1
View File
@@ -1287,7 +1287,7 @@ int ata_change_queue_depth(struct ata_port *ap, struct scsi_device *sdev,
spin_lock_irqsave(ap->lock, flags);
dev = ata_scsi_find_dev(ap, sdev);
if (!dev || queue_depth < 1 || queue_depth == sdev->queue_depth) {
if (!dev || queue_depth < 1) {
spin_unlock_irqrestore(ap->lock, flags);
return sdev->queue_depth;
}
+135 -71
View File
@@ -2048,6 +2048,19 @@ static int ata_scsi_translate(struct ata_device *dev, struct scsi_cmnd *cmd,
if (xlat_func(qc))
goto done;
/*
* A data-out request may contain pages pinned without write access.
* Reject a translated data-in command before issuing it, since its
* completion handler may write to the buffer even if the device fails.
*/
if (unlikely(cmd->sc_data_direction == DMA_TO_DEVICE &&
ata_is_data(qc->tf.protocol) &&
!(qc->tf.flags & ATA_TFLAG_WRITE))) {
ata_scsi_set_sense(dev, cmd, ABORTED_COMMAND,
DATA_IN_BUFFER_ERROR);
goto done;
}
return ata_scsi_qc_issue(ap, qc);
done:
@@ -2079,6 +2092,13 @@ static void ata_scsi_rbuf_fill(struct ata_device *dev, struct scsi_cmnd *cmd,
unsigned long flags;
unsigned int len;
/* A data-out request may contain pages pinned without write access. */
if (cmd->sc_data_direction == DMA_TO_DEVICE) {
ata_scsi_set_sense(dev, cmd, ABORTED_COMMAND,
DATA_IN_BUFFER_ERROR);
return;
}
spin_lock_irqsave(&ata_scsi_rbuf_lock, flags);
memset(ata_scsi_rbuf, 0, ATA_SCSI_RBUF_SIZE);
@@ -3173,6 +3193,14 @@ static unsigned int atapi_xlat(struct ata_queued_cmd *qc)
qc->complete_fn = atapi_qc_complete;
/* atapi_fixup_inquiry() writes to the buffer on successful completion. */
if (scmd->sc_data_direction == DMA_TO_DEVICE &&
scmd->cmnd[0] == INQUIRY) {
ata_scsi_set_sense(dev, scmd, ABORTED_COMMAND,
DATA_IN_BUFFER_ERROR);
return 1;
}
qc->tf.flags |= ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE;
if (scmd->sc_data_direction == DMA_TO_DEVICE) {
qc->tf.flags |= ATA_TFLAG_WRITE;
@@ -4366,14 +4394,22 @@ invalid_param_len:
/**
* ata_mselect_caching - Simulate MODE SELECT for caching info page
* @qc: Storage for translated ATA taskfile
* @buf: input buffer
* @len: number of valid bytes in the input buffer
* @fp: out parameter for the failed field on error
* @buf: Mode page, starting with the mode page header
* @len: Length of the mode page, including the mode page header
* @fp: Out parameter, offset in @buf of the first invalid byte on error
*
* Prepare a taskfile to modify caching information for the device.
*
* The caller has stripped the mode parameter header and the block
* descriptors, so @buf points at the mode page header, like the buffer
* filled by the ata_msense_*() functions, and offsets in @buf, including
* the one returned in @fp, are the byte numbers of the mode page.
*
* LOCKING:
* None.
*
* RETURNS:
* 0 if a taskfile was prepared, -EINVAL if the mode page is invalid.
*/
static int ata_mselect_caching(struct ata_queued_cmd *qc,
const u8 *buf, int len, u16 *fp)
@@ -4384,26 +4420,19 @@ static int ata_mselect_caching(struct ata_queued_cmd *qc,
u8 wce;
int i;
/*
* The first two bytes of def_cache_mpage are a header, so offsets
* in mpage are off by 2 compared to buf. Same for len.
*/
if (len != CACHE_MPAGE_LEN - 2) {
*fp = min(len, CACHE_MPAGE_LEN - 2);
if (len != CACHE_MPAGE_LEN) {
*fp = 1;
return -EINVAL;
}
wce = buf[0] & (1 << 2);
wce = buf[2] & (1 << 2);
/*
* Check that read-only bits are not modified.
*/
ata_msense_caching(dev->id, mpage, false);
for (i = 0; i < CACHE_MPAGE_LEN - 2; i++) {
if (i == 0)
continue;
if (mpage[i + 2] != buf[i]) {
for (i = 3; i < CACHE_MPAGE_LEN; i++) {
if (mpage[i] != buf[i]) {
*fp = i;
return -EINVAL;
}
@@ -4417,8 +4446,26 @@ static int ata_mselect_caching(struct ata_queued_cmd *qc,
return 0;
}
/*
* Simulate MODE SELECT control mode page, sub-page 0.
/**
* ata_mselect_control_spg0 - Simulate MODE SELECT for control sub-page 0
* @qc: Storage for translated ATA taskfile
* @buf: Mode page, starting with the mode page header
* @len: Length of the mode page, including the mode page header
* @fp: Out parameter, offset in @buf of the first invalid byte on error
*
* Simulate MODE SELECT control mode page, sub-page 0.
*
* The caller has stripped the mode parameter header and the block
* descriptors, so @buf points at the mode page header, like the buffer
* filled by the ata_msense_*() functions, and offsets in @buf, including
* the one returned in @fp, are the byte numbers of the mode page.
*
* LOCKING:
* None.
*
* RETURNS:
* 0, as no ATA command needs to be sent, or -EINVAL if the mode page is
* invalid.
*/
static int ata_mselect_control_spg0(struct ata_queued_cmd *qc,
const u8 *buf, int len, u16 *fp)
@@ -4428,26 +4475,19 @@ static int ata_mselect_control_spg0(struct ata_queued_cmd *qc,
u8 d_sense;
int i;
/*
* The first two bytes of def_control_mpage are a header, so offsets
* in mpage are off by 2 compared to buf. Same for len.
*/
if (len != CONTROL_MPAGE_LEN - 2) {
*fp = min(len, CONTROL_MPAGE_LEN - 2);
if (len != CONTROL_MPAGE_LEN) {
*fp = 1;
return -EINVAL;
}
d_sense = buf[0] & (1 << 2);
d_sense = buf[2] & (1 << 2);
/*
* Check that read-only bits are not modified.
*/
ata_msense_control_spg0(dev, mpage, false);
for (i = 0; i < CONTROL_MPAGE_LEN - 2; i++) {
if (i == 0)
continue;
if (mpage[2 + i] != buf[i]) {
for (i = 3; i < CONTROL_MPAGE_LEN; i++) {
if (mpage[i] != buf[i]) {
*fp = i;
return -EINVAL;
}
@@ -4459,9 +4499,27 @@ static int ata_mselect_control_spg0(struct ata_queued_cmd *qc,
return 0;
}
/*
* Translate MODE SELECT control mode page, sub-page f2h (ATA feature mode
* page) into a SET FEATURES command.
/**
* ata_mselect_control_ata_feature - Translate ATA Feature Control page
* @qc: Storage for translated ATA taskfile
* @buf: Mode page, starting with the mode page header
* @len: Length of the mode page, including the mode page header
* @fp: Out parameter, offset in @buf of the first invalid byte on error
*
* Translate MODE SELECT control mode page, sub-page f2h (ATA feature mode
* page) into a SET FEATURES command.
*
* The caller has stripped the mode parameter header and the block
* descriptors, so @buf points at the mode page header, like the buffer
* filled by the ata_msense_*() functions, and offsets in @buf, including
* the one returned in @fp, are the byte numbers of the mode page.
*
* LOCKING:
* None.
*
* RETURNS:
* 1 if a taskfile was prepared, -EINVAL if the mode page is invalid or if
* CDL cannot be enabled.
*/
static int ata_mselect_control_ata_feature(struct ata_queued_cmd *qc,
const u8 *buf, int len, u16 *fp)
@@ -4470,17 +4528,13 @@ static int ata_mselect_control_ata_feature(struct ata_queued_cmd *qc,
struct ata_taskfile *tf = &qc->tf;
u8 cdl_action;
/*
* The first four bytes of ATA Feature Control mode page are a header,
* so offsets in mpage are off by 4 compared to buf. Same for len.
*/
if (len != ATA_FEATURE_SUB_MPAGE_LEN - 4) {
*fp = min(len, ATA_FEATURE_SUB_MPAGE_LEN - 4);
if (len != ATA_FEATURE_SUB_MPAGE_LEN) {
*fp = 2;
return -EINVAL;
}
/* Check cdl_ctrl */
switch (buf[0] & 0x03) {
switch (buf[4] & 0x03) {
case 0:
/* Disable CDL */
ata_dev_dbg(dev, "Disabling CDL\n");
@@ -4495,6 +4549,7 @@ static int ata_mselect_control_ata_feature(struct ata_queued_cmd *qc,
if (dev->flags & ATA_DFLAG_NCQ_PRIO_ENABLED) {
ata_dev_err(dev,
"NCQ priority must be disabled to enable CDL\n");
*fp = 4;
return -EINVAL;
}
ata_dev_dbg(dev, "Enabling CDL\n");
@@ -4502,7 +4557,7 @@ static int ata_mselect_control_ata_feature(struct ata_queued_cmd *qc,
dev->flags |= ATA_DFLAG_CDL_ENABLED;
break;
default:
*fp = 0;
*fp = 4;
return -EINVAL;
}
@@ -4518,15 +4573,24 @@ static int ata_mselect_control_ata_feature(struct ata_queued_cmd *qc,
/**
* ata_mselect_control - Simulate MODE SELECT for control page
* @qc: Storage for translated ATA taskfile
* @spg: target sub-page of the control page
* @buf: input buffer
* @len: number of valid bytes in the input buffer
* @fp: out parameter for the failed field on error
* @spg: Sub-page of the control page, 0 or ATA_FEATURE_SUB_MPAGE
* @buf: Mode page, starting with the mode page header
* @len: Length of the mode page, including the mode page header
* @fp: Out parameter, offset in @buf of the first invalid byte on error
*
* Prepare a taskfile to modify caching information for the device.
* Call the handler of sub-page @spg of the control mode page.
*
* The caller has stripped the mode parameter header and the block
* descriptors, so @buf points at the mode page header, like the buffer
* filled by the ata_msense_*() functions, and offsets in @buf, including
* the one returned in @fp, are the byte numbers of the mode page.
*
* LOCKING:
* None.
*
* RETURNS:
* 0 if no ATA command needs to be sent, 1 if a taskfile was prepared,
* -EINVAL if the mode page is invalid.
*/
static int ata_mselect_control(struct ata_queued_cmd *qc, u8 spg,
const u8 *buf, int len, u16 *fp)
@@ -4613,7 +4677,6 @@ static unsigned int ata_scsi_mode_select_xlat(struct ata_queued_cmd *qc)
goto invalid_param_len;
if (bd_len != 0 && bd_len != 8) {
fp = (six_byte) ? 3 : 6;
fp += bd_len + hdr_len;
goto invalid_param;
}
@@ -4628,48 +4691,56 @@ static unsigned int ata_scsi_mode_select_xlat(struct ata_queued_cmd *qc)
if (len < 4)
goto invalid_param_len;
/*
* Mode pages with subpage code 00h use the page_0 format: SAT
* defines the SPF bit of the Caching and Control mode pages,
* for subpage code 00h, as not changeable and set to zero.
*/
spg = p[1];
pg_len = get_unaligned_be16(&p[2]);
p += 4;
len -= 4;
if (!spg) {
fp = hdr_len + bd_len;
goto invalid_param;
}
pg_len = get_unaligned_be16(&p[2]) + 4;
} else {
if (len < 2)
goto invalid_param_len;
spg = 0;
pg_len = p[1];
p += 2;
len -= 2;
pg_len = p[1] + 2;
}
/*
* Supported subpages: all subpages and ATA feature sub-page f2h of
* the control page.
* The only supported subpage is the ATA feature sub-page f2h of the
* control page.
*/
if (spg) {
switch (spg) {
case ALL_SUB_MPAGES:
/* All subpages is not supported for the control page */
if (pg == CONTROL_MPAGE) {
fp = (p[0] & 0x40) ? 1 : 0;
fp += hdr_len + bd_len;
goto invalid_param;
}
break;
case ATA_FEATURE_SUB_MPAGE:
if (qc->dev->flags & ATA_DFLAG_CDL &&
pg == CONTROL_MPAGE)
break;
fallthrough;
default:
fp = (p[0] & 0x40) ? 1 : 0;
fp += hdr_len + bd_len;
fp = hdr_len + bd_len + 1;
goto invalid_param;
}
}
if (pg_len > len)
goto invalid_param_len;
/*
* A MODE SELECT command is translated into at most one ATA command, so
* only one mode page per command is supported. Reject any data after
* the mode page before calling the mode page handlers, which may
* already update the device flags.
*/
if (len > pg_len) {
fp = p - buffer + pg_len;
goto invalid_param;
}
switch (pg) {
case CACHE_MPAGE:
if (ata_mselect_caching(qc, p, pg_len, &fp) < 0) {
@@ -4692,13 +4763,6 @@ static unsigned int ata_scsi_mode_select_xlat(struct ata_queued_cmd *qc)
goto invalid_param;
}
/*
* Only one page has changeable data, so we only support setting one
* page at a time.
*/
if (len > pg_len)
goto invalid_param;
return 0;
invalid_fld: