From patchwork Mon Feb 26 21:03:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 129715 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp4291959edc; Mon, 26 Feb 2018 13:06:22 -0800 (PST) X-Google-Smtp-Source: AH8x224irUV2wZ8NYSmufaExj9b7TN6bI1xJ4k/l8q/WCO2oeQut5g4T8KbuHR8+0mMWXFpbjizs X-Received: by 2002:a17:902:a50d:: with SMTP id s13-v6mr11986348plq.191.1519679182607; Mon, 26 Feb 2018 13:06:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519679182; cv=none; d=google.com; s=arc-20160816; b=XWd+tQ1rsyt6S+vJDVao+pMRxsLKio5INBesbbuG44DhmxEvJpSpXoceYJrdmKvOHe skB0pF9R/mk4SjydowRr/L/djQ2JG4UXO9lDPkgst0UcJeqk7On/p0s47FCV2kZY2pPd TwodCnf2q8eRUvwggAIV4iIS3MLycuYV/3YvOrAT99YeBtKL2w+1jNewprettjN+0Fwe 4p2EqPfgZZDcYVEWeXI78M0EFdvIU3lC4C8ZPdBmTHW1TLZ4U82KJvkx0BMC/jSewORx ZShtWJ2czlDBhpweE+xd4vTzX3E7QsOFnOJdTvV2RwXX8saLbZgEcTNsYg7p/XNIuWx5 firw== 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=5G4t+OFEO1NvZp5Gn83xbqY8FcxTZ/wHvoWIDSR+aCk=; b=GhKNxDDxZjSDddsQ3qIZFmEtJJW1WvC6L0h0A1DL0DHcC7bGjLyTvaxwFFrmCuPsMd +MCPHdnZ2goaCodf+LGD0x8ODq43Lh1rtb5uaet1ut3XVHL2rRtNutGVEh69kAsCSEYj T0GMbjO3A4/lmeAvZkUDPLzcnZ2wkgxmyslM3A9G+ZB5ZqswSh0psV6JfVHnfyszZ3An VMZPbFiNwGF7seHFT7TbqOLaQzNKFtSTuZsm9oNaxvYyTp0LKLT7zHxM5/E43odT1xL8 Q5v8t2t6okuq8zI1kx4OJwxwmiQAt+WL4X/pY17iTpEcfiP8T1oQrj4NVbDkv6cTE8DA JNnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=SB8Afzow; spf=pass (google.com: domain of libc-alpha-return-90630-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-90630-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 j62si6015851pgc.583.2018.02.26.13.06.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Feb 2018 13:06:22 -0800 (PST) Received-SPF: pass (google.com: domain of libc-alpha-return-90630-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=SB8Afzow; spf=pass (google.com: domain of libc-alpha-return-90630-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-90630-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=JfdnZ1LVe25EknGtWby7NJTYWfvhY9+ AlASVWUORGGt5Mv4o70Y9jU6aX2WouG0en1RNCtZpKgxrWxjZQAHSBQwi15lW19K DPiqsT/zVBB8LnBkOGEuW+2dBucPeMqvgeezDTcUqmtRi9wm86MJNq5n9pm0gC+P 6ZTJ7uc4kybE= 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=VUO53K1ELUulmR6GDJVVl0L2Gkw=; b=SB8Af zowsKXGzfBZxwn5kS6Uzs5uKxe8mnkZB7vW3m81fstCTbWe2KvTlY6AyADyVp3py ACj1McthuXXCDAgk2SFa2+Z2z/yQ8Qx2Qe/d2TXDQDAxKdU3d4/DWOPnI7vSbefv nEcS+4qubKMIYmuPVKByD1yTffb38272IhLAcs= Received: (qmail 77595 invoked by alias); 26 Feb 2018 21:04:12 -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 76886 invoked by uid 89); 26 Feb 2018 21:04:07 -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=Hx-languages-length:2208, 0002 X-HELO: mail-qk0-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=5G4t+OFEO1NvZp5Gn83xbqY8FcxTZ/wHvoWIDSR+aCk=; b=MkAzVzw0XTUuWwluhap5dL5zeWgKElPoySBX5/DBJfq4Lov358GT0hOkuVNco9PzV1 aHhLoC2dW+v38nRdnAwJWGb449EPS+Vr/4ZAVdQiypHTUUf8XvZsJIdwqcTCcr/7POFu 34IuyTPKsrcAFcOH7oCpGSb94cfer7Oz2swg0Jg0ymLUN6H659Nhzfsja/4Gyo8ivaTa /tjrAgcJoxZUYuWnVbzfGZGXXOZUxN5jbt1Qa7p9pGhsZ92+1y2FAh0qNDWx/RQPISyv 8xSYwxpNqV3YgWfd9nN5mM3ytAMLNE8XmPn6y3ZR/KR904KbNP5iBwZbjK+YstjtnASo b6tQ== X-Gm-Message-State: APf1xPCCycH5U08aWtu9H20/g4yvCPy1bcDvtEanv5mJj9kFib1wrlDD SeUKoz7AD6544OXAH/aKPFEwyUx4w3Q= X-Received: by 10.55.207.82 with SMTP id e79mr15192467qkj.219.1519679044051; Mon, 26 Feb 2018 13:04:04 -0800 (PST) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH v2 13/21] nptl: m68k: Fix Race conditions in pthread cancellation (BZ#12683) Date: Mon, 26 Feb 2018 18:03:28 -0300 Message-Id: <1519679016-12241-14-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 patch adds the m68k modifications required for the BZ#12683. It basically adds the required ucontext_get_pc function The default syscall_cancel.c should is as expected for m68k with GCC 6.2.1. It generates the following code for syscall_cancel.os: --- 00000000 <__GI___syscall_cancel_arch>: 0: 4e56 0000 linkw %fp,#0 4: 48e7 3c00 moveml %d2-%d5,%sp@- 00000008 <__syscall_cancel_arch_start>: 8: 206e 0008 moveal %fp@(8),%a0 c: 2010 movel %a0@,%d0 e: 0800 0002 btst #2,%d0 12: 6628 bnes 3c <__syscall_cancel_arch_end+0xa> 14: 206e 0024 moveal %fp@(36),%a0 18: 2a2e 0020 movel %fp@(32),%d5 1c: 282e 001c movel %fp@(28),%d4 20: 262e 0018 movel %fp@(24),%d3 24: 242e 0014 movel %fp@(20),%d2 28: 222e 0010 movel %fp@(16),%d1 2c: 202e 000c movel %fp@(12),%d0 30: 4e40 trap #0 00000032 <__syscall_cancel_arch_end>: 32: 4cee 003c fff0 moveml %fp@(-16),%d2-%d5 38: 4e5e unlk %fp 3a: 4e75 rts 3c: 61ff 0000 0000 bsrl 3e <__syscall_cancel_arch_end+0xc> --- Checked against a build and make check run-built-tests=no for m68k-linux-gnu. [BZ #12683] * sysdeps/unix/sysv/linux/m68k/sigcontextinfo.h (ucontext_get_pc): New function. --- ChangeLog | 4 ++++ sysdeps/unix/sysv/linux/m68k/sigcontextinfo.h | 13 +++++++++++++ 2 files changed, 17 insertions(+) -- 2.7.4 diff --git a/sysdeps/unix/sysv/linux/m68k/sigcontextinfo.h b/sysdeps/unix/sysv/linux/m68k/sigcontextinfo.h index 58374ed..3a288ea 100644 --- a/sysdeps/unix/sysv/linux/m68k/sigcontextinfo.h +++ b/sysdeps/unix/sysv/linux/m68k/sigcontextinfo.h @@ -16,6 +16,11 @@ License along with the GNU C Library. If not, see . */ +#ifndef _SIGCONTEXTINFO_H +#define _SIGCONTEXTINFO_H + +#include + #define SIGCONTEXT int _code, struct sigcontext * #define SIGCONTEXT_EXTRA_ARGS _code, #define GET_PC(ctx) ((void *) (ctx)->sc_pc) @@ -23,3 +28,11 @@ #define GET_STACK(ctx) ((void *) (ctx)->sc_usp) #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.gregs[R_PC]; +} + +#endif /* _SIGCONTEXTINFO_H */