From nobody Mon Feb 9 17:40:55 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1538068727739496.46833138328986; Thu, 27 Sep 2018 10:18:47 -0700 (PDT) Received: from localhost ([::1]:38480 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g5Zvz-00059o-8c for importer@patchew.org; Thu, 27 Sep 2018 13:18:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48537) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g5Zv6-0004o0-U4 for qemu-devel@nongnu.org; Thu, 27 Sep 2018 13:17:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g5Zv3-0002D3-5O for qemu-devel@nongnu.org; Thu, 27 Sep 2018 13:17:44 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:45827) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g5Zv2-00029D-TR for qemu-devel@nongnu.org; Thu, 27 Sep 2018 13:17:41 -0400 Received: by mail-wr1-x443.google.com with SMTP id m16so3435058wrx.12 for ; Thu, 27 Sep 2018 10:17:40 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id q135-v6sm4765473wmd.4.2018.09.27.10.17.38 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 Sep 2018 10:17:38 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 6316B3E029A; Thu, 27 Sep 2018 18:17:38 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=0Wllvh/QNEaY3mOEoXndfmv9MaMC7+h/nmT3DIPDXHs=; b=eXHzLc7EjYV0DsUT8l8iUqpuaAUQx1JBbM3DbdFoEJp/Q8CbioDaq0RJfVsSzeowIc WkXW5Vfu/7tKsotWJh1hk7pKdZo5i6oqJEdhZQhAN/q+2yM7Jt79JRctGhNBev3ssH98 aSz49ZYb3Mz0Zk0SQ4zRCP1baIC1sLmUzwo64= 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:mime-version :content-transfer-encoding; bh=0Wllvh/QNEaY3mOEoXndfmv9MaMC7+h/nmT3DIPDXHs=; b=CPK8G5Td6Sfs87FhLzSgF36Sqqa2StUWWmXKQEMrf2CYwOasAZroDkoJ67Fod3ifr8 SHi7hRkZ3DHSw3khbaQql5RjSpn0P33If1HKa0sssoaFXNIHquRrvNj5oDAOikDCTtvD 1ATRUv7LjG5GPqcsgx2KD9+fVAJrXLLdse5/EpwZiUotAmZVg2lrLX/PtYfnny1MR2RO pxaut/gJteyzhZj+csGznB6jcDR/BQLgpWlSQCSKzoOv4M4+zp0+pKJX4mmJgwtIsVTB 0/6D3APWg718Q22BzGddwsnoY7hu7iqWdknJ4fV3vxFuc6hxKu8Zw/S12BKue+UEMnV7 HOZw== X-Gm-Message-State: ABuFfohInq/8UDh759OEAVg7TBtRhC4v5o3mJa6zUTSNq3ze2paLv51i Km3OOmXc3bC5GcwoZ0jUn1v7sw== X-Google-Smtp-Source: ACcGV61jPQg23vI63tH8lw9+IlMIvWNR80n/ZPtmw9oyCxZUrQPJiRQ6kpjSj6rEGIOgCTlLaKbzRg== X-Received: by 2002:a5d:42ca:: with SMTP id t10-v6mr6463415wrr.104.1538068659098; Thu, 27 Sep 2018 10:17:39 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 27 Sep 2018 18:17:24 +0100 Message-Id: <20180927171724.30128-1-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 Subject: [Qemu-devel] [PATCH] cpus: fix TCG kick timer leak X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: marcandre.lureau@redhat.com, Richard Henderson , Peter Crosthwaite , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDMRC_1 RDKM_2 RSF_0 Z_629925259 SPT_0 This is an alternative fix to Marc's original patch as per Paolo's suggesti= on. Reported-by: Marc-Andr=C3=A9 Lureau Suggested-by: Paolo Bonzini Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Marc-Andr=C3=A9 Lureau --- cpus.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cpus.c b/cpus.c index 719788320f..d7d69a101e 100644 --- a/cpus.c +++ b/cpus.c @@ -964,6 +964,8 @@ static void start_tcg_kick_timer(void) if (!tcg_kick_vcpu_timer && CPU_NEXT(first_cpu)) { tcg_kick_vcpu_timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, kick_tcg_thread, NULL); + } + if (tcg_kick_vcpu_timer && !timer_pending(tcg_kick_vcpu_timer)) { timer_mod(tcg_kick_vcpu_timer, qemu_tcg_next_kick()); } } @@ -971,9 +973,8 @@ static void start_tcg_kick_timer(void) static void stop_tcg_kick_timer(void) { assert(!mttcg_enabled); - if (tcg_kick_vcpu_timer) { + if (tcg_kick_vcpu_timer && timer_pending(tcg_kick_vcpu_timer)) { timer_del(tcg_kick_vcpu_timer); - tcg_kick_vcpu_timer =3D NULL; } } =20 --=20 2.17.1