From: Mark Rutland <mark.rutland@arm.com>
To: Will Deacon <will.deacon@arm.com>
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, catalin.marinas@arm.com,
ard.biesheuvel@linaro.org, sboyd@codeaurora.org,
dave.hansen@linux.intel.com, keescook@chromium.org,
msalter@redhat.com, labbott@redhat.com, tglx@linutronix.de
Subject: Re: [PATCH v2 12/18] arm64: entry: Explicitly pass exception level to kernel_ventry macro
Date: Fri, 1 Dec 2017 11:58:36 +0000 [thread overview]
Message-ID: <20171201115836.jaxzbjsnpnuau56s@lakrids.cambridge.arm.com> (raw)
In-Reply-To: <1512059986-21325-13-git-send-email-will.deacon@arm.com>
On Thu, Nov 30, 2017 at 04:39:40PM +0000, Will Deacon wrote:
> We will need to treat exceptions from EL0 differently in kernel_ventry,
> so rework the macro to take the exception level as an argument and
> construct the branch target using that.
>
> Signed-off-by: Will Deacon <will.deacon@arm.com>
> ---
> arch/arm64/kernel/entry.S | 46 +++++++++++++++++++++++-----------------------
> 1 file changed, 23 insertions(+), 23 deletions(-)
>
> diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S
> index dea196f287a0..688e52f65a8d 100644
> --- a/arch/arm64/kernel/entry.S
> +++ b/arch/arm64/kernel/entry.S
> @@ -71,7 +71,7 @@
> #define BAD_FIQ 2
> #define BAD_ERROR 3
>
> - .macro kernel_ventry label
> + .macro kernel_ventry, el, label, regsize = 64
> .align 7
> sub sp, sp, #S_FRAME_SIZE
> #ifdef CONFIG_VMAP_STACK
> @@ -84,7 +84,7 @@
> tbnz x0, #THREAD_SHIFT, 0f
> sub x0, sp, x0 // x0'' = sp' - x0' = (sp + x0) - sp = x0
> sub sp, sp, x0 // sp'' = sp' - x0 = (sp + x0) - x0 = sp
> - b \label
> + b el\()\el\()_\label
>
> 0:
> /*
> @@ -116,7 +116,7 @@
> sub sp, sp, x0
> mrs x0, tpidrro_el0
> #endif
> - b \label
> + b el\()\el\()_\label
> .endm
>
> .macro kernel_entry, el, regsize = 64
> @@ -369,31 +369,31 @@ tsk .req x28 // current thread_info
>
> .align 11
> ENTRY(vectors)
> - kernel_ventry el1_sync_invalid // Synchronous EL1t
> - kernel_ventry el1_irq_invalid // IRQ EL1t
> - kernel_ventry el1_fiq_invalid // FIQ EL1t
> - kernel_ventry el1_error_invalid // Error EL1t
> + kernel_ventry 1, sync_invalid // Synchronous EL1t
> + kernel_ventry 1, irq_invalid // IRQ EL1t
> + kernel_ventry 1, fiq_invalid // FIQ EL1t
> + kernel_ventry 1, error_invalid // Error EL1t
Using the el paramter to build the branch name has the unfortunate
property of obscuring the branch name. For example, that makes it
difficult to jump around the entry asm with ctags, which is somewhat
painful.
Could we leave the full branch name in place, e.g.
kernel_ventry 1, el1_sync_invalid // Synchronous EL1t
kernel_ventry 1, el1_irq_invalid // IRQ EL1t
kernel_ventry 1, el1_fiq_invalid // FIQ EL1t
kernel_ventry 1, el1_error_invalid // Error EL1t
... or have separate kernel_ventry and user_ventry macros that
implicitly encoded the source EL, also leaving the label name as-is.
Otherwise, this looks fine to me.
Thanks,
Mark.
next prev parent reply other threads:[~2017-12-01 11:58 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-30 16:39 [PATCH v2 00/18] arm64: Unmap the kernel whilst running in userspace (KAISER) Will Deacon
2017-11-30 16:39 ` [PATCH v2 01/18] arm64: mm: Use non-global mappings for kernel space Will Deacon
2017-11-30 16:39 ` [PATCH v2 02/18] arm64: mm: Temporarily disable ARM64_SW_TTBR0_PAN Will Deacon
2017-11-30 16:39 ` [PATCH v2 03/18] arm64: mm: Move ASID from TTBR0 to TTBR1 Will Deacon
2017-11-30 17:36 ` Mark Rutland
2017-11-30 16:39 ` [PATCH v2 04/18] arm64: mm: Remove pre_ttbr0_update_workaround for Falkor erratum #E1003 Will Deacon
2017-11-30 16:39 ` [PATCH v2 05/18] arm64: mm: Rename post_ttbr0_update_workaround Will Deacon
2017-11-30 16:39 ` [PATCH v2 06/18] arm64: mm: Fix and re-enable ARM64_SW_TTBR0_PAN Will Deacon
2017-12-01 11:48 ` Mark Rutland
2017-11-30 16:39 ` [PATCH v2 07/18] arm64: mm: Allocate ASIDs in pairs Will Deacon
2017-11-30 16:39 ` [PATCH v2 08/18] arm64: mm: Add arm64_kernel_unmapped_at_el0 helper Will Deacon
2017-11-30 16:39 ` [PATCH v2 09/18] arm64: mm: Invalidate both kernel and user ASIDs when performing TLBI Will Deacon
2017-11-30 16:39 ` [PATCH v2 10/18] arm64: entry: Add exception trampoline page for exceptions from EL0 Will Deacon
2017-12-01 13:31 ` Mark Rutland
2017-12-06 10:25 ` Ard Biesheuvel
2017-11-30 16:39 ` [PATCH v2 11/18] arm64: mm: Map entry trampoline into trampoline and kernel page tables Will Deacon
2017-11-30 18:29 ` Mark Rutland
2017-11-30 16:39 ` [PATCH v2 12/18] arm64: entry: Explicitly pass exception level to kernel_ventry macro Will Deacon
2017-12-01 11:58 ` Mark Rutland [this message]
2017-12-01 17:51 ` Will Deacon
2017-12-01 18:00 ` Mark Rutland
2017-11-30 16:39 ` [PATCH v2 13/18] arm64: entry: Hook up entry trampoline to exception vectors Will Deacon
2017-12-01 13:53 ` Mark Rutland
2017-12-01 17:40 ` Will Deacon
2017-11-30 16:39 ` [PATCH v2 14/18] arm64: erratum: Work around Falkor erratum #E1003 in trampoline code Will Deacon
2017-11-30 17:06 ` Robin Murphy
2017-11-30 17:19 ` Will Deacon
2017-11-30 16:39 ` [PATCH v2 15/18] arm64: tls: Avoid unconditional zeroing of tpidrro_el0 for native tasks Will Deacon
2017-11-30 16:39 ` [PATCH v2 16/18] arm64: entry: Add fake CPU feature for unmapping the kernel at EL0 Will Deacon
2017-12-01 13:55 ` Mark Rutland
2017-11-30 16:39 ` [PATCH v2 17/18] arm64: Kconfig: Add CONFIG_UNMAP_KERNEL_AT_EL0 Will Deacon
2017-12-12 8:44 ` Geert Uytterhoeven
2017-12-12 10:28 ` Will Deacon
2017-11-30 16:39 ` [PATCH v2 18/18] perf: arm_spe: Disallow userspace profiling when arm_kernel_unmapped_at_el0() Will Deacon
2017-12-01 12:15 ` Mark Rutland
2017-12-01 16:49 ` Will Deacon
2017-12-01 16:26 ` Stephen Boyd
2017-12-01 14:04 ` [PATCH v2 00/18] arm64: Unmap the kernel whilst running in userspace (KAISER) Mark Rutland
2017-12-01 17:50 ` Will Deacon
2017-12-01 17:58 ` Mark Rutland
2017-12-01 18:02 ` Dave Hansen
2017-12-01 18:14 ` Will Deacon
2017-12-11 2:24 ` Shanker Donthineni
2017-12-04 23:47 ` Laura Abbott
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=20171201115836.jaxzbjsnpnuau56s@lakrids.cambridge.arm.com \
--to=mark.rutland@arm.com \
--cc=ard.biesheuvel@linaro.org \
--cc=catalin.marinas@arm.com \
--cc=dave.hansen@linux.intel.com \
--cc=keescook@chromium.org \
--cc=labbott@redhat.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=msalter@redhat.com \
--cc=sboyd@codeaurora.org \
--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;
as well as URLs for NNTP newsgroup(s).