perf/x86/core: Simplify hybrid PMU registration failure path
Subsystems (2)
PATCH RESEND 1/1 perf/x86/core: Simplify hybrid PMU registration failure path
Handle perf_pmu_register() errors directly instead of breaking out of the registration loop and checking the index separately. Reuse the loop index i to unregister any previously registered PMUs in reverse order and drop the extra index j.
Also log the failing PMU's name and error code.
Reviewed-by Dapeng Mi <[email protected]>
Signed-off-by Thorsten Blum <[email protected]>
--- arch/x86/events/core.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)
arch/x86/events/core.c +8 -10
@@ -2714,7 +2714,7 @@ static int __init init_hw_perf_events(void) goto out2; }else {struct x86_hybrid_pmu *hybrid_pmu; -int i, j; +int i;for (i =0 ; i < x86_pmu.num_hybrid_pmus; i++) { hybrid_pmu = &x86_pmu.hybrid_pmu[i];
@@ -2725,15 +2725,13 @@ static int __init init_hw_perf_events(void) err =perf_pmu_register (&hybrid_pmu->pmu, hybrid_pmu->name, (hybrid_pmu->pmu_type == hybrid_big) ?PERF_TYPE_RAW :-1 ); -if (err) -break ; - } - -if (i < x86_pmu.num_hybrid_pmus) { -for (j =0 ; j < i; j++) -perf_pmu_unregister (&x86_pmu.hybrid_pmu[j].pmu); -pr_warn ("Failed to register hybrid PMUs\n" ); - goto out2; +if (err) { +while (i--) +perf_pmu_unregister (&x86_pmu.hybrid_pmu[i].pmu); +pr_warn ("Failed to register hybrid PMU %s: %d\n" , + hybrid_pmu->name, err); + goto out2; + } } }
[email protected]
AI reviewSashiko has reviewed this patch and found no issues. It looks great!
Quoted 9 lines
Handle
perf_pmu_register()errors directly instead of breaking out of the registration loop and checking the index separately. Reuse the loop index i to unregister any previously registered PMUs in reverse order and drop the extra index j.Also log the failing PMU's name and error code.
Reviewed-by Dapeng Mi <[email protected]>Signed-off-by Thorsten Blum <[email protected]>
Sashiko has reviewed this patch and found no issues. It looks great!
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1