395 Star 1.4K Fork 1.3K

GVPopenEuler / kernel

 / 详情

【openEuler 21.03】设置cgroup下cpu.cfs_quota_us为18446744073709551报错

已验收
缺陷
创建于  
2021-03-18 10:24

【环境信息】
软件信息:
NAME="openEuler"
VERSION="21.03"
ID="openEuler"
VERSION_ID="21.03"
PRETTY_NAME="openEuler 21.03"
ANSI_COLOR="0;31"

qemu版本信息:
qemu-4.1.0-48.oe1.aarch64

内核版本信息:
5.10.0-4.9.0.21.oe1.aarch64

【问题复现步骤】
1、启动一台虚拟机
2、调用命令设置emulator_quota为18446744073709551
/usr/bin/virsh schedinfo f7ae4282-4a85-4634-8091-5ce170e0c2e3 --set emulator_quota=18446744073709551

出现概率:必现

【预期结果】
设置成功

【实际结果】
设置失败,报错

【附件信息】
新版本设置失败
输入图片说明
输入图片说明

老版本上可以设置成功
输入图片说明

评论 (4)

kzming 创建了缺陷
kzming 关联仓库设置为openEuler/kernel
展开全部操作日志

Hey upper_code, Welcome to openEuler Community.
All of the projects in openEuler Community are maintained by @openeuler-ci-bot.
That means the developers can comment below every pull request or issue to trigger Bot Commands.
Please follow instructions at https://gitee.com/openeuler/community/blob/master/en/sig-infrastructure/command.md to find the details.

kzming 里程碑设置为openEuler 21.03-RC2
kzming 负责人设置为Xie XiuQi

这个值是溢出的 18446744073709551,这个社区有补丁新增检查这个范围,
超过 U64_MAX / NSEC_PRE_USEC 会包 invalid。

这个值是溢出的 18446744073709551,这个社区有补丁新增检查这个范围,
超过 U64_MAX / NSEC_PRE_USEC 会包 invalid。

@Xie XiuQi

commit e046bf8db7bd4cf1bdaf518a12fe7559a86912f3
Author: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Date:   Sat Jun 1 17:20:05 2019 +0800

    sched/core: Check quota and period overflow at usec to nsec conversion

    [ Upstream commit 1a8b4540db732ca16c9e43ac7c08b1b8f0b252d8 ]

    Large values could overflow u64 and pass following sanity checks.

     # echo 18446744073750000 > cpu.cfs_period_us
     # cat cpu.cfs_period_us
     40448

     # echo 18446744073750000 > cpu.cfs_quota_us
     # cat cpu.cfs_quota_us
     40448

    After this patch they will fail with -EINVAL.

    Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
    Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Link: http://lkml.kernel.org/r/155125502079.293431.3947497929372138600.stgit@buzz
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index c68880ed0590..16cbc1f58a63 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -6620,8 +6620,10 @@ int tg_set_cfs_quota(struct task_group *tg, long cfs_quota_us)
        period = ktime_to_ns(tg->cfs_bandwidth.period);
        if (cfs_quota_us < 0)
                quota = RUNTIME_INF;
-       else
+       else if ((u64)cfs_quota_us <= U64_MAX / NSEC_PER_USEC)
                quota = (u64)cfs_quota_us * NSEC_PER_USEC;
+       else
+               return -EINVAL;

        return tg_set_cfs_bandwidth(tg, period, quota);
 }
@@ -6643,6 +6645,9 @@ int tg_set_cfs_period(struct task_group *tg, long cfs_period_us)
 {
        u64 quota, period;

+       if ((u64)cfs_period_us > U64_MAX / NSEC_PER_USEC)
+               return -EINVAL;
+
        period = (u64)cfs_period_us * NSEC_PER_USEC;
        quota = tg->cfs_bandwidth.quota;

Xie XiuQi 任务状态待办的 修改为已完成
kzming 任务状态已完成 修改为已验收

登录 后才可以发表评论

状态
负责人
项目
里程碑
Pull Requests
关联的 Pull Requests 被合并后可能会关闭此 issue
分支
开始日期   -   截止日期
-
置顶选项
优先级
预计工期 (小时)
参与者(3)
5329419 openeuler ci bot 1632792936
C
1
https://gitee.com/openeuler/kernel.git
git@gitee.com:openeuler/kernel.git
openeuler
kernel
kernel

搜索帮助