From patchwork Mon Feb 26 21:03:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 129707 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp4290415edc; Mon, 26 Feb 2018 13:04:53 -0800 (PST) X-Google-Smtp-Source: AH8x226UbFPnJK1KaBifFsZWCXp1aAGTNDICOL3dYXT7efnHdiX+YnRgsHtMSfV3BmpUollAcO36 X-Received: by 10.98.247.9 with SMTP id h9mr11880496pfi.212.1519679093885; Mon, 26 Feb 2018 13:04:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519679093; cv=none; d=google.com; s=arc-20160816; b=WiERuojagIV8v2/21iN7zaoCdQSadUJoO4J9Gjv7DL3Vzp0vjkeF4pYupuwTc2agaa QSHuJY6GCcUdbKEcqsXNnIGFwHJnuwbUL139Tkpw/YTJ6kh/xGeNjqfNBRwJIFTEDUr4 y0/lIZv609LS/0x1ebF3f1qehfwCaSIohS7SO5jNuTfCibBWJHTyms0D+YK0IlE4cQLm 9HEE15kj5hWs23wKa46lNeHZ8KAysF21zPEJq5G8CgvU4g40sivg/Ia2KvO8s1VAd79W qpUEj8QGe1ir9+McqsHpCbBJ08E85r3BS63Lud2zm8zL9fFPIjO3RrL0v3Ji45Kzd5RA c9Pg== 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=1fH9Xga2PMgKXeCAB0Z/gXJbmF0E+eqe1UFTyzWmLmQ=; b=DTlbxekWDgmR9AugoDwP4/0D2xi+ZNbcCDXoCWWw9EtnlrF62rVQjbFqyOX2D0IIN2 DrN8cUQGXJxHKrw2jQjuvlJJkB4bJGhXI3l8pk0TEaz5y1SDDClBHcDu5VXGVvQclzqy xT4kKlIIcJ7vqAy+idl+wfNlpRAP6pMcwfeSeHCxkTk6GTRv6B8vrXD/sSMnbw+XfraD iKhpUaaybW6wRIrNI7I6RtIp9+pHJ/HKc5vMcHEoaTP/YZf86Bl2eHbuEr2Q/mTUYQ6f 6viDr0LcJ0t6w3KvBZCDWjIqGFhmWP3SQC1hAXbNVA7mQ9w2gigReFLlVFebqA2ymLS4 zwfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=jJ8T5zhy; spf=pass (google.com: domain of libc-alpha-return-90622-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-90622-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 a21si5979807pgw.213.2018.02.26.13.04.53 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Feb 2018 13:04:53 -0800 (PST) Received-SPF: pass (google.com: domain of libc-alpha-return-90622-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=jJ8T5zhy; spf=pass (google.com: domain of libc-alpha-return-90622-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-90622-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=bIqhPewLXTTgilIgftU/yT1jJuWWc5L 2ITs4L4UnRfy/OlvyfuOydLoSZkIfVx6vjMb1q8MvGLhHe38BC3dEG/BDshO4+tL 7y8/6oxk0KP8O0Xpzta1aac2ahMTFNM3l/qyFQHiPQQVQoNG25XLzqqTik1ylxDZ eXfvXBsV+Fik= 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=ojDDoqrW/Wiak1HtV43RgyZ12p0=; b=jJ8T5 zhywKwYaCWeCW69GxIS7EcUk9S5RjkI7ga+X/liuP33LjHp5HV7q89Opuq9k6Ykt GwZtYJTKakaKzCpXVo8y3kJ8dVJKdOmP5jZGuI0SefN35ZbciWLF4kYeXS34mGlm /f+KE/ZHt36tTEgxNSIuYzwRma+Zp30OPQ4Z9k= Received: (qmail 75485 invoked by alias); 26 Feb 2018 21:03:58 -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 75362 invoked by uid 89); 26 Feb 2018 21:03:57 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.0 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-f194.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=1fH9Xga2PMgKXeCAB0Z/gXJbmF0E+eqe1UFTyzWmLmQ=; b=nQTnJSViOCAbeC5QeyMdamF5bO+4Vpo2Va4vZhWp1EquWR7nNaHyYjSFJEJbVDroH8 TwJIa5ihsi7Zm8uRc4I1oxL6eQ4GeGE2w978iKznsoiCm/H1gCWEk3jooMe2mZUi74lx eOS1gUqc8FBVljCS6Xd0zArxFf1xoyqX1HxbN4rU/hk9prv/ttuEiDShao4f1ePNF6o7 9qZEU51by/QaqcHAyhI6v4POBMSjs4FDURltSgpPaQe3yQtGEL9S4iM10HVQwUr87M0c hl0zCOoCczwMY0RJ0z3zOyatLPohvC2yy4VD21sOp6lY9c5+f4A0HZbnpSqnD1sYebQL s/Og== X-Gm-Message-State: APf1xPAdqJb47Gbd9ED+Evck1pfaErRUHbaSZQoy1Z1URNUxEpKPF9Tv /juXNvrAeNb8POeO0+JuVjD19/P1czQ= X-Received: by 10.200.12.68 with SMTP id l4mr3822436qti.71.1519679033645; Mon, 26 Feb 2018 13:03:53 -0800 (PST) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH v2 07/21] nptl: powerpc: Fix Race conditions in pthread cancellation (BZ#12683) Date: Mon, 26 Feb 2018 18:03:22 -0300 Message-Id: <1519679016-12241-8-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 patches adds the powerpc64 modification required for the BZ#12683. It basically adds the required __pthread_get_pc function and a arch specific syscall_cancel implementation. The powerpc requires an arch-specific syscall_cancel because INTERNAL_SYSCALL_NCS adds a mfcr just after the sc instruction to get the CR0.SO bit information from kernel (which signals the error return status). So for cancelled syscalls with side effects, __pthread_get_pc will point to mcfr and thus invalidating the checks on sigcancel_handler. Checked on powerpc64le-linux-gnu and powerpc-linux-gnu. [BZ #12683] * sysdeps/unix/sysv/linux/powerpc/syscall_cancel.S: New file. * sysdeps/unix/sysv/linux/powerpc/sysdep-cancel.h (__pthread_get_pc): New function. --- ChangeLog | 5 ++ sysdeps/unix/sysv/linux/powerpc/sigcontextinfo.h | 16 ++++++ sysdeps/unix/sysv/linux/powerpc/syscall_cancel.S | 64 ++++++++++++++++++++++++ 3 files changed, 85 insertions(+) create mode 100644 sysdeps/unix/sysv/linux/powerpc/syscall_cancel.S -- 2.7.4 diff --git a/sysdeps/unix/sysv/linux/powerpc/sigcontextinfo.h b/sysdeps/unix/sysv/linux/powerpc/sigcontextinfo.h index 72381e3..3be71f7 100644 --- a/sysdeps/unix/sysv/linux/powerpc/sigcontextinfo.h +++ b/sysdeps/unix/sysv/linux/powerpc/sigcontextinfo.h @@ -15,7 +15,11 @@ License along with the GNU C Library; if not, see . */ +#ifndef _SIGCONTEXTINFO_H +#define _SIGCONTEXTINFO_H + #include +#include #define SIGCONTEXT struct sigcontext * #define SIGCONTEXT_EXTRA_ARGS @@ -24,3 +28,15 @@ #define GET_STACK(ctx) ((void *)((ctx)->regs->gpr[1])) #define CALL_SIGHANDLER(handler, signo, ctx) \ (handler)((signo), SIGCONTEXT_EXTRA_ARGS (ctx)) + +static inline uintptr_t +ucontext_get_pc (const ucontext_t *uc) +{ +#ifdef __powerpc64__ + return uc->uc_mcontext.gp_regs[PT_NIP]; +#else + return uc->uc_mcontext.uc_regs->gregs[PT_NIP]; +#endif +} + +#endif /* _SIGCONTEXTINFO_H */ diff --git a/sysdeps/unix/sysv/linux/powerpc/syscall_cancel.S b/sysdeps/unix/sysv/linux/powerpc/syscall_cancel.S new file mode 100644 index 0000000..2e56c72 --- /dev/null +++ b/sysdeps/unix/sysv/linux/powerpc/syscall_cancel.S @@ -0,0 +1,64 @@ +/* Cancellable syscall wrapper. Linux/powerpc 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 [r3] __syscall_cancel_arch (int *cancelhandling [r3], + long int nr [r4], + long int arg1 [r5], + long int arg2 [r6], + long int arg3 [r7], + long int arg4 [r8], + long int arg5 [r9], + long int arg6 [r10]) */ + +ENTRY (__syscall_cancel_arch) + + .globl __syscall_cancel_arch_start + .type __syscall_cancel_arch_start,@function +__syscall_cancel_arch_start: + + /* if (*cancelhandling & CANCELED_BITMASK) + __syscall_do_cancel() */ + lwz r0,0(r3) + rldicl. r0,r0,62,63 + beq 1f + b __syscall_do_cancel + nop +1: + ABORT_TRANSACTION + /* Issue a 6 argument syscall, the nr [r4] being the syscall + number. */ + mr r0,r4 + mr r3,r5 + mr r4,r6 + mr r5,r7 + mr r6,r8 + mr r7,r9 + mr r8,r10 + sc + + .globl __syscall_cancel_arch_end + .type __syscall_cancel_arch_end,@function +__syscall_cancel_arch_end: + + bnslr+ + neg r3,r3 + blr +END (__syscall_cancel_arch) +libc_hidden_def (__syscall_cancel_arch)