leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

block: Fix handling of tasks without ioprio in ioprio_get(2)

Browse Source 
ioprio_get(2) can be asked to return the best IO priority from several
tasks (IOPRIO_WHO_PGRP, IOPRIO_WHO_USER). Currently the call treats
tasks without set IO priority as having priority
IOPRIO_CLASS_BE/IOPRIO_BE_NORM however this does not really reflect the
IO priority the task will get (which depends on task's nice value).

Fix the code to use the real IO priority task's IO will use. We have to
modify code for ioprio_get(IOPRIO_WHO_PROCESS) to keep returning
IOPRIO_CLASS_NONE priority for tasks without set IO priority as a
special case to maintain userspace visible API.

Reviewed-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Tested-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20220623074840.5960-5-jack@suse.cz
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Jan Kara 2022-06-23 09:48:30 +02:00 committed by Jens Axboe
parent fc25545e17
commit 4b838d9ee9
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
block/ioprio.c
View File

@ -171,10 +171,31 @@ static int get_task_ioprio(struct task_struct *p)
ret = security_task_getioprio(p); ret = security_task_getioprio(p);
if (ret) if (ret)
goto out; goto out;
ret = IOPRIO_DEFAULT; task_lock(p);
ret = __get_task_ioprio(p);
task_unlock(p);
out:
return ret;
}
/*
* Return raw IO priority value as set by userspace. We use this for
* ioprio_get(pid, IOPRIO_WHO_PROCESS) so that we keep historical behavior and
* also so that userspace can distinguish unset IO priority (which just gets
* overriden based on task's nice value) from IO priority set to some value.
*/
static int get_task_raw_ioprio(struct task_struct *p)
{
int ret;
ret = security_task_getioprio(p);
if (ret)
goto out;
task_lock(p); task_lock(p);
if (p->io_context) if (p->io_context)
ret = p->io_context->ioprio; ret = p->io_context->ioprio;
else
ret = IOPRIO_DEFAULT;
task_unlock(p); task_unlock(p);
out: out:
return ret; return ret;
@ -182,11 +203,6 @@ out:
static int ioprio_best(unsigned short aprio, unsigned short bprio) static int ioprio_best(unsigned short aprio, unsigned short bprio)
{ {
if (!ioprio_valid(aprio))
aprio = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, IOPRIO_BE_NORM);
if (!ioprio_valid(bprio))
bprio = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, IOPRIO_BE_NORM);
return min(aprio, bprio); return min(aprio, bprio);
} }
@ -207,7 +223,7 @@ SYSCALL_DEFINE2(ioprio_get, int, which, int, who)
else else
p = find_task_by_vpid(who); p = find_task_by_vpid(who);
if (p) if (p)
ret = get_task_ioprio(p); ret = get_task_raw_ioprio(p);
break; break;
case IOPRIO_WHO_PGRP: case IOPRIO_WHO_PGRP:
if (!who) if (!who)