Skip to content

Commit

Permalink
Merge tag 'perf_urgent_for_v6.3_rc4' of git://git.kernel.org/pub/scm/…
Browse files Browse the repository at this point in the history
…linux/kernel/git/tip/tip

Pull perf fix from Borislav Petkov:

 - Properly clear perf event status tracking in the AMD perf event
   overflow handler

* tag 'perf_urgent_for_v6.3_rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86/amd/core: Always clear status for idx
  • Loading branch information
Linus Torvalds committed Mar 26, 2023
2 parents f6cdaeb + 263f5ec commit 974fc94
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions arch/x86/events/amd/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -923,6 +923,7 @@ static int amd_pmu_v2_handle_irq(struct pt_regs *regs)

/* Event overflow */
handled++;
status &= ~mask;
perf_sample_data_init(&data, 0, hwc->last_period);

if (!x86_perf_event_set_period(event))
Expand All @@ -933,8 +934,6 @@ static int amd_pmu_v2_handle_irq(struct pt_regs *regs)

if (perf_event_overflow(event, &data, regs))
x86_pmu_stop(event, 0);

status &= ~mask;
}

/*
Expand Down

0 comments on commit 974fc94

Please sign in to comment.