Commit 88c0fab4 authored by Wang ShaoBo's avatar Wang ShaoBo Committed by Zheng Zengkai
Browse files

arm64/mpam: Restore extend ctrls' max width for checking schemata input 



hulk inclusion
category: feature
feature: ARM MPAM support
bugzilla: 48265
CVE: NA

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

Use an array for storing extend ctrls' max width, on purpose, checking
each input value from schemata.

Note the useful value of each ctrls' max width is at least 1, 0 means
meaningless, and greater than 1 means the choices can be selected.

Signed-off-by: default avatarWang ShaoBo <bobo.shaobowang@huawei.com>
Reviewed-by: default avatarXiongfeng Wang <wangxiongfeng2@huawei.com>
Reviewed-by: default avatarCheng Jian <cj.chengjian@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 413914f7

arch/arm64/include/asm/mpam.h

+1 −2
Original line number Diff line number Diff line
@@ -315,8 +315,7 @@ struct raw_resctrl_resource { 
	u16                 num_intpartid;

	u16                 num_pmg;



	u16                 pri_wd;

	u16                 hdl_wd;

	u16                 extend_ctrls_wd[SCHEMA_NUM_CTRL_TYPE];



	void (*msr_update)(struct resctrl_resource *r, struct rdt_domain *d,

				struct msr_param *para);

arch/arm64/kernel/mpam/mpam_ctrlmon.c

+2 −4
Original line number Diff line number Diff line
@@ -83,10 +83,8 @@ static int add_schema(enum resctrl_conf_type t, struct resctrl_resource *r) 
	rr = r->res;

	INIT_LIST_HEAD(&s->schema_ctrl_list);

	for_each_extend_ctrl_type(type) {

		if ((type == SCHEMA_PRI && !rr->pri_wd) ||

			(type == SCHEMA_HDL && !rr->hdl_wd) ||

			!resctrl_ctrl_extend_bits_match(r->ctrl_extend_bits,

			type))

		if (!resctrl_ctrl_extend_bits_match(r->ctrl_extend_bits, type) ||

			!rr->extend_ctrls_wd[type])

			continue;



		sc = kzalloc(sizeof(*sc), GFP_KERNEL);

arch/arm64/kernel/mpam/mpam_resctrl.c

+1 −2
Original line number Diff line number Diff line
@@ -734,8 +734,7 @@ static int extend_ctrl_enable(enum resctrl_ctrl_type type) 
	for_each_supported_resctrl_exports(res) {

		r = &res->resctrl_res;

		rr = r->res;

		if ((type == SCHEMA_PRI && rr->pri_wd) ||

			(type == SCHEMA_HDL && rr->hdl_wd)) {

		if (rr->extend_ctrls_wd[type]) {

			resctrl_ctrl_extend_bits_set(&r->ctrl_extend_bits, type);

			match = true;

		}

arch/arm64/kernel/mpam/mpam_setup.c

+7 −5
Original line number Diff line number Diff line
@@ -392,8 +392,8 @@ static int mpam_resctrl_resource_init(struct mpam_resctrl_res *res) 
		r->mon_capable = true;

		r->mon_enabled = true;

		/* Export memory bandwidth hardlimit, default active hardlimit */

		rr->hdl_wd = 2;

		r->default_ctrl[SCHEMA_HDL] = rr->hdl_wd - 1;

		rr->extend_ctrls_wd[SCHEMA_HDL] = 2;

		r->default_ctrl[SCHEMA_HDL] = 1;

	} else if (class == mpam_resctrl_exports[RDT_RESOURCE_L3].class) {

		r->rid = RDT_RESOURCE_L3;

		rr = mpam_get_raw_resctrl_resource(RDT_RESOURCE_L3);
@@ -466,11 +466,13 @@ static int mpam_resctrl_resource_init(struct mpam_resctrl_res *res) 
		rr->num_pmg = class->num_pmg;



		/*

		 * Export priority setting, default priority from hardware,

		 * no clever here, we don't need to define another default

		 * Export priority setting, extend_ctrls_wd represents the

		 * max level of control we can export. this default priority

		 * is just from hardware, no need to define another default

		 * value.

		 */

		rr->pri_wd = max(class->intpri_wd, class->dspri_wd);

		rr->extend_ctrls_wd[SCHEMA_PRI] = 1 << max(class->intpri_wd,

			class->dspri_wd);

		r->default_ctrl[SCHEMA_PRI] = max(class->hwdef_intpri,

			class->hwdef_dspri);

	}