From patchwork Fri Apr 3 20:31:53 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: 38738 Return-Path: X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qk1-x736.google.com (mail-qk1-x736.google.com [IPv6:2607:f8b0:4864:20::736]) by sourceware.org (Postfix) with ESMTPS id 2B189388B813 for ; Fri, 3 Apr 2020 20:32:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 2B189388B813 Received: by mail-qk1-x736.google.com with SMTP id x3so9559090qki.4 for ; Fri, 03 Apr 2020 13:32:28 -0700 (PDT) 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=9T8kFou/j9AsTsiRCbYUqB0h7cju0DlIbQYw/22DRW0=; b=BTzWIjcEorwxt0q91VZ/K4tG1sZGkLFoiHsHpDi1qe+V6mOLQ29fP683kmGBatjHHu AKF4wlPCvn/tEXgW12I1s9RsYtshIkuyPPCDDQZPXrVU7QaLA4NfjSLnBIQ/FmnPlxj2 FxPl4+pMjbFLmRzTwtNfz1yk4wX0Oh+/9zU8lRjOGTYp2zeva2CKQAgtpOs40w9mUVWC PJbfXewZS3FEN34OVIs/gGfnkVXMaGdZUU0BMbZBRfcAQwVm/OMBtDo4zGrVrbUU4Spv MM95n39hWC5aBZhRN5YiFSp4OPEpRugEKawchADMOYKKLG7VwMKui/v31lwhd8MmHkfJ LUew== X-Gm-Message-State: AGi0PuZuJGYvaSTOl2hohiEg4NQHKFP8AxXonQZt4VmX15BXqreqAlQG kRNfGEFuHMJXyP5wwXTMlIa7SuWXpJA= X-Google-Smtp-Source: APiQypI9qiS4ut+tkptL8eq+ewwKGj95qkTsyPlz2ulXxVwDw4XuBg+cQTisj+pI5+Mxko9+XwreYg== X-Received: by 2002:a37:66ce:: with SMTP id a197mr10698233qkc.458.1585945947493; Fri, 03 Apr 2020 13:32:27 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id d141sm7063535qke.68.2020.04.03.13.32.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Apr 2020 13:32:27 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH v4 13/21] nptl: hppa: Fix Race conditions in pthread cancellation [BZ#12683] Date: Fri, 3 Apr 2020 17:31:53 -0300 Message-Id: <20200403203201.7494-14-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200403203201.7494-1-adhemerval.zanella@linaro.org> References: <20200403203201.7494-1-adhemerval.zanella@linaro.org> X-Spam-Status: No, score=-26.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SCC_5_SHORT_WORD_LINES, 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-List-Received-Date: Fri, 03 Apr 2020 20:32:29 -0000 This patch adds the hppa modifications required for the BZ#12683 fix by adding the arch-specific cancellation syscall bridge. Checked on hppa-linux-gnu. --- sysdeps/hppa/nptl/tcb-offsets.sym | 3 + sysdeps/unix/sysv/linux/hppa/syscall_cancel.S | 83 +++++++++++++++++++ sysdeps/unix/sysv/linux/hppa/sysdep.h | 1 + 3 files changed, 87 insertions(+) create mode 100644 sysdeps/unix/sysv/linux/hppa/syscall_cancel.S diff --git a/sysdeps/hppa/nptl/tcb-offsets.sym b/sysdeps/hppa/nptl/tcb-offsets.sym index 6e852f35b1..0aff5f32d5 100644 --- a/sysdeps/hppa/nptl/tcb-offsets.sym +++ b/sysdeps/hppa/nptl/tcb-offsets.sym @@ -15,3 +15,6 @@ MUTEX_FUTEX offsetof (pthread_mutex_t, __data.__lock) #define thread_offsetof(mem) (unsigned int)(offsetof(struct pthread, mem) - sizeof(struct pthread)) TID_THREAD_OFFSET thread_offsetof (tid) MULTIPLE_THREADS_THREAD_OFFSET thread_offsetof (header.multiple_threads) + +-- Not strictly offsets, used on syscall_cancel.S +TCB_CANCELED_BIT CANCELED_BIT diff --git a/sysdeps/unix/sysv/linux/hppa/syscall_cancel.S b/sysdeps/unix/sysv/linux/hppa/syscall_cancel.S new file mode 100644 index 0000000000..4fe0dcf55d --- /dev/null +++ b/sysdeps/unix/sysv/linux/hppa/syscall_cancel.S @@ -0,0 +1,83 @@ +/* Cancellable syscall wrapper. Linux/hppa version. + Copyright (C) 2020 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 + +/* long int __syscall_cancel_arch (int *cancelhandling, + long int nr, + long int arg1, + long int arg2, + long int arg3, + long int arg4, + long int arg5, + long int arg6) */ + + .text +ENTRY(__syscall_cancel_arch) + stw %r2,-20(%r30) + ldo 128(%r30),%r30 + cfi_def_cfa_offset (-128) + cfi_offset (2, -20) + ldw -180(%r30),%r28 + copy %r24,%r31 + stw %r28,-104(%r30) +#ifndef __PIC__ + cfi_offset (4, 28) +#endif + ldw -184(%r30),%r28 + stw %r28,-108(%r30) + ldw -188(%r30),%r28 + stw %r28,-112(%r30) + ldw -192(%r30),%r28 + stw %r4,-100(%r30) + stw %r28,-116(%r30) + copy %r25,%r28 + copy %r23,%r25 +#ifdef __PIC__ + stw %r19,-32(%r30) + cfi_offset (4, 28) +#endif + + .global __syscall_cancel_arch_start +__syscall_cancel_arch_start: + + ldw 0(%r26),%r20 + bb,< %r20,31-TCB_CANCELED_BIT,1f + ldw -120(%r30),%r21 + ldw -116(%r30),%r22 + copy %r31,%r26 + ldw -112(%r30),%r23 + ldw -108(%r30),%r24 + copy %r19, %r4 + ble 0x100(%sr2, %r0) + + .global __syscall_cancel_arch_end +__syscall_cancel_arch_end: + + copy %r28, %r20 + copy %r4, %r19 + ldw -148(%r30),%r2 + ldw -100(%r30),%r4 + bv %r0(%r2) + ldo -128(%r30),%r30 +1: + bl __syscall_do_cancel,%r2 + nop + nop +END(__syscall_cancel_arch) +libc_hidden_def (__syscall_cancel_arch) diff --git a/sysdeps/unix/sysv/linux/hppa/sysdep.h b/sysdeps/unix/sysv/linux/hppa/sysdep.h index 7f8da30d23..c0d47318b3 100644 --- a/sysdeps/unix/sysv/linux/hppa/sysdep.h +++ b/sysdeps/unix/sysv/linux/hppa/sysdep.h @@ -24,6 +24,7 @@ #include #include #include +#include /* Defines RTLD_PRIVATE_ERRNO. */ #include