mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-31 00:17:44 +00:00
de2ae403b4
is_xen_pmu() is taking the cpu number as parameter, but it is not using
it. Instead it just tests whether the Xen PMU initialization on the
current cpu did succeed. As this test is done by checking a percpu
pointer, preemption needs to be disabled in order to avoid switching
the cpu while doing the test. While resuming from suspend() this seems
not to be the case:
[ 88.082751] ACPI: PM: Low-level resume complete
[ 88.087933] ACPI: EC: EC started
[ 88.091464] ACPI: PM: Restoring platform NVS memory
[ 88.097166] xen_acpi_processor: Uploading Xen processor PM info
[ 88.103850] Enabling non-boot CPUs ...
[ 88.108128] installing Xen timer for CPU 1
[ 88.112763] BUG: using smp_processor_id() in preemptible [00000000] code: systemd-sleep/7138
[ 88.122256] caller is is_xen_pmu+0x12/0x30
[ 88.126937] CPU: 0 PID: 7138 Comm: systemd-sleep Tainted: G W 5.16.13-2.fc32.qubes.x86_64 #1
[ 88.137939] Hardware name: Star Labs StarBook/StarBook, BIOS 7.97 03/21/2022
[ 88.145930] Call Trace:
[ 88.148757] <TASK>
[ 88.151193] dump_stack_lvl+0x48/0x5e
[ 88.155381] check_preemption_disabled+0xde/0xe0
[ 88.160641] is_xen_pmu+0x12/0x30
[ 88.164441] xen_smp_intr_init_pv+0x75/0x100
Fix that by replacing is_xen_pmu() by a simple boolean variable which
reflects the Xen PMU initialization state on cpu 0.
Modify xen_pmu_init() to return early in case it is being called for a
cpu other than cpu 0 and the boolean variable not being set.
Fixes: bf6dfb154d ("xen/PMU: PMU emulation code")
Reported-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Link: https://lore.kernel.org/r/20220325142002.31789-1-jgross@suse.com
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
22 lines
631 B
C
22 lines
631 B
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef __XEN_PMU_H
|
|
#define __XEN_PMU_H
|
|
|
|
#include <xen/interface/xenpmu.h>
|
|
|
|
extern bool is_xen_pmu;
|
|
|
|
irqreturn_t xen_pmu_irq_handler(int irq, void *dev_id);
|
|
#ifdef CONFIG_XEN_HAVE_VPMU
|
|
void xen_pmu_init(int cpu);
|
|
void xen_pmu_finish(int cpu);
|
|
#else
|
|
static inline void xen_pmu_init(int cpu) {}
|
|
static inline void xen_pmu_finish(int cpu) {}
|
|
#endif
|
|
bool pmu_msr_read(unsigned int msr, uint64_t *val, int *err);
|
|
bool pmu_msr_write(unsigned int msr, uint32_t low, uint32_t high, int *err);
|
|
int pmu_apic_update(uint32_t reg);
|
|
unsigned long long xen_read_pmc(int counter);
|
|
|
|
#endif /* __XEN_PMU_H */
|