From patchwork Fri Feb 15 14:11:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 158522 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp750142jaa; Fri, 15 Feb 2019 06:12:02 -0800 (PST) X-Google-Smtp-Source: AHgI3IZYdSxRiM45ROHsWMdCG0m96FSduFL54DtRoTJyIqWSj+l+PAvQNVjaaLgdFtHqBlk1V529 X-Received: by 2002:a62:20c9:: with SMTP id m70mr9134259pfj.118.1550239922279; Fri, 15 Feb 2019 06:12:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550239922; cv=none; d=google.com; s=arc-20160816; b=t4IRCcaKAOLHKXCgAR+6cS24H6NjAXnxhlw2/emEIgWG9GVNbDTgPC1cWrEGUBTCVh EIVO+0worWDHliQK9oXofa0thR7Z8wu+jt4yVS9ZneFsGtq/EdP6du5l6G/tVdToKIkx sJ3BjcFIqih+FEfssObKqtx52oXYTr/p9OgZsCHL9OuSWV5oeKcKLVgtOJ8VGaT4cZVC 4Fsugj5+oO9zg6mhi3rQ8dTOYH6VsL7vp/oIwuJ8srNxODYMrxYdJisvBMRRC4FLnOqP oaSFRIlXAbDdnd4BpZwoWOypAXV14CVEt625WCidSxdVKFuCy8eZZ2a0xfOFW8FKWMZW 5JIA== 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=K/SdvDm8BLtOxyXXWg8ySDJ2aAK+ZnSlx3NtevCNfKs=; b=mE7C9RpM3QP/iKDt48dFfttvbxqin/BGTOPCh8ZGdFSCpcZqGv0Z20FdtP+Q/4xij/ 32RsXNyPJzLn87s0r+JDzQSSjtvx1Uje/mNuL2tJ4qVyqkjXzB0LLFliFQxhBonMxO7z 9eGOqnKmDVDj/lFEgDZVFKolmVJXqj/iy2yXwPUBFpSAjaQX11SoI/0iH8CUqs6qLhMk z203lj6mtOZq6xwSjMZgxO24MvfGhoAXfC7mH9Euyr3fki4ZHXovFkjvYgKpCNXiTgbH Qti2AbmviCkWmCH14aCXx+ivHGre5RgMxOE3y0xHICC6QKWjSgRlS9O3eGUTuLMwkzYS sSRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=R9NFTVAD; dkim=pass header.i=@linaro.org header.s=google header.b=XBQq0KwC; spf=pass (google.com: domain of libc-alpha-return-100072-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-100072-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 g12si5712652pgd.567.2019.02.15.06.12.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Feb 2019 06:12:02 -0800 (PST) Received-SPF: pass (google.com: domain of libc-alpha-return-100072-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=R9NFTVAD; dkim=pass header.i=@linaro.org header.s=google header.b=XBQq0KwC; spf=pass (google.com: domain of libc-alpha-return-100072-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-100072-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=Rb693GlgRp/xrsshOcwGgLkhxiEfo29 ezCHw5INlrIZkmIlsv8cNw7vhPSG/OWU6cKQ57GrlQXAlh7AearJdO/rUgiynSmq 95gaoz8H45y31Z58MKT+Pm1hDLQaGwnqASqTSzHoCqAfSA7MTUg00zodM6RMH5CI W+MNOFwC5ei4= 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=dxpdyUdPbYWueDdwoAIrT3dOe9A=; b=R9NFT VADvwoaybZamVlpdrpsHQV1oi+/MuLbIrbR5trK+WU++l1JLCcUKO0uOSy0XJkrc BBhK6fWqaGp9JICF1HkxNmo0Df7Lv7Pi9DyMQdE+1XEwXrM7CmVt7PDeMXnvIoZj yvicunZ1K53f3yCzDpd2+essc87wgR+cHmIGbc= Received: (qmail 111432 invoked by alias); 15 Feb 2019 14:11:44 -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 111397 invoked by uid 89); 15 Feb 2019 14:11:44 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=Hx-languages-length:4479 X-HELO: mail-qk1-f179.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=K/SdvDm8BLtOxyXXWg8ySDJ2aAK+ZnSlx3NtevCNfKs=; b=XBQq0KwCGQKbrBlSMjfxvHgICQPZtRlQqQ6TDWWK7cepr/3CxAJ6LIVoAnklFKSrXp sE0qEGMuGekdPiKwrjbx9GOi3/rZX6TqxZooPy3TkaebztVD5twHT+gopQJdLDGZj1es 7EQFhyTcd+dVoFVp/zbdq+E8DK7fFodZxeJA9dEwnK6u6j1fsZQjzK6XLbrSxagx8wPr 23fixtJ2yA77LZLCxG6r5GK1M4T4lLIyf0UtBufVKzr86e8f5oW+Vp7MUnRkyw2FN7Da jpMH4jFrmt6B6SqSSp7WXUpwZ8csZTI2PWOrsg9qF2eCI0tHJ8hdyrDflouLO9Ybahm5 DAvw== Return-Path: From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 2/2] mips: Remove rt_sigreturn usage on context function Date: Fri, 15 Feb 2019 12:11:32 -0200 Message-Id: <20190215141132.24404-2-adhemerval.zanella@linaro.org> In-Reply-To: <20190215141132.24404-1-adhemerval.zanella@linaro.org> References: <20190215141132.24404-1-adhemerval.zanella@linaro.org> Similar to powerpc, mips also issues rt_sigreturn for setcontext case the v0 value saved is not the one set by setcontext or makecontext. As for powerpc, it is intention is no really supported since setcontext is not async-signal-safe. Checked the context tests on mips64-linux-gnu and mips-linux-gnu. * sysdeps/unix/sysv/linux/mips/getcontext.S (__getcontext): Remove the magic flag store. * sysdeps/unix/sysv/linux/mips/makecontext.S (__makecontext): Likewise. * sysdeps/unix/sysv/linux/mips/swapcontext.S (__swapcontext): Likewise. * sysdeps/unix/sysv/linux/mips/setcontext.S (__setcontext): Remove rt_sigreturn call. --- sysdeps/unix/sysv/linux/mips/getcontext.S | 5 --- sysdeps/unix/sysv/linux/mips/makecontext.S | 5 --- sysdeps/unix/sysv/linux/mips/setcontext.S | 38 ---------------------- sysdeps/unix/sysv/linux/mips/swapcontext.S | 5 --- 4 files changed, 53 deletions(-) -- 2.17.1 diff --git a/sysdeps/unix/sysv/linux/mips/getcontext.S b/sysdeps/unix/sysv/linux/mips/getcontext.S index 4f7f89ee9a..015bd5bff6 100644 --- a/sysdeps/unix/sysv/linux/mips/getcontext.S +++ b/sysdeps/unix/sysv/linux/mips/getcontext.S @@ -78,11 +78,6 @@ NESTED (__getcontext, FRAMESZ, ra) .set at #endif - /* Store a magic flag. */ - li v1, 1 - /* zero */ - REG_S v1, (MCONTEXT_GREGOFF + 0 * MCONTEXT_GREGSZ + MCONTEXT_GREGS)(a0) - REG_S s0, (MCONTEXT_GREGOFF + 16 * MCONTEXT_GREGSZ + MCONTEXT_GREGS)(a0) REG_S s1, (MCONTEXT_GREGOFF + 17 * MCONTEXT_GREGSZ + MCONTEXT_GREGS)(a0) REG_S s2, (MCONTEXT_GREGOFF + 18 * MCONTEXT_GREGSZ + MCONTEXT_GREGS)(a0) diff --git a/sysdeps/unix/sysv/linux/mips/makecontext.S b/sysdeps/unix/sysv/linux/mips/makecontext.S index 4439fec3ff..3f40f7c9f2 100644 --- a/sysdeps/unix/sysv/linux/mips/makecontext.S +++ b/sysdeps/unix/sysv/linux/mips/makecontext.S @@ -93,11 +93,6 @@ NESTED (__makecontext, FRAMESZ, ra) REG_S a7, A7OFF(sp) #endif - /* Store a magic flag. */ - li v1, 1 - /* zero */ - REG_S v1, (MCONTEXT_GREGOFF + 0 * MCONTEXT_GREGSZ + MCONTEXT_GREGS)(a0) - /* Set up the stack. */ PTR_L t0, STACK_SP(a0) PTR_L t2, STACK_SIZE(a0) diff --git a/sysdeps/unix/sysv/linux/mips/setcontext.S b/sysdeps/unix/sysv/linux/mips/setcontext.S index b6553bdb5e..98afe6cbac 100644 --- a/sysdeps/unix/sysv/linux/mips/setcontext.S +++ b/sysdeps/unix/sysv/linux/mips/setcontext.S @@ -77,12 +77,6 @@ NESTED (__setcontext, FRAMESZ, ra) .set at #endif - /* Check for the magic flag. */ - li v0, 1 - /* zero */ - REG_L v1, (MCONTEXT_GREGOFF + 0 * MCONTEXT_GREGSZ + MCONTEXT_GREGS)(a0) - bne v0, v1, 98f - REG_S a0, A0OFF(sp) /* rt_sigprocmask (SIG_SETMASK, &ucp->uc_sigmask, NULL, _NSIG8) */ @@ -154,38 +148,6 @@ NESTED (__setcontext, FRAMESZ, ra) move v0, zero jr t9 -98: - /* This is a context obtained from a signal handler. - Perform a full restore by pushing the context - passed onto a simulated signal frame on the stack - and call the signal return syscall as if a signal - handler exited normally. */ - PTR_ADDIU sp, -((RT_SIGFRAME_SIZE + ALSZ) & ALMASK) - cfi_adjust_cfa_offset ((RT_SIGFRAME_SIZE + ALSZ) & ALMASK) - - /* Only ucontext is referred to from rt_sigreturn, - copy it. */ - PTR_ADDIU t1, sp, RT_SIGFRAME_UCONTEXT - li t3, ((UCONTEXT_SIZE + SZREG - 1) / SZREG) - 1 -0: - REG_L t2, (a0) - PTR_ADDIU a0, SZREG - REG_S t2, (t1) - PTR_ADDIU t1, SZREG - .set noreorder - bgtz t3, 0b - addiu t3, -1 - .set reorder - -/* rt_sigreturn () -- no arguments, sp points to struct rt_sigframe. */ - li v0, SYS_ify (rt_sigreturn) - syscall - - /* Restore the stack and fall through to the error - path. Successful rt_sigreturn never returns to - its calling place. */ - PTR_ADDIU sp, ((RT_SIGFRAME_SIZE + ALSZ) & ALMASK) - cfi_adjust_cfa_offset (-((RT_SIGFRAME_SIZE + ALSZ) & ALMASK)) 99: #ifdef __PIC__ PTR_LA t9, JUMPTARGET (__syscall_error) diff --git a/sysdeps/unix/sysv/linux/mips/swapcontext.S b/sysdeps/unix/sysv/linux/mips/swapcontext.S index 9c68961345..6612e757cd 100644 --- a/sysdeps/unix/sysv/linux/mips/swapcontext.S +++ b/sysdeps/unix/sysv/linux/mips/swapcontext.S @@ -87,11 +87,6 @@ NESTED (__swapcontext, FRAMESZ, ra) .set at #endif - /* Store a magic flag. */ - li v1, 1 - /* zero */ - REG_S v1, (MCONTEXT_GREGOFF + 0 * MCONTEXT_GREGSZ + MCONTEXT_GREGS)(a0) - REG_S s0, (MCONTEXT_GREGOFF + 16 * MCONTEXT_GREGSZ + MCONTEXT_GREGS)(a0) REG_S s1, (MCONTEXT_GREGOFF + 17 * MCONTEXT_GREGSZ + MCONTEXT_GREGS)(a0) REG_S s2, (MCONTEXT_GREGOFF + 18 * MCONTEXT_GREGSZ + MCONTEXT_GREGS)(a0)