From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 80A563858D33; Tue, 11 Apr 2023 14:19:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 80A563858D33 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1681222746; bh=xoJcehWhoEKibO4NpFVffXw+K2tDzH3cIRB9Mg5ADY8=; h=From:To:Subject:Date:From; b=WbY76gsKmqnfo5H3GDsnPDUU+rre/ajNPxpEd6bkK1hm8TiV44pYRdDPIKorijKwx yFFzsp+Cu7Knz7Z2QK4ZH2U4fLTi7uO/NnN4gZNPoKyi/6sBKKycAq4S7czCKG07KV 763nxDID/1WaMBAlFk4ray7esnhm2unbySeC1ntk= 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] riscv: 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: f1140551341d91f3fcbf49dbcb526bf815b59979 X-Git-Newrev: 0e9567f22fdd4b2319f01dc5f32238acdcefd5f6 Message-Id: <20230411141906.80A563858D33@sourceware.org> Date: Tue, 11 Apr 2023 14:19:06 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=0e9567f22fdd4b2319f01dc5f32238acdcefd5f6 commit 0e9567f22fdd4b2319f01dc5f32238acdcefd5f6 Author: Adhemerval Zanella Date: Mon Apr 3 10:57:49 2023 -0300 riscv: Fix Race conditions in pthread cancellation [BZ#12683] By adding the required syscall_cancel.S. Reviewed-by: Andrew Waterman Diff: --- sysdeps/unix/sysv/linux/riscv/syscall_cancel.S | 67 ++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/sysdeps/unix/sysv/linux/riscv/syscall_cancel.S b/sysdeps/unix/sysv/linux/riscv/syscall_cancel.S new file mode 100644 index 0000000000..742c748d09 --- /dev/null +++ b/sysdeps/unix/sysv/linux/riscv/syscall_cancel.S @@ -0,0 +1,67 @@ +/* Cancellable syscall wrapper. Linux/riscv 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 + +/* 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) */ + +#ifdef SHARED + .option pic +#else + .option nopic +#endif + +ENTRY (__syscall_cancel_arch) + + .globl __syscall_cancel_arch_start +__syscall_cancel_arch_start: + lw t1, 0(a0) + /* if (*ch & CANCELED_BITMASK) */ + andi t1, t1, TCB_CANCELED_BITMASK + bne t1, zero, 1f + + mv t3, a1 + mv a0, a2 + mv a1, a3 + mv a2, a4 + mv a3, a5 + mv a4, a6 + mv a5, a7 + mv a7, t3 + scall + + .globl __syscall_cancel_arch_end +__syscall_cancel_arch_end: + ret + +1: + addi sp, sp, -16 + cfi_def_cfa_offset (16) + REG_S ra, (16-SZREG)(sp) + cfi_offset (ra, -SZREG) + call __syscall_do_cancel + +END (__syscall_cancel_arch)