From patchwork Mon Feb 26 21:03:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 129720 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp4292762edc; Mon, 26 Feb 2018 13:07:12 -0800 (PST) X-Google-Smtp-Source: AH8x225bf9j9TOajf1Xel61hpB6l1Yntfn6cKmOFDSVYnCo5k9iJBPjqAIV/ta0GDv6LagmjIkiS X-Received: by 10.167.131.199 with SMTP id j7mr11637851pfn.99.1519679232693; Mon, 26 Feb 2018 13:07:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519679232; cv=none; d=google.com; s=arc-20160816; b=Olhplu4EkmNlO3OWL5sTQ9htYYmMjNku0krgB35n7xFk25Tsl2icq6cbkBT6NWRCph AmIo9CKZjFdBzjhU+C+/g2mCgW1qO8lvgkKZfZY7/P0g4jjRKYbgBy1cw1lJJFKfKV9I 7xwty6AKpmcDGe9lyHXAoQpgnKp0Axr8eRflUcQ/467FTmOKPZiWoO+fVN/mv1aULbcs Dip1lQVuLYo5afIIDAcoIlx4T2UgTBZRoSX81hgEQ1A9oWG4rap104GOY57ktKvd0oLv pXdrXeSgYDx2HBEWljC/wUQDCJX+z+L9zBfvu8ZVWSSBYrH9POC2hiCDUJ8NeGGJICbI Rm9Q== 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:delivered-to :sender:list-help:list-post:list-archive:list-subscribe :list-unsubscribe:list-id:precedence:mailing-list:dkim-signature :domainkey-signature:arc-authentication-results; bh=hb8UvkBJfeaG645t3Gab0kwORa9VQxOXJFikOnbpdm0=; b=fBd8Fntw5VEABj2ehIugfwRtILQyoLRWl2tr7QH0Jh8E21hPu8HkTbBEL3R14fnnvu cAH0vPs0OjXSNWNikrsF1Waah9hPHU4VduIyJtG9WSnC0Eq4LIWcuSIqqY54Z9PEKRZi xjnN1pw4wHA4wdNjQiNOlLj7A2r+ADSW2oZc3qqBl+pHRbjnzvyI4ngyaKhcHH+Qzhs5 pb4NJlolOr6m7IV4yQzhEnqUxHjwvV6N3QviLOjf17ExZPLPlJctpc7jzNJUus+IXV+f cRkC/UCA7kTaRB5XPvxsGCLMR7sWsAt6+cA3J/XsXwzyK3Gb+sMUr5fZh7Vz7DKCM0u8 k0kw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=SXnwBY20; spf=pass (google.com: domain of libc-alpha-return-90635-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-90635-patch=linaro.org@sourceware.org; dmarc=fail (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 e9-v6si7434489pln.492.2018.02.26.13.07.12 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Feb 2018 13:07:12 -0800 (PST) Received-SPF: pass (google.com: domain of libc-alpha-return-90635-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=SXnwBY20; spf=pass (google.com: domain of libc-alpha-return-90635-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-90635-patch=linaro.org@sourceware.org; dmarc=fail (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=gfEeetSsmdrXdGTCQSTXtNL2bsCgV9m 01Q1toHItM/Gu0WAfJ58EGrcsTBULFsJAjzawUJAcs4EM3ug5/bCU/Wvg0/reC8v eUQOmMkuh5eVuy9BaMoLUkDZ+ktKnC7tnlhoscitB7Zx1b0dUu0ODkZnuSGeViga 6KjPEx6ibQIo= 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=svdX8CE2tJ84XY5uRpIpFZngc3A=; b=SXnwB Y20qCTOObXpcBfu/s3cWcJCjr6TDdE0OpHKlz1OXP2Rk9srKbi9CnWaosKd0V56/ yqZ2GZj4VSXi2iqq7rdegtmvYrYsjSYhmG6ande0P2D2rdCrnIl/RCUz47Ift54e WnRsOFKvLy50IOX53RqzRqQjwwzNJ/I80K2NM0= Received: (qmail 79714 invoked by alias); 26 Feb 2018 21:04:29 -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 77903 invoked by uid 89); 26 Feb 2018 21:04:15 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.1 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.2 spammy= X-HELO: mail-qk0-f195.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=hb8UvkBJfeaG645t3Gab0kwORa9VQxOXJFikOnbpdm0=; b=lT/G0JptlFPO4Ce/Q8ywnMlwFsEQEe/PcdN8J/6zV/eaCfRtPIBnwmGW4jLbcMX2jB +SwUopzhzTzikxZ4Wx0plPjY1Fj8iRmHHDVxn8vHPU/76HKrhZ8bRIlDpmSmwUE90Nmb ZUR4R+ppVL+Fe3PHXUy+XHjNRSTSaDMlTtMCul1vc4xxbfL710J9OBXDZWy8eY0kSkIy UpU/qgeU+/1pKRDh/M79b3isjUL96eUQMk7T0BHQVr2uUkrLma828Ntx6yd4wBefB/6I weAL6tmstHaIl3EimzBf+RMLBLE6ocpa1qzpuA3v+Czsl8yg7VbIiGUcrgHYn9wzFYgC K+3w== X-Gm-Message-State: APf1xPBpnvpAmw+KOQhzWU6Jg0VEEL7uxWq/oM4FuK8hCQ5Hpq+Nmzl3 elrvM+ZwgzpfkotyqZ61XjpAep0Sr6s= X-Received: by 10.55.18.135 with SMTP id 7mr19578352qks.7.1519679051007; Mon, 26 Feb 2018 13:04:11 -0800 (PST) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH v2 18/21] nptl: sh: Fix Race conditions in pthread cancellation (BZ#12683) Date: Mon, 26 Feb 2018 18:03:33 -0300 Message-Id: <1519679016-12241-19-git-send-email-adhemerval.zanella@linaro.org> In-Reply-To: <1519679016-12241-1-git-send-email-adhemerval.zanella@linaro.org> References: <1519679016-12241-1-git-send-email-adhemerval.zanella@linaro.org> This patch adds the sh modifications required for the BZ#12683. It basically adds the required ucontext_get_pc function and a cancellable syscall wrapper. SH requires an arch-specific syscall_cancel because the INTERNAL_SYSCALL_NCS adds the required or instruction to workaround a hardware bug [1]. The implementation were based on on default C version built with GCC 6.2.1. Checked against a build and make check run-built-tests=no for sh4-linux-gnu. [BZ #12683] * sysdeps/unix/sysv/linux/sh/syscall_cancel.S: New file. * sysdeps/unix/sysv/linux/sh/sigcontextinfo.h (ucontext_get_pc): New function. [1] http://documentation.renesas.com/eng/products/mpumcu/tu/tnsh7456ae.pdf --- ChangeLog | 6 ++ sysdeps/sh/sysdep.h | 1 + sysdeps/unix/sysv/linux/sh/sigcontextinfo.h | 11 +++ sysdeps/unix/sysv/linux/sh/syscall_cancel.S | 125 ++++++++++++++++++++++++++++ 4 files changed, 143 insertions(+) create mode 100644 sysdeps/unix/sysv/linux/sh/syscall_cancel.S -- 2.7.4 diff --git a/sysdeps/sh/sysdep.h b/sysdeps/sh/sysdep.h index 37889fb..df34c4c 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/sigcontextinfo.h b/sysdeps/unix/sysv/linux/sh/sigcontextinfo.h index d6dd48d..239f931 100644 --- a/sysdeps/unix/sysv/linux/sh/sigcontextinfo.h +++ b/sysdeps/unix/sysv/linux/sh/sigcontextinfo.h @@ -16,6 +16,9 @@ License along with the GNU C Library; if not, see . */ +#ifndef _SIGCONTEXTINFO_H +#define _SIGCONTEXTINFO_H + #define SIGCONTEXT int _a2, int _a3, int _a4, struct sigcontext #define SIGCONTEXT_EXTRA_ARGS _a2, _a3, _a4, @@ -24,3 +27,11 @@ #define GET_STACK(ctx) ((void *) ctx.sc_regs[15]) #define CALL_SIGHANDLER(handler, signo, ctx) \ (handler)((signo), SIGCONTEXT_EXTRA_ARGS (ctx)) + +static inline uintptr_t +ucontext_get_pc (const ucontext_t *uc) +{ + return uc->uc_mcontext.pc; +} + +#endif /* _SIGCONTEXTINFO_H */ 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 0000000..02a050d --- /dev/null +++ b/sysdeps/unix/sysv/linux/sh/syscall_cancel.S @@ -0,0 +1,125 @@ +/* Cancellable syscall wrapper. Linux/sh version. + Copyright (C) 2017 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 +__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 + +/* The additional or is a workaround for a hardware issue: + http://documentation.renesas.com/eng/products/mpumcu/tu/tnsh7456ae.pdf */ + .globl __syscall_cancel_arch_end +__syscall_cancel_arch_end: + + 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)