Skip to content

Commit 0143928

Browse files
sandip4ningomolnar
authored andcommitted
perf/x86/amd/uncore: Fix the return value of amd_uncore_df_event_init() on error
If amd_uncore_event_init() fails, return an error irrespective of the pmu_version. Setting hwc->config should be safe even if there is an error so use this opportunity to simplify the code. Closes: https://lore.kernel.org/all/aTaI0ci3vZ44lmBn@stanley.mountain/ Fixes: d6389d3 ("perf/x86/amd/uncore: Refactor uncore management") Reported-by: Dan Carpenter <dan.carpenter@linaro.org> Signed-off-by: Sandipan Das <sandipan.das@amd.com> Signed-off-by: Ingo Molnar <mingo@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: stable@vger.kernel.org Link: https://patch.msgid.link/076935e23a70335d33bd6e23308b75ae0ad35ba2.1765268667.git.sandipan.das@amd.com
1 parent 92546f6 commit 0143928

1 file changed

Lines changed: 1 addition & 4 deletions

File tree

arch/x86/events/amd/uncore.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -656,14 +656,11 @@ static int amd_uncore_df_event_init(struct perf_event *event)
656656
struct hw_perf_event *hwc = &event->hw;
657657
int ret = amd_uncore_event_init(event);
658658

659-
if (ret || pmu_version < 2)
660-
return ret;
661-
662659
hwc->config = event->attr.config &
663660
(pmu_version >= 2 ? AMD64_PERFMON_V2_RAW_EVENT_MASK_NB :
664661
AMD64_RAW_EVENT_MASK_NB);
665662

666-
return 0;
663+
return ret;
667664
}
668665

669666
static int amd_uncore_df_add(struct perf_event *event, int flags)

0 commit comments

Comments
 (0)