From patchwork Mon Oct 14 20:56:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 176349 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp5013225ill; Mon, 14 Oct 2019 13:59:44 -0700 (PDT) X-Google-Smtp-Source: APXvYqzdVzhSKTtJAfF41Dw/TpZXiYQ/FGoBjWK4YGK4xYuEWE8Gl4i5d1NXSkfdE44bHKHnrO5H X-Received: by 2002:a17:906:8317:: with SMTP id j23mr30088992ejx.314.1571086784861; Mon, 14 Oct 2019 13:59:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571086784; cv=none; d=google.com; s=arc-20160816; b=Fy7u1WudEYLFPP0kFcA8SqmjmHATHnYEBPWA2hNjACctz3feIYaqdCB4zu36WCsIjK wDwGnG+oyij6w1u4/JTj72verlfYCyKM61Fh1d0xnT8J3mrho4IKB71jouiBrhOO6bHW MjU3FS2FA9K6zXr10IJ5ceMn+co/igWoNBytEGDLqzzuE/v084tYUBFtxJfe+kwEdoLD qAw/AguQFO3clJrrUMWzBxvdq3v90GHyDjfmklpFW1gLDFdrnIw64mTw3ZFtrC+vqAEz 5GNztTF/zac+NgNDEi0ThX5rg6b2fMVQZhCtkPSzQYFLdVs7MkhcyxGVverP92BeWVww t+pw== 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=tY2t0NansyhpvoCU4gDj1rc28nqlOMKFhMruZ7AQUMk=; b=RPaJY8r+ar//9D5TC15Vv135kLzdXLX7J3UrvRCd5C5CTrYoitdkTeGTuu93v2MAmL eIp69ozN0iJQX7X1tq+DR9be7FROm3vAU+GAQd3hxrye9fhOVAB+b8ZG0S1cExJK53hW RTrU0pXd3Xy4p9bITM/BY1qojytt53HHFN4pqXdTecan6YqdOpQalNO4yQBQAE7bnnGy SO55EaUfMOtIl0JsFNpePkWUMypocXWuW7IBR19YHXfGTSbVaxNOnb70YjkVkXWXBowl wKDkHhzstEjrnaBPDGwo1/n4MyzLrzwyaFTEFVUcDSCd1zDw9WQ9EDjdgwmLXgwi8yuQ H6HQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=WHIUbWyH; dkim=pass header.i=@linaro.org header.s=google header.b=fPw2cLgq; spf=pass (google.com: domain of libc-alpha-return-105940-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-105940-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 l23si12061796edr.187.2019.10.14.13.59.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Oct 2019 13:59:44 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-105940-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=WHIUbWyH; dkim=pass header.i=@linaro.org header.s=google header.b=fPw2cLgq; spf=pass (google.com: domain of libc-alpha-return-105940-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-105940-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=GCrOdl+FS4Bt+w9QnMW/hpE57UCXv/z PsWCnMP4lJIXBjwVb5+XP8Og5ILmVk4SzoAThjKQGqhmJg8UkSPTxmKYrU+bQ5UY M94PtaG9aS5eC/s+q9oCoX3hgwIv7DRKkwGdwSRq01PFLQJeOlGtZrw7StIJ2vgC zhlx+PgF5GFA= 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=u12Q6eo5D4o5V3aEm91seDtuF88=; b=WHIUb WyHLmXQ+M9SRDlhFuaV/Yq2WRoF4AHJ2euQgBtXL2/RZ0IWgtOtrQGIufIISDAU3 +A5T3qIMG9UghnqnBuJshlJN7TI83nN0Id68UL7hDhnydikk2DFnfVPcnJWvGpF8 VDAy0AiWJyVGlIS+Qu22xckV5OF2XkwB22MS1g= Received: (qmail 116210 invoked by alias); 14 Oct 2019 20:57:33 -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 115484 invoked by uid 89); 14 Oct 2019 20:57:27 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.3 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-qt1-f193.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=tY2t0NansyhpvoCU4gDj1rc28nqlOMKFhMruZ7AQUMk=; b=fPw2cLgqEQgAoxmWiptkP9OhpD6A/IsHnwRIgpK24+VIMNpKdmHpSyXsnJFS5DrMJV /rl41hjilcXuvxzEvRNbRE5bchRkHdfSvun9cAtaYYepinzn3CuJ/A0kO0yuPbgKSNan hWNjoaguC+YoTgOCPFspjksurR1mG2tD+PS6hVetxIfss7fhflgRL9QgOQ85qt9CGKtk jihDjJaE8q3G3c95ySnxlHnlx7qxL0bfLv82BDpXIRvQkT0q65+zTGX1Dht6sC6P0duf LkF+tILCHCZ+Rnh7Rlz5Wa4BGHls8uj7o1FIv0hWF2ItxA8E37haMLmqM5CnMbf8m87Q 0jrA== Return-Path: From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH v3 12/21] nptl: sparc: Fix Race conditions in pthread cancellation (BZ#12683) Date: Mon, 14 Oct 2019 17:56:47 -0300 Message-Id: <20191014205656.29834-13-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 sparc modifications required for the BZ#12683 fix. Different than other architectures, SPARC passes the sigcontext_t struct pointer as third argument in the signal handler set with SA_SIGINFO (some info at [1]) for 64 bits and the pt_regs in 32 bits. >From Linux code: * arch/sparc/kernel/signal_64.c 428 /* 3. signal handler back-trampoline and parameters */ 429 regs->u_regs[UREG_FP] = ((unsigned long) sf) - STACK_BIAS; 430 regs->u_regs[UREG_I0] = ksig->sig; 431 regs->u_regs[UREG_I1] = (unsigned long) &sf->info; 432 433 /* The sigcontext is passed in this way because of how it 434 * is defined in GLIBC's /usr/include/bits/sigcontext.h 435 * for sparc64. It includes the 128 bytes of siginfo_t. 436 */ 437 regs->u_regs[UREG_I2] = (unsigned long) &sf->info; * arch/sparc/kernel/signal_32.c: 392 regs->u_regs[UREG_FP] = (unsigned long) sf; 393 regs->u_regs[UREG_I0] = ksig->sig; 394 regs->u_regs[UREG_I1] = (unsigned long) &sf->info; 395 regs->u_regs[UREG_I2] = (unsigned long) &sf->regs; 396 397 regs->pc = (unsigned long) ksig->ka.sa.sa_handler; 398 regs->npc = (regs->pc + 4); So it requires an arch-specific ucontext_add_cancel. Also on sparc interrupted pause syscall returns with a PC indicating a side-effect and this deviates from other architectures. The sparc64 pause fall back to ppool syscall. Checked on sparc64-linux-gnu and sparcv9-linux-gnu. [1] https://www.spinics.net/lists/sparclinux/msg05037.html --- .../sysv/linux/sparc/cancellation-sigmask.h | 39 ++++++++++ .../sysv/linux/sparc/sparc32/syscall_cancel.S | 76 ++++++++++++++++++ sysdeps/unix/sysv/linux/sparc/sparc64/pause.c | 25 ++++++ .../sysv/linux/sparc/sparc64/syscall_cancel.S | 77 +++++++++++++++++++ 4 files changed, 217 insertions(+) create mode 100644 sysdeps/unix/sysv/linux/sparc/cancellation-sigmask.h create mode 100644 sysdeps/unix/sysv/linux/sparc/sparc32/syscall_cancel.S create mode 100644 sysdeps/unix/sysv/linux/sparc/sparc64/pause.c create mode 100644 sysdeps/unix/sysv/linux/sparc/sparc64/syscall_cancel.S -- 2.17.1 diff --git a/sysdeps/unix/sysv/linux/sparc/cancellation-sigmask.h b/sysdeps/unix/sysv/linux/sparc/cancellation-sigmask.h new file mode 100644 index 0000000000..6fd889b1cc --- /dev/null +++ b/sysdeps/unix/sysv/linux/sparc/cancellation-sigmask.h @@ -0,0 +1,39 @@ +/* Architecture specific bits for cancellation handling. + 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 + . */ + +#ifndef _NPTL_CANCELLATION_SIGMASK_H +#define _NPTL_CANCELLATION_SIGMASK_H 1 + +/* Add the SIGCANCEL signal on sigmask set at the ucontext CTX obtained from + the sigaction handler. */ +static void +ucontext_add_cancel (void *ctx) +{ + sigset_t *set; +#ifdef __arch64__ + struct pt_regs *regs = (struct pt_regs*) ((siginfo_t *)(ctx) + 1); + __siginfo_fpu_t *f = (__siginfo_fpu_t *)(regs + 1); + set = (sigset_t *) ((stack_t *)(f + 1) + 1); +#else + struct pt_regs32 *ptregs = (struct pt_regs32 *) (ctx); + set = (sigset_t *) (ptregs + 1); +#endif + __sigaddset (set, SIGCANCEL); +} + +#endif diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/syscall_cancel.S b/sysdeps/unix/sysv/linux/sparc/sparc32/syscall_cancel.S new file mode 100644 index 0000000000..7c86dee33c --- /dev/null +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/syscall_cancel.S @@ -0,0 +1,76 @@ +/* Cancellable syscall wrapper. Linux/sparc32 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) + save %sp, -96, %sp + + cfi_window_save + cfi_register (%o7, %i7) + cfi_def_cfa_register (%fp) + + .globl __syscall_cancel_arch_start + .type __syscall_cancel_arch_start, @function +__syscall_cancel_arch_start: + + /* if (*cancelhandling & CANCELED_BITMASK) + __syscall_do_cancel() */ + ld [%i0], %g2 + andcc %g2, 4, %g0 + bne,pn %icc, 2f + + /* Issue a 6 argument syscall. */ + mov %i2, %o0 + mov %i3, %o1 + ld [%fp+92], %o4 + mov %i4, %o2 + mov %i5, %o3 + ld [%fp+96], %o5 + mov %i1, %g1 + ta 0x10 + + .globl __syscall_cancel_arch_end + .type __syscall_cancel_arch_end, @function +__syscall_cancel_arch_end: + bcc 1f + mov 0, %g1 + sub %g0, %o0, %o0 + mov 1, %g1 + +1: + mov %o0, %i0 + return %i7+8 + nop + +2: + call __syscall_do_cancel, 0 + nop + nop + +END (__syscall_cancel_arch) +libc_hidden_def (__syscall_cancel_arch) diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/pause.c b/sysdeps/unix/sysv/linux/sparc/sparc64/pause.c new file mode 100644 index 0000000000..4a0cf4db59 --- /dev/null +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/pause.c @@ -0,0 +1,25 @@ +/* Linux pause syscall implementation. Linux/sparc64. + 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 + +/* On sparc interrupted pause syscall returns with a PC indicating a + side-effect and this deviates from other architectures. Fall back to + ppool implementation. */ +#undef __NR_pause +#include diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/syscall_cancel.S b/sysdeps/unix/sysv/linux/sparc/sparc64/syscall_cancel.S new file mode 100644 index 0000000000..8a6d5a2fd8 --- /dev/null +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/syscall_cancel.S @@ -0,0 +1,77 @@ +/* Cancellable syscall wrapper. Linux/sparc64 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 + + .register %g2, #scratch + +/* 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) + save %sp, -176, %sp + cfi_window_save + cfi_def_cfa_register (%fp) + cfi_register (%o7, %i7) + + .globl __syscall_cancel_arch_start + .type __syscall_cancel_arch_start, @function +__syscall_cancel_arch_start: + + /* if (*cancelhandling & CANCELED_BITMASK) + __syscall_do_cancel() */ + lduw [%i0], %g2 + andcc %g2, 4, %g0 + bne,pn %xcc, 2f + + /* Issue a 6 argument syscall. */ + mov %i2, %o0 + mov %i3, %o1 + mov %i4, %o2 + mov %i5, %o3 + ldx [%fp + STACK_BIAS + 176], %o4 + ldx [%fp + STACK_BIAS + 184], %o5 + mov %i1, %g1 + ta 0x6d + + .global __syscall_cancel_arch_end + .type __syscall_cancel_arch_end, @function +__syscall_cancel_arch_end: + + bcc,pt %xcc, 1f + mov 0, %g1 + sub %g0, %o0, %o0 + mov 1, %g1 +1: + mov %o0, %i0 + return %i7+8 + nop + +2: + call __syscall_do_cancel, 0 + nop + nop + +END (__syscall_cancel_arch) +libc_hidden_def (__syscall_cancel_arch)