linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: shijie.huang@arm.com (Huang Shijie)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/9] arm64: entry: record the hardirq changes on the entry/exit code
Date: Mon, 30 May 2016 10:52:24 +0800	[thread overview]
Message-ID: <1464576750-25160-4-git-send-email-shijie.huang@arm.com> (raw)
In-Reply-To: <1464576750-25160-1-git-send-email-shijie.huang@arm.com>

Just as the arm32 code does, record the hardirq changes at the entry/exit
code.

The trace code may changes some registers, but the syscall path
needs the x0 ~ x7, we restore them in the el0_svc_naked.

Signed-off-by: Huang Shijie <shijie.huang@arm.com>
---
 arch/arm64/kernel/entry.S | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S
index 21b6068..4c67c56 100644
--- a/arch/arm64/kernel/entry.S
+++ b/arch/arm64/kernel/entry.S
@@ -132,6 +132,15 @@
 	mov	scno, x8
 	.endif
 
+#ifdef CONFIG_TRACE_IRQFLAGS
+	/*
+	 * The trace_hardirqs_off may changes some registers, so we should
+	 * restore them back from the stack in the necessary place, such as
+	 * el0_svc_naked.
+	 */
+	bl	trace_hardirqs_off
+#endif
+
 	/*
 	 * Registers that may be useful after this macro is invoked:
 	 *
@@ -142,6 +151,9 @@
 	.endm
 
 	.macro	kernel_exit, el
+#ifdef CONFIG_TRACE_IRQFLAGS
+	bl	trace_hardirqs_on
+#endif
 	ldp	x21, x22, [sp, #S_PC]		// load ELR, SPSR
 	.if	\el == 0
 	ct_user_enter
@@ -729,6 +741,9 @@ el0_svc:
 	uxtw	scno, w26			// syscall number in w8
 	mov	sc_nr, #__NR_syscalls
 el0_svc_naked:					// compat entry point
+#ifdef CONFIG_TRACE_IRQFLAGS
+	restore_syscall_regs
+#endif
 	stp	x19, scno, [sp, #S_ORIG_X0]	// save the original x0 and syscall number
 	enable_dbg_and_irq
 	ct_user_exit 1
-- 
2.5.5

  parent reply	other threads:[~2016-05-30  2:52 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-30  2:52 [PATCH 0/9] arm64: add more accurate code for tracing the hardirq flags changes Huang Shijie
2016-05-30  2:52 ` [PATCH 1/9] arm64: entry: use the callee-saved registers to save some registers Huang Shijie
2016-05-30  2:52 ` [PATCH 2/9] arm64: entry: add a new macro to restore the registers for syscall Huang Shijie
2016-05-30  2:52 ` Huang Shijie [this message]
2016-05-30  2:52 ` [PATCH 4/9] arm64: entry: remove the duplicated code for tracing the IRQ flags Huang Shijie
2016-05-30  2:52 ` [PATCH 5/9] arm64: entry: only restore the syscall registers once Huang Shijie
2016-05-30  2:52 ` [PATCH 6/9] arm64: entry: adjust el1_sync so that a function can be called Huang Shijie
2016-05-30  2:52 ` [PATCH 7/9] arm64: entry: save the x0 back into the stack before disabling the interrupt Huang Shijie
2016-05-30  2:52 ` [PATCH 8/9] arm64: add the hardirq flags trace code for irq macros Huang Shijie
2016-05-30  2:52 ` [PATCH 9/9] arm64: entry: remove the duplicated hardirq flags trace code Huang Shijie

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=1464576750-25160-4-git-send-email-shijie.huang@arm.com \
    --to=shijie.huang@arm.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /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;
as well as URLs for NNTP newsgroup(s).