From patchwork Mon Oct 14 20:56:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 176352 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp5013708ill; Mon, 14 Oct 2019 14:00:13 -0700 (PDT) X-Google-Smtp-Source: APXvYqwDpwbKziAB7eNduEl3DuiEB3tGzqdYpKeZzn+ij0Ed9yzm3L5hSe0j5RCIJ0jloFMB4nvT X-Received: by 2002:a50:d70c:: with SMTP id t12mr30324322edi.252.1571086813691; Mon, 14 Oct 2019 14:00:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571086813; cv=none; d=google.com; s=arc-20160816; b=cxlDTnqVO0bSU9gDUQp0mKTd0ugn2L2Kvr5hCick5glYclpV1XZB3v95SXmLvaLBFC fk1lnkA/DP9cPAJEnQorewIo6XBbJBsGfrhSV2T3myvlKZxA5CsUMdCQ7swyNv7loghI b624jv/6lwz6YMAWciWoA/+3OFP5/q0TxVldXsmD5ocV0deA12CUcWTyMDW+mGRtf7FB P9aysg3qFA3QP8Ml1gfiqADs1lH5ljyRBJiocITmZD87gwWglU2eoiNwiLFcGEUfUJ/F TK6shqdtRFl04KDXgeVYgBv6woqjTSLYndQbE2VIYZoEPYlQYF+v77gHfXFyRZKkPuVx Nxqg== 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=Vvhujm+erXu1LL7BSIyLWVlvKpXxbeaOB21RrARVVoc=; b=TNnO2MvZqiKYuWtbafGzM2zfuf9stuXOeOMcJXrYhr5X7wL+cKNV8pIRUFrIFkTdrr d4QymcReTUgQOQkobSSx0Wbrtia2r+pqFhHITJbbvv+SDnAUV6/zR0njUbXlo24f4qnT pjPK9rA3DYIUrXxIsxJZEKMM0suyNZlMizNU8rmgQvOM5MX1wrqJDj/IEqLYECuFcr7O +yOuxR9k7JpFMIJoOyA+tARkxCPLfe3tQV47akoQ7YPEA3pBUX+gCFORJ+S6rYtamKOI m4TGf12MyPBmLW/OXQs+SN+iBhaKYB9+RKbly8CNLvKiBLEZMjbALdWh+0mpFeQ0CKp6 CZRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=Viynoi3w; dkim=pass header.i=@linaro.org header.s=google header.b=sDcfbRbp; spf=pass (google.com: domain of libc-alpha-return-105943-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-105943-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 qp4si11654612ejb.171.2019.10.14.14.00.12 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Oct 2019 14:00:13 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-105943-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=Viynoi3w; dkim=pass header.i=@linaro.org header.s=google header.b=sDcfbRbp; spf=pass (google.com: domain of libc-alpha-return-105943-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-105943-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=M/Anjh0jc82Y6ILJaLh2vP6+/YLAcbf ScXvn8jUaATpCU9YL/FVtSC2Zq/9sfvQ8xDikUWonKLXHqCN/RkbVE/PM2WeuR8a Veo2v3GVkYxcUNii/EylTosIeTP/ea5UJU2g5kIrcmos4FvA+MpOsULoyCF9CQRe 8fFC3ueegYFk= 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=N2SZ5Cup2HQAim3WdZf3Exyukpg=; b=Viyno i3w/jyI0HMZ36PyV6gA0Z62c1OurFdix0PnCvGikVI6JNnMSdNlrCu9zlRnK0UEh CDoqXXSckeaSU1YC1fIG1P10p0E+7YSh3EnY9nuXIgrrPTqlC3vSSS7k+m89mEDR wK/xyt5afQZEZGGQDiuMnDENyKpXGOAy+u/+gU= Received: (qmail 116427 invoked by alias); 14 Oct 2019 20:57:34 -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 116070 invoked by uid 89); 14 Oct 2019 20:57:31 -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=eng X-HELO: mail-qt1-f173.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=Vvhujm+erXu1LL7BSIyLWVlvKpXxbeaOB21RrARVVoc=; b=sDcfbRbp6S7FfSr3lqwYxih9XY6TenVEJwIkVbAzuycFZFY7K/4eyn/fKJEsyj9rhd MtvG3Gc3XL3RuCNtEQGe3tvEs3xSKk8kTNUxhl0zqfcoSDmCRuFG8vBfbN3kLNKeeHjT Vtdg6o5rpvnLHyT/eNPbG04guFj0amp9ETT3stP89LRo9HuVBXCo/b/vvFE2Io0SG2ff 2tMrbuFp/EaWmsMUntYh+UwMZFwuQv+Po6AQm6QoNH5LkR+Qh3YcdW5kZfbNcZVxQqSu hw0aYu+0oXuMfZX+aOgoGKQk29S/gg/boEENI1md0QpKe/7hLpnJcFUJjYLjRHgyDn1w /OtA== Return-Path: From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH v3 16/21] nptl: sh: Fix Race conditions in pthread cancellation (BZ#12683) Date: Mon, 14 Oct 2019 17:56:51 -0300 Message-Id: <20191014205656.29834-17-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 sh 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 sh4-linux-gnu. --- sysdeps/sh/sysdep.h | 1 + sysdeps/unix/sysv/linux/sh/syscall_cancel.S | 128 ++++++++++++++++++++ 2 files changed, 129 insertions(+) create mode 100644 sysdeps/unix/sysv/linux/sh/syscall_cancel.S -- 2.17.1 diff --git a/sysdeps/sh/sysdep.h b/sysdeps/sh/sysdep.h index 2f109b241e..31b7f312cd 100644 --- a/sysdeps/sh/sysdep.h +++ b/sysdeps/sh/sysdep.h @@ -24,6 +24,7 @@ #define ALIGNARG(log2) log2 #define ASM_SIZE_DIRECTIVE(name) .size name,.-name +#define L(label) .L##label #ifdef SHARED #define PLTJMP(_x) _x##@PLT diff --git a/sysdeps/unix/sysv/linux/sh/syscall_cancel.S b/sysdeps/unix/sysv/linux/sh/syscall_cancel.S new file mode 100644 index 0000000000..3bdb939adb --- /dev/null +++ b/sysdeps/unix/sysv/linux/sh/syscall_cancel.S @@ -0,0 +1,128 @@ +/* Cancellable syscall wrapper. Linux/sh 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) + +#ifdef SHARED + mov.l r12,@-r15 + cfi_def_cfa_offset (4) + cfi_offset (12, -4) + mova L(GT),r0 + mov.l L(GT),r12 + sts.l pr,@-r15 + cfi_def_cfa_offset (8) + cfi_offset (17, -8) + add r0,r12 +#else + sts.l pr,@-r15 + cfi_def_cfa_offset (4) + cfi_offset (17, -4) +#endif + + .globl __syscall_cancel_arch_start + .type __syscall_cancel_arch_start,@function +__syscall_cancel_arch_start: + + /* if (*cancelhandling & CANCELED_BITMASK) + __syscall_do_cancel() */ + mov.l @r4,r0 + tst #4,r0 + bf/s 1f + + /* Issue a 6 argument syscall. */ + mov r5,r3 + mov r6,r4 + mov r7,r5 +#ifdef SHARED + mov.l @(8,r15),r6 + mov.l @(12,r15),r7 + mov.l @(16,r15),r0 + mov.l @(20,r15),r1 +#else + mov.l @(4,r15),r6 + mov.l @(8,r15),r7 + mov.l @(12,r15),r0 + mov.l @(16,r15),r1 +#endif + trapa #0x16 + + .globl __syscall_cancel_arch_end + .type __syscall_cancel_arch_end,@function +__syscall_cancel_arch_end: + + /* The additional or is a workaround for a hardware issue: + http://documentation.renesas.com/eng/products/mpumcu/tu/tnsh7456ae.pdf + */ + or r0,r0 + or r0,r0 + or r0,r0 + or r0,r0 + or r0,r0 + + lds.l @r15+,pr + cfi_remember_state + cfi_restore (17) +#ifdef SHARED + cfi_def_cfa_offset (4) + rts + mov.l @r15+,r12 + cfi_def_cfa_offset (0) + cfi_restore (12) + .align 1 +1: + cfi_restore_state + mov.l L(SC),r1 + bsrf r1 +L(M): + nop + + .align 2 +L(GT): + .long _GLOBAL_OFFSET_TABLE_ +L(SC): + .long __syscall_do_cancel-(L(M)+2) +#else + cfi_def_cfa_offset (0) + rts + nop + + .align 1 +1: + cfi_restore_state + mov.l 2f,r1 + jsr @r1 + nop + + .align 2 +2: + .long __syscall_do_cancel +#endif + +END (__syscall_cancel_arch) +libc_hidden_def (__syscall_cancel_arch)