Skip to content

Commit 65b4f40

Browse files
Vikas ShivappaKAGA-KOKO
Vikas Shivappa
authored and
KAGA-KOKO
committed
x86/intel_rdt: Prepare for RDT monitoring mkdir support
Separate the ctrl mkdir code from the rest in order to prepare for adding support for RDT monitoring mkdir support as well. Signed-off-by: Vikas Shivappa <vikas.shivappa@linux.intel.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: ravi.v.shankar@intel.com Cc: tony.luck@intel.com Cc: fenghua.yu@intel.com Cc: peterz@infradead.org Cc: eranian@google.com Cc: vikas.shivappa@intel.com Cc: ak@linux.intel.com Cc: davidcc@google.com Cc: reinette.chatre@intel.com Link: http://lkml.kernel.org/r/1501017287-28083-13-git-send-email-vikas.shivappa@linux.intel.com
1 parent d4ab332 commit 65b4f40

File tree

1 file changed

+79
-32
lines changed

1 file changed

+79
-32
lines changed

‎arch/x86/kernel/cpu/intel_rdt_rdtgroup.c

Lines changed: 79 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1082,46 +1082,35 @@ static struct file_system_type rdt_fs_type = {
10821082
.kill_sb = rdt_kill_sb,
10831083
};
10841084

1085-
static int rdtgroup_mkdir(struct kernfs_node *parent_kn, const char *name,
1086-
umode_t mode)
1085+
static int mkdir_rdt_prepare(struct kernfs_node *parent_kn,
1086+
struct kernfs_node *prgrp_kn,
1087+
const char *name, umode_t mode,
1088+
struct rdtgroup **r)
10871089
{
1088-
struct rdtgroup *parent, *rdtgrp;
1090+
struct rdtgroup *prdtgrp, *rdtgrp;
10891091
struct kernfs_node *kn;
1090-
int ret, closid;
1091-
1092-
/* Only allow mkdir in the root directory */
1093-
if (parent_kn != rdtgroup_default.kn)
1094-
return -EPERM;
1095-
1096-
/* Do not accept '\n' to avoid unparsable situation. */
1097-
if (strchr(name, '\n'))
1098-
return -EINVAL;
1092+
uint files = 0;
1093+
int ret;
10991094

1100-
parent = rdtgroup_kn_lock_live(parent_kn);
1101-
if (!parent) {
1095+
prdtgrp = rdtgroup_kn_lock_live(prgrp_kn);
1096+
if (!prdtgrp) {
11021097
ret = -ENODEV;
11031098
goto out_unlock;
11041099
}
11051100

1106-
ret = closid_alloc();
1107-
if (ret < 0)
1108-
goto out_unlock;
1109-
closid = ret;
1110-
11111101
/* allocate the rdtgroup. */
11121102
rdtgrp = kzalloc(sizeof(*rdtgrp), GFP_KERNEL);
11131103
if (!rdtgrp) {
11141104
ret = -ENOSPC;
1115-
goto out_closid_free;
1105+
goto out_unlock;
11161106
}
1117-
rdtgrp->closid = closid;
1118-
list_add(&rdtgrp->rdtgroup_list, &rdt_all_groups);
1107+
*r = rdtgrp;
11191108

11201109
/* kernfs creates the directory for rdtgrp */
1121-
kn = kernfs_create_dir(parent->kn, name, mode, rdtgrp);
1110+
kn = kernfs_create_dir(parent_kn, name, mode, rdtgrp);
11221111
if (IS_ERR(kn)) {
11231112
ret = PTR_ERR(kn);
1124-
goto out_cancel_ref;
1113+
goto out_free_rgrp;
11251114
}
11261115
rdtgrp->kn = kn;
11271116

@@ -1137,27 +1126,85 @@ static int rdtgroup_mkdir(struct kernfs_node *parent_kn, const char *name,
11371126
if (ret)
11381127
goto out_destroy;
11391128

1140-
ret = rdtgroup_add_files(kn, RF_CTRL_BASE);
1129+
files = RFTYPE_BASE | RFTYPE_CTRL;
1130+
ret = rdtgroup_add_files(kn, files);
11411131
if (ret)
11421132
goto out_destroy;
11431133

11441134
kernfs_activate(kn);
11451135

1146-
ret = 0;
1147-
goto out_unlock;
1136+
/*
1137+
* The caller unlocks the prgrp_kn upon success.
1138+
*/
1139+
return 0;
11481140

11491141
out_destroy:
11501142
kernfs_remove(rdtgrp->kn);
1151-
out_cancel_ref:
1152-
list_del(&rdtgrp->rdtgroup_list);
1143+
out_free_rgrp:
11531144
kfree(rdtgrp);
1154-
out_closid_free:
1155-
closid_free(closid);
11561145
out_unlock:
1157-
rdtgroup_kn_unlock(parent_kn);
1146+
rdtgroup_kn_unlock(prgrp_kn);
1147+
return ret;
1148+
}
1149+
1150+
static void mkdir_rdt_prepare_clean(struct rdtgroup *rgrp)
1151+
{
1152+
kernfs_remove(rgrp->kn);
1153+
kfree(rgrp);
1154+
}
1155+
1156+
/*
1157+
* These are rdtgroups created under the root directory. Can be used
1158+
* to allocate resources.
1159+
*/
1160+
static int rdtgroup_mkdir_ctrl(struct kernfs_node *parent_kn,
1161+
struct kernfs_node *prgrp_kn,
1162+
const char *name, umode_t mode)
1163+
{
1164+
struct rdtgroup *rdtgrp;
1165+
struct kernfs_node *kn;
1166+
u32 closid;
1167+
int ret;
1168+
1169+
ret = mkdir_rdt_prepare(parent_kn, prgrp_kn, name, mode, &rdtgrp);
1170+
if (ret)
1171+
return ret;
1172+
1173+
kn = rdtgrp->kn;
1174+
ret = closid_alloc();
1175+
if (ret < 0)
1176+
goto out_common_fail;
1177+
closid = ret;
1178+
1179+
rdtgrp->closid = closid;
1180+
list_add(&rdtgrp->rdtgroup_list, &rdt_all_groups);
1181+
1182+
goto out_unlock;
1183+
1184+
out_common_fail:
1185+
mkdir_rdt_prepare_clean(rdtgrp);
1186+
out_unlock:
1187+
rdtgroup_kn_unlock(prgrp_kn);
11581188
return ret;
11591189
}
11601190

1191+
static int rdtgroup_mkdir(struct kernfs_node *parent_kn, const char *name,
1192+
umode_t mode)
1193+
{
1194+
/* Do not accept '\n' to avoid unparsable situation. */
1195+
if (strchr(name, '\n'))
1196+
return -EINVAL;
1197+
1198+
/*
1199+
* If the parent directory is the root directory and RDT
1200+
* allocation is supported, add a control rdtgroup.
1201+
*/
1202+
if (rdt_alloc_capable && parent_kn == rdtgroup_default.kn)
1203+
return rdtgroup_mkdir_ctrl(parent_kn, parent_kn, name, mode);
1204+
1205+
return -EPERM;
1206+
}
1207+
11611208
static int rdtgroup_rmdir(struct kernfs_node *kn)
11621209
{
11631210
int ret, cpu, closid = rdtgroup_default.closid;

0 commit comments

Comments
 (0)