From patchwork Mon Oct 14 20:56:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 176347 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp5012881ill; Mon, 14 Oct 2019 13:59:22 -0700 (PDT) X-Google-Smtp-Source: APXvYqzgk22KU4Kc2Bui3e5hUWAnS7s52nVvUb7JCwzCOqFQPRKHXo6GX17XygWVyPksbOVByClB X-Received: by 2002:a17:906:940a:: with SMTP id q10mr31002747ejx.250.1571086762848; Mon, 14 Oct 2019 13:59:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571086762; cv=none; d=google.com; s=arc-20160816; b=Hxu5fyw9SJwz92bxezVsZwD3MXBzYnZmytg55cpxQJ2pSaquDwlFLL0Zbuw1nl0FQL g5ZBTHxhXGxHNkxCirXgWye13m8Fjwm+oXxtuQQo+Sf8oMqZsr7icZaXponp0WjNCcJ2 skqaWyHFMoEHjefVIPWn4ZfjFk+WW9rQqDXJ92EYFLHC/MveEf5zkxKZPF7tPKN8HDkV IhWUqj/1Tn7ZH4abnnfOo5lRi531q1gRY0qwdIdbPxvbtYMNrKdZ91KWzMqoLoJBRYwN +E4Lrsh0GrWeRvCcGk04QkW8Zhw2eLXploJt4SGHgnFOrZmlTB6YzhOSL1I9Y87Q9MSr 7rQQ== 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=Wyh4qaSsn8l6HL2qXTK9ltVxaZVr95Wf8WMGcX6oqk0=; b=HW8+0TDj781bBDImKHaD1l/qYvdEwEY1a7UrjrioZG537IlJeza5qPgFs0+WRMNhHj ZOBmyP5LR8IEN1bEyfMCHlHFpCtNxS/jWHennFOtDhDSPn9jvEZqcqcTA5Lf9Q6Uuu+B bhSOPfith8yGCcIVVf6bTC6uLmYdz6eTVS2eAcdrWv2tAg8OZq2hsIl6RtbSHNU4WqqU dTaZl1gcofleAyEh58Qiu7CatSbtHV026bmtjGyHuwu5E+3ot5MISdNQeDZG++PGRJwS mr7NG0ld6270bGh9Md230jcX4uQ1MA6mg/jo5cbKTJV6AI3u4q1l3qP0s6EnX7jkWX/U cNMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=qEQRppoC; dkim=pass header.i=@linaro.org header.s=google header.b=ym4qSSnb; spf=pass (google.com: domain of libc-alpha-return-105938-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-105938-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 b33si14184137edc.265.2019.10.14.13.59.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Oct 2019 13:59:22 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-105938-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=qEQRppoC; dkim=pass header.i=@linaro.org header.s=google header.b=ym4qSSnb; spf=pass (google.com: domain of libc-alpha-return-105938-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-105938-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=OcRcd96r4RQQH4YNv7aJ08roYdBsPxK FJuguNltQgdwz0XNj6niZLIvEN4bdAwYxH7xI+Vh03xqFoAY5C8A+g0xPMnpJlNf QO2sD6x8OLYRZvrzg+n2MnSUxQrobaP+eQnUuum9EJEx2taEYDKGDZnl9OS4GU8y MRRc1tmnDCYA= 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=eQHio1dSDcbuKNt6JfbBQRtifA4=; b=qEQRp poCyYK9Rf09r8Kvrqh9x5HNwZobn+oQ9DhG53TT8u8tFo3KNBZC8A2t9rJqXMJd9 +X29G57gjj28hzCZoCd+8juZWaHRrJZ0tDxoAHNvAntQ4/zCJPH3rdFYZi7LYuMg nWiNWbpBJ3gP/ajCTtYV8BlzXSHwq2L1qoxLU8= Received: (qmail 115242 invoked by alias); 14 Oct 2019 20:57:26 -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 115039 invoked by uid 89); 14 Oct 2019 20:57:24 -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= X-HELO: mail-qk1-f169.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=Wyh4qaSsn8l6HL2qXTK9ltVxaZVr95Wf8WMGcX6oqk0=; b=ym4qSSnbvYVx+lY82ykS941IjsM0VLOSAroiyDENnT9dMWtWoTkgZO2fnVsPKwOZXT he6Hbw8h5+8lFv5s1LrE7UBXHTFGv35d4foW8d8uvVY2PTjFfHUK6k0XjR0MtKYZnITU yzuL7dZbWpjF3JwpLeSKTgiYD69sYVAu3TFBcgT0WRKAJhSs243g3J+5N4r0ULTTcpes AWzI3CW4Sw8Idkw9s8YHdv7my9CzGil3LLYLQP44ixv19+YQuxOvoxOH/HY2ADLo+pSj vsKl9FTou9Y5HQDDtUDrnQxqhIrURTpf0ryVQsueo4wmmc8rhuMrd0jMqYFSEVGmIdb+ 8fFg== Return-Path: From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH v3 11/21] nptl: microblaze: Fix Race conditions in pthread cancellation (BZ#12683) Date: Mon, 14 Oct 2019 17:56:46 -0300 Message-Id: <20191014205656.29834-12-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 microblaze modifications required for the BZ#12683 fix by adding the arch-specific cancellation syscall bridge. Checked against a build and make check run-built-tests=no for microblaze-linux-gnu. --- .../sysv/linux/microblaze/syscall_cancel.S | 64 +++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 sysdeps/unix/sysv/linux/microblaze/syscall_cancel.S -- 2.17.1 diff --git a/sysdeps/unix/sysv/linux/microblaze/syscall_cancel.S b/sysdeps/unix/sysv/linux/microblaze/syscall_cancel.S new file mode 100644 index 0000000000..19f566ba61 --- /dev/null +++ b/sysdeps/unix/sysv/linux/microblaze/syscall_cancel.S @@ -0,0 +1,64 @@ +/* Cancellable syscall wrapper. Linux/microblaze 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) */ + +ENTRY (__syscall_cancel_arch) + + .globl __syscall_cancel_arch_start + .type __syscall_cancel_arch_start, @function +__syscall_cancel_arch_start: + + lwi r3,r5,0 + andi r3,r3,4 #and1 + bneid r3,1f + addk r12,r6,r0 + + addk r5,r7,r0 + addk r6,r8,r0 + addk r7,r9,r0 + addk r8,r10,r0 + lwi r9,r1,56 + lwi r10,r1,60 + brki r14,8 + + .globl __syscall_cancel_arch_end + .type __syscall_cancel_arch_end, @function +__syscall_cancel_arch_end: + + nop + lwi r15,r1,0 + rtsd r15,8 + addik r1,r1,28 + +1: + brlid r15, __syscall_do_cancel + nop + +END (__syscall_cancel_arch) +libc_hidden_def (__syscall_cancel_arch) +