From: Kees Cook <keescook@chromium.org>
To: Mark Brown <broonie@kernel.org>
Cc: "Catalin Marinas" <catalin.marinas@arm.com>,
"Will Deacon" <will@kernel.org>,
"Alexander Viro" <viro@zeniv.linux.org.uk>,
"Paul Elliott" <paul.elliott@arm.com>,
"Peter Zijlstra" <peterz@infradead.org>,
"Yu-cheng Yu" <yu-cheng.yu@intel.com>,
"Amit Kachhap" <amit.kachhap@arm.com>,
"Vincenzo Frascino" <vincenzo.frascino@arm.com>,
"Marc Zyngier" <maz@kernel.org>,
"Eugene Syromiatnikov" <esyr@redhat.com>,
"Szabolcs Nagy" <szabolcs.nagy@arm.com>,
"H . J . Lu " <hjl.tools@gmail.com>,
"Andrew Jones" <drjones@redhat.com>,
"Arnd Bergmann" <arnd@arndb.de>, "Jann Horn" <jannh@google.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Kristina Martšenko" <kristina.martsenko@arm.com>,
"Thomas Gleixner" <tglx@linutronix.de>,
"Florian Weimer" <fweimer@redhat.com>,
"Sudakshina Das" <sudi.das@arm.com>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org,
linux-fsdevel@vger.kernel.org,
"Dave Martin" <Dave.Martin@arm.com>
Subject: Re: [PATCH v7 08/11] arm64: traps: Shuffle code to eliminate forward declarations
Date: Wed, 26 Feb 2020 13:39:49 -0800 [thread overview]
Message-ID: <202002261339.53539BA19@keescook> (raw)
In-Reply-To: <20200226155714.43937-9-broonie@kernel.org>
On Wed, Feb 26, 2020 at 03:57:11PM +0000, Mark Brown wrote:
> From: Dave Martin <Dave.Martin@arm.com>
>
> Hoist the IT state handling code earlier in traps.c, to avoid
> accumulating forward declarations.
>
> No functional change.
>
> Signed-off-by: Dave Martin <Dave.Martin@arm.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
-Kees
> Signed-off-by: Mark Brown <broonie@kernel.org>
> ---
> arch/arm64/kernel/traps.c | 103 ++++++++++++++++++--------------------
> 1 file changed, 50 insertions(+), 53 deletions(-)
>
> diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c
> index bc9f4292bfc3..3c07a7074145 100644
> --- a/arch/arm64/kernel/traps.c
> +++ b/arch/arm64/kernel/traps.c
> @@ -272,7 +272,55 @@ void arm64_notify_die(const char *str, struct pt_regs *regs,
> }
> }
>
> -static void advance_itstate(struct pt_regs *regs);
> +#ifdef CONFIG_COMPAT
> +#define PSTATE_IT_1_0_SHIFT 25
> +#define PSTATE_IT_1_0_MASK (0x3 << PSTATE_IT_1_0_SHIFT)
> +#define PSTATE_IT_7_2_SHIFT 10
> +#define PSTATE_IT_7_2_MASK (0x3f << PSTATE_IT_7_2_SHIFT)
> +
> +static u32 compat_get_it_state(struct pt_regs *regs)
> +{
> + u32 it, pstate = regs->pstate;
> +
> + it = (pstate & PSTATE_IT_1_0_MASK) >> PSTATE_IT_1_0_SHIFT;
> + it |= ((pstate & PSTATE_IT_7_2_MASK) >> PSTATE_IT_7_2_SHIFT) << 2;
> +
> + return it;
> +}
> +
> +static void compat_set_it_state(struct pt_regs *regs, u32 it)
> +{
> + u32 pstate_it;
> +
> + pstate_it = (it << PSTATE_IT_1_0_SHIFT) & PSTATE_IT_1_0_MASK;
> + pstate_it |= ((it >> 2) << PSTATE_IT_7_2_SHIFT) & PSTATE_IT_7_2_MASK;
> +
> + regs->pstate &= ~PSR_AA32_IT_MASK;
> + regs->pstate |= pstate_it;
> +}
> +
> +static void advance_itstate(struct pt_regs *regs)
> +{
> + u32 it;
> +
> + /* ARM mode */
> + if (!(regs->pstate & PSR_AA32_T_BIT) ||
> + !(regs->pstate & PSR_AA32_IT_MASK))
> + return;
> +
> + it = compat_get_it_state(regs);
> +
> + /*
> + * If this is the last instruction of the block, wipe the IT
> + * state. Otherwise advance it.
> + */
> + if (!(it & 7))
> + it = 0;
> + else
> + it = (it & 0xe0) | ((it << 1) & 0x1f);
> +
> + compat_set_it_state(regs, it);
> +}
>
> void arm64_skip_faulting_instruction(struct pt_regs *regs, unsigned long size)
> {
> @@ -285,7 +333,7 @@ void arm64_skip_faulting_instruction(struct pt_regs *regs, unsigned long size)
> if (user_mode(regs))
> user_fastforward_single_step(current);
>
> - if (regs->pstate & PSR_MODE32_BIT)
> + if (compat_user_mode(regs))
> advance_itstate(regs);
> }
>
> @@ -578,34 +626,6 @@ static const struct sys64_hook sys64_hooks[] = {
> {},
> };
>
> -
> -#ifdef CONFIG_COMPAT
> -#define PSTATE_IT_1_0_SHIFT 25
> -#define PSTATE_IT_1_0_MASK (0x3 << PSTATE_IT_1_0_SHIFT)
> -#define PSTATE_IT_7_2_SHIFT 10
> -#define PSTATE_IT_7_2_MASK (0x3f << PSTATE_IT_7_2_SHIFT)
> -
> -static u32 compat_get_it_state(struct pt_regs *regs)
> -{
> - u32 it, pstate = regs->pstate;
> -
> - it = (pstate & PSTATE_IT_1_0_MASK) >> PSTATE_IT_1_0_SHIFT;
> - it |= ((pstate & PSTATE_IT_7_2_MASK) >> PSTATE_IT_7_2_SHIFT) << 2;
> -
> - return it;
> -}
> -
> -static void compat_set_it_state(struct pt_regs *regs, u32 it)
> -{
> - u32 pstate_it;
> -
> - pstate_it = (it << PSTATE_IT_1_0_SHIFT) & PSTATE_IT_1_0_MASK;
> - pstate_it |= ((it >> 2) << PSTATE_IT_7_2_SHIFT) & PSTATE_IT_7_2_MASK;
> -
> - regs->pstate &= ~PSR_AA32_IT_MASK;
> - regs->pstate |= pstate_it;
> -}
> -
> static bool cp15_cond_valid(unsigned int esr, struct pt_regs *regs)
> {
> int cond;
> @@ -626,29 +646,6 @@ static bool cp15_cond_valid(unsigned int esr, struct pt_regs *regs)
> return aarch32_opcode_cond_checks[cond](regs->pstate);
> }
>
> -static void advance_itstate(struct pt_regs *regs)
> -{
> - u32 it;
> -
> - /* ARM mode */
> - if (!(regs->pstate & PSR_AA32_T_BIT) ||
> - !(regs->pstate & PSR_AA32_IT_MASK))
> - return;
> -
> - it = compat_get_it_state(regs);
> -
> - /*
> - * If this is the last instruction of the block, wipe the IT
> - * state. Otherwise advance it.
> - */
> - if (!(it & 7))
> - it = 0;
> - else
> - it = (it & 0xe0) | ((it << 1) & 0x1f);
> -
> - compat_set_it_state(regs, it);
> -}
> -
> static void compat_cntfrq_read_handler(unsigned int esr, struct pt_regs *regs)
> {
> int reg = (esr & ESR_ELx_CP15_32_ISS_RT_MASK) >> ESR_ELx_CP15_32_ISS_RT_SHIFT;
> --
> 2.20.1
>
--
Kees Cook
next prev parent reply other threads:[~2020-02-26 21:39 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-26 15:57 [PATCH v7 00/11] arm64: Branch Target Identification support Mark Brown
2020-02-26 15:57 ` [PATCH v7 01/11] ELF: UAPI and Kconfig additions for ELF program properties Mark Brown
2020-02-26 15:57 ` [PATCH v7 02/11] ELF: Add ELF program property parsing support Mark Brown
2020-02-26 15:57 ` [PATCH v7 03/11] arm64: Basic Branch Target Identification support Mark Brown
2020-02-26 15:57 ` [PATCH v7 04/11] elf: Allow arch to tweak initial mmap prot flags Mark Brown
2020-02-26 15:57 ` [PATCH v7 05/11] arm64: elf: Enable BTI at exec based on ELF program properties Mark Brown
2020-02-26 21:43 ` Kees Cook
2020-02-27 4:45 ` Amit Kachhap
2020-02-26 15:57 ` [PATCH v7 06/11] arm64: BTI: Decode BYTPE bits when printing PSTATE Mark Brown
2020-02-26 21:42 ` Kees Cook
2020-02-26 15:57 ` [PATCH v7 07/11] arm64: unify native/compat instruction skipping Mark Brown
2020-02-26 21:41 ` Kees Cook
2020-02-26 15:57 ` [PATCH v7 08/11] arm64: traps: Shuffle code to eliminate forward declarations Mark Brown
2020-02-26 21:39 ` Kees Cook [this message]
2020-02-26 15:57 ` [PATCH v7 09/11] arm64: BTI: Reset BTYPE when skipping emulated instructions Mark Brown
2020-02-26 15:57 ` [PATCH v7 10/11] KVM: " Mark Brown
2020-02-26 15:57 ` [PATCH v7 11/11] arm64: mm: Display guarded pages in ptdump Mark Brown
2020-02-26 21:38 ` Kees Cook
2020-02-26 21:44 ` [PATCH v7 00/11] arm64: Branch Target Identification support Kees Cook
2020-02-27 13:13 ` Mark Brown
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=202002261339.53539BA19@keescook \
--to=keescook@chromium.org \
--cc=Dave.Martin@arm.com \
--cc=amit.kachhap@arm.com \
--cc=arnd@arndb.de \
--cc=broonie@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=drjones@redhat.com \
--cc=esyr@redhat.com \
--cc=fweimer@redhat.com \
--cc=hjl.tools@gmail.com \
--cc=jannh@google.com \
--cc=kristina.martsenko@arm.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maz@kernel.org \
--cc=paul.elliott@arm.com \
--cc=peterz@infradead.org \
--cc=richard.henderson@linaro.org \
--cc=sudi.das@arm.com \
--cc=szabolcs.nagy@arm.com \
--cc=tglx@linutronix.de \
--cc=vincenzo.frascino@arm.com \
--cc=viro@zeniv.linux.org.uk \
--cc=will@kernel.org \
--cc=yu-cheng.yu@intel.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).