Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EF7E1C4363A for ; Fri, 16 Oct 2020 10:45:27 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 48F2F207F7 for ; Fri, 16 Oct 2020 10:45:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 48F2F207F7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=tempfail smtp.mailfrom=dm-devel-bounces@redhat.com 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-364-xgrxE6m1PFm7ik76tzS13Q-1; Fri, 16 Oct 2020 06:45:23 -0400 X-MC-Unique: xgrxE6m1PFm7ik76tzS13Q-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1EFEE1019631; Fri, 16 Oct 2020 10:45:19 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 029106EF4A; Fri, 16 Oct 2020 10:45:19 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id C8F381826D36; Fri, 16 Oct 2020 10:45:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09GAjGOM020651 for ; Fri, 16 Oct 2020 06:45:17 -0400 Received: by smtp.corp.redhat.com (Postfix) id DF20512D8B8; Fri, 16 Oct 2020 10:45:16 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D9D3B16C2DB for ; Fri, 16 Oct 2020 10:45:14 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CE50C101A56B for ; Fri, 16 Oct 2020 10:45:14 +0000 (UTC) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-303-xnO8ZPwzMG2_4RV3Z45ICA-1; Fri, 16 Oct 2020 06:45:12 -0400 X-MC-Unique: xnO8ZPwzMG2_4RV3Z45ICA-1 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id B05D7AF48; Fri, 16 Oct 2020 10:45:10 +0000 (UTC) From: mwilck@suse.com To: Christophe Varoqui , Benjamin Marzinski Date: Fri, 16 Oct 2020 12:44:34 +0200 Message-Id: <20201016104501.8700-3-mwilck@suse.com> In-Reply-To: <20201016104501.8700-1-mwilck@suse.com> References: <20201016104501.8700-1-mwilck@suse.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 09GAjGOM020651 X-loop: dm-devel@redhat.com Cc: lixiaokeng@huawei.com, dm-devel@redhat.com, Martin Wilck Subject: [dm-devel] [PATCH v2 02/29] multipathd: Fix liburcu memory leak X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dm-devel-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit From: Martin Wilck Fix this leak in multipathd, reported by valgrind, that messes up multipathd's otherwise clean leak report: ==23823== 336 bytes in 1 blocks are possibly lost in loss record 3 of 3 ==23823== at 0x483AB65: calloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==23823== by 0x4012F16: _dl_allocate_tls (in /lib64/ld-2.31.so) ==23823== by 0x493BB8E: pthread_create@@GLIBC_2.2.5 (in /lib64/libpthread-2.31.so) ==23823== by 0x492A9A9: call_rcu_data_init (urcu-call-rcu-impl.h:437) ==23823== by 0x492AD2F: UnknownInlinedFun (urcu-call-rcu-impl.h:492) ==23823== by 0x492AD2F: create_call_rcu_data_memb (urcu-call-rcu-impl.h:504) ==23823== by 0x1164E3: child.constprop.0.isra.0 (main.c:2915) ==23823== by 0x10F50C: main (main.c:3335) ==23823== ==23823== LEAK SUMMARY: ==23823== definitely lost: 0 bytes in 0 blocks ==23823== indirectly lost: 0 bytes in 0 blocks ==23823== possibly lost: 336 bytes in 1 blocks The problem is caused by using liburcu's default RCU call handler, which liburcu refuses to stop/join. See comments in the code. Reviewed-by: Benjamin Marzinski Signed-off-by: Martin Wilck --- multipathd/main.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/multipathd/main.c b/multipathd/main.c index c5c374b..be1b5ae 100644 --- a/multipathd/main.c +++ b/multipathd/main.c @@ -2889,6 +2889,47 @@ set_oom_adj (void) condlog(0, "couldn't adjust oom score"); } +/* + * Use a non-default call_rcu_data for child(). + * + * We do this to avoid a memory leak from liburcu. + * liburcu never frees the default rcu handler (see comments on + * call_rcu_data_free() in urcu-call-rcu-impl.h), its thread + * can't be joined with pthread_join(), leaving a memory leak. + * + * Therefore we create our own, which can be destroyed and joined. + */ +static struct call_rcu_data *setup_rcu(void) +{ + struct call_rcu_data *crdp; + + rcu_init(); + rcu_register_thread(); + crdp = create_call_rcu_data(0UL, -1); + if (crdp != NULL) + set_thread_call_rcu_data(crdp); + return crdp; +} + +static void cleanup_rcu(int dummy __attribute__((unused)), void *arg) +{ + struct call_rcu_data *crdp = arg; + pthread_t rcu_thread; + + /* Wait for any pending RCU calls */ + rcu_barrier(); + if (crdp != NULL) { + rcu_thread = get_call_rcu_thread(crdp); + /* detach this thread from the RCU thread */ + set_thread_call_rcu_data(NULL); + synchronize_rcu(); + /* tell RCU thread to exit */ + call_rcu_data_free(crdp); + pthread_join(rcu_thread, NULL); + } + rcu_unregister_thread(); +} + static int child (__attribute__((unused)) void *param) { @@ -2903,10 +2944,12 @@ child (__attribute__((unused)) void *param) char *envp; int queue_without_daemon; enum daemon_status state; + struct call_rcu_data *crdp; mlockall(MCL_CURRENT | MCL_FUTURE); signal_init(); - rcu_init(); + crdp = setup_rcu(); + on_exit(cleanup_rcu, crdp); setup_thread_attr(&misc_attr, 64 * 1024, 0); setup_thread_attr(&uevent_attr, DEFAULT_UEVENT_STACKSIZE * 1024, 0); -- 2.28.0 -- dm-devel mailing list dm-devel@redhat.com https://www.redhat.com/mailman/listinfo/dm-devel