From: Phillip Berndt <phillip.berndt@googlemail.com>
To: musl@lists.openwall.com
Subject: Re: TLS issue on aarch64
Date: Sat, 26 May 2018 10:24:43 +0200 [thread overview]
Message-ID: <CA+RmVGwxcGU8pai0-FfvNuvcfbmiugqj1sOHHUeEFQ6_AQOxsA@mail.gmail.com> (raw)
In-Reply-To: <20180526005415.GI4418@port70.net>
2018-05-26 2:54 GMT+02:00 Szabolcs Nagy <nsz@port70.net>:
> indeed you need another alignment there, i came up with the
> following fix:
>
> (on mips/ppc i expect it not to change anything: tp is
> at a page aligned offset from the end of struct pthread,
> so one alignment is enough there, but on aarch64/arm/sh4
> this makes a difference, and seems to pass my simple tests)
>
> diff --git a/src/env/__init_tls.c b/src/env/__init_tls.c
> index 1c5d98a0..8e70024d 100644
> --- a/src/env/__init_tls.c
> +++ b/src/env/__init_tls.c
> @@ -41,9 +41,12 @@ void *__copy_tls(unsigned char *mem)
> #ifdef TLS_ABOVE_TP
> dtv = (void **)(mem + libc.tls_size) - (libc.tls_cnt + 1);
>
> - mem += -((uintptr_t)mem + sizeof(struct pthread)) & (libc.tls_align-1);
> + /* Ensure TP is aligned. */
> + mem += -(uintptr_t)TP_ADJ(mem) & (libc.tls_align-1);
> td = (pthread_t)mem;
> mem += sizeof(struct pthread);
> + /* Ensure TLS is aligned after struct pthread. */
> + mem += -(uintptr_t)mem & (libc.tls_align-1);
>
> for (i=1, p=libc.tls_head; p; i++, p=p->next) {
> dtv[i] = mem + p->offset;
I took the demo from my first mail and tested your patch with all alignments
up to the page size: They all seem to work fine. Awesome :)
- Phillip
next prev parent reply other threads:[~2018-05-26 8:24 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-25 12:40 Phillip Berndt
2018-05-25 14:50 ` Szabolcs Nagy
2018-05-25 21:38 ` Szabolcs Nagy
2018-05-25 22:20 ` Phillip Berndt
2018-05-26 0:54 ` Szabolcs Nagy
2018-05-26 8:24 ` Phillip Berndt [this message]
2018-05-27 0:34 ` Rich Felker
2018-05-28 20:47 ` Szabolcs Nagy
2018-05-28 22:15 ` Rich Felker
2018-05-29 6:33 ` Szabolcs Nagy
2018-05-31 15:22 ` Phillip Berndt
2018-06-01 0:11 ` Szabolcs Nagy
2018-06-01 0:52 ` Rich Felker
2018-06-01 9:38 ` Szabolcs Nagy
2018-05-27 0:17 ` Rich Felker
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=CA+RmVGwxcGU8pai0-FfvNuvcfbmiugqj1sOHHUeEFQ6_AQOxsA@mail.gmail.com \
--to=phillip.berndt@googlemail.com \
--cc=musl@lists.openwall.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.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/musl/
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).