From patchwork Mon Oct 14 20:56:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 176343 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp5012278ill; Mon, 14 Oct 2019 13:58:35 -0700 (PDT) X-Google-Smtp-Source: APXvYqy99jLchg9rRLpGs4bNS6D0fXox+qw6pRQhcEe8ugtHJY1cIfzS7NK6Neo2s7etrnMQZ1Xz X-Received: by 2002:a17:906:64e:: with SMTP id t14mr30767979ejb.75.1571086714951; Mon, 14 Oct 2019 13:58:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571086714; cv=none; d=google.com; s=arc-20160816; b=FtrdpMoQfh6ZK54KhLnfU8iQLMp49ohyP9503Y7/iqFWdkK+IJcaEEToyt6ddp2rE1 e4/N/rm1PAHyrH+nSefrGUHmVLCg0A1v1YyUHeCBsbmuQMvxebafd1MHmMlu1GNPU9Pt wzpfWyWKjzgdNRswZNDTriw6ic/tZJrNktCZn5SxTtlkhoab7i3/JCC0oNUaJEAztYOx ZvKjxsccxBMYy8GwRiN4C1ODerhgBv3b25VFHmLCS7Ci+v9q+3fDfQmP4JBZGwLm8eEH XJVufEHV/FF4TbXsJov5MmgJnHUHiwUUhSrIyNv3NAPy/brRk6lalWohDeZ9cQ+O4NXa 1CUA== 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=jNTVM/O7zU2fP5GI+U15z42qqoqbtQhr3aGg2Ewk7Qk=; b=0PM5+Ifz0lrQLXlxorDNgx6rtkO9EcWwO0KPbUzseyuOLMSrmdZoTpyQKcMMR6Hkd2 TuyT2ZbZyEwNNBkPy3kj/1bUrW4LCZb449gRZy52+naF13e4j1Ri3z5opU+Mzk42UlSd TWFyOvM/M+WiD6zizK1WrGjrY5W71B4u0rw30iZFmToizp1dkSF3CA6YuETG0Vlzmojg 91rfWc977w83NpHuS6qi/wgq+tS8hHmGCOg5NzBkl2q9SyMLoTIItphf9KB7YzwB7loz GSNTRAEcOevhcKeZjkXha4e1r56Bdxew0bTCGzyjePL6At2+MbBR9YWbZnVR2Ak2QEJP suLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b="E/7q0Hzh"; dkim=pass header.i=@linaro.org header.s=google header.b=YOpEo91O; spf=pass (google.com: domain of libc-alpha-return-105934-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-105934-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 w26si13086304edd.305.2019.10.14.13.58.34 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Oct 2019 13:58:34 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-105934-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="E/7q0Hzh"; dkim=pass header.i=@linaro.org header.s=google header.b=YOpEo91O; spf=pass (google.com: domain of libc-alpha-return-105934-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-105934-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=FnHTZbDOtiK0UB1AGhlEyNI3C4tYP1r TcSoDKBjlqlweL9K0QeIUSwvgT8F7eUS6Qp1WEXngsSNXbjJ6tfbx81q+6yBmAlL dMstGw9BdNk8lbjZj1RzB1EwcvsCEsj9osKjtXwTfCQgcJdDFy3Hqk3rfnWUkqjY DgOHPFnLKB9k= 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=iLEPHG+CilHtfQchvxX0lVb5wSA=; b=E/7q0 HzhX25kFCYna8mlV/taO0ayHlEVHnbE6aUFj3bo+YGI0Cyb4218PYyZqaXrj8LF9 hagMsh57VIAApOrfZmG8yFTIBlf8/B6v2yLYOceyoXcRLB7NK7f4kAUwWpRQThCy saF8jp/7EB/nAFhZ01JoET0qAZCRUZi5CSYm8E= Received: (qmail 114575 invoked by alias); 14 Oct 2019 20:57:21 -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 114475 invoked by uid 89); 14 Oct 2019 20:57:20 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.2 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-f196.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=jNTVM/O7zU2fP5GI+U15z42qqoqbtQhr3aGg2Ewk7Qk=; b=YOpEo91OvIRI3yfbxEMKVgRp33ZauSlnCFIfB0OJxY27S1bROTiPFTeKKxXO2rTzUG TIAr9Aw5TklhHOnAdD6Vti/3oGGKK4xyoe0kT2FrWY9rzu8OTmZYNxi/Q+A4m/owqLmc GcQ9Yxw43+WanJiiswncWRDPhfwz1Ur5EgSkgvT16uYA3wP7dgEf7m9ghMdO0HhcyV6f ThGGruIFCCXkyFyuEPTwRsB6Qh6E8EGtypFrH3+E95pzNiQbpG6rcH1m2Vo/iiIm1p3V 6NL2DzmbmidpTZb3TNGXDgyoemNGq7BQSMkOD8yiHfihbwkTy3KNMvte5PZh1Ee37N/1 XthA== Return-Path: From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH v3 08/21] nptl: aarch64: Fix Race conditions in pthread cancellation (BZ#12683) Date: Mon, 14 Oct 2019 17:56:43 -0300 Message-Id: <20191014205656.29834-9-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 aarch64 modifications required for the BZ#12683 fix by adding the arch-specific cancellation syscall bridge. Checked on aarch64-linux-gnu. --- .../unix/sysv/linux/aarch64/syscall_cancel.S | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 sysdeps/unix/sysv/linux/aarch64/syscall_cancel.S -- 2.17.1 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 0000000000..e105480bf3 --- /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)