Sandro/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-09-18 22:09:30 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

scsi: leapraid: Standardize NCQ priority sysfs attributes

Browse Source 
Replace the earlier LeapRAID ncq_cmd_prio_enable attribute with the
standard sas_ncq_prio_supported and sas_ncq_prio_enable names documented in
Documentation/ABI/testing/sysfs-block-device, and rename the per-device NCQ
priority state to match.

The earlier ncq_cmd_prio_enable name has not yet been established as part
of a released userspace ABI, so no compatibility alias is needed.

For LeapRAID, sas_ncq_prio_enable is backed by the driver's per-device NCQ
priority state and controls whether RT-class I/O requests are issued with
command priority on supported SATA devices.

Update leapraid.rst to describe the standard attribute names and paths, and
clean up the surrounding RST text for consistency with kernel documentation
style.

Also switch the capability check from open-coded VPD page 0x89 parsing to
sas_ata_ncq_prio_supported(), use kstrtobool() for the enable path, and
expose the NCQ priority attributes only for SATA devices using LeapRAID's
target-private SAS device state.

Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Signed-off-by: Dongdong Hao <doubled@leap-io-kernel.com>
Reviewed-by: Hannes Reinecke <hare@kernel.org>
Link: https://patch.msgid.link/20260814090526.395704-1-doubled@leap-io-kernel.com
Signed-off-by: Martin K. Petersen (Oracle) <mkp@kernel.org>
This commit is contained in:
Dongdong Hao
2026-08-23 21:57:41 -04:00
committed by Martin K. Petersen (Oracle)
parent 00b7c8d4ce
commit 46f861d300
3 changed files with 68 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Documentation/scsi/leapraid.rst
+10 -4
View File
@@ -22,6 +22,7 @@ Supported devices
Features
========
- PCIe Gen4 x8 host interface
- Support for SAS and SATA devices
- RAID levels: 0, 1, 10, 5, 50, 6, 60
@@ -50,16 +51,20 @@ LeapRAID specific disk attributes
::
/sys/class/scsi_disk/host:bus:target:lun/device/sas_device_handle
/sys/class/scsi_disk/host:bus:target:lun/device/ncq_cmd_prio_enable
/sys/block/<disk>/device/sas_device_handle
/sys/block/<disk>/device/sas_ncq_prio_supported
/sys/block/<disk>/device/sas_ncq_prio_enable
The read-only attribute "sas_device_handle" represents the disk's device
handle, which is a unique identifier maintained by the firmware.
This attribute "ncq_cmd_prio_enable" controls NCQ command priority. A value
The read-only attribute "sas_ncq_prio_supported" reports whether a SATA
device supports NCQ command priority.
The attribute "sas_ncq_prio_enable" controls NCQ command priority. A value
of 0 disables NCQ priority handling for RT-priority I/O. Writing 1 enables
NCQ priority handling when the device reports support for the feature through
VPD page 0x89. Unsupported devices keep the effective state at 0.
VPD page 0x89. Writes to unsupported devices fail with an error.
LeapRAID module parameters
==========================
@@ -100,6 +105,7 @@ in io_uring poll mode. The default value is 0.
File Location
=============
The driver source is located at:
``drivers/scsi/leapraid/``
drivers/scsi/leapraid/leapraid_func.h
+2 -2
View File
@@ -1064,7 +1064,7 @@ struct leapraid_starget_priv {
* @starget_priv: Associated target private data.
* @lun: Logical Unit Number.
* @flg: Flags.
* @ncq_cmd_prio_enable: Enables NCQ command priority for RT I/O.
* @ncq_prio_enable: Enables NCQ command priority for RT I/O.
* @block: Block flag.
* @deleted: Deletion flag.
* @sep: SEP flag.
@@ -1073,7 +1073,7 @@ struct leapraid_sdev_priv {
struct leapraid_starget_priv *starget_priv;
unsigned int lun;
u32 flg;
u8 ncq_cmd_prio_enable;
u8 ncq_prio_enable;
u8 block;
u8 deleted;
u8 sep;
drivers/scsi/leapraid/leapraid_os.c
+56 -31
View File
@@ -859,7 +859,7 @@ static u32 build_scsiio_req_control(struct scsi_cmnd *scmd,
control |= LEAPRAID_SCSIIO_CTRL_SIMPLEQ;
if (sdev_priv->ncq_cmd_prio_enable &&
if (sdev_priv->ncq_prio_enable &&
(IOPRIO_PRIO_CLASS(req_get_ioprio(scsi_cmd_to_rq(scmd))) ==
IOPRIO_CLASS_RT))
control |= LEAPRAID_SCSIIO_CTRL_CMDPRI;
@@ -1854,7 +1854,16 @@ static ssize_t sas_device_handle_show(struct device *dev,
sas_device_priv_data->starget_priv->hdl);
}
static ssize_t ncq_cmd_prio_enable_show(struct device *dev,
static ssize_t sas_ncq_prio_supported_show(struct device *dev,
struct device_attribute *attr,
char *buf)
{
struct scsi_device *sdev = to_scsi_device(dev);
return sysfs_emit(buf, "%d\n", sas_ata_ncq_prio_supported(sdev));
}
static ssize_t sas_ncq_prio_enable_show(struct device *dev,
struct device_attribute *attr,
char *buf)
{
@@ -1867,19 +1876,16 @@ static ssize_t ncq_cmd_prio_enable_show(struct device *dev,
return -EINVAL;
}
return sysfs_emit(buf, "%d\n",
sas_device_priv_data->ncq_cmd_prio_enable);
return sysfs_emit(buf, "%d\n", sas_device_priv_data->ncq_prio_enable);
}
static ssize_t ncq_cmd_prio_enable_store(struct device *dev,
static ssize_t sas_ncq_prio_enable_store(struct device *dev,
struct device_attribute *attr,
const char *buf, size_t count)
{
struct scsi_device *sdev = to_scsi_device(dev);
struct leapraid_sdev_priv *sas_device_priv_data = sdev->hostdata;
struct scsi_vpd *vpd_pg89;
int ncq_cmd_prio_enable;
bool ncq_supported;
bool enable;
if (!sas_device_priv_data) {
dev_err(&sdev->sdev_gendev,
@@ -1887,44 +1893,63 @@ static ssize_t ncq_cmd_prio_enable_store(struct device *dev,
return -EINVAL;
}
if (kstrtoint(buf, 0, &ncq_cmd_prio_enable))
if (kstrtobool(buf, &enable))
return -EINVAL;
if (ncq_cmd_prio_enable != 0 && ncq_cmd_prio_enable != 1) {
dev_err(&sdev->sdev_gendev,
"%s: Invalid NCQ cmd prio %d (0/1 only)\n",
__func__, ncq_cmd_prio_enable);
if (!sas_ata_ncq_prio_supported(sdev))
return -EINVAL;
}
rcu_read_lock();
vpd_pg89 = rcu_dereference(sdev->vpd_pg89);
if (!vpd_pg89 || vpd_pg89->len < LEAPRAID_VPD_PG89_MIN_LEN) {
rcu_read_unlock();
return -EINVAL;
}
ncq_supported = (vpd_pg89->data[LEAPRAID_VPD_PG89_NCQ_BYTE_IDX] >>
LEAPRAID_VPD_PG89_NCQ_BIT_SHIFT) &
LEAPRAID_VPD_PG89_NCQ_BIT_MASK;
rcu_read_unlock();
if (ncq_supported)
sas_device_priv_data->ncq_cmd_prio_enable =
ncq_cmd_prio_enable;
sas_device_priv_data->ncq_prio_enable = enable;
return count;
}
static DEVICE_ATTR_RO(sas_device_handle);
static DEVICE_ATTR_RO(sas_ncq_prio_supported);
static DEVICE_ATTR_RW(sas_ncq_prio_enable);
static DEVICE_ATTR_RW(ncq_cmd_prio_enable);
static bool leapraid_sdev_is_sata(struct scsi_device *sdev)
{
struct scsi_target *starget = sdev->sdev_target;
struct leapraid_starget_priv *starget_priv = starget->hostdata;
struct leapraid_sas_dev *sas_dev;
if (!starget_priv)
return false;
sas_dev = starget_priv->sas_dev;
return sas_dev && (sas_dev->dev_info & LEAPRAID_DEVTYP_SATA_DEV);
}
static struct attribute *leapraid_sdev_attrs[] = {
&dev_attr_sas_device_handle.attr,
&dev_attr_ncq_cmd_prio_enable.attr,
&dev_attr_sas_ncq_prio_supported.attr,
&dev_attr_sas_ncq_prio_enable.attr,
NULL,
};
ATTRIBUTE_GROUPS(leapraid_sdev);
static umode_t leapraid_sdev_attr_is_visible(struct kobject *kobj,
struct attribute *attr, int i)
{
struct device *dev = kobj_to_dev(kobj);
struct scsi_device *sdev = to_scsi_device(dev);
if (attr == &dev_attr_sas_ncq_prio_supported.attr ||
attr == &dev_attr_sas_ncq_prio_enable.attr)
if (!leapraid_sdev_is_sata(sdev))
return 0;
return attr->mode;
}
static const struct attribute_group leapraid_sdev_attr_group = {
.attrs = leapraid_sdev_attrs,
.is_visible = leapraid_sdev_attr_is_visible,
};
static const struct attribute_group *leapraid_sdev_groups[] = {
&leapraid_sdev_attr_group,
NULL,
};
static struct scsi_host_template leapraid_driver_template = {
.module = THIS_MODULE,