ba5d4dc003
[ Upstream commit 1782663897945a5cf28e564ba5eed730098e9aa4 ] After the L1 saves its PMU SPRs but before loading the L2's PMU SPRs, switch the pmcregs_in_use field in the L1 lppaca to the value advertised by the L2 in its VPA. On the way out of the L2, set it back after saving the L2 PMU registers (if they were in-use). This transfers the PMU liveness indication between the L1 and L2 at the points where the registers are not live. This fixes the nested HV bug for which a workaround was added to the L0 HV by commit63279eeb7f("KVM: PPC: Book3S HV: Always save guest pmu for guest capable of nesting"), which explains the problem in detail. That workaround is no longer required for guests that include this bug fix. Fixes:360cae3137("KVM: PPC: Book3S HV: Nested guest entry via hypercall") Signed-off-by: Nicholas Piggin <npiggin@gmail.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Reviewed-by: Fabiano Rosas <farosas@linux.ibm.com> Link: https://lore.kernel.org/r/20210811160134.904987-10-npiggin@gmail.com Signed-off-by: Sasha Levin <sashal@kernel.org>
54 lines
1.1 KiB
C
54 lines
1.1 KiB
C
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
/*
|
|
* pmc.h
|
|
* Copyright (C) 2004 David Gibson, IBM Corporation
|
|
*/
|
|
#ifndef _POWERPC_PMC_H
|
|
#define _POWERPC_PMC_H
|
|
#ifdef __KERNEL__
|
|
|
|
#include <asm/ptrace.h>
|
|
|
|
typedef void (*perf_irq_t)(struct pt_regs *);
|
|
extern perf_irq_t perf_irq;
|
|
|
|
int reserve_pmc_hardware(perf_irq_t new_perf_irq);
|
|
void release_pmc_hardware(void);
|
|
void ppc_enable_pmcs(void);
|
|
|
|
#ifdef CONFIG_PPC_BOOK3S_64
|
|
#include <asm/lppaca.h>
|
|
#include <asm/firmware.h>
|
|
|
|
static inline void ppc_set_pmu_inuse(int inuse)
|
|
{
|
|
#if defined(CONFIG_PPC_PSERIES) || defined(CONFIG_KVM_BOOK3S_HV_POSSIBLE)
|
|
if (firmware_has_feature(FW_FEATURE_LPAR)) {
|
|
#ifdef CONFIG_PPC_PSERIES
|
|
get_lppaca()->pmcregs_in_use = inuse;
|
|
#endif
|
|
}
|
|
#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE
|
|
get_paca()->pmcregs_in_use = inuse;
|
|
#endif
|
|
#endif
|
|
}
|
|
|
|
#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE
|
|
static inline int ppc_get_pmu_inuse(void)
|
|
{
|
|
return get_paca()->pmcregs_in_use;
|
|
}
|
|
#endif
|
|
|
|
extern void power4_enable_pmcs(void);
|
|
|
|
#else /* CONFIG_PPC64 */
|
|
|
|
static inline void ppc_set_pmu_inuse(int inuse) { }
|
|
|
|
#endif
|
|
|
|
#endif /* __KERNEL__ */
|
|
#endif /* _POWERPC_PMC_H */
|