Commit 8a74962d authored Feb 26, 2021 by Xie XiuQi Committed by Zheng Zengkai Apr 09, 2021

arm64/mpam: update group flags only when enable sucsses



hulk inclusion
category: bugfix
bugzilla: 48265
CVE: NA

--------------------------------

The ctrlcon flag should be set only when we sucessful to
enable ctrlmon, or the flag is mismatch with ctrlmon status.

ctrlmon is indicate a group which could moniter the usage
of L3/Memory bandwidth.

Signed-off-by: Xie XiuQi <xiexiuqi@huawei.com>
Reviewed-by: Hanjun Guo <guohanjun@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Signed-off-by: Wang ShaoBo <bobo.shaobowang@huawei.com>
Reviewed-by: Cheng Jian <cj.chengjian@huawei.com>
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>

parent 0833601f

arch/arm64/kernel/mpam.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -1013,9 +1013,10 @@ static ssize_t resctrl_group_ctrlmon_write(struct kernfs_open_file *of,
		rdtgrp->flags &= ~RDT_CTRLMON;
		resctrl_ctrlmon_disable(rdtgrp->mon.mon_data_kn, rdtgrp);
		} else if (!(rdtgrp->flags & RDT_CTRLMON) && ctrlmon) {
		rdtgrp->flags \|= RDT_CTRLMON;
		resctrl_ctrlmon_enable(rdtgrp->kn, rdtgrp,
		ret = resctrl_ctrlmon_enable(rdtgrp->kn, rdtgrp,
		&rdtgrp->mon.mon_data_kn);
		if (!ret)
		rdtgrp->flags \|= RDT_CTRLMON;
		} else {
		ret = -ENOENT;
		}