提交 cfd0f34e 编写于 作者: T Tony Luck 提交者: Thomas Gleixner

x86/intel_rdt: Add diagnostics when making directories

Mostly this is about running out of RMIDs or CLOSIDs. Other
errors are various internal errors.
Signed-off-by: NTony Luck <tony.luck@intel.com>
Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Vikas Shivappa <vikas.shivappa@intel.com>
Cc: Boris Petkov <bp@suse.de>
Cc: Reinette Chatre <reinette.chatre@intel.com>
Link: https://lkml.kernel.org/r/027cf1ffb3a3695f2d54525813a1d644887353cf.1506382469.git.tony.luck@intel.com
上级 94457b36
...@@ -1593,8 +1593,10 @@ static int mkdir_rdt_prepare(struct kernfs_node *parent_kn, ...@@ -1593,8 +1593,10 @@ static int mkdir_rdt_prepare(struct kernfs_node *parent_kn,
int ret; int ret;
prdtgrp = rdtgroup_kn_lock_live(prgrp_kn); prdtgrp = rdtgroup_kn_lock_live(prgrp_kn);
rdt_last_cmd_clear();
if (!prdtgrp) { if (!prdtgrp) {
ret = -ENODEV; ret = -ENODEV;
rdt_last_cmd_puts("directory was removed\n");
goto out_unlock; goto out_unlock;
} }
...@@ -1602,6 +1604,7 @@ static int mkdir_rdt_prepare(struct kernfs_node *parent_kn, ...@@ -1602,6 +1604,7 @@ static int mkdir_rdt_prepare(struct kernfs_node *parent_kn,
rdtgrp = kzalloc(sizeof(*rdtgrp), GFP_KERNEL); rdtgrp = kzalloc(sizeof(*rdtgrp), GFP_KERNEL);
if (!rdtgrp) { if (!rdtgrp) {
ret = -ENOSPC; ret = -ENOSPC;
rdt_last_cmd_puts("kernel out of memory\n");
goto out_unlock; goto out_unlock;
} }
*r = rdtgrp; *r = rdtgrp;
...@@ -1613,6 +1616,7 @@ static int mkdir_rdt_prepare(struct kernfs_node *parent_kn, ...@@ -1613,6 +1616,7 @@ static int mkdir_rdt_prepare(struct kernfs_node *parent_kn,
kn = kernfs_create_dir(parent_kn, name, mode, rdtgrp); kn = kernfs_create_dir(parent_kn, name, mode, rdtgrp);
if (IS_ERR(kn)) { if (IS_ERR(kn)) {
ret = PTR_ERR(kn); ret = PTR_ERR(kn);
rdt_last_cmd_puts("kernfs create error\n");
goto out_free_rgrp; goto out_free_rgrp;
} }
rdtgrp->kn = kn; rdtgrp->kn = kn;
...@@ -1626,24 +1630,32 @@ static int mkdir_rdt_prepare(struct kernfs_node *parent_kn, ...@@ -1626,24 +1630,32 @@ static int mkdir_rdt_prepare(struct kernfs_node *parent_kn,
kernfs_get(kn); kernfs_get(kn);
ret = rdtgroup_kn_set_ugid(kn); ret = rdtgroup_kn_set_ugid(kn);
if (ret) if (ret) {
rdt_last_cmd_puts("kernfs perm error\n");
goto out_destroy; goto out_destroy;
}
files = RFTYPE_BASE | RFTYPE_CTRL; files = RFTYPE_BASE | RFTYPE_CTRL;
files = RFTYPE_BASE | BIT(RF_CTRLSHIFT + rtype); files = RFTYPE_BASE | BIT(RF_CTRLSHIFT + rtype);
ret = rdtgroup_add_files(kn, files); ret = rdtgroup_add_files(kn, files);
if (ret) if (ret) {
rdt_last_cmd_puts("kernfs fill error\n");
goto out_destroy; goto out_destroy;
}
if (rdt_mon_capable) { if (rdt_mon_capable) {
ret = alloc_rmid(); ret = alloc_rmid();
if (ret < 0) if (ret < 0) {
rdt_last_cmd_puts("out of RMIDs\n");
goto out_destroy; goto out_destroy;
}
rdtgrp->mon.rmid = ret; rdtgrp->mon.rmid = ret;
ret = mkdir_mondata_all(kn, rdtgrp, &rdtgrp->mon.mon_data_kn); ret = mkdir_mondata_all(kn, rdtgrp, &rdtgrp->mon.mon_data_kn);
if (ret) if (ret) {
rdt_last_cmd_puts("kernfs subdir error\n");
goto out_idfree; goto out_idfree;
}
} }
kernfs_activate(kn); kernfs_activate(kn);
...@@ -1721,8 +1733,10 @@ static int rdtgroup_mkdir_ctrl_mon(struct kernfs_node *parent_kn, ...@@ -1721,8 +1733,10 @@ static int rdtgroup_mkdir_ctrl_mon(struct kernfs_node *parent_kn,
kn = rdtgrp->kn; kn = rdtgrp->kn;
ret = closid_alloc(); ret = closid_alloc();
if (ret < 0) if (ret < 0) {
rdt_last_cmd_puts("out of CLOSIDs\n");
goto out_common_fail; goto out_common_fail;
}
closid = ret; closid = ret;
rdtgrp->closid = closid; rdtgrp->closid = closid;
...@@ -1734,8 +1748,10 @@ static int rdtgroup_mkdir_ctrl_mon(struct kernfs_node *parent_kn, ...@@ -1734,8 +1748,10 @@ static int rdtgroup_mkdir_ctrl_mon(struct kernfs_node *parent_kn,
* of tasks and cpus to monitor. * of tasks and cpus to monitor.
*/ */
ret = mongroup_create_dir(kn, NULL, "mon_groups", NULL); ret = mongroup_create_dir(kn, NULL, "mon_groups", NULL);
if (ret) if (ret) {
rdt_last_cmd_puts("kernfs subdir error\n");
goto out_id_free; goto out_id_free;
}
} }
goto out_unlock; goto out_unlock;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册