From patchwork Mon Dec 11 19:07:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 121455 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp3170657qgn; Mon, 11 Dec 2017 11:11:13 -0800 (PST) X-Google-Smtp-Source: ACJfBotUqWIkL+ZnroTbTmluSPfW5C9GVh+EkUPaQALLMnmD8d/fzzzctrLv7Yj3ugnnSCbSJMEu X-Received: by 10.101.100.24 with SMTP id a24mr1191427pgv.239.1513019473266; Mon, 11 Dec 2017 11:11:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513019473; cv=none; d=google.com; s=arc-20160816; b=tLSA+b4cgY5jlvEfI7NF7hfdrHXl2NdjmyHu9JDGHFPwLH5o+5y3epiA8nP4INL60Q IJHnZJiZ2SGYo6X+6VUZfscGUDSiEfBTvbx60c9nbrSaWPxi65AJgNjwljpQ9HoG3jkV taCNOM8+q8QAiwLSOH11QovzQFGUjzivkB7dGrKglpJL1mfAXBxanDs60Q2VtzdWDEeY rleIl/1VHr6kNSiB2H931noV2ZSMNk7qE7fIvEmSVg3lpQ+RRyl9N71mbWjMGLtYDRX8 Y5htuu9hLPIBHVxhHuLhTWW7DdWHA8b+gsX4XaTjH7yvozSkt6KcA+DKqhKAeCw4ztd7 S8HA== 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=/NpNQdoM3x1FW1yS5y6gJFBKb9aSEgN68ONZOJXuXgo=; b=MPefdBgcX5zNQWcvb6l9VxTv6iuo82OxPgRFBZa2GdBC/7J5qOzrZnlRGEysokqQ5Z pHHh7cpAjGGiohe2qJwgwgzyLYQLawo/LV+Kj1LFmjFbxyiNluCTPGmvCBerSz2NVkqs vT8oioVl4I2WE0d+Tm4+rsPhMVLowMueOvkJTpp5jtgjkjfF73waIr/kL9al5P02Lhff 0YunT18hQNbDFHvAID4MdQnjrFAe/xxETOeVM7w9A3Y4f7lTTGoSBqhRtZ95mqBzObJ8 CRs/mrXt0LpKXl4y7g1KJP1NB0S5UC+EkfyYcSExhy1vSjVUL2+n4qFDd69ZS9CSH/E+ Jwyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=w3yH9S4/; spf=pass (google.com: domain of libc-alpha-return-88033-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-88033-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 g7si4220784plp.1.2017.12.11.11.11.13 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Dec 2017 11:11:13 -0800 (PST) Received-SPF: pass (google.com: domain of libc-alpha-return-88033-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=w3yH9S4/; spf=pass (google.com: domain of libc-alpha-return-88033-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-88033-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=kQ11KKzl3xmmPR8Bvnfmx4WrgijuNCV B1kBdhkQoyk0I0EW7WGT3FH68XHa7m/NmoE1Dg8AzV8I4BEjILyaSsZA2D/URvay NMMQ4nuuZe5naD5h4jy5U+1HHQh1IfZxn0MBwGy2ZN8ozczHEHE1+tBbVf0FvY+R lS6MlIR6TkRE= 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=wZ4ex739pkRdXsP0Cf3iivw6cso=; b=w3yH9 S4/zmbX2T0Clqe5fXuHd/srBg16SfHhm/IhNd7st6IJiqR5t0eXbJhmIBcbo7cE/ OHks66cPiSsishK3r0PGVq2xk+rHikOPIIgKJHMqopqq1DG1eJNL4UvYN39VF34X 6yVqLV1Ak86rK5XD5sLiNdhj12/hN38eQw/jzo= Received: (qmail 43235 invoked by alias); 11 Dec 2017 19:07:42 -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 43200 invoked by uid 89); 11 Dec 2017 19:07:42 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.9 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-qt0-f193.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=/NpNQdoM3x1FW1yS5y6gJFBKb9aSEgN68ONZOJXuXgo=; b=fct/hscFt0Q5U1evEEmj2A9fVxVZp6u+/LImlHWIfT8dTMU0yponlKq5t6WhShsBsb Hpx16v1fZqm2OZ1+nZhGdw1WakC7sdcEStO73QsyVvY90WkrbLEGdm/IJcjL8u93hLBO ZpEPI8N8iQjK0d/0JdOPG/qzO9lKCm3l0xx40gIIYMp/fZaeXCZ433L/sXGQTmgpZ9yt qLurg4g0qYR9N0to7fr6OeO3SanXZDUon8UviHBG5XpT8uhzG4r3iJxYvW9dx5et256y WxS8bDhhCLtaN0nbrA9OkQWNtKoTbpi70a4Sn4GM/zOWNkqN8Sh0N3QaNQKpOjHLpDf+ KybA== X-Gm-Message-State: AKGB3mKsKGc8Db3461iP+PX4LASP4WT8moxRZVoGHdorxxtrGgPVynai 9ApQj9dOstqzKYTZgmd1wTFbKStsu+U= X-Received: by 10.55.105.5 with SMTP id e5mr2024932qkc.256.1513019258773; Mon, 11 Dec 2017 11:07:38 -0800 (PST) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 19/19] nptl: hppa: Fix Race conditions in pthread cancellation (BZ#12683) Date: Mon, 11 Dec 2017 17:07:03 -0200 Message-Id: <1513019223-7603-20-git-send-email-adhemerval.zanella@linaro.org> In-Reply-To: <1513019223-7603-1-git-send-email-adhemerval.zanella@linaro.org> References: <1513019223-7603-1-git-send-email-adhemerval.zanella@linaro.org> This patch adds the hppa modifications required for the BZ#12683. It basically adds the required __pthread_get_pc function. HPPA requires an arch-specific syscall_cancel because the INTERNAL_SYSCALL_NCS adds some instruction to fetch the returned syscalls value. The implementation were based on on default C version built with GCC 6.1 Checked on hppa-linux-gnu. * sysdeps/unix/sysv/linux/hppa/sigcontextinfo.h: New file. * sysdeps/unix/sysv/linux/hppa/syscall_cancel.S: Likewise. Signed-off-by: Adhemerval Zanella --- ChangeLog | 3 + sysdeps/unix/sysv/linux/hppa/sigcontextinfo.h | 38 +++++++++++++ sysdeps/unix/sysv/linux/hppa/syscall_cancel.S | 82 +++++++++++++++++++++++++++ 3 files changed, 123 insertions(+) create mode 100644 sysdeps/unix/sysv/linux/hppa/sigcontextinfo.h create mode 100644 sysdeps/unix/sysv/linux/hppa/syscall_cancel.S -- 2.7.4 diff --git a/sysdeps/unix/sysv/linux/hppa/sigcontextinfo.h b/sysdeps/unix/sysv/linux/hppa/sigcontextinfo.h new file mode 100644 index 0000000..4f59c1e --- /dev/null +++ b/sysdeps/unix/sysv/linux/hppa/sigcontextinfo.h @@ -0,0 +1,38 @@ +/* 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 + . */ + +#ifndef _SIGCONTEXTINFO_H +#define _SIGCONTEXTINFO_H + +#include + +/* In general we cannot provide any information. */ +#define SIGCONTEXT struct sigcontext * +#define SIGCONTEXT_EXTRA_ARGS +#define GET_PC(ctx) ((void *) 0) +#define GET_FRAME(ctx) ((void *) 0) +#define GET_STACK(ctx) ((void *) 0) +#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.sc_iaoq[0] & ~0x3; +} + +#endif /* _SIGCONTEXTINFO_H */ 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 0000000..552ba2f --- /dev/null +++ b/sysdeps/unix/sysv/linux/hppa/syscall_cancel.S @@ -0,0 +1,82 @@ +/* Cancellable syscall wrapper. Linux/hppa 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) */ + + .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)