public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Adhemerval Zanella <azanella@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc/azanella/pthread-multiple-fixes] nptl: microblaze: Fix Race conditions in pthread cancellation [BZ#12683] Date: Tue, 8 Jun 2021 20:49:51 +0000 (GMT) [thread overview] Message-ID: <20210608204951.3300C398381D@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=6af4e1d54ffc37a0a1ccbc59b902200cf2b6c373 commit 6af4e1d54ffc37a0a1ccbc59b902200cf2b6c373 Author: Adhemerval Zanella <adhemerval.zanella@linaro.org> Date: Mon Jan 16 17:02:17 2017 -0200 nptl: microblaze: Fix Race conditions in pthread cancellation [BZ#12683] This patch adds the microblaze modifications required for the BZ#12683 fix by adding the arch-specific cancellation syscall bridge. Checked against a build and make check run-built-tests=no for microblaze-linux-gnu. Diff: --- sysdeps/microblaze/nptl/tcb-offsets.sym | 3 ++ sysdeps/unix/sysv/linux/alpha/syscall_cancel.S | 2 +- .../unix/sysv/linux/microblaze/syscall_cancel.S | 61 ++++++++++++++++++++++ sysdeps/unix/sysv/linux/microblaze/sysdep.h | 1 + 4 files changed, 66 insertions(+), 1 deletion(-) diff --git a/sysdeps/microblaze/nptl/tcb-offsets.sym b/sysdeps/microblaze/nptl/tcb-offsets.sym index 614f0dfed6..bb39e23d57 100644 --- a/sysdeps/microblaze/nptl/tcb-offsets.sym +++ b/sysdeps/microblaze/nptl/tcb-offsets.sym @@ -8,3 +8,6 @@ MULTIPLE_THREADS_OFFSET thread_offsetof (header.multiple_threads) TID_OFFSET thread_offsetof (tid) + +-- Not strictly offsets, used on syscall_cancel.S +TCB_CANCELED_BITMASK CANCELED_BITMASK diff --git a/sysdeps/unix/sysv/linux/alpha/syscall_cancel.S b/sysdeps/unix/sysv/linux/alpha/syscall_cancel.S index e3726688fb..c3a57122ed 100644 --- a/sysdeps/unix/sysv/linux/alpha/syscall_cancel.S +++ b/sysdeps/unix/sysv/linux/alpha/syscall_cancel.S @@ -74,7 +74,7 @@ __syscall_cancel_arch_end: 1: cfi_restore_state ldq t12, __do_cancel(gp) !literal!2 - jsr ra, (t12), __cancel !lituse_jsr!2 + jsr ra, (t12), __do_cancel !lituse_jsr!2 cfi_endproc END (__syscall_cancel_arch) libc_hidden_def (__syscall_cancel_arch) diff --git a/sysdeps/unix/sysv/linux/microblaze/syscall_cancel.S b/sysdeps/unix/sysv/linux/microblaze/syscall_cancel.S new file mode 100644 index 0000000000..087a786443 --- /dev/null +++ b/sysdeps/unix/sysv/linux/microblaze/syscall_cancel.S @@ -0,0 +1,61 @@ +/* Cancellable syscall wrapper. Linux/microblaze version. + Copyright (C) 2020 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#include <sysdep.h> + +/* long int __syscall_cancel_arch (int *cancelhandling, + long int nr, + long int arg1, + long int arg2, + long int arg3, + long int arg4, + long int arg5, + long int arg6) */ + +ENTRY (__syscall_cancel_arch) + + .globl __syscall_cancel_arch_start +__syscall_cancel_arch_start: + + lwi r3,r5,0 + andi r3,r3,TCB_CANCELED_BITMASK + bneid r3,1f + addk r12,r6,r0 + + addk r5,r7,r0 + addk r6,r8,r0 + addk r7,r9,r0 + addk r8,r10,r0 + lwi r9,r1,56 + lwi r10,r1,60 + brki r14,8 + + .globl __syscall_cancel_arch_end +__syscall_cancel_arch_end: + + nop + lwi r15,r1,0 + rtsd r15,8 + addik r1,r1,28 + +1: + brlid r15, __do_cancel + nop + +END (__syscall_cancel_arch) +libc_hidden_def (__syscall_cancel_arch) diff --git a/sysdeps/unix/sysv/linux/microblaze/sysdep.h b/sysdeps/unix/sysv/linux/microblaze/sysdep.h index 52c1e3d8d0..f7c7aa7013 100644 --- a/sysdeps/unix/sysv/linux/microblaze/sysdep.h +++ b/sysdeps/unix/sysv/linux/microblaze/sysdep.h @@ -22,6 +22,7 @@ #include <sysdeps/unix/sysdep.h> #include <sysdeps/unix/sysv/linux/sysdep.h> #include <sysdeps/microblaze/sysdep.h> +#include <tls.h> /* Defines RTLD_PRIVATE_ERRNO. */ #include <dl-sysdep.h>
reply other threads:[~2021-06-08 20:49 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20210608204951.3300C398381D@sourceware.org \ --to=azanella@sourceware.org \ --cc=glibc-cvs@sourceware.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: linkBe 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).