diff options
author | Damien Le Moal <dlemoal@kernel.org> | 2023-06-08 18:55:56 +0900 |
---|---|---|
committer | Martin K. Petersen <martin.petersen@oracle.com> | 2023-06-16 12:04:30 -0400 |
commit | 01584c1e233740519d0e11aa20daa323d26bf598 (patch) | |
tree | 32bcd9c0c143b9248f7eebdbc9508408bb7b5050 /block | |
parent | 022000d3f586de7b0765075b85f0705f50a4fa69 (diff) | |
download | linux-stable-01584c1e233740519d0e11aa20daa323d26bf598.tar.gz linux-stable-01584c1e233740519d0e11aa20daa323d26bf598.tar.bz2 linux-stable-01584c1e233740519d0e11aa20daa323d26bf598.zip |
scsi: block: Improve ioprio value validity checks
The introduction of the macro IOPRIO_PRIO_LEVEL() in commit eca2040972b4
("scsi: block: ioprio: Clean up interface definition") results in an
iopriority level to always be masked using the macro IOPRIO_LEVEL_MASK, and
thus to the kernel always seeing an acceptable value for an I/O priority
level when checked in ioprio_check_cap(). Before this patch, this function
would return an error for some (but not all) invalid values for a level
valid range of [0..7].
Restore and improve the detection of invalid priority levels by introducing
the inline function ioprio_value() to check an ioprio class, level and hint
value before combining these fields into a single value to be used with
ioprio_set() or AIOs. If an invalid value for the class, level or hint of
an ioprio is detected, ioprio_value() returns an ioprio using the class
IOPRIO_CLASS_INVALID, indicating an invalid value and causing
ioprio_check_cap() to return -EINVAL.
Fixes: 6c913257226a ("scsi: block: Introduce ioprio hints")
Fixes: eca2040972b4 ("scsi: block: ioprio: Clean up interface definition")
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
Link: https://lore.kernel.org/r/20230608095556.124001-1-dlemoal@kernel.org
Reviewed-by: Niklas Cassel <niklas.cassel@wdc.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'block')
-rw-r--r-- | block/ioprio.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/block/ioprio.c b/block/ioprio.c index f0d9e818abc5..b5a942519a79 100644 --- a/block/ioprio.c +++ b/block/ioprio.c @@ -58,6 +58,7 @@ int ioprio_check_cap(int ioprio) if (level) return -EINVAL; break; + case IOPRIO_CLASS_INVALID: default: return -EINVAL; } |