From patchwork Tue Sep 8 12:29:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yonggang Luo X-Patchwork-Id: 11763313 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1B814159A for ; Tue, 8 Sep 2020 12:34:44 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D50DC22204 for ; Tue, 8 Sep 2020 12:34:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HWmd40yz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D50DC22204 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:59424 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kFcpe-0007Mx-TO for patchwork-qemu-devel@patchwork.kernel.org; Tue, 08 Sep 2020 08:34:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33686) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kFclJ-0006XE-Hv; Tue, 08 Sep 2020 08:30:15 -0400 Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]:45509) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kFclG-0007tY-VH; Tue, 08 Sep 2020 08:30:13 -0400 Received: by mail-pf1-x443.google.com with SMTP id k15so10804907pfc.12; Tue, 08 Sep 2020 05:30:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6IbIev6UphKtRupMGnz/q+0CYLU1wctlYm7gArTx0pQ=; b=HWmd40yzOdiKTmh0ZEbZQwQlqAu8dLTirNNekRPFEdhe+cWwlP6fGMPWOlnM2Y5Rka /CdSb9FGTOVLqEn4ZDes7Z3U83B+F11qCWOXrWb0gygIRmgey3ykaGdnEWrmPqrO5ZXX dECJahuMrFbzcsI4y9fwZuZX7lxoU1Sfvc+u5jQ374j5FWs4IhcnTevPbdAhnOufbnA5 KtFTfhZsm2x4TEPkaWLWAfIC7BPo+rhCyRwJmgGF2pbJONd1hbRmMIYYUGrSacPE+xpS vYwPKvpxzkl9r8CxQAFitYTNjE1FUog2uPZKj2wBLhoRF1tgMhg63QPM/aXabGR7t2sG GF+w== 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=6IbIev6UphKtRupMGnz/q+0CYLU1wctlYm7gArTx0pQ=; b=kd1uv5TuSkYl8FLYGI0eciT6VFRIKkz2G51I8Zdxm/wflyRuzEcqfWveTImsdJxe9g EymdEKbdpZNkhvFo7t9FFzaD7qIbUk+Wwjhq47iT6gMQDT+EHP9hYCCaCFWEHWIcJnVF yON2odSmRaNmmZnv6DOr0qwexW5reCBBwPGI67WZtQmlCR9r1aO4PBdO9LK13uD9Ivvv Zyf1BIH/3FG5KzWzJDTpi6oYRcqhvzDSGjttsYW+oN6mfPbmr+itOh9xrj6KxInDb4rr XGm4XPQQTDpa6GodLVf+tLYe4snJySJ4jWUwdS9/bBto09YjWB9IMSdCKr64LuvuU/AX ZG7A== X-Gm-Message-State: AOAM532cdQCDj/YmtfO2D6XsGFZPWmusRtjwGFIOMaknMiUbJbt90Yw6 6b5ESHGWGUnt8wA+Fw8GLbKQVTy1nSCSC0qt X-Google-Smtp-Source: ABdhPJwsjMwkrj10GjYshQ7utDoFtMkaqSyDEmtkZhkdrNw6XH3tAHVRymp+SFnEMDgbE/WCnLGrTA== X-Received: by 2002:a62:16d3:: with SMTP id 202mr24784383pfw.44.1599568208119; Tue, 08 Sep 2020 05:30:08 -0700 (PDT) Received: from localhost.localdomain ([222.95.248.6]) by smtp.googlemail.com with ESMTPSA id d8sm14833887pgt.19.2020.09.08.05.30.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Sep 2020 05:30:07 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Subject: [PATCH v2 2/2] rcu: add uninit destructor for rcu Date: Tue, 8 Sep 2020 20:29:44 +0800 Message-Id: <20200908122944.414-3-luoyonggang@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20200908122944.414-1-luoyonggang@gmail.com> References: <20200908122944.414-1-luoyonggang@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::443; envelope-from=luoyonggang@gmail.com; helo=mail-pf1-x443.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: QEMU Trivial , Daniel Brodsky , Yonggang Luo , Stefan Hajnoczi , Juan Quintela Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" This is necessary if the pending rcu calls are closing and removing temp files. This also provide a function void rcu_wait_finished(void); to fixes test-logging.c test failure on msys2/mingw. On windows if the file doesn't closed, you can not remove it. Signed-off-by: Yonggang Luo --- include/qemu/rcu.h | 5 +++++ tests/test-logging.c | 2 ++ util/rcu.c | 28 ++++++++++++++++++++++++---- 3 files changed, 31 insertions(+), 4 deletions(-) diff --git a/include/qemu/rcu.h b/include/qemu/rcu.h index 570aa603eb..dd0a92c1d0 100644 --- a/include/qemu/rcu.h +++ b/include/qemu/rcu.h @@ -124,6 +124,11 @@ extern void rcu_unregister_thread(void); extern void rcu_enable_atfork(void); extern void rcu_disable_atfork(void); +/* + * Wait all rcu call executed and exit the rcu thread. + */ +extern void rcu_wait_finished(void); + struct rcu_head; typedef void RCUCBFunc(struct rcu_head *head); diff --git a/tests/test-logging.c b/tests/test-logging.c index 957f6c08cd..7a5b59f4a5 100644 --- a/tests/test-logging.c +++ b/tests/test-logging.c @@ -210,6 +210,8 @@ int main(int argc, char **argv) tmp_path, test_logfile_lock); rc = g_test_run(); + qemu_log_close(); + rcu_wait_finished(); rmdir_full(tmp_path); g_free(tmp_path); diff --git a/util/rcu.c b/util/rcu.c index 60a37f72c3..3d5ba695a4 100644 --- a/util/rcu.c +++ b/util/rcu.c @@ -234,6 +234,7 @@ retry: static void *call_rcu_thread(void *opaque) { + int *rcu_finished_ptr = (int *)opaque; struct rcu_head *node; rcu_register_thread(); @@ -241,6 +242,10 @@ static void *call_rcu_thread(void *opaque) for (;;) { int tries = 0; int n = atomic_read(&rcu_call_count); + if (n == 0 && atomic_mb_read(rcu_finished_ptr) == 1) + { + return NULL; + } /* Heuristically wait for a decent number of callbacks to pile up. * Fetch rcu_call_count now, we only must process elements that were @@ -308,10 +313,12 @@ void rcu_unregister_thread(void) qemu_mutex_unlock(&rcu_registry_lock); } +static QemuThread rcu_thread; +static int rcu_finished = 0; + static void rcu_init_complete(void) { - QemuThread thread; - + atomic_mb_set(&rcu_finished, 0); qemu_mutex_init(&rcu_registry_lock); qemu_mutex_init(&rcu_sync_lock); qemu_event_init(&rcu_gp_event, true); @@ -321,12 +328,20 @@ static void rcu_init_complete(void) /* The caller is assumed to have iothread lock, so the call_rcu thread * must have been quiescent even after forking, just recreate it. */ - qemu_thread_create(&thread, "call_rcu", call_rcu_thread, - NULL, QEMU_THREAD_DETACHED); + qemu_thread_create(&rcu_thread, "call_rcu", call_rcu_thread, + &rcu_finished, QEMU_THREAD_JOINABLE); rcu_register_thread(); } +void rcu_wait_finished(void) +{ + if (atomic_xchg(&rcu_finished, 1) == 0) + { + qemu_thread_join(&rcu_thread); + } +} + static int atfork_depth = 1; void rcu_enable_atfork(void) @@ -379,3 +394,8 @@ static void __attribute__((__constructor__)) rcu_init(void) #endif rcu_init_complete(); } + +static void __attribute__((__destructor__)) rcu_uninit(void) +{ + rcu_wait_finished(); +}