From nobody Sat Nov 15 12:47:47 2025 Delivered-To: importer@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+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1752492495; cv=none; d=zohomail.com; s=zohoarc; b=KRkLhtFFdCKIiu0PJ8NKKBtniSi3/pYonxrvDEAe1sgNExDhk0+VuIdvmLO7BkexWcnOtRFy9e1GzKtJZKRjluKbjUdDCRIfb8LMdRRp9FQwipeQrARcPBH0GT9KdwhhEJ1eD963lgIfQQENAVMyQUS7n5dEaxe+pkRQcb4JrRc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752492495; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=MBwevjOhRk6EkhoFd3vWdZKDnsxohT7/wN7rE5aDxAg=; b=LfGAK9Uev2asVYzIqX4NkZRrd9T1115CSZrmvBqYct5hFGkL2oL5cW9n9EkuPIrn6d/qPLUHlYup/Ol30eJzuPMRfS+HipnxXBzrodEpt0rCdXGIQ2i5Resu6dvSworhQ2xS4W0oBBYRhCHIbWrVNVf6s3OmUq1FqMKBYCi5DTY= 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+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1752492495656764.9658974738771; Mon, 14 Jul 2025 04:28:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ubHKF-0004RD-GW; Mon, 14 Jul 2025 07:26:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ubH0Q-0001NZ-JU for qemu-devel@nongnu.org; Mon, 14 Jul 2025 07:06:07 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ubH0L-0001xx-J6 for qemu-devel@nongnu.org; Mon, 14 Jul 2025 07:05:57 -0400 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-594-O2dXi3ngMpqN9XAxmj7idA-1; Mon, 14 Jul 2025 07:05:51 -0400 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-3a50816cc58so1416982f8f.3 for ; Mon, 14 Jul 2025 04:05:51 -0700 (PDT) Received: from [192.168.10.48] ([151.49.73.155]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45617dc1fccsm38365675e9.5.2025.07.14.04.05.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jul 2025 04:05:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752491152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MBwevjOhRk6EkhoFd3vWdZKDnsxohT7/wN7rE5aDxAg=; b=aPfnXe3mVvJ7Z/Px9UsyMAp+lq0kG6aXEs1ESmC53EuOScHsd84zLZmgQsPawAuF2T/j6a ayxJ6a+kmr2TmcQ5f7EXqIaQwrhfzBrLDZtultUw/lVeWublK9IfYfC1mqT7Op0tvBQrkl GALAFNr9hQQpbk/1a26n7zIZjlU/nnY= X-MC-Unique: O2dXi3ngMpqN9XAxmj7idA-1 X-Mimecast-MFC-AGG-ID: O2dXi3ngMpqN9XAxmj7idA_1752491150 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752491149; x=1753095949; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MBwevjOhRk6EkhoFd3vWdZKDnsxohT7/wN7rE5aDxAg=; b=dF6jki/7aEbg7+ygtOUsLQ0ryfQ/R0hBoPaxOin9KEyOYaQkhDJDfGVQxFUeeM6m7L 8cN15Wb/2z28pV3S59Gpunm8aTW3b58cxQ6v6iVt0Emta8mQ/8iCsVT/RN9pdX9x0ADn YBc0MV2cfGxB/DAvjgKqVJyD0Jbpq7/4hP7LjZEfhZAgrKG+rw9i76an8DOrHJ6d8bip w7FfDjX1imG8LdFFTFbbp5BG2597P714k10W/VGNqTKxXg2tfSXn0n+YNaEv3xoEm6oS Zf14R3/CAmDd1I6Y3iW/sv+gIvLCZgb2NSk5qDkRQ7fsEq5ozCr1b7lCRc52rnbvbpWu ujZA== X-Gm-Message-State: AOJu0YzJC7bWRz0gw4Jef925YHfkBCR8sVbzMScPPg5/FMC5zP0hC/mu h+uU/yUSw9sH3XfiQOHxYGvRS86jXxFbj6zxQp8ULVUjKdkpg8GkEZ/Z/PfEswtsY6pFHVswCuk ir/Jni85CMXgbcPftAMLdzNj3tSYalym3WuzTK94Jm7NDf1CIjeTer9gO8cG+2vxts55qSX9+dc 1v7tiP0x+b2lM3kE6rw9CfsSaa75z6UT2C1iqa6JUF X-Gm-Gg: ASbGncuH5uEz0fScMh7cHhDx9ad0Jnx9ostOrNHvaXapu/DzmY3oV0nRbjmHj4R1a1Z Svesov9MPo8ELU+41zpZnBP/n+dwcllHKpZbKElSPiHSYRjhU2CNO31CsxIOJ22elnqWPxyAzsw uxm8IFPKpRuSR3BZ+UhB+VWMVNf07Z0BjQh/FguyuuL3dZy8kCVsUggzZv8Hi0bLcFgqa6JqWs2 6XMIWm9lkbOl6AyOUdhhU4WB5Q36ri3KpMyOH0hu6QDBBvTvoBfw9DbxmeA4gaW5XmeveN7+VKy cx68L+MFmqoGWVcQDf2Bh1hNXI/Y+FZPTsj90agrGoA= X-Received: by 2002:adf:e186:0:b0:3a5:2653:7308 with SMTP id ffacd0b85a97d-3b5f18debd5mr12150444f8f.57.1752491148635; Mon, 14 Jul 2025 04:05:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG3CtiCjNnS3zYqf88BuiobIylpZ9ILgZlGY8K7rcRW3Zd9I1K7jWjFuxPKGQc18OMlIomWSg== X-Received: by 2002:adf:e186:0:b0:3a5:2653:7308 with SMTP id ffacd0b85a97d-3b5f18debd5mr12150414f8f.57.1752491148166; Mon, 14 Jul 2025 04:05:48 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Xiaoyao Li , Zhao Liu Subject: [PULL 38/77] i386/tdx: Remove task->watch only when it's valid Date: Mon, 14 Jul 2025 13:03:27 +0200 Message-ID: <20250714110406.117772-39-pbonzini@redhat.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250714110406.117772-1-pbonzini@redhat.com> References: <20250714110406.117772-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1752492497557116600 Content-Type: text/plain; charset="utf-8" From: Xiaoyao Li In some case (e.g., failed to connect to QGS socket), tdx_generate_quote_cleanup() is called with task->watch invalid. It triggers assertion of qemu-system-x86_64: GLib: g_source_remove: assertion 'tag > 0' failed Fix it by checking task->watch. Fixes: 40da501d8989 ("i386/tdx: handle TDG.VP.VMCALL") Signed-off-by: Xiaoyao Li Reviewed-by: Zhao Liu Link: https://lore.kernel.org/r/20250625035505.2770580-1-xiaoyao.li@intel.c= om Signed-off-by: Paolo Bonzini --- target/i386/kvm/tdx-quote-generator.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/i386/kvm/tdx-quote-generator.c b/target/i386/kvm/tdx-qu= ote-generator.c index f59715f6175..dee8334b27a 100644 --- a/target/i386/kvm/tdx-quote-generator.c +++ b/target/i386/kvm/tdx-quote-generator.c @@ -75,7 +75,9 @@ static void tdx_generate_quote_cleanup(TdxGenerateQuoteTa= sk *task) { timer_del(&task->timer); =20 - g_source_remove(task->watch); + if (task->watch) { + g_source_remove(task->watch); + } qio_channel_close(QIO_CHANNEL(task->sioc), NULL); object_unref(OBJECT(task->sioc)); =20 --=20 2.50.0