From patchwork Thu Nov 14 14:46:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 179436 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp11155244ilf; Thu, 14 Nov 2019 06:47:25 -0800 (PST) X-Google-Smtp-Source: APXvYqyJtC1Uy/0ruNYhI6e31hyrk7zhZK9yYyOO8NGRcrbrdKLi2mpw3IVJycCu4XJHF18GjDEy X-Received: by 2002:a05:6402:b2d:: with SMTP id bo13mr1593684edb.125.1573742845434; Thu, 14 Nov 2019 06:47:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573742845; cv=none; d=google.com; s=arc-20160816; b=Hwpjoue7Ovdd2RggmpTyfgQcJNHOAdQuuFNinBgImQlHuDTOJOa9DUxX5Se2onFZre 1SN+P+oWk46rgaEjcdkgC/vngEcILQaQWKOtcXi6ruwQrtAZ61Dvt3p04aj2MbTh5gWw UF44JwuSWMDmsrUUjxUimUYf/4An39D8NWNjbooz3VS4kZpdGRtsYJuEaD809O4xTUGF TRO35tp5TV1aqUjonwepmxIZ2Fu4QHPntw8b3IdlMlxOUGvRAwRv93fric00QDejPYnR KUdBTwxSdgmtaouFcyko2w3/QoSKUPTxAHErsBJyiwZHLko7XoSjAPL2lxGT67v2bhUs a4SA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc: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=s67mveFj3RgNUr+tNCaJCoDmwPM9abKG9Xh9e8y8Tzo=; b=bWWbw4B29vNOsBW1yAbvhd0VoYTWaCcjLe/kuSj6HEseyRaIBZVzaj9JwYRXVJULkr JRpF3M9F7Dt4AIxER5gNcbWxCsdNenGZNWDyLnXSSjguwr80XnuPoHcrA/iWx7+H8sG4 RACbyj9+PRcX8uw5Pj/0xfiiwVVcaADrNBvZMLkiBI0i6a2OvBitRBzXNsjTV4ALNC3s CD3DIAmD782bIZqBfYB1KE/Yk6vvMmTtwliZ5mFXI7+68w2DPvN/tUnHF+AY8VbKmf/n 5Tg6LdCufwpdrevIf7TAT78zpzWDhpkC+dRAhBerTocHWtU5arFoiIh4I65civHPbckt 6S2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=DDpKc7kD; dkim=pass header.i=@linaro.org header.s=google header.b=tsgsDQ+r; spf=pass (google.com: domain of libc-alpha-return-107080-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-107080-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 be24si1504463edb.156.2019.11.14.06.47.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Nov 2019 06:47:25 -0800 (PST) Received-SPF: pass (google.com: domain of libc-alpha-return-107080-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=DDpKc7kD; dkim=pass header.i=@linaro.org header.s=google header.b=tsgsDQ+r; spf=pass (google.com: domain of libc-alpha-return-107080-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-107080-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:cc:subject:date:message-id; q=dns; s= default; b=yHXDNsAXEXRRP64DLo/8wWr2xzDtvqzSS87LOkWdIuLUVX/knl9Jy nVMw77CU3YxjR8+d/W+MzLLxK61Nu4ihyOuUBNdO21UU0QJzt1vchsOOHT1icbI9 ZT+V3bryAiWPBs5hlt7NhMoVAomt+1NGl4eh1wFcwPYKtm/MzGFdvk= 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:cc:subject:date:message-id; s=default; bh=4fZsRYJVBBZO+eH7Qfvd+Tdf9Mo=; b=DDpKc7kDTcJPfmRwuet5HWHdcMNl IePdINcgM22gvDhFjWUrIqUdk+DRIfLAx4yT1t6uRURVa+gCKjGK0JazYmBCUdeU tyl02rQ2DJgJ7C+FobJGnkDlZrdGqAmuV8tItuycFcFy/Tgw5dv0bzmVWnIjUf1n 45n6i1T5c6AFKNM= Received: (qmail 28842 invoked by alias); 14 Nov 2019 14:47:14 -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 28834 invoked by uid 89); 14 Nov 2019 14:47:13 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, SPF_PASS autolearn=ham version=3.3.1 spammy=sk:INTERNA X-HELO: mail-qv1-f67.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=s67mveFj3RgNUr+tNCaJCoDmwPM9abKG9Xh9e8y8Tzo=; b=tsgsDQ+rEXk6Bx8D4aYgQAmRBcmOZXdyxYfKWkcdfEyZKlWPNeO0Z6oXBXTgstkCnN G0jvqr9XX0MRPKaHbWYeqtyBh7njhS9y0HsWjxZAINKcx+u8E4UYWrl3DrrHkk5kdqHS BzgdvYd4+yVD9GwAKYqHZOzp/Mge61lBNgVO5JcaL4r0I0eMPhAZ+8Tc257AzsYWkWmz njBc1xtgw/ShysDqsuJgT9EZEhQ77HTB3ySFgvlqqiG1EKGzdWTvftAF5ZVUtzpBmCpr XG6YtaPKwxSxPoWyzaeb7nCF8/CD+hYP9ov15lkNEpb4gyflKLLmRFaxASGy9M65hYtt OBVA== Return-Path: From: Adhemerval Zanella To: libc-alpha@sourceware.org Cc: Alistair Francis , alistair23@gmail.com Subject: [PATCH 1/7] Remove __waitpid_nocancel Date: Thu, 14 Nov 2019 11:46:58 -0300 Message-Id: <20191114144704.19002-1-adhemerval.zanella@linaro.org> It enables and disable cancellation with pthread_setcancelstate prior calling the waitpid. It simplifies the waitpid implementation for architectures that does not provide either __NR_waitpid or __NR_wait4. Checked on x86_64-linux-gnu. --- libio/iopopen.c | 6 +++- sysdeps/generic/not-cancel.h | 2 -- sysdeps/posix/system.c | 6 +++- sysdeps/unix/sysv/linux/Makefile | 2 +- sysdeps/unix/sysv/linux/not-cancel.h | 4 --- sysdeps/unix/sysv/linux/waitpid_nocancel.c | 34 ---------------------- 6 files changed, 11 insertions(+), 43 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/waitpid_nocancel.c -- 2.17.1 diff --git a/libio/iopopen.c b/libio/iopopen.c index 22d53a88ef..a15d3bf4b6 100644 --- a/libio/iopopen.c +++ b/libio/iopopen.c @@ -281,7 +281,11 @@ _IO_new_proc_close (FILE *fp) described in POSIX.2, such implementations are not conforming." */ do { - wait_pid = __waitpid_nocancel (((_IO_proc_file *) fp)->pid, &wstatus, 0); + int state; + __libc_ptf_call (__pthread_setcancelstate, + (PTHREAD_CANCEL_DISABLE, &state), 0); + wait_pid = __waitpid (((_IO_proc_file *) fp)->pid, &wstatus, 0); + __libc_ptf_call (__pthread_setcancelstate, (state, NULL), 0); } while (wait_pid == -1 && errno == EINTR); if (wait_pid == -1) diff --git a/sysdeps/generic/not-cancel.h b/sysdeps/generic/not-cancel.h index d3b53e48cf..e0729bb1db 100644 --- a/sysdeps/generic/not-cancel.h +++ b/sysdeps/generic/not-cancel.h @@ -47,8 +47,6 @@ __write (fd, buf, n) #define __writev_nocancel_nostatus(fd, iov, n) \ (void) __writev (fd, iov, n) -# define __waitpid_nocancel(pid, stat_loc, options) \ - __waitpid (pid, stat_loc, options) #define __fcntl64_nocancel(fd, cmd, ...) \ __fcntl64 (fd, cmd, __VA_ARGS__) diff --git a/sysdeps/posix/system.c b/sysdeps/posix/system.c index d8c6cb8e1c..6de85bd3e4 100644 --- a/sysdeps/posix/system.c +++ b/sysdeps/posix/system.c @@ -81,7 +81,11 @@ cancel_handler (void *arg) __kill_noerrno (args->pid, SIGKILL); - TEMP_FAILURE_RETRY (__waitpid_nocancel (args->pid, NULL, 0)); + int state; + __libc_ptf_call (__pthread_setcancelstate, + (PTHREAD_CANCEL_DISABLE, &state), 0); + TEMP_FAILURE_RETRY (__waitpid (args->pid, NULL, 0)); + __libc_ptf_call (__pthread_setcancelstate, (state, NULL), 0); DO_LOCK (); if (SUB_REF () == 0) diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index 07776d28ea..8735092c12 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -216,7 +216,7 @@ sysdep_routines += xstatconv internal_statvfs internal_statvfs64 \ open_nocancel open64_nocancel \ openat_nocancel openat64_nocancel \ read_nocancel pread64_nocancel \ - waitpid_nocancel write_nocancel statx_cp + write_nocancel statx_cp sysdep_headers += bits/fcntl-linux.h diff --git a/sysdeps/unix/sysv/linux/not-cancel.h b/sysdeps/unix/sysv/linux/not-cancel.h index 192a0a5195..49e4e0249a 100644 --- a/sysdeps/unix/sysv/linux/not-cancel.h +++ b/sysdeps/unix/sysv/linux/not-cancel.h @@ -69,9 +69,6 @@ __writev_nocancel_nostatus (int fd, const struct iovec *iov, int iovcnt) INTERNAL_SYSCALL_CALL (writev, err, fd, iov, iovcnt); } -/* Uncancelable waitpid. */ -__typeof (waitpid) __waitpid_nocancel; - /* Uncancelable fcntl. */ __typeof (__fcntl) __fcntl64_nocancel; @@ -84,7 +81,6 @@ hidden_proto (__read_nocancel) hidden_proto (__pread64_nocancel) hidden_proto (__write_nocancel) hidden_proto (__close_nocancel) -hidden_proto (__waitpid_nocancel) hidden_proto (__fcntl64_nocancel) #endif diff --git a/sysdeps/unix/sysv/linux/waitpid_nocancel.c b/sysdeps/unix/sysv/linux/waitpid_nocancel.c deleted file mode 100644 index 3697c6b938..0000000000 --- a/sysdeps/unix/sysv/linux/waitpid_nocancel.c +++ /dev/null @@ -1,34 +0,0 @@ -/* Linux waitpid syscall implementation -- non-cancellable. - Copyright (C) 2018-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 -#include -#include -#include -#include - -__pid_t -__waitpid_nocancel (__pid_t pid, int *stat_loc, int options) -{ -#ifdef __NR_waitpid - return INLINE_SYSCALL_CALL (waitpid, pid, stat_loc, options); -#else - return INLINE_SYSCALL_CALL (wait4, pid, stat_loc, options, NULL); -#endif -} -libc_hidden_def (__waitpid_nocancel)