From: Richard Earnshaw <Richard.Earnshaw@foss.arm.com>
To: "Victor L. Do Nascimento" <victor.donascimento@arm.com>,
newlib@sourceware.org
Cc: Richard Earnshaw <Richard.Earnshaw@arm.com>
Subject: Re: [PATCH v5 8/8] newlib: libc: setjmp M-profile PACBTI-enablement
Date: Thu, 5 Jan 2023 16:53:31 +0000 [thread overview]
Message-ID: <11a6c996-6575-1c62-6205-776e178cdce3@foss.arm.com> (raw)
In-Reply-To: <yw8j1qothtkd.fsf_-_@arm.com>
On 21/12/2022 11:42, Victor L. Do Nascimento wrote:
> Add function prologue/epilogue to conditionally add BTI landing pads
> and/or PAC code generation & authentication instructions depending on
> compilation flags.
> ---
> newlib/libc/machine/arm/setjmp.S | 39 ++++++++++++++++++++++++++++++++
> 1 file changed, 39 insertions(+)
>
> diff --git a/newlib/libc/machine/arm/setjmp.S b/newlib/libc/machine/arm/setjmp.S
> index d814afea8..3e4d7cb70 100644
> --- a/newlib/libc/machine/arm/setjmp.S
> +++ b/newlib/libc/machine/arm/setjmp.S
> @@ -155,6 +155,8 @@ SYM (.arm_start_of.\name):
> .align 2
> MODE
> .globl SYM (\name)
> + .fnstart
> + .cfi_startproc
> TYPE (\name)
> SYM (\name):
> PROLOGUE \name
> @@ -162,6 +164,8 @@ SYM (\name):
>
> .macro FUNC_END name
> RET
> + .cfi_endproc
> + .fnend
> SIZE (\name)
> .endm
>
> @@ -171,6 +175,21 @@ SYM (\name):
>
> FUNC_START setjmp
>
> +#if __ARM_FEATURE_PAC_DEFAULT
> +# if __ARM_FEATURE_BTI_DEFAULT
> + pacbti ip, lr, sp
> +# else
> + pac ip, lr, sp
> +# endif /* __ARM_FEATURE_BTI_DEFAULT */
> + mov r3, ip
> + str r3, [r0, #104]
#104 here is a bit obscure. I think it would be clearer to write
something like
str r3, [r0, #(CORE_REGS_SAVE_SIZE + FP_REGS_SAVE_SIZE)]
and then define these as appropriate.
> + .cfi_register 143, 12
> +#else
> +# if __ARM_FEATURE_BTI_DEFAULT
> + bti
> +# endif /* __ARM_FEATURE_BTI_DEFAULT */
> +#endif /* __ARM_FEATURE_PAC_DEFAULT */
> +
> /* Save all the callee-preserved registers into the jump buffer. */
> #ifdef __thumb2__
> mov ip, sp
> @@ -184,6 +203,10 @@ SYM (\name):
>
> /* When setting up the jump buffer return 0. */
> mov r0, #0
> +#if __ARM_FEATURE_PAC_DEFAULT
> + mov ip, r3
> + aut ip, lr, sp
> +#endif /* __ARM_FEATURE_PAC_DEFAULT */
>
> FUNC_END setjmp
>
> @@ -193,6 +216,16 @@ SYM (\name):
>
> FUNC_START longjmp
>
> +#if __ARM_FEATURE_BTI_DEFAULT
> + bti
> +#endif /* __ARM_FEATURE_BTI_DEFAULT */
> +
> +#if __ARM_FEATURE_PAC_DEFAULT
> + /* Keep original jmpbuf address for retrieving pac-code
> + for authentication. */
> + mov r2, r0
> +#endif /* __ARM_FEATURE_PAC_DEFAULT */
> +
> /* If we have stack extension code it ought to be handled here. */
>
> /* Restore the registers, retrieving the state when setjmp() was called. */
> @@ -212,5 +245,11 @@ SYM (\name):
> it eq
> moveq r0, #1
>
> +#if __ARM_FEATURE_PAC_DEFAULT
> + ldr r3, [r2, #104]
> + mov ip, r3
See above. Also, you don't need to load into r3 and then move to IP,
just load ip directly.
> + aut ip, lr, sp
> +#endif /* __ARM_FEATURE_PAC_DEFAULT */
> +
> FUNC_END longjmp
> #endif
R.
prev parent reply other threads:[~2023-01-05 16:53 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-21 11:03 [PATCH v5 0/8] Implement assembly cortex-M PACBTI functionality Victor Do Nascimento
2022-12-21 11:19 ` [PATCH v5 1/8] newlib: libc: define M-profile PACBTI-enablement macros Victor L. Do Nascimento
2023-01-06 10:42 ` Christophe Lyon
2023-01-06 20:51 ` Victor Do Nascimento
2023-01-09 9:33 ` Christophe Lyon
2022-12-21 11:21 ` [PATCH v5 2/8] newlib: libc: strcmp M-profile PACBTI-enablement Victor L. Do Nascimento
2023-01-06 11:09 ` Christophe Lyon
2023-01-06 21:35 ` Victor Do Nascimento
2022-12-21 11:22 ` [PATCH v5 3/8] newlib: libc: strlen " Victor L. Do Nascimento
2022-12-21 11:24 ` [PATCH v5 4/8] newlib: libc: memchr " Victor L. Do Nascimento
2022-12-21 11:25 ` [PATCH v5 5/8] newlib: libc: memcpy " Victor L. Do Nascimento
2022-12-21 11:27 ` [PATCH v5 6/8] newlib: libc: aeabi_memmove " Victor L. Do Nascimento
2022-12-21 11:28 ` [PATCH v5 7/8] newlib: libc: aeabi_memset " Victor L. Do Nascimento
2022-12-21 11:42 ` [PATCH v5 8/8] newlib: libc: setjmp " Victor L. Do Nascimento
2023-01-05 16:53 ` Richard Earnshaw [this message]
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=11a6c996-6575-1c62-6205-776e178cdce3@foss.arm.com \
--to=richard.earnshaw@foss.arm.com \
--cc=Richard.Earnshaw@arm.com \
--cc=newlib@sourceware.org \
--cc=victor.donascimento@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 read-only IMAP folder(s) and NNTP newsgroup(s).