From nobody Wed Apr 24 02:06:32 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1652453067; cv=none; d=zohomail.com; s=zohoarc; b=SOXRLsPPdm8P/qH50j1GE0+vqBh6lXubI30g34X1iQ3onm0wgw5U+DhBSBRyi1/2uvp5/Wb610LCn/8Z+exOB+gYLL+lv6/DlduhEEwh2Z2V2cmjvFsi0iWvtr7MDmDk3Oyrzgl/v92Axej90oe1c3ZyBDCKX1Tnwlzw4c2quyA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652453067; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=YNkNswOe7Or/47ENboGBNVkX3wGwwVdTC94Ui7rMMe0=; b=eQCEkJXjSfva5JGRyBSL1YVMlaLpUfE39GYGs2IlY9lVV/rDABn/99TrfBaaDoc/DF4UQGSluPUM6b2vV85pk6mxFRaIUJzewQuvT9BuQ1LFyMrtYYmfY30wgk03PkgeK2btrAHIskzS/toFeYs5jgUYW6m7DWk547v+Gj0eMcY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1652453067404355.0952934280606; Fri, 13 May 2022 07:44:27 -0700 (PDT) Received: from localhost ([::1]:46116 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1npWWo-0001uf-9L for importer2@patchew.org; Fri, 13 May 2022 10:44:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58232) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1npWQS-00035m-2a for qemu-devel@nongnu.org; Fri, 13 May 2022 10:37:52 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:50160) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1npWQQ-0005Nt-Gv for qemu-devel@nongnu.org; Fri, 13 May 2022 10:37:51 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-344-PDfNUaQrPLOtwScGA6_d5g-1; Fri, 13 May 2022 10:37:48 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D057F8032E5 for ; Fri, 13 May 2022 14:37:47 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.33.36.124]) by smtp.corp.redhat.com (Postfix) with ESMTP id 07BC214609B1; Fri, 13 May 2022 14:37:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652452670; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YNkNswOe7Or/47ENboGBNVkX3wGwwVdTC94Ui7rMMe0=; b=Z1gql3dURNbZSwXUjSw36i55VaK+K8vm/B0veY0DYLuopKbOkez+BOAWmjJtDpqLfS64Hi u7fj5ITAlmmjkk21hBYKetzwcl3cn+mwvf2T6cE6nInYsol0t7BsiINUmgKVxjyqF6uJUD eT8EpflkWewtIFx66OEwgQ0epHLx/Wo= X-MC-Unique: PDfNUaQrPLOtwScGA6_d5g-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Laurent Vivier , Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH] tests/qtest: kill off QEMU with SIGKILL when qtest exits abnormally Date: Fri, 13 May 2022 15:37:43 +0100 Message-Id: <20220513143743.198390-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1652453069379100001 If a qtest program exits without calling qtest_quit(), then the QEMU emulator process will remain running in the background forever. Unfortunately this scenario is exactly what will happen when a g_assert() check triggers an abort(). Prior to switching to use of 'meson test', this problem would cause tap-driver.pl to hang forever. It was waiting for its STDIN to report EOF, but that would never happen due to the ophaned QEMU emulator processes keeping the pipe open forever. Fortunately this doesn't happen with meson, but it is still desirable to not leak QEMU processes when asserts fire. Using the Linux specific prctl(PR_SET_PDEATHSIG) syscall, we can ensure that QEMU gets sent SIGKILL as soon as the controlling qtest exits, despite being daemonized. Note, technically the death signal is sent when the *thread* that called fork() exits. IOW, if you are calling qtest_init() in one thread, letting that thread exit, and then expecting to run qtest_quit() in a different thread, things are not going to work out. Fortunately that is not a scenario that exists in qtests, as pairs of qtest_init and qtest_quit are always called from the same thread. Signed-off-by: Daniel P. Berrang=C3=A9 --- tests/qtest/libqtest.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c index 228357f1ea..553e82e492 100644 --- a/tests/qtest/libqtest.c +++ b/tests/qtest/libqtest.c @@ -19,6 +19,9 @@ #include #include #include +#ifdef __linux__ +#include +#endif /* __linux__ */ =20 #include "libqtest.h" #include "libqmp.h" @@ -301,6 +304,21 @@ QTestState *qtest_init_without_qmp_handshake(const cha= r *extra_args) s->expected_status =3D 0; s->qemu_pid =3D fork(); if (s->qemu_pid =3D=3D 0) { +#ifdef __linux__ + /* + * If the controlling qtest process exits without calling + * the qtest_quit() method, the QEMU processes will get + * orphaned and remain running forever in the background. + * + * Missing qtest_quit() calls are, unfortunately, exactly + * what happen when a g_assert() check triggers abort() in + * a failing test scenario. + * + * This PR_SET_PDEATHSIG setup will ensure QEMU will + * get terminated with SIGKILL. + */ + prctl(PR_SET_PDEATHSIG, SIGKILL, 0, 0, 0); +#endif /* __linux__ */ if (!g_setenv("QEMU_AUDIO_DRV", "none", true)) { exit(1); } --=20 2.36.1