From patchwork Mon Dec 7 21:27:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 41337 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7BD72394848E; Mon, 7 Dec 2020 21:28:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7BD72394848E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1607376499; bh=nPg49SGlmAqdkgyV7YRKmtHT8BWK/zMk4sX3ESMmTHI=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=mZ5T/gHH9YSozfnXE4WygMzzFVKKYhjS5YiAr/RscwmIm4ey4VHBVcGBMRH1jZh6B MUC4vu0UXmEqN8n+/d0hTM7ucrsK33+znmi0CWaZjiqccJvlFwYwjYtUj+d+X1HHTj vQEA/edmzmeXSlJvMeOnndWB5iAKyrPSABRA2qEQ= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qk1-x741.google.com (mail-qk1-x741.google.com [IPv6:2607:f8b0:4864:20::741]) by sourceware.org (Postfix) with ESMTPS id 573C939450DA for ; Mon, 7 Dec 2020 21:28:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 573C939450DA Received: by mail-qk1-x741.google.com with SMTP id q22so14156665qkq.6 for ; Mon, 07 Dec 2020 13:28:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nPg49SGlmAqdkgyV7YRKmtHT8BWK/zMk4sX3ESMmTHI=; b=Js2TyYCINhsNL6EXf/U03wlRGXvDS8aXPtEF3hclPyIU5GzFJ6PAE3mQOXJW32ie9K LMYTs5yrWirODEJN9PHjrt61vlDDKbXWNlPPc4zwbfRX80kS5VgQZq8ySxASWgLWURqN zGl7wUGe4BGGAFInSdU+HYZX80eR0LUgK/Kbu5thXi575P4Ec3TV8M4YYRSsuNptUJxv JYCt/PyFk3SGkTyFGukcB3C2m29HnvMS3yJjFQisKmuImV69qM6ml3xQD9au3ANQE9bn 5UpQpmAkrS1pLimLObGgqJX0FUdyhLurH7976mOya0DZ8qTuwuRUw7N2alkOlN4ogtuc jdjw== X-Gm-Message-State: AOAM533HZBRHOWUeZixJj3BayrsKGCbonRR1qYT6nhYQOKKIrvVJFTj8 xOWPBF8XYhL6eYuXgCDbXPEqCUnqkx1bmQ== X-Google-Smtp-Source: ABdhPJx+bE+Jc3zeUniRUuOuW29R0PDaLRhQTS45SjNZHV8tfnftTPgQbXfa6dPzlETBt2YKLQz5EA== X-Received: by 2002:ae9:ddc1:: with SMTP id r184mr26039366qkf.266.1607376495746; Mon, 07 Dec 2020 13:28:15 -0800 (PST) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id o29sm12832317qtl.7.2020.12.07.13.28.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Dec 2020 13:28:15 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH 8/8] nptl: Use pthread_kill on pthread_cancel Date: Mon, 7 Dec 2020 18:27:57 -0300 Message-Id: <20201207212757.3948164-8-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201207212757.3948164-1-adhemerval.zanella@linaro.org> References: <20201207212757.3948164-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Cc: Florian Weimer Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" It consolidates the tgkill call and it is the first step of making pthread_cancel async-signal-safe. Checked on x86_64-linux-gnu. --- nptl/Versions | 2 ++ nptl/pthreadP.h | 2 ++ nptl/pthread_cancel.c | 7 +------ nptl/pthread_kill.c | 19 +++++++++++++------ 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/nptl/Versions b/nptl/Versions index 7cfe39a91c..ec68f8bb3d 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -66,6 +66,8 @@ libc { __pthread_attr_copy; __pthread_getattr_default_np; __pthread_attr_setsigmask_internal; + # Used for thread cancellation. + __pthread_kill_internal; } } diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h index 1a8518ef23..40499d6881 100644 --- a/nptl/pthreadP.h +++ b/nptl/pthreadP.h @@ -514,6 +514,8 @@ extern int __pthread_equal (pthread_t thread1, pthread_t thread2); extern int __pthread_detach (pthread_t th); extern int __pthread_cancel (pthread_t th); libc_hidden_proto (__pthread_kill) +extern int __pthread_kill_internal (pthread_t threadid, int signo); +libc_hidden_proto (__pthread_kill_internal); extern void __pthread_exit (void *value) __attribute__ ((__noreturn__)); extern int __pthread_join (pthread_t threadid, void **thread_return); extern int __pthread_setcanceltype (int type, int *oldtype); diff --git a/nptl/pthread_cancel.c b/nptl/pthread_cancel.c index 266fd77284..766dfca260 100644 --- a/nptl/pthread_cancel.c +++ b/nptl/pthread_cancel.c @@ -69,12 +69,7 @@ __pthread_cancel (pthread_t th) /* The cancellation handler will take care of marking the thread as canceled. */ - pid_t pid = __getpid (); - - int val = INTERNAL_SYSCALL_CALL (tgkill, pid, pd->tid, - SIGCANCEL); - if (INTERNAL_SYSCALL_ERROR_P (val)) - result = INTERNAL_SYSCALL_ERRNO (val); + __pthread_kill_internal (th, SIGCANCEL); break; } diff --git a/nptl/pthread_kill.c b/nptl/pthread_kill.c index cf12fa743f..97f1bf2b4b 100644 --- a/nptl/pthread_kill.c +++ b/nptl/pthread_kill.c @@ -20,13 +20,8 @@ #include int -__pthread_kill (pthread_t threadid, int signo) +__pthread_kill_internal (pthread_t threadid, int signo) { - /* Disallow sending the signal we use for cancellation, timers, - for the setxid implementation. */ - if (__is_internal_signal (signo)) - return EINVAL; - sigset_t set; __libc_signal_block_all (&set); @@ -57,5 +52,17 @@ __pthread_kill (pthread_t threadid, int signo) return val; } +libc_hidden_def (__pthread_kill_internal) + +int +__pthread_kill (pthread_t threadid, int signo) +{ + /* Disallow sending the signal we use for cancellation, timers, + for the setxid implementation. */ + if (__is_internal_signal (signo)) + return EINVAL; + + return __pthread_kill_internal (threadid, signo); +} libc_hidden_def (__pthread_kill) weak_alias (__pthread_kill, pthread_kill)