[ck] [PATCH openEuler v1 065/119] openEuler: arm64/mpam: pass rdtgroup when create mon_data dir

From: Xie XiuQi <xiexiuqi(a)huawei.com> commit 0bf8b142ee7326830598fec429382614ad97655e openEuler-1.0 hulk inclusion category: feature bugzilla: 5510 CVE: NA Print more info when create mon_data dir. Signed-off-by: Xie XiuQi <xiexiuqi(a)huawei.com> Reviewed-by: Hanjun Guo <guohanjun(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> Signed-off-by: Xin Hao <haoxing990(a)gmail.com> --- arch/arm64/kernel/mpam_ctrlmon.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/arch/arm64/kernel/mpam_ctrlmon.c b/arch/arm64/kernel/mpam_ctrlmon.c index db3d4b8dfbc5..032313421a98 100644 --- a/arch/arm64/kernel/mpam_ctrlmon.c +++ b/arch/arm64/kernel/mpam_ctrlmon.c @@ -314,14 +314,21 @@ int resctrl_group_mondata_show(struct seq_file *m, void *arg) return -ENOMEM; rdtgrp = resctrl_group_kn_lock_live(of->kn); + if (!rdtgrp) { + resctrl_group_kn_unlock(of->kn); + return -ENOENT; + } md.priv = of->kn->priv; - pr_info("%s: resname %s, rid %d, domid %d, partid %d, pmg %d\n", + pr_info("%s: resname %s, rid %d, domid %d, partid %d, pmg %d, (group: partid %d, pmg %d)\n", __func__, resname, md.u.rid, md.u.domid, md.u.partid, - md.u.pmg); + md.u.pmg, + rdtgrp->closid, + rdtgrp->mon.rmid + ); /* show monitor data */ @@ -545,7 +552,7 @@ int mkdir_mondata_all(struct kernfs_node *parent_kn, /* * Create the mon_data directory first. */ - ret = mongroup_create_dir(parent_kn, NULL, "mon_data", &kn); + ret = mongroup_create_dir(parent_kn, prgrp, "mon_data", &kn); if (ret) return ret; -- 2.31.0