From patchwork Wed Jun 30 08:25:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 44050 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 90ED43838013 for ; Wed, 30 Jun 2021 08:26:20 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 90ED43838013 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1625041580; bh=yKK0OnKa6Cm++gRdZbIyY9X/8oxxJ0aZnkrWsOtNgCk=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=uj2jhbqUPxGWfGcKLfaTisiYolJyGx04qODOeccBkVZCE+zyhmgGc66Oh6CrdWaNq A9c9pAGc2OJ8SBGX2u0bI4WMZZpKY6ATysQGtclFxM5ijWrAxMigb9LCXNst0VcDbw +Loqv2KViJtlWvxGHyCFF1Zv3vJ8e45Qs5m0HHBw= 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 [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id 1F35E3858D35 for ; Wed, 30 Jun 2021 08:25:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1F35E3858D35 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-231-vs5Hb3n-MEqJ30RyrV3w3w-1; Wed, 30 Jun 2021 04:25:51 -0400 X-MC-Unique: vs5Hb3n-MEqJ30RyrV3w3w-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B6648802E61; Wed, 30 Jun 2021 08:25:50 +0000 (UTC) Received: from oldenburg.str.redhat.com (ovpn-112-228.ams2.redhat.com [10.36.112.228]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7A7AB18A77; Wed, 30 Jun 2021 08:25:49 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH] malloc: Initiate tcache shutdown even without allocations [BZ #28028] Date: Wed, 30 Jun 2021 10:25:47 +0200 Message-ID: <87czs3kbck.fsf@oldenburg.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, 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 Cc: JeffyChen Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" From: JeffyChen After commit 1e26d35193efbb29239c710a4c46a64708643320 ("malloc: Fix tcache leak after thread destruction [BZ #22111]"), tcache_shutting_down is still not early enough. When we detach a thread with no tcache allocated, tcache_shutting_down would still be false. Reviewed-by: DJ Delorie --- malloc/malloc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/malloc/malloc.c b/malloc/malloc.c index 0e2e1747e0..bb9a1642aa 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -3144,12 +3144,13 @@ tcache_thread_shutdown (void) int i; tcache_perthread_struct *tcache_tmp = tcache; + tcache_shutting_down = true; + if (!tcache) return; /* Disable the tcache and prevent it from being reinitialized. */ tcache = NULL; - tcache_shutting_down = true; /* Free all of the entries and the tcache itself back to the arena heap for coalescing. */