Messages in this thread | | | Date | Thu, 5 Oct 2023 18:07:02 +0100 | Subject | Re: [PATCH v6 08/24] x86/resctrl: Track the number of dirty RMID a CLOSID has | From | James Morse <> |
| |
Hi Reinette,
On 03/10/2023 22:13, Reinette Chatre wrote: > On 9/14/2023 10:21 AM, James Morse wrote: >> @@ -796,13 +817,30 @@ void mbm_setup_overflow_handler(struct rdt_domain *dom, unsigned long delay_ms) >> static int dom_data_init(struct rdt_resource *r) >> { >> u32 idx_limit = resctrl_arch_system_num_rmid_idx(); >> + u32 num_closid = resctrl_arch_get_num_closid(r); >> struct rmid_entry *entry = NULL; >> + int err = 0, i; >> u32 idx; >> - int i; >> + >> + mutex_lock(&rdtgroup_mutex); >> + if (IS_ENABLED(CONFIG_RESCTRL_RMID_DEPENDS_ON_CLOSID)) { >> + int *tmp; >> + >> + tmp = kcalloc(num_closid, sizeof(int), GFP_KERNEL); > > Shouldn't this rather be sizeof(unsigned int) to match the type it will store?
It matches the type of tmp... I'll change both closid_num_dirty_rmid and tmp to a u32 *, and this sizeof() to be sizeof(*tmp).
>> + if (!tmp) { >> + err = -ENOMEM; >> + goto out_unlock; >> + } >> + >> + closid_num_dirty_rmid = tmp; >> + } >> >> rmid_ptrs = kcalloc(idx_limit, sizeof(struct rmid_entry), GFP_KERNEL); >> - if (!rmid_ptrs) >> - return -ENOMEM; >> + if (!rmid_ptrs) { >> + kfree(closid_num_dirty_rmid); >> + err = -ENOMEM; >> + goto out_unlock; >> + } >> >> for (i = 0; i < idx_limit; i++) { >> entry = &rmid_ptrs[i]; >> @@ -822,13 +860,21 @@ static int dom_data_init(struct rdt_resource *r) >> entry = __rmid_entry(idx); >> list_del(&entry->list); >> >> - return 0; >> +out_unlock: >> + mutex_unlock(&rdtgroup_mutex); >> + >> + return err; >> } >> >> void resctrl_exit_mon_l3_config(struct rdt_resource *r) >> { >> mutex_lock(&rdtgroup_mutex); >> >> + if (IS_ENABLED(CONFIG_RESCTRL_RMID_DEPENDS_ON_CLOSID)) { >> + kfree(closid_num_dirty_rmid); >> + closid_num_dirty_rmid = NULL; >> + } >> + >> kfree(rmid_ptrs); >> rmid_ptrs = NULL; >> > > Awaiting response on patch #2 related to above hunk.
It's the same story here. CONFIG_RESCTRL_RMID_DEPENDS_ON_CLOSID makes this behaviour visible to the filesystem code, which means the filesystem code can do the alloc/free of this array. All this eventually moves out to /fs/.
This is all because the RMID allocation is dependent on the limbo list that resctrl manages, and for MPAM the CLOSID is too. I'm sure its simpler to expose this MPAM behaviour to resctrl - and in a way that the compiler can remove if its not needed. The alternative would be to duplicate the allocators on each architecture. I don't think MPAM is different enough to justify this.
Thanks,
James
| |