lkml.org 
[lkml]   [2024]   [Feb]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip: x86/cache] x86/resctrl: Free rmid_ptrs from resctrl_exit()
    The following commit has been merged into the x86/cache branch of tip:

    Commit-ID: 3f7b07380d58cfbb6a2d3aa672dcc76c0f4b0745
    Gitweb: https://git.kernel.org/tip/3f7b07380d58cfbb6a2d3aa672dcc76c0f4b0745
    Author: James Morse <james.morse@arm.com>
    AuthorDate: Tue, 13 Feb 2024 18:44:16
    Committer: Borislav Petkov (AMD) <bp@alien8.de>
    CommitterDate: Fri, 16 Feb 2024 19:18:31 +01:00

    x86/resctrl: Free rmid_ptrs from resctrl_exit()

    rmid_ptrs[] is allocated from dom_data_init() but never free()d.

    While the exit text ends up in the linker script's DISCARD section,
    the direction of travel is for resctrl to be/have loadable modules.

    Add resctrl_put_mon_l3_config() to cleanup any memory allocated
    by rdt_get_mon_l3_config().

    There is no reason to backport this to a stable kernel.

    Signed-off-by: James Morse <james.morse@arm.com>
    Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
    Reviewed-by: Babu Moger <babu.moger@amd.com>
    Reviewed-by: Reinette Chatre <reinette.chatre@intel.com>
    Tested-by: Babu Moger <babu.moger@amd.com>
    Tested-by: Carl Worth <carl@os.amperecomputing.com> # arm64
    Link: https://lore.kernel.org/r/20240213184438.16675-3-james.morse@arm.com
    Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
    ---
    arch/x86/kernel/cpu/resctrl/core.c | 6 ++++++
    arch/x86/kernel/cpu/resctrl/internal.h | 1 +
    arch/x86/kernel/cpu/resctrl/monitor.c | 15 +++++++++++++++
    3 files changed, 22 insertions(+)

    diff --git a/arch/x86/kernel/cpu/resctrl/core.c b/arch/x86/kernel/cpu/resctrl/core.c
    index aa9810a..9641c42 100644
    --- a/arch/x86/kernel/cpu/resctrl/core.c
    +++ b/arch/x86/kernel/cpu/resctrl/core.c
    @@ -990,8 +990,14 @@ late_initcall(resctrl_late_init);

    static void __exit resctrl_exit(void)
    {
    + struct rdt_resource *r = &rdt_resources_all[RDT_RESOURCE_L3].r_resctrl;
    +
    cpuhp_remove_state(rdt_online);
    +
    rdtgroup_exit();
    +
    + if (r->mon_capable)
    + rdt_put_mon_l3_config();
    }

    __exitcall(resctrl_exit);
    diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/resctrl/internal.h
    index 52e7e7d..61c7636 100644
    --- a/arch/x86/kernel/cpu/resctrl/internal.h
    +++ b/arch/x86/kernel/cpu/resctrl/internal.h
    @@ -544,6 +544,7 @@ void closid_free(int closid);
    int alloc_rmid(void);
    void free_rmid(u32 rmid);
    int rdt_get_mon_l3_config(struct rdt_resource *r);
    +void __exit rdt_put_mon_l3_config(void);
    bool __init rdt_cpu_has(int flag);
    void mon_event_count(void *info);
    int rdtgroup_mondata_show(struct seq_file *m, void *arg);
    diff --git a/arch/x86/kernel/cpu/resctrl/monitor.c b/arch/x86/kernel/cpu/resctrl/monitor.c
    index 3a6c069..3a73db0 100644
    --- a/arch/x86/kernel/cpu/resctrl/monitor.c
    +++ b/arch/x86/kernel/cpu/resctrl/monitor.c
    @@ -719,6 +719,16 @@ static int dom_data_init(struct rdt_resource *r)
    return 0;
    }

    +static void __exit dom_data_exit(void)
    +{
    + mutex_lock(&rdtgroup_mutex);
    +
    + kfree(rmid_ptrs);
    + rmid_ptrs = NULL;
    +
    + mutex_unlock(&rdtgroup_mutex);
    +}
    +
    static struct mon_evt llc_occupancy_event = {
    .name = "llc_occupancy",
    .evtid = QOS_L3_OCCUP_EVENT_ID,
    @@ -814,6 +824,11 @@ int __init rdt_get_mon_l3_config(struct rdt_resource *r)
    return 0;
    }

    +void __exit rdt_put_mon_l3_config(void)
    +{
    + dom_data_exit();
    +}
    +
    void __init intel_rdt_mbm_apply_quirk(void)
    {
    int cf_index;
    \
     
     \ /
      Last update: 2024-05-27 15:10    [W:4.404 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site