arm64: Add CNTFRQ_EL0 trap handler (9842119a) · Commits · 戴 / test

We now trap accesses to CNTVCT_EL0 when the counter is broken enough to require the kernel to mediate the access. But it turns out that some existing userspace (such as OpenMPI) do probe for the counter frequency, leading to an UNDEF exception as CNTVCT_EL0 and CNTFRQ_EL0 share the same control bit. The fix is to handle the exception the same way we do for CNTVCT_EL0. Fixes: ("arm64: arch_timer: Enable CNTVCT_EL0 trap if workaround is enabled") Reported-by:

Hanjun Guo <guohanjun@huawei.com> Tested-by:

Hanjun Guo <guohanjun@huawei.com> Reviewed-by:

Hanjun Guo <guohanjun@huawei.com> Signed-off-by:

Marc Zyngier <marc.zyngier@arm.com> Signed-off-by:

Catalin Marinas <catalin.marinas@arm.com>

arch/arm64/include/asm/esr.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -177,6 +177,10 @@

		#define ESR_ELx_SYS64_ISS_SYS_CNTVCT (ESR_ELx_SYS64_ISS_SYS_VAL(3, 3, 2, 14, 0) \| \
		ESR_ELx_SYS64_ISS_DIR_READ)

		#define ESR_ELx_SYS64_ISS_SYS_CNTFRQ (ESR_ELx_SYS64_ISS_SYS_VAL(3, 3, 0, 14, 0) \| \
		ESR_ELx_SYS64_ISS_DIR_READ)

		#ifndef __ASSEMBLY__
		#include <asm/types.h>

arch/arm64/kernel/traps.c

+14 −0

Original line number	Diff line number	Diff line
		@@ -513,6 +513,14 @@ static void cntvct_read_handler(unsigned int esr, struct pt_regs *regs)
		regs->pc += 4;
		}

		static void cntfrq_read_handler(unsigned int esr, struct pt_regs *regs)
		{
		int rt = (esr & ESR_ELx_SYS64_ISS_RT_MASK) >> ESR_ELx_SYS64_ISS_RT_SHIFT;

		pt_regs_write_reg(regs, rt, read_sysreg(cntfrq_el0));
		regs->pc += 4;
		}

		struct sys64_hook {
		unsigned int esr_mask;
		unsigned int esr_val;
		@@ -537,6 +545,12 @@ static struct sys64_hook sys64_hooks[] = {
		.esr_val = ESR_ELx_SYS64_ISS_SYS_CNTVCT,
		.handler = cntvct_read_handler,
		},
		{
		/* Trap read access to CNTFRQ_EL0 */
		.esr_mask = ESR_ELx_SYS64_ISS_SYS_OP_MASK,
		.esr_val = ESR_ELx_SYS64_ISS_SYS_CNTFRQ,
		.handler = cntfrq_read_handler,
		},
		{},
		};

Admin message