lkml.org 
[lkml]   [2019]   [Nov]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.9 36/99] s390/perf: Return error when debug_register fails
    Date
    From: Thomas Richter <tmricht@linux.ibm.com>

    [ Upstream commit ec0c0bb489727de0d4dca6a00be6970ab8a3b30a ]

    Return an error when the function debug_register() fails allocating
    the debug handle.
    Also remove the registered debug handle when the initialization fails
    later on.

    Signed-off-by: Thomas Richter <tmricht@linux.ibm.com>
    Reviewed-by: Hendrik Brueckner <brueckner@linux.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/s390/kernel/perf_cpum_sf.c | 6 +++++-
    1 file changed, 5 insertions(+), 1 deletion(-)

    diff --git a/arch/s390/kernel/perf_cpum_sf.c b/arch/s390/kernel/perf_cpum_sf.c
    index 96e4fcad57bf7..f46e5c0cb6d95 100644
    --- a/arch/s390/kernel/perf_cpum_sf.c
    +++ b/arch/s390/kernel/perf_cpum_sf.c
    @@ -1611,14 +1611,17 @@ static int __init init_cpum_sampling_pmu(void)
    }

    sfdbg = debug_register(KMSG_COMPONENT, 2, 1, 80);
    - if (!sfdbg)
    + if (!sfdbg) {
    pr_err("Registering for s390dbf failed\n");
    + return -ENOMEM;
    + }
    debug_register_view(sfdbg, &debug_sprintf_view);

    err = register_external_irq(EXT_IRQ_MEASURE_ALERT,
    cpumf_measurement_alert);
    if (err) {
    pr_cpumsf_err(RS_INIT_FAILURE_ALRT);
    + debug_unregister(sfdbg);
    goto out;
    }

    @@ -1627,6 +1630,7 @@ static int __init init_cpum_sampling_pmu(void)
    pr_cpumsf_err(RS_INIT_FAILURE_PERF);
    unregister_external_irq(EXT_IRQ_MEASURE_ALERT,
    cpumf_measurement_alert);
    + debug_unregister(sfdbg);
    goto out;
    }

    --
    2.20.1
    \
     
     \ /
      Last update: 2019-11-16 16:52    [W:4.038 / U:0.588 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site