unofficial mirror of libc-alpha@sourceware.org
 help / color / mirror / Atom feed
From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org
Subject: [PATCH v2 21/21] nptl: riscv: Fix Race conditions in pthread cancellation (BZ#12683)
Date: Mon, 26 Feb 2018 18:03:36 -0300	[thread overview]
Message-ID: <1519679016-12241-22-git-send-email-adhemerval.zanella@linaro.org> (raw)
In-Reply-To: <1519679016-12241-1-git-send-email-adhemerval.zanella@linaro.org>

This patch adds the riscv modifications required for the BZ#12683.
It basically adds the required ucontext_get_pc function.

The default syscall_cancel.c should be as expected for RISCV. With
GCC 7.3.1 syscall_cancel.c generates the following code:

0000000000000000 <__GI___syscall_cancel_arch>:
   0:   8346                    mv      t1,a7

0000000000000002 <__syscall_cancel_arch_start>:
   2:   00052883                lw      a7,0(a0)
   6:   0048f893                andi    a7,a7,4
   a:   00089c63                bnez    a7,22 <.L0 >
   e:   88ae                    mv      a7,a1
  10:   8532                    mv      a0,a2
  12:   85b6                    mv      a1,a3
  14:   863a                    mv      a2,a4
  16:   86be                    mv      a3,a5
  18:   8742                    mv      a4,a6
  1a:   879a                    mv      a5,t1
  1c:   00000073                ecall

0000000000000020 <__syscall_cancel_arch_end>:
  20:   8082                    ret

  22:   1141                    addi    sp,sp,-16
  24:   e406                    sd      ra,8(sp)
  26:   00000097                auipc   ra,0x0
  2a:   000080e7                jalr    ra # 26 <.L0 >

Checked with a build for riscv64-linux-gnu with run-built-tests=no.

	[BZ #12683]
	* sysdeps/unix/sysv/linux/riscv/sigcontextinfo.h (ucontext_get_pc):
	New fuction.
---
 ChangeLog                                      |  4 ++++
 sysdeps/unix/sysv/linux/riscv/sigcontextinfo.h | 12 ++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/sysdeps/unix/sysv/linux/riscv/sigcontextinfo.h b/sysdeps/unix/sysv/linux/riscv/sigcontextinfo.h
index 3ca8a80..5a68ff8 100644
--- a/sysdeps/unix/sysv/linux/riscv/sigcontextinfo.h
+++ b/sysdeps/unix/sysv/linux/riscv/sigcontextinfo.h
@@ -16,6 +16,10 @@
    License along with the GNU C Library.  If not, see
    <http://www.gnu.org/licenses/>.  */
 
+#ifndef _SIGCONTEXTINFO_H
+#define _SIGCONTEXTINFO_H
+
+#include <stdint.h>
 #include <sys/ucontext.h>
 
 #define SIGCONTEXT siginfo_t *_si, ucontext_t *
@@ -26,3 +30,11 @@
 
 #define CALL_SIGHANDLER(handler, signo, ctx) \
   (handler)((signo), SIGCONTEXT_EXTRA_ARGS (ctx))
+
+static inline uintptr_t
+ucontext_get_pc (const ucontext_t *uc)
+{
+  return uc->uc_mcontext.__gregs[REG_PC];
+}
+
+#endif /* _SIGCONTEXTINFO_H  */
-- 
2.7.4



  parent reply	other threads:[~2018-02-26 21:05 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-26 21:03 [PATCH v2 00/21] nptl: Fix Race conditions in pthread cancellation (BZ#12683) Adhemerval Zanella
2018-02-26 21:03 ` [PATCH v2 01/21] powerpc: Create stackframe information on syscall Adhemerval Zanella
2018-02-26 21:41   ` Andreas Schwab
2018-02-27 12:05     ` Adhemerval Zanella
2018-05-07  2:49   ` Zack Weinberg
2018-05-07 13:57     ` Adhemerval Zanella
2018-02-26 21:03 ` [PATCH v2 02/21] nptl: Fix testcases for new pthread cancellation mechanism Adhemerval Zanella
2018-02-26 21:43   ` Andreas Schwab
2018-02-27 12:05     ` Adhemerval Zanella
2018-05-07  2:49   ` Zack Weinberg
2018-05-07 17:13     ` Adhemerval Zanella
2018-05-08 13:35       ` Zack Weinberg
2018-05-08 17:26         ` Adhemerval Zanella
2018-02-26 21:03 ` [PATCH v2 03/21] nptl: Fix Race conditions in pthread cancellation (BZ#12683) Adhemerval Zanella
2018-04-27 12:20   ` Zack Weinberg
2018-04-27 12:25     ` Adhemerval Zanella
2018-05-07  2:48       ` Zack Weinberg
2018-05-07  2:49   ` Zack Weinberg
2018-05-08 17:11     ` Adhemerval Zanella
2018-02-26 21:03 ` [PATCH v2 04/21] nptl: x86_64: " Adhemerval Zanella
2018-05-07  2:49   ` Zack Weinberg
2018-05-08 17:55     ` Adhemerval Zanella
2018-02-26 21:03 ` [PATCH v2 05/21] nptl: x32: " Adhemerval Zanella
2018-02-26 21:03 ` [PATCH v2 06/21] nptl: i386: " Adhemerval Zanella
2018-05-07  2:49   ` Zack Weinberg
2018-05-08 17:56     ` Adhemerval Zanella
2018-02-26 21:03 ` [PATCH v2 07/21] nptl: powerpc: " Adhemerval Zanella
2018-05-07 19:25   ` Tulio Magno Quites Machado Filho
2018-05-08 18:07     ` Adhemerval Zanella
2018-02-26 21:03 ` [PATCH v2 08/21] nptl: aarch64: " Adhemerval Zanella
2018-02-26 21:03 ` [PATCH v2 09/21] nptl: arm: " Adhemerval Zanella
2018-02-26 21:03 ` [PATCH v2 10/21] nptl: s390: " Adhemerval Zanella
2018-02-26 21:03 ` [PATCH v2 11/21] nptl: ia64: " Adhemerval Zanella
2018-02-26 21:03 ` [PATCH v2 12/21] nptl: alpha: " Adhemerval Zanella
2018-02-26 21:03 ` [PATCH v2 13/21] nptl: m68k: " Adhemerval Zanella
2018-02-26 21:03 ` [PATCH v2 14/21] nptl: microblaze: " Adhemerval Zanella
2018-02-26 21:03 ` [PATCH v2 15/21] nptl: tile: " Adhemerval Zanella
2018-02-26 21:03 ` [PATCH v2 16/21] nptl: sparc: " Adhemerval Zanella
2018-02-26 21:03 ` [PATCH v2 17/21] nptl: nios2: " Adhemerval Zanella
2018-02-26 21:03 ` [PATCH v2 18/21] nptl: sh: " Adhemerval Zanella
2018-02-26 21:03 ` [PATCH v2 19/21] nptl: mips: " Adhemerval Zanella
2018-02-26 21:03 ` [PATCH v2 20/21] nptl: hppa: " Adhemerval Zanella
2018-02-26 21:03 ` Adhemerval Zanella [this message]
2018-02-27  1:16   ` [PATCH v2 21/21] nptl: riscv: " DJ Delorie
2018-02-27 13:03     ` Adhemerval Zanella

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

  List information: https://www.gnu.org/software/libc/involved.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1519679016-12241-22-git-send-email-adhemerval.zanella@linaro.org \
    --to=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).