From patchwork Mon Oct 14 20:56:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 176354 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp5014153ill; Mon, 14 Oct 2019 14:00:35 -0700 (PDT) X-Google-Smtp-Source: APXvYqw8j4Yv3Q9ihfx+MRtH/WX7pny8oU2PP0ClzvXNfxJ1/Q24rV1ojE8lkYMuXNJBUJdF6m5v X-Received: by 2002:aa7:df07:: with SMTP id c7mr29605135edy.110.1571086834980; Mon, 14 Oct 2019 14:00:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571086834; cv=none; d=google.com; s=arc-20160816; b=QJVDUrZorlrXwdW7LY7a1S66oETo915GnwmcDdWDoCjkh2irNTZDsWzl9WyDfw3Tcv bqwn5v1nzlLRW/iHrjZvqwPhWVCHpfTtdBJSe7W5mBO2BOBPuAmFRm5bAOmaMp8ndJ9A Vx4/q+P8uqUfsX5KN4wStPvMMo2OI0TTVVS2KB8iA3DRU/vw0ajU80IBh9NxfuS/riyC v5Ocq3caQcSR5P/DN2LCFgh+uQdbpPODLhd2NCimaTwGtsGJpIaHE2fLL0xG2hDRy1Dr HW9uyoJ1BOWd9/oovwMGWRGHTYoL618mrg/tZI9mTwaiHCsmw2A0s6bSfAixBlGSyr+I Hraw== 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=nHS0DuGabUSi8Li/+DZSxyInhQ/EdztOmlDkW2Nz7mg=; b=Ke+GAlTi2QewZPoAXw5K42CLMXgOANW24TUgHEMz+1fSFjgkII4UvhusnjzWDVQHwj sCfgAMQw3hjizheXqF0v3P2ndBPdD+OTGTB5bpqCb93cL51OeYws7tSRukYFNNXZUShy n9PyuWa/FejzSpgTDrt8KGHthbKGjxcjyZ9tQ4jqN0v0wk/B9+7t4oH8fpftxXnrSiSR Ngi9VjDEciLLs9PMAc/lSMJYlQWbe9VrQi6e1rm5pUCVtbU7EUkgPdIZKZvHqmLlEvFw 1odrHQpAlYniFskGg4O7Dyxm5ju4qM3ShY1w20YJ7HOX4uEjeb7lVaWnL3/kNUzVkrLg BGww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=qnXKXjwV; dkim=pass header.i=@linaro.org header.s=google header.b=qY4ZdXSl; spf=pass (google.com: domain of libc-alpha-return-105945-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-105945-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 um16si11703335ejb.12.2019.10.14.14.00.34 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Oct 2019 14:00:34 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-105945-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=qnXKXjwV; dkim=pass header.i=@linaro.org header.s=google header.b=qY4ZdXSl; spf=pass (google.com: domain of libc-alpha-return-105945-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-105945-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=ARvAu5kZjY+VPUp8HyG/qDzxQXklfMn Ij7eLy1YopKojOqMjjFp99tWZoiMMBA5kubOTsMmMD32u5k2oK8M9y+seWLADrTi wyrVRRYRYt1cW292qARxUKgpJgY8mxZKdLQMdDEF95G4hDmSOWbpQITtfi6aX/bY wATNKS2iSGDg= 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=JIu4b8a3YFti8TR+W7CQkoeIQtc=; b=qnXKX jwVoFXJIQ2X16oQvMJ6XjFV3Fx2/Iqpj0OwllemBTJMr0Tar2+c00jcxOpUlxHlU 6JVFw7zC1tNwfmg8egMTSbSQSLm7RKggtZwkg2VVazgcOxGMoFssay5xl3I/ISju 3bJDQ+aWe4lp5IizuIDWZka/CYW4kDPsZq2eRw= Received: (qmail 117741 invoked by alias); 14 Oct 2019 20:57:44 -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 116538 invoked by uid 89); 14 Oct 2019 20:57:35 -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= X-HELO: mail-qk1-f195.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=nHS0DuGabUSi8Li/+DZSxyInhQ/EdztOmlDkW2Nz7mg=; b=qY4ZdXSlbgReuJZAvIy40VHH15k11xXVsn8oYk6YtLnpmfMHe4uPb97VbgCtUPWirS IxmAeGDCJ7yOOrR9YwpmaTqd/ImwuBR/cF4yd2GPp7LG1esyPKinyHXzrE/6rMqquWMP R4g6MfhQKipXxAt9Zs6YZJ/oPHWxyYt8VDZ3HUoC5ZUDF01CPxxDLMrU3tMVDRQ4cH7C zySQFEQ8cEY+aFPgDvxJAIfl6U88lcLIkFeY1f/m0v64SIoXaNwGRte0oiEC084dIiZp xOJlxjEWodKXE3AWJZICCS0I9PGNPB2yzfNMpPMbxTkf6BUgubPcPHx0sIzaWJqWy3mP A4DQ== Return-Path: From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH v3 19/21] nptl: nios2: Fix Race conditions in pthread cancellation (BZ#12683) Date: Mon, 14 Oct 2019 17:56:54 -0300 Message-Id: <20191014205656.29834-20-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 nios2 modifications required for the BZ#12683 fix by adding the arch-specific cancellation syscall bridge. --- .../unix/sysv/linux/nios2/syscall_cancel.S | 97 +++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 sysdeps/unix/sysv/linux/nios2/syscall_cancel.S -- 2.17.1 diff --git a/sysdeps/unix/sysv/linux/nios2/syscall_cancel.S b/sysdeps/unix/sysv/linux/nios2/syscall_cancel.S new file mode 100644 index 0000000000..cc19c4525e --- /dev/null +++ b/sysdeps/unix/sysv/linux/nios2/syscall_cancel.S @@ -0,0 +1,97 @@ +/* Cancellable syscall wrapper. Linux/nios2 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, + __syscall_arg_t nr, + __syscall_arg_t arg1, + __syscall_arg_t arg2, + __syscall_arg_t arg3, + __syscall_arg_t arg4, + __syscall_arg_t arg5, + __syscall_arg_t arg6) */ + +ENTRY (__syscall_cancel_arch) +#ifdef SHARED + addi sp, sp, -8 + stw r22, 0(sp) + nextpc r22 +1: + movhi r8, %hiadj(_gp_got - 1b) + addi r8, r8, %lo(_gp_got - 1b) + stw ra, 4(sp) + add r22, r22, r8 +#else + addi sp, sp, -4 + cfi_def_cfa_offset (4) + stw ra, 0(sp) + cfi_offset (31, -4) +#endif + + .globl __syscall_cancel_arch_start + .type __syscall_cancel_arch_start,@function +__syscall_cancel_arch_start: + ldw r3, 0(r4) + andi r3, r3, 4 + bne r3, zero, 3f + mov r10, r6 + mov r2, r5 +#ifdef SHARED +# define STACK_ADJ 4 +#else +# define STACK_ADJ 0 +#endif + ldw r9, (16 + STACK_ADJ)(sp) + mov r5, r7 + ldw r8, (12 + STACK_ADJ)(sp) + ldw r7, (8 + STACK_ADJ)(sp) + ldw r6, (4 + STACK_ADJ)(sp) + mov r4, r10 + trap + + .globl __syscall_cancel_arch_end + .type __syscall_cancel_arch_end,@function +__syscall_cancel_arch_end: + beq r7, zero, 2f + sub r2, zero, r2 +2: +#ifdef SHARED + ldw ra, 4(sp) + ldw r22, 0(sp) + addi sp, sp, 8 +#else + ldw ra, (0 + STACK_ADJ)(sp) + cfi_remember_state + cfi_restore (31) + addi sp, sp, 4 + cfi_def_cfa_offset (0) +#endif + ret + +3: +#ifdef SHARED + ldw r2, %call(__syscall_do_cancel)(r22) + callr r2 +#else + cfi_restore_state + call __syscall_do_cancel +#endif + +END (__syscall_cancel_arch) +libc_hidden_def (__syscall_cancel_arch)