diff --git a/arch/x86/kernel/cpu/resctrl/core.c b/arch/x86/kernel/cpu/resctrl/core.c
index 816d9af6b36b..f9195f1bece0 100644
--- a/arch/x86/kernel/cpu/resctrl/core.c
+++ b/arch/x86/kernel/cpu/resctrl/core.c
@@ -697,6 +697,21 @@ static void domain_remove_cpu(int cpu, struct rdt_resource *r)
domain_remove_cpu_mon(cpu, r);
}
+int resctrl_arch_alloc_rmid(u32 *closid, u32 *rmid)
+{
+ int ret;
+
+ if (!closid || !rmid)
+ return -EINVAL;
+
+ ret = alloc_rmid(*closid);
+ if (ret < 0)
+ return ret;
+
+ *rmid = ret;
+ return 0;
+}
+
static void clear_closid_rmid(int cpu)
{
struct resctrl_pqr_state *state = this_cpu_ptr(&pqr_state);diff --git a/drivers/platform/arm64/mpam/mpam_resctrl.c b/drivers/platform/arm64/mpam/mpam_resctrl.c
index dfd4125875d7..f0fb76b2424a 100644
--- a/drivers/platform/arm64/mpam/mpam_resctrl.c
+++ b/drivers/platform/arm64/mpam/mpam_resctrl.c
@@ -171,6 +171,11 @@ static u32 get_num_reqpartid(void)
return mpam_partid_max + 1;
}
+static u32 get_num_reqpartid_per_closid(void)
+{
+ return get_num_reqpartid() / resctrl_arch_get_num_closid(NULL);
+}
+
u32 resctrl_arch_system_num_rmid_idx(void)
{
u8 closid_shift = fls(mpam_pmg_max);@@ -182,10 +187,11 @@ u32 resctrl_arch_system_num_rmid_idx(void)
u32 resctrl_arch_rmid_idx_encode(u32 closid, u32 rmid)
{
u8 closid_shift = fls(mpam_pmg_max);
+ u32 pmg_mask = ~(~0 << closid_shift);
BUG_ON(closid_shift > 8);
- return (closid << closid_shift) | rmid;
+ return (closid << closid_shift) | (rmid & pmg_mask);
}
void resctrl_arch_rmid_idx_decode(u32 idx, u32 *closid, u32 *rmid)@@ -195,8 +201,10 @@ void resctrl_arch_rmid_idx_decode(u32 idx, u32 *closid, u32 *rmid)
BUG_ON(closid_shift > 8);
- *closid = idx >> closid_shift;
- *rmid = idx & pmg_mask;
+ if (closid)
+ *closid = idx >> closid_shift;
+ if (rmid)
+ *rmid = idx & pmg_mask;
}
void resctrl_arch_sched_in(struct task_struct *tsk)
@@ -1032,6 +1040,33 @@ static void reqpartid_destroy(void)
bitmap_free(reqpartid_free_map);
}
+int resctrl_arch_alloc_rmid(u32 *closid, u32 *rmid)
+{
+ int closid_num = resctrl_arch_get_num_closid(NULL);
+ int i, reqpartid, pmg;
+
+ if (!closid || !rmid)
+ return -EINVAL;
+
+ /* The closid is out of the range of intPARTIDs */
+ if (*closid >= closid_num)
+ return -EINVAL;
+
+ for (i = 0; i < get_num_reqpartid_per_closid(); i++) {
+ reqpartid = i * closid_num + *closid;
+ pmg = alloc_rmid(reqpartid);
+ if (pmg >= 0)
+ break;
+ }
+
+ if (pmg < 0)
+ return pmg;
+
+ *closid = reqpartid;
+ *rmid = pmg;
+ return 0;
+}
+
int mpam_resctrl_setup(void)
{
int err = 0;diff --git a/fs/resctrl/internal.h b/fs/resctrl/internal.h
index a4288997fb93..f817e67a8cfc 100644
--- a/fs/resctrl/internal.h
+++ b/fs/resctrl/internal.h
@@ -325,8 +325,6 @@ int closids_supported(void);
void closid_free(int closid);
-int alloc_rmid(u32 closid);
-
void free_rmid(u32 closid, u32 rmid);
void resctrl_mon_resource_exit(void);
diff --git a/fs/resctrl/pseudo_lock.c b/fs/resctrl/pseudo_lock.c
index 65f3ae15cdfa..ab8d7a36d303 100644
--- a/fs/resctrl/pseudo_lock.c
+++ b/fs/resctrl/pseudo_lock.c
@@ -582,12 +582,11 @@ int rdtgroup_locksetup_exit(struct rdtgroup *rdtgrp)
int ret;
if (resctrl_arch_mon_capable()) {
- ret = alloc_rmid(rdtgrp->closid);
+ ret = resctrl_arch_alloc_rmid(&rdtgrp->closid, &rdtgrp->mon.rmid);
if (ret < 0) {
rdt_last_cmd_puts("Out of RMIDs\n");
return ret;
}
- rdtgrp->mon.rmid = ret;
}
ret = rdtgroup_locksetup_user_restore(rdtgrp);diff --git a/fs/resctrl/rdtgroup.c b/fs/resctrl/rdtgroup.c
index 30f1dd05e10b..7a71fc0b76b5 100644
--- a/fs/resctrl/rdtgroup.c
+++ b/fs/resctrl/rdtgroup.c
@@ -3272,12 +3272,11 @@ static int mkdir_rdt_prepare_rmid_alloc(struct rdtgroup *rdtgrp)
if (!resctrl_arch_mon_capable())
return 0;
- ret = alloc_rmid(rdtgrp->closid);
+ ret = resctrl_arch_alloc_rmid(&rdtgrp->closid, &rdtgrp->mon.rmid);
if (ret < 0) {
rdt_last_cmd_puts("Out of RMIDs\n");
return ret;
}
- rdtgrp->mon.rmid = ret;
ret = mkdir_mondata_all(rdtgrp->kn, rdtgrp, &rdtgrp->mon.mon_data_kn);
if (ret) {diff --git a/include/linux/resctrl.h b/include/linux/resctrl.h
index be9d9f4c7b81..4fffbe8cd22e 100644
--- a/include/linux/resctrl.h
+++ b/include/linux/resctrl.h
@@ -506,6 +506,22 @@ static inline void resctrl_arch_rmid_read_context_check(void)
might_sleep();
}
+int alloc_rmid(u32 closid);
+/**
+ * resctrl_arch_alloc_rmid() - Providing the similar functionality as
+ * alloc_rmid, but this function is an
+ * enhanced version based on different
+ * architecture implementations.
+ * @closid: closid that matches the rmid. Depending on the
+ * architecture, may update new closid and return by the
+ * pointer.
+ * @rmid: update available rmid by the pointer.
+ *
+ * Return:
+ * 0 on success, or -EINVAL, -ENOSPC etc on error.
+ */
+int resctrl_arch_alloc_rmid(u32 *closid, u32 *rmid);
+
/**
* resctrl_arch_reset_rmid() - Reset any private state associated with rmid
* and eventid.
--
2.25.1