From patchwork Mon Oct 14 20:56:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 176351 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp5013519ill; Mon, 14 Oct 2019 14:00:03 -0700 (PDT) X-Google-Smtp-Source: APXvYqwv50IYr2c3mnYNTOcf3REcKNtIcRNIF128DTU6siSLBF4uE8HnuM+tduqfBlUgbUHFJbKd X-Received: by 2002:a05:6402:1686:: with SMTP id a6mr3051242edv.174.1571086803462; Mon, 14 Oct 2019 14:00:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571086803; cv=none; d=google.com; s=arc-20160816; b=sZC2PgWx8qK4WbxiXVoVkCqer40UxZwI3z9QSbRTKLhcfOvYmSAtKCUYVzhRuh0ArC NAC0cLNVbCBGxppA56I1lA/qb3wszsl6467xMbqENWCDQDUAHmV11YMfQfgVrgRmxcqg HIyVJHlb9M0cINAx7UuiIchQzkZUF1FdBQNKzVDOON8ve3RExoJ+owXlRxLG+SfO/2si +l9OlDouV2OqWs6ECg3kaBX534OJgB6tidbZk7m/sus1iI/8saQAtBJDsWTu8+IEK22v N8/TApRUWaWBJZj2ZND4xLqYseH5z0WthS6w9bgz/+jIxNiiDIBfWQjlLvfXB6S2Qmen nz2w== 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=FFphYilTSsp2+i+YPh3T9cur6JXmTyfU5PiRopfWRVk=; b=KLA77hxpXxq9ZSEZD5iYTArjaCSqjmeb5ZnTOZEylbWKbPf61TDixsFbrCE0uJAUKv faptsQaIpGDX7YUC80lTcohfh8z6yxYxCcy2mO7waghi7s2hQGPMEncEtxhNq5HnrwwC Vj3nUQcQqA5+MVJSchBHopGV00lZOVD0ie5DKKnjzhYJXuSdqqAi2Vo7Op7D0jZpb5UV gvCZEKEazyA9hTgwG5MTUSoqxsMQfjGAGAFLeAc7/eB6iVAn03JpgylLsgGrBlx0ZA9p hdXTWTYKESZKEcZS1e7jx89LzL3Bd3aac2CGHmnuZbZnb7x16tPDUXnVzoixPKVo66BF 8Mkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=Axcql4m2; dkim=pass header.i=@linaro.org header.s=google header.b=RVfpGPRh; spf=pass (google.com: domain of libc-alpha-return-105942-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-105942-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 z7si14534038edi.318.2019.10.14.14.00.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Oct 2019 14:00:03 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-105942-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=Axcql4m2; dkim=pass header.i=@linaro.org header.s=google header.b=RVfpGPRh; spf=pass (google.com: domain of libc-alpha-return-105942-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-105942-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=SV9cRdtSKuY92oFcUkuLs9fz5ESQWjo mb1uuhWDE+g79VLQQB8m9ximrk9of9gwAhix/9i5zRJh+7C4Nvd1GalK1hEnZKgP Tjmi3TsJ/pbC+TZIrDfS+wkrsmYEpCOpyga/gPT/pSaHLC3yGnfUoPAzKIBstbQe TSg7KSwd0kFc= 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=SpCN56X9EByTv6NrlOiSZK9c3+8=; b=Axcql 4m2LuDc//A+A2fJB0KtTOJ5191/6wJlrxSbkV5q5HfETwLfM4NQIrgABQuk2Dz2q ZNhWv0QBhJXVh1RMY7XrV8cIdgzD96401XJYQmYFxGz2M+SB924mJlgyEglu7FNT cORkXq0fujRcoZQszqBV3ogQ/vfQkr2Ell0gxE= Received: (qmail 116351 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 116036 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= 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=FFphYilTSsp2+i+YPh3T9cur6JXmTyfU5PiRopfWRVk=; b=RVfpGPRhPuLhL+Vw3fj4TYhSGWxBT/o9xvH6oufKzkTb3OpjrEXjxMEEbFHSkpoAHD ZdBZpmCLoQyimdzJZcnex2PHhO7oARS0zXqtqFwjJ7w/lpMFLLiowmkG6DNOk4sWUBD0 KdjMJ3yXoRTWn2GsXLnkKcKy3XrDLGzqOv6OU2D8uwTfB3iR2kGsdpshoyHZoQlaA9fZ c73l6KXalVhj+cLplSji90kfzefRhI4zOt8Lb80w1bT/sOJs2Io2yNcFfCJR0OKtLC5D omv0LVqGmLWl+O4kxscUScPr3h/SBc4cnoiXPzuD9fz2+Edo2fZI99jn4lmrGC3FqBam C4dQ== Return-Path: From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH v3 15/21] nptl: alpha: Fix Race conditions in pthread cancellation (BZ#12683) Date: Mon, 14 Oct 2019 17:56:50 -0300 Message-Id: <20191014205656.29834-16-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 hppa modifications required for the BZ#12683 fix by adding the arch-specific cancellation syscall bridge. Checked on alpha-linux-gnu. --- .../unix/sysv/linux/alpha/syscall_cancel.S | 82 +++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 sysdeps/unix/sysv/linux/alpha/syscall_cancel.S -- 2.17.1 diff --git a/sysdeps/unix/sysv/linux/alpha/syscall_cancel.S b/sysdeps/unix/sysv/linux/alpha/syscall_cancel.S new file mode 100644 index 0000000000..e497b1c805 --- /dev/null +++ b/sysdeps/unix/sysv/linux/alpha/syscall_cancel.S @@ -0,0 +1,82 @@ +/* Cancellable syscall wrapper. Linux/alpha 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, + __syscall_arg_t arg7) */ + + .set noreorder + .set noat + .set nomacro +ENTRY (__syscall_cancel_arch) + .frame sp, 16, ra, 0 + .mask 0x4000000,-16 + cfi_startproc + ldah gp, 0(t12) + lda gp, 0(gp) + lda sp, -16(sp) + cfi_def_cfa_offset (16) + mov a1, v0 + stq ra, 0(sp) + cfi_offset (26, -16) + .prologue 1 + + .global __syscall_cancel_arch_start + .type __syscall_cancel_arch_start,%function +__syscall_cancel_arch_start: + ldl t0, 0(a0) + addl zero, t0, t0 + and t0, 0x4, t0 /* if (*ch & CANCELED_BITMASK) */ + bne t0, 1f + mov a2, a0 + mov a3, a1 + mov a4, a2 + ldq a4, 16(sp) + mov a5, a3 + ldq a5, 24(sp) + .set macro + callsys + .set nomacro + + .global __syscall_cancel_arch_end + .type __syscall_cancel_arch_end,%function +__syscall_cancel_arch_end: + subq zero, v0, t0 + ldq ra, 0(sp) + cmovne a3, t0, v0 + lda sp, 16(sp) + cfi_remember_state + cfi_restore (26) + cfi_def_cfa_offset (0) + ret zero, (ra), 1 + .align 4 +1: + cfi_restore_state + ldq t12, __syscall_do_cancel(gp) !literal!2 + jsr ra, (t12), __syscall_do_cancel !lituse_jsr!2 + cfi_endproc +END (__syscall_cancel_arch) +libc_hidden_def (__syscall_cancel_arch)