lkml.org 
[lkml]   [2023]   [Oct]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v7 02/24] x86/resctrl: kfree() rmid_ptrs from rdtgroup_exit()
    Date
    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_exit_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>
    ---
    Changes since v5:
    * This patch is new

    Changes since v6:
    * Removed struct rdt_resource argument, added __exit markers to match the
    only caller.
    * Adedd a whole stack of functions to maintain symmetry.
    ---
    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 19e0681f0435..0056c9962a44 100644
    --- a/arch/x86/kernel/cpu/resctrl/core.c
    +++ b/arch/x86/kernel/cpu/resctrl/core.c
    @@ -992,7 +992,13 @@ 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);
    +
    + if (r->mon_capable)
    + rdt_put_mon_l3_config(r);
    +
    rdtgroup_exit();
    }

    diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/resctrl/internal.h
    index a4f1aa15f0a2..f68c6aecfa66 100644
    --- a/arch/x86/kernel/cpu/resctrl/internal.h
    +++ b/arch/x86/kernel/cpu/resctrl/internal.h
    @@ -546,6 +546,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(struct rdt_resource *r);
    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 f136ac046851..5d9864919f1c 100644
    --- a/arch/x86/kernel/cpu/resctrl/monitor.c
    +++ b/arch/x86/kernel/cpu/resctrl/monitor.c
    @@ -741,6 +741,16 @@ static int dom_data_init(struct rdt_resource *r)
    return 0;
    }

    +static void __exit dom_data_exit(struct rdt_resource *r)
    +{
    + 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,
    @@ -830,6 +840,11 @@ int __init rdt_get_mon_l3_config(struct rdt_resource *r)
    return 0;
    }

    +void __exit rdt_put_mon_l3_config(struct rdt_resource *r)
    +{
    + dom_data_exit(r);
    +}
    +
    void __init intel_rdt_mbm_apply_quirk(void)
    {
    int cf_index;
    --
    2.39.2
    \
     
     \ /
      Last update: 2023-10-25 20:06    [W:4.218 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site