From patchwork Thu Mar 4 12:10:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 42227 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 CBBF13836C28; Thu, 4 Mar 2021 12:10:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CBBF13836C28 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1614859857; bh=T7busX5Oz5zl4ogs9h2F3gKcfyoRyloNgPy7TgyjTp8=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=n8NHzoroH2xGOu7Nl83Hxe5ueGalixDmbUT90scfKU7m7pE5sFL/72yHLkkeiSIfv tTHsXgUMEkZRf0LDEpMLvGHrxGuUfbhK6pIiiWgDqwBvxhsDP2xM9ap0IqGCSWkSOU OfJk8gRsyawbkPrYXEhqfgfPvkGf1gerFh3WCJc4= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id 9D0FD386102B for ; Thu, 4 Mar 2021 12:10:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 9D0FD386102B Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-76--kVYLPekOvOXW7tnEwdIFw-1; Thu, 04 Mar 2021 07:10:50 -0500 X-MC-Unique: -kVYLPekOvOXW7tnEwdIFw-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3102B1005D4C for ; Thu, 4 Mar 2021 12:10:49 +0000 (UTC) Received: from oldenburg.str.redhat.com (ovpn-112-56.ams2.redhat.com [10.36.112.56]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 54BBF10013D6 for ; Thu, 4 Mar 2021 12:10:48 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH 0/8] Move libpthread unwind-related functionality into libc Message-Id: Date: Thu, 04 Mar 2021 13:10:55 +0100 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, 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: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" This series continues my efforts to remove libpthread. Its focus is unwinding in various forms: DWARF unwinding for new-style cancellation, longjmp-based unwinding, and callback-based unwinding (legacy cancellation unwinder). I have tested intermediate steps with build-many-glibcs.py, and the final patch also passed testing on i386-linux-gnu, powerpc64le-linux-gnu, s390x-linux-gnu, x86_64-linux-gnu. This series depends on this additional patch: : Support compat_symbol_reference for _ISOMAC Florian Weimer (8): nptl: Move pthread_mutex_consistent into libc nptl: Move __pthread_cleanup_routine into libc nptl: Move legacy unwinding implementation into libc nptl: Move legacy cancelation handling into libc as compat symbols nptl: Remove longjmp, siglongjmp from libpthread Legacy unwinder: Remove definition of _Unwind_GetCFA nptl: Move __pthread_cleanup_upto into libc nptl: Move __pthread_unwind_next into libc NEWS | 4 +- elf/Makefile | 2 + include/setjmp.h | 4 +- nptl/Makefile | 26 ++++--- nptl/Versions | 33 ++++++--- nptl/cleanup_compat.c | 16 +++-- nptl/cleanup_defer_compat.c | 72 ++++--------------- nptl/cleanup_routine.c | 12 +++- nptl/forward.c | 6 -- nptl/libc-cleanup.c | 64 ++++++++++++++++- nptl/nptl-init.c | 4 -- nptl/pt-longjmp.c | 49 ------------- nptl/pthreadP.h | 21 +++--- nptl/pthread_cancel.c | 10 ++- nptl/{pt-cleanup.c => pthread_cleanup_upto.c} | 2 +- nptl/pthread_exit.c | 11 ++- nptl/pthread_mutex_consistent.c | 22 +++++- nptl/tst-cleanup4.c | 5 ++ nptl/tst-cleanup4aux.c | 5 ++ nptl/unwind.c | 14 ++-- setjmp/Versions | 4 -- sysdeps/arm/Makefile | 5 -- sysdeps/arm/nptl/unwind-forcedunwind.c | 25 ------- sysdeps/arm/pt-arm-unwind-resume.S | 20 ------ sysdeps/generic/unwind-dw2.c | 8 --- sysdeps/generic/unwind-resume.c | 14 ++++ .../unwind-resume.c} | 5 +- sysdeps/nptl/jmp-unwind.c | 8 +-- sysdeps/nptl/libc-lock.h | 59 +++++++-------- sysdeps/nptl/libc-lockP.h | 22 +----- sysdeps/nptl/pthread-functions.h | 6 -- sysdeps/nptl/pthread.h | 5 +- sysdeps/nptl/unwind-forcedunwind.c | 64 ----------------- sysdeps/pthread/tst-robust1.c | 4 +- sysdeps/pthread/tst-robust8.c | 2 +- sysdeps/pthread/tst-robust9.c | 4 +- sysdeps/unix/sysv/linux/aarch64/libc.abilist | 11 +++ .../sysv/linux/aarch64/libpthread.abilist | 10 --- sysdeps/unix/sysv/linux/alpha/libc.abilist | 11 +++ .../unix/sysv/linux/alpha/libpthread.abilist | 10 --- sysdeps/unix/sysv/linux/arc/libc.abilist | 11 +++ .../unix/sysv/linux/arc/libpthread.abilist | 8 --- sysdeps/unix/sysv/linux/arm/be/libc.abilist | 11 +++ .../unix/sysv/linux/arm/be/libpthread.abilist | 10 --- sysdeps/unix/sysv/linux/arm/le/libc.abilist | 11 +++ .../unix/sysv/linux/arm/le/libpthread.abilist | 10 --- sysdeps/unix/sysv/linux/csky/libc.abilist | 11 +++ .../unix/sysv/linux/csky/libpthread.abilist | 8 --- sysdeps/unix/sysv/linux/hppa/libc.abilist | 11 +++ .../unix/sysv/linux/hppa/libpthread.abilist | 10 --- sysdeps/unix/sysv/linux/i386/libc.abilist | 11 +++ .../unix/sysv/linux/i386/libpthread.abilist | 10 --- sysdeps/unix/sysv/linux/ia64/Makefile | 2 +- sysdeps/unix/sysv/linux/ia64/libc.abilist | 11 +++ .../unix/sysv/linux/ia64/libpthread.abilist | 10 --- .../sysv/linux/m68k/coldfire/libc.abilist | 11 +++ .../linux/m68k/coldfire/libpthread.abilist | 10 --- .../unix/sysv/linux/m68k/m680x0/libc.abilist | 11 +++ .../sysv/linux/m68k/m680x0/libpthread.abilist | 10 --- .../sysv/linux/microblaze/be/libc.abilist | 11 +++ .../linux/microblaze/be/libpthread.abilist | 10 --- .../sysv/linux/microblaze/le/libc.abilist | 11 +++ .../linux/microblaze/le/libpthread.abilist | 10 --- .../sysv/linux/mips/mips32/fpu/libc.abilist | 11 +++ .../sysv/linux/mips/mips32/libpthread.abilist | 10 --- .../sysv/linux/mips/mips32/nofpu/libc.abilist | 11 +++ .../sysv/linux/mips/mips64/libpthread.abilist | 10 --- .../sysv/linux/mips/mips64/n32/libc.abilist | 11 +++ .../sysv/linux/mips/mips64/n64/libc.abilist | 11 +++ sysdeps/unix/sysv/linux/nios2/libc.abilist | 11 +++ .../unix/sysv/linux/nios2/libpthread.abilist | 10 --- .../linux/powerpc/powerpc32/fpu/libc.abilist | 11 +++ .../powerpc/powerpc32/libpthread.abilist | 12 ---- .../powerpc/powerpc32/nofpu/libc.abilist | 11 +++ .../linux/powerpc/powerpc64/be/libc.abilist | 11 +++ .../powerpc/powerpc64/be/libpthread.abilist | 12 ---- .../linux/powerpc/powerpc64/le/libc.abilist | 11 +++ .../powerpc/powerpc64/le/libpthread.abilist | 10 --- sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c | 61 ---------------- .../unix/sysv/linux/riscv/rv32/libc.abilist | 11 +++ .../sysv/linux/riscv/rv32/libpthread.abilist | 8 --- .../unix/sysv/linux/riscv/rv64/libc.abilist | 11 +++ .../sysv/linux/riscv/rv64/libpthread.abilist | 8 --- sysdeps/unix/sysv/linux/s390/Versions | 2 +- sysdeps/unix/sysv/linux/s390/jmp-unwind.c | 7 +- .../unix/sysv/linux/s390/libpthread-compat.c | 25 +++++++ sysdeps/unix/sysv/linux/s390/pt-longjmp.c | 33 --------- .../unix/sysv/linux/s390/s390-32/libc.abilist | 11 +++ .../linux/s390/s390-32/libpthread.abilist | 13 +--- .../unix/sysv/linux/s390/s390-64/libc.abilist | 11 +++ .../linux/s390/s390-64/libpthread.abilist | 13 +--- sysdeps/unix/sysv/linux/sh/be/libc.abilist | 11 +++ .../unix/sysv/linux/sh/be/libpthread.abilist | 10 --- sysdeps/unix/sysv/linux/sh/le/libc.abilist | 11 +++ .../unix/sysv/linux/sh/le/libpthread.abilist | 10 --- .../sysv/linux/sparc/sparc32/libc.abilist | 11 +++ .../linux/sparc/sparc32/libpthread.abilist | 10 --- .../sysv/linux/sparc/sparc64/libc.abilist | 11 +++ .../linux/sparc/sparc64/libpthread.abilist | 10 --- .../unix/sysv/linux/x86_64/64/libc.abilist | 11 +++ .../sysv/linux/x86_64/64/libpthread.abilist | 10 --- .../unix/sysv/linux/x86_64/x32/libc.abilist | 11 +++ .../sysv/linux/x86_64/x32/libpthread.abilist | 10 --- sysdeps/x86/nptl/pt-longjmp.c | 71 ------------------ 104 files changed, 648 insertions(+), 834 deletions(-) delete mode 100644 nptl/pt-longjmp.c rename nptl/{pt-cleanup.c => pthread_cleanup_upto.c} (98%) delete mode 100644 sysdeps/arm/nptl/unwind-forcedunwind.c delete mode 100644 sysdeps/arm/pt-arm-unwind-resume.S rename sysdeps/{unix/sysv/linux/ia64/unwind-forcedunwind.c => ia64/unwind-resume.c} (87%) delete mode 100644 sysdeps/nptl/unwind-forcedunwind.c delete mode 100644 sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c create mode 100644 sysdeps/unix/sysv/linux/s390/libpthread-compat.c delete mode 100644 sysdeps/unix/sysv/linux/s390/pt-longjmp.c delete mode 100644 sysdeps/x86/nptl/pt-longjmp.c