From patchwork Mon Oct 14 20:56:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 176350 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp5013371ill; Mon, 14 Oct 2019 13:59:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqwBFdVzbF86J8mCZDAjUni3RwbjCZ2uK6b/aQmYiXRaFLiAB2gJiLjwm1gFU6Ly7bJDSYFT X-Received: by 2002:a17:906:e090:: with SMTP id gh16mr30947255ejb.56.1571086794384; Mon, 14 Oct 2019 13:59:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571086794; cv=none; d=google.com; s=arc-20160816; b=S7KLQ+R0cl2vMLCzOEi9bDDeZVcFrfSXw1/xJZlPp6dCt1Lwa/A7yxsTAKa9PoC+CX D4wvw45mCu4XqXuVI3mgsNDzTaMsFxI8ABK/+dnH8CC2HlUWmvK42CPOQsx6XzdZOBsB NNjq1tMrMZQi1UbTMVgjT7Uz7rp+vcWKraq4rwOL7b708g4yakAXTi86NRgXeNs9sU29 62DLK47H26ef6kLCGpuhulVBf1u8AZREFqv7NTiJYn77nCf/XddNrrLfYmn2SinzpBs4 qm2tjTrmG4ICXJ2KVSwC3rnzVgEZ4xy+j/NtfsyTHJlw2C0yzRd0Yp3so/TaJI/IBXI/ Z2eQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:to:from :dkim-signature:delivered-to:sender:list-help:list-post:list-archive :list-subscribe:list-unsubscribe:list-id:precedence:mailing-list :dkim-signature:domainkey-signature; bh=L77Ho6IP4TXZCDpPZteqxSHdOU+gdUV6IzPfV6zOrPE=; b=P6qXdhQO0gqLEeaufYxyoOJdN1R7Y/M2xoGBXsXg/Sg8CosZ9R0b50+JvhsEVvxNnN ir0inHNmTo3XLHXBW/ypW28cePNCK3EjHd8CSne413f7lYRY4YBhSmXR/L+h3bFtQ8za 5a8rEDGJJPFNLIeICcZ1w/zTryTKY2KVXiBHEmx1TFjNZ+ZC2W3E6PeZsGGlSozcvHeQ fzTeqiszJZQe8gqqUDUZpMP7HVtyLWlPDXFEZuMxkWBscs0oL82YlHTV5CbXGPR3SwOB NE5O4M4oKcqGn6QJFErTHr1dqCueDwLNkL5JDiGn5ao9wUBEk36RUaEr3M/lXOWVQhlu djdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=GwvGbOnN; dkim=pass header.i=@linaro.org header.s=google header.b=V2H9HmHM; spf=pass (google.com: domain of libc-alpha-return-105941-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-105941-patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id e50si15050371edb.177.2019.10.14.13.59.53 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Oct 2019 13:59:54 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-105941-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=GwvGbOnN; dkim=pass header.i=@linaro.org header.s=google header.b=V2H9HmHM; spf=pass (google.com: domain of libc-alpha-return-105941-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-105941-patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=iIK8MVN5Y1bhinjl1Q17td95LbZQjYi 9TEhxlTc3c7QGFJbhXjoVFHVsnQ3KgIwABzACLUUgHmoXiaA1Dnc18z1qL5LQJJW GlMKAvP2CznRqD1d+pQG4WSZOL27dbnr+nYkxQTvE97jt+YHLlsO6r/o94Bt0Ebx h4RaoDLNcOVo= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; s=default; bh=7uNmeDJxUxJqOdUbDY/TiM+BbMs=; b=GwvGb OnNcBkrlQyQeTHdNqzR7SOYCoPPGlZXabNhK9SKJOmzeylRIRgvmS30irgQoEVws exS/tmsLOnjn7/lTsjH9tyPfh/b0d0v2Krda/H5xr5jh5nh2V6lMTWJAtG+uUHUT HvzhFy5kw8ILMXhwlT1LvL+8wpABzNqeq2VN90= Received: (qmail 116304 invoked by alias); 14 Oct 2019 20:57:33 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 115809 invoked by uid 89); 14 Oct 2019 20:57:29 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: mail-qk1-f194.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=L77Ho6IP4TXZCDpPZteqxSHdOU+gdUV6IzPfV6zOrPE=; b=V2H9HmHMBdX6cwkrOckt2NBvoKDk3Licpixe2mf8BRqzSaA3XWFtkyz71cjvjXIE1h LDUZhIgcLJCOHAila4jZWeZ7sMmH3unICL+tCi0Tw16nkq9j89/Wb0EGtFfpXtGNKStF 2fJAb2+nWu7g3NSUg2zGGbnD3VEP9DDiVXJ4bgLqdxPd902rJ8+FyTXN+9uSEcNWhWL7 3SbaFKTMnv8f2oSpj/7Kfzsye7BuRLCrwNDb5sAF19JCQD7H8bzcluVJpQHTI0SVZYrH THF0dfdR1db4+1prZ1GUajaD5So1oZex5egf59eqDibg3kUsK0PjSFNIaAz7hi/HZFco OV5A== Return-Path: From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH v3 14/21] nptl: m68k: Fix Race conditions in pthread cancellation (BZ#12683) Date: Mon, 14 Oct 2019 17:56:49 -0300 Message-Id: <20191014205656.29834-15-adhemerval.zanella@linaro.org> In-Reply-To: <20191014205656.29834-1-adhemerval.zanella@linaro.org> References: <20191014205656.29834-1-adhemerval.zanella@linaro.org> This patch adds the hppa modifications required for the BZ#12683 fix by adding the arch-specific cancellation syscall bridge. Checked on m68k-linux-gnu. --- sysdeps/unix/sysv/linux/m68k/syscall_cancel.S | 87 +++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 sysdeps/unix/sysv/linux/m68k/syscall_cancel.S -- 2.17.1 diff --git a/sysdeps/unix/sysv/linux/m68k/syscall_cancel.S b/sysdeps/unix/sysv/linux/m68k/syscall_cancel.S new file mode 100644 index 0000000000..4e5223ee7b --- /dev/null +++ b/sysdeps/unix/sysv/linux/m68k/syscall_cancel.S @@ -0,0 +1,87 @@ +/* Cancellable syscall wrapper. Linux/m68k 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 __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, + __syscall_arg_t arg7) */ + + +ENTRY (__syscall_cancel_arch) +#ifdef __mcoldfire__ + lea (-16,%sp),%sp + movem.l #60,(%sp) +#else + movem.l #15360,-(%sp) +#endif + cfi_def_cfa_offset (20) + cfi_offset (2, -20) + cfi_offset (3, -16) + cfi_offset (4, -12) + cfi_offset (5, -8) + + .global __syscall_cancel_arch_start + .type __syscall_cancel_arch_start,%function +__syscall_cancel_arch_start: + + move.l 20(%sp),%a0 + move.l (%a0),%d0 +#ifdef __mcoldfire__ + move.w %d0,%ccr + jeq 1f +#else + btst #2,%d0 + jne 1f +#endif + + move.l 48(%sp),%a0 + move.l 44(%sp),%d5 + move.l 40(%sp),%d4 + move.l 36(%sp),%d3 + move.l 32(%sp),%d2 + move.l 28(%sp),%d1 + move.l 24(%sp),%d0 + trap #0 + + .global __syscall_cancel_arch_end + .type __syscall_cancel_arch_end,%function +__syscall_cancel_arch_end: + +#ifdef __mcoldfire__ + movem.l (%sp),#60 + lea (16,%sp),%sp +#else + movem.l (%sp)+,#60 +#endif + rts + +1: +#ifdef PIC + bsr.l __syscall_do_cancel +#else + jsr __syscall_do_cancel +#endif +END (__syscall_cancel_arch) +libc_hidden_def (__syscall_cancel_arch)