From nobody Sat Nov 23 17:13:58 2024 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=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1731659736; cv=none; d=zohomail.com; s=zohoarc; b=DEVmuOjAJf1S4yhvPtfUKKOsthGWbUmythYydCHXVwpHCrLC7cSa/1vF26IpWMYb2AxTfaUgtOCyJOaPpAeSgxAgVBhc/PPZbvk1W8hcqDYWlyINWSNlAIT0UlG04L7cdFdtZ4B80sPS6K3rTryxNsJfB9FeB3TgtjjowRmR//U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1731659736; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=QQWo/ovWUNf1DBc4aVbXvUIlv7YaVLAACo7w+whX02M=; b=DHn5YquUvQ4i5xy5xClU4k64pYdNkNhwR001wwIcN69uQ5gRF/I3BJA4+9wA4F3R54y4zjpbU4ntGfzwmZUpX60bY8jgUIx+rIrOTLyUvsc575XdzgJTYxjdzdjhzNfYx4Qw+if5BElM+wHEwP6fgklCvPbcXtGYQOW5jd9Xa5g= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1731659736957729.294717948481; Fri, 15 Nov 2024 00:35:36 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tBrnF-0002hs-3Q; Fri, 15 Nov 2024 03:35:06 -0500 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 1tBrn3-0002hE-Bj for qemu-devel@nongnu.org; Fri, 15 Nov 2024 03:34:54 -0500 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 1tBrn2-0002Ms-0e for qemu-devel@nongnu.org; Fri, 15 Nov 2024 03:34:53 -0500 Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-662-3jB_NRTWNSe4Cp0qZsFnNw-1; Fri, 15 Nov 2024 03:34:47 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8DDDB1955EEA; Fri, 15 Nov 2024 08:34:45 +0000 (UTC) Received: from corto.redhat.com (unknown [10.39.192.159]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3B9D0195DF81; Fri, 15 Nov 2024 08:34:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1731659690; 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=QQWo/ovWUNf1DBc4aVbXvUIlv7YaVLAACo7w+whX02M=; b=ewctZo8eX45JHPwD+k6aANrHnNdOvYBwXQo5TRCeJpPr1D78jWYYUnjkCwxRl3TjFLDzBQ c+sU4saK5vDbCqAdEIyfNGNr/t2Ew26rgoTm1lGDxpa06E/9+g0ExpQfyujT1CQndDoy5t YYhRYMiyBw/2b3AwTPQKSFakquTWKpg= X-MC-Unique: 3jB_NRTWNSe4Cp0qZsFnNw-1 X-Mimecast-MFC-AGG-ID: 3jB_NRTWNSe4Cp0qZsFnNw From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: qemu-devel@nongnu.org Cc: Alex Williamson , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Zhenzhong Duan , Eric Auger Subject: [PATCH v2] vfio/container: Fix container object destruction Date: Fri, 15 Nov 2024 09:34:40 +0100 Message-ID: <20241115083440.2236669-1-clg@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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=clg@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.122, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_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: 1731659739001116600 When commit 96b7af4388b3 intoduced a .instance_finalize() handler, it did not take into account that the container was not necessarily inserted into the container list of the address space. Hence, if the container object is destroyed, by calling object_unref() for example, before vfio_address_space_insert() is called, QEMU may crash when removing the container from the list as done in vfio_container_instance_finalize(). This was seen with an SEV-SNP guest for which discarding of RAM fails. To resolve this issue, use the safe version of QLIST_REMOVE(). Cc: Zhenzhong Duan Cc: Eric Auger Fixes: 96b7af4388b3 ("vfio/container: Move vfio_container_destroy() to an i= nstance_finalize() handler") Signed-off-by: C=C3=A9dric Le Goater Reviewed-by: Eric Auger Reviewed-by: Zhenzhong Duan --- Changes in v2: - use the safe version of QLIST_REMOVE() instead of calling vfio_address_space_insert() earlier. hw/vfio/container-base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/vfio/container-base.c b/hw/vfio/container-base.c index 809b15767425a48f2404b08fc409ee5684af2094..6f86c37d971ec38426dacd471bc= a837c0d0df806 100644 --- a/hw/vfio/container-base.c +++ b/hw/vfio/container-base.c @@ -103,7 +103,7 @@ static void vfio_container_instance_finalize(Object *ob= j) VFIOContainerBase *bcontainer =3D VFIO_IOMMU(obj); VFIOGuestIOMMU *giommu, *tmp; =20 - QLIST_REMOVE(bcontainer, next); + QLIST_SAFE_REMOVE(bcontainer, next); =20 QLIST_FOREACH_SAFE(giommu, &bcontainer->giommu_list, giommu_next, tmp)= { memory_region_unregister_iommu_notifier( --=20 2.47.0