From patchwork Mon Oct 14 20:56:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 176348 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp5013037ill; Mon, 14 Oct 2019 13:59:33 -0700 (PDT) X-Google-Smtp-Source: APXvYqylMdBNnWTGyhGWKk0beEdHw59Ae2VP2XUJK/WfPdTcveQKArD57jiz3qMWIxRNTGLm856j X-Received: by 2002:a17:906:fca8:: with SMTP id qw8mr31428968ejb.188.1571086773121; Mon, 14 Oct 2019 13:59:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571086773; cv=none; d=google.com; s=arc-20160816; b=Zq1zzamYxD6Of10SW2hZ3yLkJ+yLRzBYZQg1oZhm2Tm/yrQx5uy/HLsMmQEIXdSjvQ 5TJpfFz7TZOjlrj85is/jQglr+C/KvmgospwYo/CW8/aQw5+hRf2GA+LYCJ6eYFgO3nn x/3ux9gAY5x2MvMcbUkRY0muAOKnwJfGoaEj/kTwdOq80pHr1r/sQvcjET1PsWgir+WQ JrnB59DGpkQkfwnGDNS6nDTTtrOnQdlPGziMzjNDK4VRpSd6Omn8Gd2UpAS0qRpEeZCs RoSET3qFakJPAcRz2m8dAfoQXUHB01M6D6YhDJLKr4bYn4dTVWkS8vgTfXi1A0XKAYdo 5S6w== 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=VbF2lTSkRZUsCBxbqkjFrl2/tacZhv5Fk1UMoJNzKVo=; b=co7dgRvPyMYOZTkukAgN+iHiwAXtumXIFOnvy6F5vFJCZfhJcECF586QOsHjZRke2Q PJPVG9g0hg3OLZQMeJb4yzAJPR281/FZHLBg4cnc89OqmxCAjx0AEr2wJpj73V9nej5n F2N9EMdCZX47v1FiH96cIMZD/notYzCbbGpgZhswBA6tNn5SpfzimfOjWaqfQcImz9JL Q8tEvOu/fHaK6ajPkD6eh5ZKjjoJ/JCDbse+nmU01hdaFIvh6sUe/9p5fm7V04XBAtm1 EZ9J4BOLeCql/Wf1JJl2tEJhqM/PWOQ9aYvAi/nQ+IlohYzVXuShDPGcx064aY5HqALB 35Ig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=ysP4XyKL; dkim=pass header.i=@linaro.org header.s=google header.b=wIf8tnGG; spf=pass (google.com: domain of libc-alpha-return-105939-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-105939-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 g25si11504966eds.210.2019.10.14.13.59.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Oct 2019 13:59:33 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-105939-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=ysP4XyKL; dkim=pass header.i=@linaro.org header.s=google header.b=wIf8tnGG; spf=pass (google.com: domain of libc-alpha-return-105939-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-105939-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=exf75ep5pr1f7PwPhVWyuZxByEpto5d rP4SOATr/jn8m7ar+A4jERZBbqeqHq91IA1Q8/S2pMk+lKmQ7r8zWCB/tjwF9IFt 3yH7dY/BPM3b+kJKGsCRTVTMZOwWvYnEisK2Sxe2yKx8rncHJmnm6HWGtclt7dlz zNOXif11m/VQ= 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=XbAAgfXDn9PYmE7IqOm9jJVAYhI=; b=ysP4X yKLxiW9CVAYSz7gH5ba3ATKY3uh29eOVy4TJVbj5MW4RBNipxsem2oHkBPBx2L1e 21Ep2G/yqa2VaLxJyYpmERNSpHf2+KfXBHVt/RbFcEeQbiUhvkpQ2myCccbzGIxE IaYho2raz/BSr0Xm5nUN0GKkjKHylVYGrjKteQ= Received: (qmail 116177 invoked by alias); 14 Oct 2019 20:57:32 -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 115445 invoked by uid 89); 14 Oct 2019 20:57:27 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.3 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=HX-Received:74b X-HELO: mail-qk1-f181.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=VbF2lTSkRZUsCBxbqkjFrl2/tacZhv5Fk1UMoJNzKVo=; b=wIf8tnGGNFkNkZSNbjaSj73ux+S6q3ymk+W+y1DClM5fiQ1mPPkNccC6YYWnzCnjNj tirXHWAsaB3Z9NKeAKtsTHQyu4RhODiyC3YsypVbED8/DvJdLNvBp/IlqK4Sw13mUdvT BZqutT/fosJcK2FJaNuCf7iTDQ7UOj/Ay3g9vycN2SsPY8horauUebP/Yq1DGRTE01ca uSby09F+ENw8LRtZpqUbatgyCxpzxO+8W9BW22vwblxAr2RoWO72/AbDDxOe8MEzL28Q O7qTf5SfxdX4D2lzKvvqYFTIGkDzqbNs0gHE/2/0meQ2psIkQGoyRuS4CUEMdETzdxpJ esqw== Return-Path: From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH v3 13/21] nptl: hppa: Fix Race conditions in pthread cancellation (BZ#12683) Date: Mon, 14 Oct 2019 17:56:48 -0300 Message-Id: <20191014205656.29834-14-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 hppa-linux-gnu. --- sysdeps/unix/sysv/linux/hppa/syscall_cancel.S | 82 +++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 sysdeps/unix/sysv/linux/hppa/syscall_cancel.S -- 2.17.1 diff --git a/sysdeps/unix/sysv/linux/hppa/syscall_cancel.S b/sysdeps/unix/sysv/linux/hppa/syscall_cancel.S new file mode 100644 index 0000000000..14e1f5f0a7 --- /dev/null +++ b/sysdeps/unix/sysv/linux/hppa/syscall_cancel.S @@ -0,0 +1,82 @@ +/* Cancellable syscall wrapper. Linux/hppa 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, + long int nr, + long int arg1, + long int arg2, + long int arg3, + long int arg4, + long int arg5, + long int arg6) */ + + .text +ENTRY(__syscall_cancel_arch) + stw %r2,-20(%r30) + ldo 128(%r30),%r30 + cfi_def_cfa_offset (-128) + cfi_offset (2, -20) + ldw -180(%r30),%r28 + copy %r24,%r31 + stw %r28,-104(%r30) + ldw -184(%r30),%r28 + stw %r28,-108(%r30) + ldw -188(%r30),%r28 + stw %r28,-112(%r30) + ldw -192(%r30),%r28 + stw %r4,-100(%r30) + stw %r28,-116(%r30) + copy %r25,%r28 + copy %r23,%r25 + stw %r19,-32(%r30) + cfi_offset (4, 28) + + .global __syscall_cancel_arch_start + .type __syscall_cancel_arch_start,@function +__syscall_cancel_arch_start: + + ldw 0(%r26),%r20 + stw %r20,-120(%r30) + ldw -120(%r30),%r20 + bb,< %r20,29,1f + ldw -116(%r30),%r21 + ldw -112(%r30),%r22 + copy %r31,%r26 + ldw -108(%r30),%r23 + ldw -104(%r30),%r24 + copy %r19, %r4 + ble 0x100(%sr2, %r0) + + .global __syscall_cancel_arch_end + .type __syscall_cancel_arch_end,@function +__syscall_cancel_arch_end: + + copy %r28, %r20 + copy %r4, %r19 + ldw -148(%r30),%r2 + ldw -100(%r30),%r4 + bv %r0(%r2) + ldo -128(%r30),%r30 +1: + bl __syscall_do_cancel,%r2 + nop + nop +END(__syscall_cancel_arch) +libc_hidden_def (__syscall_cancel_arch)