From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 126349 invoked by alias); 19 Aug 2019 20:35:47 -0000 Mailing-List: contact glibc-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: , Sender: glibc-cvs-owner@sourceware.org List-Subscribe: Received: (qmail 126326 invoked by uid 9943); 19 Aug 2019 20:35:47 -0000 Date: Mon, 19 Aug 2019 20:35:00 -0000 Message-ID: <20190819203547.126325.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc/azanella/bz12683] nptl: aarch64: Fix Race conditions in pthread cancellation (BZ#12683) X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/azanella/bz12683 X-Git-Oldrev: d0af38e7ba2c9b6fec7aaac39a86da15888adcde X-Git-Newrev: 13d801afca6868738aa16c6ff8b118dd7a58a3f4 X-SW-Source: 2019-q3/txt/msg00304.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=13d801afca6868738aa16c6ff8b118dd7a58a3f4 commit 13d801afca6868738aa16c6ff8b118dd7a58a3f4 Author: Adhemerval Zanella Date: Mon Jan 7 16:03:04 2019 +0000 nptl: aarch64: Fix Race conditions in pthread cancellation (BZ#12683) This patch adds the aarch64 modifications required for the BZ#12683 fix by adding the arch-specific cancellation syscall bridge. Checked on aarch64-linux-gnu. [BZ #12683] * sysdeps/unix/sysv/linux/aarch64/syscall_cancel.S: New file. Diff: --- sysdeps/unix/sysv/linux/aarch64/syscall_cancel.S | 61 ++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/sysdeps/unix/sysv/linux/aarch64/syscall_cancel.S b/sysdeps/unix/sysv/linux/aarch64/syscall_cancel.S new file mode 100644 index 0000000..e105480 --- /dev/null +++ b/sysdeps/unix/sysv/linux/aarch64/syscall_cancel.S @@ -0,0 +1,61 @@ +/* Cancellable syscall wrapper. Linux/AArch64 version. + Copyright (C) 2019 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 + . */ + +#include + +/* long int [r0] __syscall_cancel_arch (int *cancelhandling [r0], + long int nr [r1], + long int arg1 [r2], + long int arg2 [r3], + long int arg3 [SP], + long int arg4 [SP+4], + long int arg5 [SP+8], + long int arg6 [SP+12]) */ + +ENTRY (__syscall_cancel_arch) + + .globl __syscall_cancel_arch_start + .type __syscall_cancel_arch_start,%function +__syscall_cancel_arch_start: + + /* if (*cancelhandling & CANCELED_BITMASK) + __syscall_do_cancel() */ + ldr w0, [x0] + tbnz w0, 2, 1f + + /* Issue a 6 argument syscall, the nr [x1] being the syscall + number. */ + mov x8, x1 + mov x0, x2 + mov x1, x3 + mov x2, x4 + mov x3, x5 + mov x4, x6 + mov x5, x7 + svc 0x0 + + .globl __syscall_cancel_arch_end + .type __syscall_cancel_arch_end,%function +__syscall_cancel_arch_end: + ret + +1: + b __syscall_do_cancel + +END (__syscall_cancel_arch) +libc_hidden_def (__syscall_cancel_arch)