Skip to content

Commit d58cdfb

Browse files
Vasily TarasovJens Axboe
authored andcommitted
[PATCH] block layer: ioprio_best function fix
Currently ioprio_best function first checks wethere aioprio or bioprio equals IOPRIO_CLASS_NONE (ioprio_valid() macros does that) and if it is so it returns bioprio/aioprio appropriately. Thus the next four lines, that set aclass/bclass to IOPRIO_CLASS_BE, if aclass/bclass == IOPRIO_CLASS_NONE, are never executed. The second problem: if aioprio from class IOPRIO_CLASS_NONE and bioprio from class IOPRIO_CLASS_IDLE are passed to ioprio_best function, it will return IOPRIO_CLASS_IDLE. It means that during __make_request we can merge two requests and set the priority of merged request to IDLE, while one of the initial requests originates from a process with NONE (default) priority. So we can get a situation when a process with default ioprio will experience IO starvation, while there is no process from real-time class in the system. Just removing ioprio_valid check should correct situation. Signed-off-by: Vasily Tarasov <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
1 parent cea2885 commit d58cdfb

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

fs/ioprio.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -150,11 +150,6 @@ int ioprio_best(unsigned short aprio, unsigned short bprio)
150150
unsigned short aclass = IOPRIO_PRIO_CLASS(aprio);
151151
unsigned short bclass = IOPRIO_PRIO_CLASS(bprio);
152152

153-
if (!ioprio_valid(aprio))
154-
return bprio;
155-
if (!ioprio_valid(bprio))
156-
return aprio;
157-
158153
if (aclass == IOPRIO_CLASS_NONE)
159154
aclass = IOPRIO_CLASS_BE;
160155
if (bclass == IOPRIO_CLASS_NONE)

0 commit comments

Comments
 (0)