From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 17D513858D35; Fri, 7 Apr 2023 17:08:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 17D513858D35 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1680887332; bh=jrKCdXl/2sK/N+JUVwtCBf66+isF1IkzoPdv9n6tCts=; h=From:To:Subject:Date:From; b=de45sd1fQW4R2cQrXiFxv30dd65wzHYZWyJFiqUvulcfwd386d52Z8OSVZJ0ZLnif 3vYFt7HHE/laA38NiImEv1fh/XECO3n3IEDGIQNAVCtaHQ8sE1fX2D2ZCGp7lq4D/U mHxUBpm4IQqMR13Sg/gqY79ZgERWod0kRDFKLDFw= 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] or1k: 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: dff30ac5678445f9e8440904ab50edb7869c31bd X-Git-Newrev: 19668dd5f71af7a441eefa57062794008645941a Message-Id: <20230407170852.17D513858D35@sourceware.org> Date: Fri, 7 Apr 2023 17:08:52 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=19668dd5f71af7a441eefa57062794008645941a commit 19668dd5f71af7a441eefa57062794008645941a Author: Adhemerval Zanella Date: Mon Apr 3 15:44:14 2023 -0300 or1k: Fix Race conditions in pthread cancellation [BZ#12683] By adding the required syscall_cancel.S. Checked against a build and make check run-built-tests=no for or1k-linux-gnu-soft. Diff: --- sysdeps/unix/sysv/linux/or1k/syscall_cancel.S | 63 +++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/sysdeps/unix/sysv/linux/or1k/syscall_cancel.S b/sysdeps/unix/sysv/linux/or1k/syscall_cancel.S new file mode 100644 index 0000000000..284029b244 --- /dev/null +++ b/sysdeps/unix/sysv/linux/or1k/syscall_cancel.S @@ -0,0 +1,63 @@ +/* Cancellable syscall wrapper. Linux/or1k 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 + . */ + +#include +#include + +ENTRY (__syscall_cancel_arch) + l.addi r1, r1, -4 + cfi_def_cfa_offset (4) + l.sw 0(r1), r9 + cfi_offset (9, -4) + + .global __syscall_cancel_arch_start +__syscall_cancel_arch_start: + + /* if (*cancelhandling & CANCELED_BITMASK) + __syscall_do_cancel() */ + l.movhi r19, hi(0) + l.lwz r17, 0(r3) + l.andi r17, r17, 8 + l.sfeq r17, r19 + l.bnf 1f + + /* Issue a 6 argument syscall. */ + l.or r11, r4, r4 + l.or r3, r5, r5 + l.or r4, r6, r6 + l.or r5, r7, r7 + l.or r6, r8, r8 + l.lwz r7, 4(r1) + l.lwz r8, 8(r1) + l.sys 1 + l.nop + + .global __syscall_cancel_arch_end +__syscall_cancel_arch_end: + + l.lwz r9, 0(r1) + l.jr r9 + l.addi r1, r1, 4 + cfi_remember_state + cfi_def_cfa_offset (0) + cfi_restore (9) +1: + cfi_restore_state + l.jal __syscall_do_cancel + l.nop +END (__syscall_cancel_arch)