mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Marc Zyngier <marc.zyngier@arm.com>
To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Cc: Mark Rutland <mark.rutland@arm.com>,
	Russell King <linux@armlinux.org.uk>,
	Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will.deacon@arm.com>,
	Daniel Lezcano <daniel.lezcano@linaro.org>,
	Thomas Gleixner <tglx@linutronix.de>
Subject: [PATCH 06/16] arm64: compat: Add CNTVCT trap handler
Date: Fri, 21 Jul 2017 18:15:32 +0100	[thread overview]
Message-ID: <20170721171542.27639-7-marc.zyngier@arm.com> (raw)
In-Reply-To: <20170721171542.27639-1-marc.zyngier@arm.com>

Since people seem to make a point in breaking the userspace visible
counter, we have no choice but to trap the access. We already do this
for 64bit userspace, but this is lacking for compat. Let's provide
the required handler.

Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
 arch/arm64/include/asm/esr.h |  3 +++
 arch/arm64/kernel/traps.c    | 16 ++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/arch/arm64/include/asm/esr.h b/arch/arm64/include/asm/esr.h
index fc71b89c99f9..43e629fe73dd 100644
--- a/arch/arm64/include/asm/esr.h
+++ b/arch/arm64/include/asm/esr.h
@@ -258,6 +258,9 @@
 					 ESR_ELx_CP15_64_ISS_CRM_MASK | \
 					 ESR_ELx_CP15_64_ISS_DIR_MASK)
 
+#define ESR_ELx_CP15_64_ISS_SYS_CNTVCT	(ESR_ELx_CP15_64_ISS_SYS_VAL(1, 14) | \
+					 ESR_ELx_CP15_64_ISS_DIR_READ)
+
 #ifndef __ASSEMBLY__
 #include <asm/types.h>
 
diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c
index ac91f4ead737..70efd63a5545 100644
--- a/arch/arm64/kernel/traps.c
+++ b/arch/arm64/kernel/traps.c
@@ -562,7 +562,23 @@ static struct sys64_hook cp15_32_hooks[] = {
 	{},
 };
 
+static void compat_cntvct_read_handler(unsigned int esr, struct pt_regs *regs)
+{
+	int rt = (esr & ESR_ELx_CP15_64_ISS_RT_MASK) >> ESR_ELx_CP15_64_ISS_RT_SHIFT;
+	int rt2 = (esr & ESR_ELx_CP15_64_ISS_RT2_MASK) >> ESR_ELx_CP15_64_ISS_RT2_SHIFT;
+	u64 val = arch_counter_get_cntvct();
+
+	regs->user_regs.regs[rt]  = lower_32_bits(val);
+	regs->user_regs.regs[rt2] = upper_32_bits(val);
+	regs->pc += 4;
+}
+
 static struct sys64_hook cp15_64_hooks[] = {
+	{
+		.esr_mask = ESR_ELx_CP15_64_ISS_SYS_MASK,
+		.esr_val = ESR_ELx_CP15_64_ISS_SYS_CNTVCT,
+		.handler = compat_cntvct_read_handler,
+	},
 	{},
 };
 
-- 
2.11.0

  parent reply	other threads:[~2017-07-21 17:16 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-21 17:15 [PATCH 00/16] arm/arm64: Workaround misprogrammed CNTFRQ Marc Zyngier
2017-07-21 17:15 ` [PATCH 01/16] arm64: Use arch_timer_get_rate when trapping CNTFRQ_EL0 Marc Zyngier
2017-07-21 17:15 ` [PATCH 02/16] arm64: Add decoding macros for CP15_32 and CP15_64 traps Marc Zyngier
2017-07-21 17:15 ` [PATCH 03/16] arm64: compat: Add separate CP15 trapping hook Marc Zyngier
2017-07-21 17:15 ` [PATCH 04/16] arm64: compat: Add condition code checks and IT advance Marc Zyngier
2017-07-21 17:15 ` [PATCH 05/16] arm64: compat: Add cp15_32 and cp15_64 handler arrays Marc Zyngier
2017-07-21 17:15 ` Marc Zyngier [this message]
2017-07-21 17:15 ` [PATCH 07/16] arm64: compat: Add CNTFRQ trap handler Marc Zyngier
2017-07-21 17:15 ` [PATCH 08/16] ARM: Let arm_check_condition work with Thumb Marc Zyngier
2017-07-21 17:15 ` [PATCH 09/16] ARM: Check condition code before trying to handle an UNDEF Marc Zyngier
2017-07-21 17:15 ` [PATCH 10/16] ARM: Add arm_advance_itstate helper Marc Zyngier
2017-07-21 17:15 ` [PATCH 11/16] ARM: Advance the IT state on successful emulation of an UNDEF Marc Zyngier
2017-07-21 17:15 ` [PATCH 12/16] ARM: Simplify condition checks in swp_handler Marc Zyngier
2017-07-21 17:15 ` [PATCH 13/16] ARM: Handle trapping of CNTVCT from userspace Marc Zyngier
2017-07-21 17:15 ` [PATCH 14/16] ARM: Handle trapping of CNTFRQ " Marc Zyngier
2017-07-21 17:15 ` [PATCH 15/16] clocksource/arm_arch_timer: Add helper to disable VDSO fastpath Marc Zyngier
2017-07-21 17:15 ` [PATCH 16/16] clocksource/arm_arch_timer: Trap user access to CNT{VCT,FRQ} if CNTFRQ is invalid Marc Zyngier
2017-07-24 12:19 ` [PATCH 00/16] arm/arm64: Workaround misprogrammed CNTFRQ Will Deacon
2017-07-24 12:48   ` Marc Zyngier
2017-07-24 13:12     ` Will Deacon
2017-07-24 13:35       ` Marc Zyngier
2017-07-25 11:46         ` Will Deacon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170721171542.27639-7-marc.zyngier@arm.com \
    --to=marc.zyngier@arm.com \
    --cc=catalin.marinas@arm.com \
    --cc=daniel.lezcano@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@armlinux.org.uk \
    --cc=mark.rutland@arm.com \
    --cc=tglx@linutronix.de \
    --cc=will.deacon@arm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®