From patchwork Mon Dec 11 19:06:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 121451 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp3169937qgn; Mon, 11 Dec 2017 11:10:32 -0800 (PST) X-Google-Smtp-Source: ACJfBosmRXVL7YYQpenxoIThWN2I72tCpbJDwT6EJ1ROHpdpxgvmpL9vMP95xcC8GoYc8SKuNdUY X-Received: by 10.84.128.229 with SMTP id a92mr1287196pla.71.1513019432868; Mon, 11 Dec 2017 11:10:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513019432; cv=none; d=google.com; s=arc-20160816; b=iRBdr45PPBI4t8PQ62LgSCJOWoVSbUBG/6GmcPkNK32uOL2BRR6oab4Iyem+J1NKHL 9L9cYMeEQgkRq9z93Hb777YR2HwlTI3tkZ4HNCkF+isK67Ir0Jf6p4JYGhjs/vuAVpB5 WcfOIElu23gN7ynJ8eEoxFWGyPISYawsqQ3XnZHtH6Gtk/CO+PXTmlsN0vO3zY9xoqp+ XTq1kkv2o64EXMhw8n0YWlk4ZgNOz7KrH/o/uROf4eyA9860mMdl6EXa0xUeCh3baZWq cnZ1R5HQNDn7Aw+kiYIxVE2wgbNdgkVIpVv6tXFBVCZjFLPQ+fYZ7YXP1vFywWqn7oox oDig== 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=aITh5FjZLR851RM2dC9BPOOCfI4N36CTxskUwOpn3aU=; b=r9+xxClC9PrL8em5pKXsimQMgHvSAr3dMKEvxgBNGT0BaLnBclImng5pK2rASXbvU9 uOD9JJBy3HbFMyJD630DK5dpwyDekuRbRWmzCoI35DkDX6mIoJIiLaQTp0kgiz5P1V3P pk4ZvKmkNSRasFOCD4fmQb19fg4iOjlG06hulYBaw5augmG9s/SSeI1ozSDFPfhP+7jq KbDTFpvT8LsybMRjZ4+LvoxzwRTBKemIjGwf011mJ0mvKn3E4uGeXYwLuCT0afh7XF3g 9XOobUAhKbaP1Cpx4bcP95OtfixAPHI/SJdA49tVQvI56R/49pdeV49bX8av8kL/DHns 5krg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=q/AXOcYh; spf=pass (google.com: domain of libc-alpha-return-88028-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-88028-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 o5si11525726pfj.28.2017.12.11.11.10.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Dec 2017 11:10:32 -0800 (PST) Received-SPF: pass (google.com: domain of libc-alpha-return-88028-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=q/AXOcYh; spf=pass (google.com: domain of libc-alpha-return-88028-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-88028-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=iMyIZb6bYgkAuS5N0/jLRupL6hwzRPd +EeAvimf3blgECxeWYu2Ro8jpAcyeO3xWWXL3sdopOfJ5tqK1meQfHJ3sTSoGirm d7jubRb8vCiNg09RBVd/ASNB6TsWeBu4m0nd6/9q565Yh0SY5+CCkAsGsyLRMYTM j8jTuXI49kNE= 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=mit3Yb/7bjBXNSg1LGguRB0OApE=; b=q/AXO cYhX0qXXF6wabN0hO0Lnl5IDRJF7HgLGsfC0yE0/TkynGEQ+IhWiN1ECCOi+BMxP t0AZqu9+PpEuia1xB7cLyeeIt7X+L0uZxZlIcauoRqMrQ3eRGblGdLcb4z8Ul2Wg Bv7TvfskkVj7wUhb+uvTox/iZdY9yZRrkhkcug= Received: (qmail 42560 invoked by alias); 11 Dec 2017 19:07:35 -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 42538 invoked by uid 89); 11 Dec 2017 19:07:34 -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=aITh5FjZLR851RM2dC9BPOOCfI4N36CTxskUwOpn3aU=; b=WUMkDJSxxjINzAyTD/5Y9oy3JYAKEpmE2q6U2Lq+eT2JHEP5bNpVO4+i7/t6IZ6A0h dtXkL8HLoBuK4lz8tHEfFRBqFAnwvWvjsIwIXHyhmZGx6tBdC/rIbFyXbq4e7oww7vIJ SHHGHl6IWq9AJPrjEpNwqLShqRRiTUvLWL2Gm3KsjlXb1PpfKLNGB/R6yMamm0rV/U/o RrgJu2wlENJHFp3GMNqEzJgnXT9K2xz2RCK6saNf6oGVctrLrT19GvcvFpJt/fYsxKeV x1a4x7S15RsveZc7q8+kpbv4mE/81XJJsOSsemeXAeBTM9CGnc4W+v6scHPo5PoSaYdC XW8w== X-Gm-Message-State: AKGB3mJoIp+0Q8kDoIAzegABLHbp0FelUo8f1LUEGNHmuXcd03I+b+5b hDVR9RGen1iDDeLeMPLBLKv26LgPb4I= X-Received: by 10.55.19.19 with SMTP id d19mr1816371qkh.189.1513019251131; Mon, 11 Dec 2017 11:07:31 -0800 (PST) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 14/19] nptl: tile: Fix Race conditions in pthread cancellation (BZ#12683) Date: Mon, 11 Dec 2017 17:06:58 -0200 Message-Id: <1513019223-7603-15-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 tile modifications required for the BZ#12683. It basically adds the required ucontext_get_pc function The default syscall_cancel.c should be as expected for TILE. With GCC 6.1 syscall_cancel.c generates the following code: * TILEGX 0000000000000000 <__GI___syscall_cancel_arch>: 0: c7bf46ce576bfd9d { move r29, sp ; addi r28, sp, -24 ; st sp, lr } 8: 283bf825401e0db6 { addi sp, sp, -32 ; move r10, r1 } 10: eeedf85b85c18d9b { addi r27, sp, 24 ; move lr, r2 ; st r28, r29 } 18: eef5f88155bbf0c1 { move r1, r3 ; move r2, r4 ; st r27, r30 } 20: 283bf8c25107f143 { move r3, r5 ; move r4, r6 } 28: 283bf8e2d1483000 { move r5, r7 } 0000000000000030 <__syscall_cancel_arch_start>: 30: 9c5e4000340c3000 { ld4s r11, r0 } 38: 18182165d1483000 { andi r11, r11, 4 } 40: 17c00163d1483000 { bnez r11, 78 <__syscall_cancel_arch_end+0x20> } 48: 283bfee051483000 { move r0, lr } 50: 286b180051485000 { swint1 } 0000000000000058 <__syscall_cancel_arch_end>: 58: 180906ced1401ff7 { subx lr, zero, r1 ; addi r29, sp, 32 } 60: 87b8c6ce4dd77040 { cmovnez r0, r1, lr ; addi r28, sp, 24 ; ld lr, r29 } 68: 9ef6400035cc3000 { ld r30, r28 } 70: 286a6ee040120db6 { addi sp, sp, 32 ; jrp lr } 78: 2000000051483000 { jal 78 <__syscall_cancel_arch_end+0x20> } * TILEGX32 00000000 <__GI___syscall_cancel_arch>: 0: cbbfc6ce576bfd9d { move r29, sp ; addxi r28, sp, -8 ; st sp, lr } 8: 283bf825402f0db6 { addxi sp, sp, -16 ; move r10, r1 } 10: eeedf860d5cbf0b7 { move lr, r2 ; move r1, r3 ; st r28, r29 } 18: 283bf8a1d107f102 { move r2, r4 ; move r3, r5 } 20: 283bf8e2d107f184 { move r4, r6 ; move r5, r7 } 00000028 <__syscall_cancel_arch_start>: 28: 9c5e4000340c3000 { ld4s r11, r0 } 30: 18182165d1483000 { andi r11, r11, 4 } 38: 17c0016351483000 { bnez r11, 68 <__syscall_cancel_arch_end+0x18> } 40: 283bfee051483000 { move r0, lr } 48: 286b180051485000 { swint1 } 00000050 <__syscall_cancel_arch_end>: 50: 28660fe540210d9d { addxi r29, sp, 16 ; subx r10, zero, r1 } 58: 9fbe40004dd4a040 { cmovnez r0, r1, r10 ; ld lr, r29 } 60: 286a6ee040210db6 { addxi sp, sp, 16 ; jrp lr } 68: 2000000051483000 { jal 68 <__syscall_cancel_arch_end+0x18> } * TILEPRO 00000000 <__GI___syscall_cancel_arch>: 0: bfdfa6ce1b7bfd9d { move r29, sp ; addi r28, sp, -12 ; sw sp, lr } 8: 0833f825403f0db6 { addi sp, sp, -16 ; move r10, r1 } 10: 9f75f85bc9d0cd9b { addi r27, sp, 12 ; move lr, r2 ; sw r28, r29 } 18: 9f6df8811debf0c1 { move r1, r3 ; move r2, r4 ; sw r27, r30 } 20: 0833f8c200cff143 { move r3, r5 ; move r4, r6 } 28: 0833f8e2f0165000 { move r5, r7 } 00000030 <__syscall_cancel_arch_start>: 30: dc05080068ba5000 { lw r11, r0 } 38: 30202165f0165000 { andi r11, r11, 4 } 40: 2800396170165000 { bnz r11, 78 <__syscall_cancel_arch_end+0x20> } 48: 0833fee070165000 { move r0, lr } 50: 400b980070166000 { swint1 } 00000058 <__syscall_cancel_arch_end>: 58: 301886ce81741ff7 { sub lr, zero, r1 ; addi r29, sp, 16 } 60: bc7066ce17777040 { mvnz r0, r1, lr ; addi r28, sp, 12 ; lw lr, r29 } 68: dc75080069ea5000 { lw r30, r28 } 70: 081606e040310db6 { addi sp, sp, 16 ; jrp lr } 78: 6000000070165000 { jal 78 <__syscall_cancel_arch_end+0x20> } Checked against a build and make check run-built-tests=no for tile-linux-gnu. * sysdeps/unix/sysv/linux/tile/sigcontextinfo.h (ucontext_get_pc): New function. Signed-off-by: Adhemerval Zanella --- ChangeLog | 3 +++ sysdeps/unix/sysv/linux/tile/sigcontextinfo.h | 12 ++++++++++++ 2 files changed, 15 insertions(+) -- 2.7.4 diff --git a/sysdeps/unix/sysv/linux/tile/sigcontextinfo.h b/sysdeps/unix/sysv/linux/tile/sigcontextinfo.h index bad81e4..043ac75 100644 --- a/sysdeps/unix/sysv/linux/tile/sigcontextinfo.h +++ b/sysdeps/unix/sysv/linux/tile/sigcontextinfo.h @@ -16,6 +16,10 @@ License along with the GNU C Library. If not, see . */ +#ifndef _SIGCONTEXTINFO_H +#define _SIGCONTEXTINFO_H + +#include #include #define SIGCONTEXT siginfo_t *_si, ucontext_t * @@ -25,3 +29,11 @@ #define GET_STACK(ctx) ((void *) (long) ctx->uc_mcontext.sp) #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.pc; +} + +#endif /* _SIGCONTEXTINFO_H */