From: Stefan Liebler <stli@linux.ibm.com>
To: Adhemerval Zanella <adhemerval.zanella@linaro.org>,
libc-alpha@sourceware.org
Subject: Re: [PATCH v5 09/22] s390: Fix Race conditions in pthread cancellation [BZ#12683]
Date: Tue, 11 Apr 2023 15:56:35 +0200 [thread overview]
Message-ID: <1a7ae677-9e0e-24bf-3eee-62e81c988797@linux.ibm.com> (raw)
In-Reply-To: <20230410204614.4129551-1-adhemerval.zanella@linaro.org>
On 10.04.23 22:46, Adhemerval Zanella wrote:
> By adding the required syscall_cancel.S.
>
> Checked on s390-linux-gnu and s390x-linux-gnu.
>
> Co-authored-by: Stefan Liebler <stli@linux.ibm.com>
> ---
> .../sysv/linux/s390/s390-32/syscall_cancel.S | 62 +++++++++++++++++++
> .../sysv/linux/s390/s390-64/syscall_cancel.S | 62 +++++++++++++++++++
> 2 files changed, 124 insertions(+)
> create mode 100644 sysdeps/unix/sysv/linux/s390/s390-32/syscall_cancel.S
> create mode 100644 sysdeps/unix/sysv/linux/s390/s390-64/syscall_cancel.S
>
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/syscall_cancel.S b/sysdeps/unix/sysv/linux/s390/s390-32/syscall_cancel.S
> new file mode 100644
> index 0000000000..9e0ad2a635
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/s390/s390-32/syscall_cancel.S
> @@ -0,0 +1,62 @@
> +/* Cancellable syscall wrapper. Linux/s390 version.
> + Copyright (C) 2023 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>
> +#include <descr-const.h>
> +
> +/* long int __syscall_cancel_arch (int *cancelhandling,
> + __syscall_arg_t nr,
> + __syscall_arg_t arg1,
> + __syscall_arg_t arg2,
> + __syscall_arg_t arg3,
> + __syscall_arg_t arg4,
> + __syscall_arg_t arg5,
> + __syscall_arg_t arg6) */
> +
> +ENTRY (__syscall_cancel_arch)
> + stm %r6,%r7,24(%r15)
> + cfi_offset (%r6, -72)
> + cfi_offset (%r7, -68)
> +
> + .globl __syscall_cancel_arch_start
> +__syscall_cancel_arch_start:
> + /* if (*cancelhandling & CANCELED_BITMASK)
> + __syscall_do_cancel() */
> + tm 3(%r2),TCB_CANCELED_BITMASK
> + jne 1f
> +
> + /* Issue a 6 argument syscall, the nr [%r1] being the syscall
> + number. */
> + lr %r1,%r3
> + lr %r2,%r4
> + lr %r3,%r5
> + lr %r4,%r6
> + lm %r5,%r7,96(%r15)
> + svc 0
> +
> + .globl __syscall_cancel_arch_end
> +__syscall_cancel_arch_end:
> + lm %r6,%r7,24(%r15)
> + cfi_remember_state
> + cfi_restore (%r7)
> + cfi_restore (%r6)
> + br %r14
> +1:
> + cfi_restore_state
> + jg __syscall_do_cancel
> +END (__syscall_cancel_arch)
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/syscall_cancel.S b/sysdeps/unix/sysv/linux/s390/s390-64/syscall_cancel.S
> new file mode 100644
> index 0000000000..e1620add6a
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/s390/s390-64/syscall_cancel.S
> @@ -0,0 +1,62 @@
> +/* Cancellable syscall wrapper. Linux/s390x version.
> + Copyright (C) 2023 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>
> +#include <descr-const.h>
> +
> +/* long int __syscall_cancel_arch (int *cancelhandling,
> + __syscall_arg_t nr,
> + __syscall_arg_t arg1,
> + __syscall_arg_t arg2,
> + __syscall_arg_t arg3,
> + __syscall_arg_t arg4,
> + __syscall_arg_t arg5,
> + __syscall_arg_t arg6) */
> +
> +ENTRY (__syscall_cancel_arch)
> + stmg %r6,%r7,48(%r15)
> + cfi_offset (%r6, -112)
> + cfi_offset (%r7, -104)
> +
> + .globl __syscall_cancel_arch_start
> +__syscall_cancel_arch_start:
> + /* if (*cancelhandling & CANCELED_BITMASK)
> + __syscall_do_cancel() */
> + tm 3(%r2),TCB_CANCELED_BITMASK
> + jne 1f
> +
> + /* Issue a 6 argument syscall, the nr [%r1] being the syscall
> + number. */
> + lgr %r1,%r3
> + lgr %r2,%r4
> + lgr %r3,%r5
> + lgr %r4,%r6
> + lmg %r5,%r7,160(%r15)
> + svc 0
> +
> + .globl __syscall_cancel_arch_end
> +__syscall_cancel_arch_end:
> + lmg %r6,%r7,48(%r15)
> + cfi_remember_state
> + cfi_restore (%r7)
> + cfi_restore (%r6)
> + br %r14
> +1:
> + cfi_restore_state
> + jg __syscall_do_cancel
> +END (__syscall_cancel_arch)
Hi Adhemerval,
the syscall_cancel.S files looks good. The testsuite also runs fine. Thanks.
prev parent reply other threads:[~2023-04-11 13:56 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-10 19:58 [PATCH v5 00/22] " Adhemerval Zanella
2023-04-10 19:58 ` [PATCH v5 01/22] nptl: " Adhemerval Zanella
2023-04-10 19:58 ` [PATCH v5 02/22] x86_64: " Adhemerval Zanella
2023-04-10 19:58 ` [PATCH v5 03/22] x32: " Adhemerval Zanella
2023-04-10 19:58 ` [PATCH v5 04/22] i386: " Adhemerval Zanella
2023-04-10 19:58 ` [PATCH v5 05/22] aarch64: " Adhemerval Zanella
2023-04-10 19:58 ` [PATCH v5 06/22] arm: " Adhemerval Zanella
2023-04-10 19:58 ` [PATCH v5 07/22] powerpc: " Adhemerval Zanella
2023-04-14 15:27 ` Paul E Murphy
2023-04-27 11:13 ` Adhemerval Zanella Netto
2023-04-10 19:58 ` [PATCH v5 08/22] sparc: " Adhemerval Zanella
2023-04-10 20:46 ` [PATCH v5 09/22] s390: " Adhemerval Zanella
2023-04-10 20:46 ` [PATCH v5 10/22] riscv: " Adhemerval Zanella
2023-04-11 6:35 ` Xi Ruoyao
2023-04-11 7:01 ` Xi Ruoyao
2023-04-11 13:49 ` Adhemerval Zanella Netto
2023-04-10 20:46 ` [PATCH v5 11/22] arc: Fix Race conditions in pthread cancellation [BZ #12683] Adhemerval Zanella
2023-04-10 20:46 ` [PATCH v5 12/22] ia64: Fix Race conditions in pthread cancellation [BZ#12683] Adhemerval Zanella
2023-04-10 20:46 ` [PATCH v5 13/22] sh: " Adhemerval Zanella
2023-04-10 20:46 ` [PATCH v5 14/22] nios2: " Adhemerval Zanella
2023-04-10 20:46 ` [PATCH v5 15/22] microblaze: " Adhemerval Zanella
2023-04-10 20:46 ` [PATCH v5 16/22] hppa: " Adhemerval Zanella
2023-04-10 20:46 ` [PATCH v5 17/22] m68k: " Adhemerval Zanella
2023-04-10 20:46 ` [PATCH v5 18/22] alpha: " Adhemerval Zanella
2023-04-10 20:46 ` [PATCH v5 19/22] csky: " Adhemerval Zanella
2023-04-10 20:46 ` [PATCH v5 20/22] mips: " Adhemerval Zanella
2023-04-10 20:46 ` [PATCH v5 21/22] or1k: " Adhemerval Zanella
2023-04-10 20:46 ` [PATCH v5 22/22] loongarch: " Adhemerval Zanella
2023-04-11 6:19 ` Xi Ruoyao
2023-04-11 12:00 ` caiyinyu
2023-04-11 12:21 ` caiyinyu
2023-04-11 12:55 ` Xi Ruoyao
2023-04-11 13:54 ` Adhemerval Zanella Netto
2023-04-11 13:56 ` Stefan Liebler [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=1a7ae677-9e0e-24bf-3eee-62e81c988797@linux.ibm.com \
--to=stli@linux.ibm.com \
--cc=adhemerval.zanella@linaro.org \
--cc=libc-alpha@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: 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).