From nobody Sat Nov 23 16:50:40 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=1731919128; cv=none; d=zohomail.com; s=zohoarc; b=FzxJF3LJfIAVyE3mfmKYQDxSJo2PwCGUQ76ZqLaa8jL+7Fuy54SBbiff0TAP3if8tIYPtx2fEmcGG3A4FadOA5k/uOOKXRG/alNROf4iK1ZaUF11MKzCFuIm+zyvJpVJkcQCxRAxpXtmNpIgGW/A5LdaGwzfvW+7Kjiv5iDtLcA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1731919128; h=Content-Type: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=cMZ91BllvvTf1AKdmQbtj4qZBOzou327ovGsGsEPLLk=; b=ZzYT+xs/lm8waRfrs+VVaZly2AUTJaaFMK6kw7KwzpcsFZ/d5uUhghpThsbln0CaWzYa4WEBZsK4/is7UPD3FxRyibugXdbMrMHT1N7Lcy1BnKYcd6ebKaVQY6KvBTgH5DujAjJESurSP5KSDW8lqYYneAvKw0mXOXr7FfE+RMA= 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 1731919128936252.95550519105518; Mon, 18 Nov 2024 00:38:48 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tCxGZ-0001Xe-KQ; Mon, 18 Nov 2024 03:37:51 -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 1tCxGX-0001XS-Qv for qemu-devel@nongnu.org; Mon, 18 Nov 2024 03:37:49 -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 1tCxGW-00045Y-9m for qemu-devel@nongnu.org; Mon, 18 Nov 2024 03:37:49 -0500 Received: from mx-prod-mc-03.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-294-GEmzJq7OPUmJVTBlMNVr_A-1; Mon, 18 Nov 2024 03:37:44 -0500 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 233FC19560BD; Mon, 18 Nov 2024 08:37:43 +0000 (UTC) Received: from corto.redhat.com (unknown [10.39.192.9]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E017E1955F3C; Mon, 18 Nov 2024 08:37:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1731919066; 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: in-reply-to:in-reply-to:references:references; bh=cMZ91BllvvTf1AKdmQbtj4qZBOzou327ovGsGsEPLLk=; b=LjHRTAlFyfL9AtTNUxWFl3D675YjczKCgkJHUxufKeFmLdTikkEy2BUrb69haFr4ZMeRNj 0lwV0ku2CrDXO2pn9xwnwOhr4/SaO8ePu7jh6vg+FVC8Z3V3j/UW+QoyUAZGKiQDdVfsO4 xRMFXJ20R/y0cPFO3O9OtGCorO7hvyU= X-MC-Unique: GEmzJq7OPUmJVTBlMNVr_A-1 X-Mimecast-MFC-AGG-ID: GEmzJq7OPUmJVTBlMNVr_A From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: qemu-devel@nongnu.org Cc: Alex Williamson , =?UTF-8?q?Corvin=20K=C3=B6hne?= Subject: [PULL 1/3] vfio/igd: add pci id for Coffee Lake Date: Mon, 18 Nov 2024 09:37:35 +0100 Message-ID: <20241118083737.174219-2-clg@redhat.com> In-Reply-To: <20241118083737.174219-1-clg@redhat.com> References: <20241118083737.174219-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.40 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: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.141, 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.01, RCVD_IN_MSPIKE_WL=-0.01, 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: 1731919130987116600 From: Corvin K=C3=B6hne I've tested and verified that Coffee Lake devices are working properly. Signed-off-by: Corvin K=C3=B6hne Reviewed-by: Alex Williamson --- hw/vfio/igd.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/vfio/igd.c b/hw/vfio/igd.c index a95d441f68661c23eee976be5d74b2da354f9498..c5282827ec9112be3c53fbef953= abed0bac64298 100644 --- a/hw/vfio/igd.c +++ b/hw/vfio/igd.c @@ -88,6 +88,9 @@ static int igd_gen(VFIOPCIDevice *vdev) case 0x2200: case 0x5900: return 8; + /* CoffeeLake */ + case 0x3e00: + return 9; /* ElkhartLake */ case 0x4500: return 11; --=20 2.47.0 From nobody Sat Nov 23 16:50:40 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=1731919167; cv=none; d=zohomail.com; s=zohoarc; b=dsIm3h5SOpWtrvGOq+OjCGky2uXlm2SsmCcKXFiP30eM7exPwm0OQKHA+ClZFMG+Jhc3LZ0EOWMeVFowQKmv1rWlcKJvWYHavVO+9QdczoQ4EF0AFdWQgXPFS9BXFRCP1tiC8BHpFxszdVgw0ZTqZY2r5GH5LYl7kd13dZumZwI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1731919167; h=Content-Type: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=BFAzC/3A8VNELRadQtvx21DMF/FHqh9bzHESjVSr+tw=; b=HMsh3IiaIpJMwEaunZ7U5cyTYO0Qpt0/BRUUyeSsro5UmDmnNqJ5kcwby88XxhCJ0pvqroVr1xPNcednlavXZYHGs+4JlJTzFczLyGqzL7rKokzoU6O/ZoCks2S9UP2Cu/YXQ1YaHKuVsN6VD+EOXb+R6i+ixXqegz/EMeMff3k= 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 1731919167589778.6200127029746; Mon, 18 Nov 2024 00:39:27 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tCxGm-0001Z5-Sx; Mon, 18 Nov 2024 03:38:04 -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 1tCxGd-0001Y0-UV for qemu-devel@nongnu.org; Mon, 18 Nov 2024 03:37:55 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tCxGc-00045w-F2 for qemu-devel@nongnu.org; Mon, 18 Nov 2024 03:37:55 -0500 Received: from mx-prod-mc-01.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-465-AWsNTAW4PlyJaXdnTyh_IQ-1; Mon, 18 Nov 2024 03:37:46 -0500 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5223D19560B2; Mon, 18 Nov 2024 08:37:45 +0000 (UTC) Received: from corto.redhat.com (unknown [10.39.192.9]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A6E481956054; Mon, 18 Nov 2024 08:37:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1731919073; 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: in-reply-to:in-reply-to:references:references; bh=BFAzC/3A8VNELRadQtvx21DMF/FHqh9bzHESjVSr+tw=; b=HLWu/VUyIHlp20pk+e89UAGWWglHPvutouo5BzzgZ/17RDx6whZw1Gbz0II4NHL8xqDqFp t8z4QxNVH3VGfiwUUADvGwH9EmF1/AcOfaYM5Q5Wfz9dYf442Vn517Cc9JVvJnWi7C2Pgi FEhl05wqEgLjfX3LVM+2P59bPVgSYJA= X-MC-Unique: AWsNTAW4PlyJaXdnTyh_IQ-1 X-Mimecast-MFC-AGG-ID: AWsNTAW4PlyJaXdnTyh_IQ From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: qemu-devel@nongnu.org Cc: Alex Williamson , =?UTF-8?q?Corvin=20K=C3=B6hne?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Subject: [PULL 2/3] vfio/igd: fix calculation of graphics stolen memory Date: Mon, 18 Nov 2024 09:37:36 +0100 Message-ID: <20241118083737.174219-3-clg@redhat.com> In-Reply-To: <20241118083737.174219-1-clg@redhat.com> References: <20241118083737.174219-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.40 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.129.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.141, 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_H2=-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: 1731919168961116600 From: Corvin K=C3=B6hne When copying the calculation of the stolen memory size for Intels integrated graphics device of gen 9 and later from the Linux kernel [1], we missed subtracting 0xf0 from the graphics mode select value for values above 0xf0. This leads to QEMU reporting a very large size of the graphics stolen memory area. That's just a waste of memory. Additionally the guest firmware might = be unable to allocate such a large buffer. [1] https://github.com/torvalds/linux/blob/7c626ce4bae1ac14f60076d00eafe71a= f30450ba/arch/x86/kernel/early-quirks.c#L455-L460 Signed-off-by: Corvin K=C3=B6hne Reviewed-by: Philippe Mathieu-Daud=C3=A9 Fixes: 871922416683 ("vfio/igd: correctly calculate stolen memory size for = gen 9 and later") Reviewed-by: Alex Williamson [ clg: Changed commit subject ] Signed-off-by: C=C3=A9dric Le Goater --- hw/vfio/igd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/vfio/igd.c b/hw/vfio/igd.c index c5282827ec9112be3c53fbef953abed0bac64298..4047f4f0717f82f48f8e255873f= 9895a157e210a 100644 --- a/hw/vfio/igd.c +++ b/hw/vfio/igd.c @@ -501,7 +501,7 @@ static int igd_get_stolen_mb(int gen, uint32_t gmch) if (gms < 0xf0) return gms * 32; else - return gms * 4 + 4; + return (gms - 0xf0) * 4 + 4; } } =20 --=20 2.47.0 From nobody Sat Nov 23 16:50:40 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=1731919136; cv=none; d=zohomail.com; s=zohoarc; b=WBWaSzJTZ8tSC3mTGQ49jR0BZxNiV5k7ZGcN13QLN6evlCEKm6BF+n04XwxFiih+x8HY6RCCI+00FE86y9+rzGuhp5ZBc7CwM291/ZQ6EHe6E6ETa8ApS4Sb06+M0fIWR1FQXhlzwj2CNQW2emDigagEGlSGZIuUm1CQSflBYLI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1731919136; h=Content-Type: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=FFMW8k47U5OHurm3wQXHfDb8dU2AP+okgUT5HYiHDCc=; b=c9IwX41pZy9KVWup8duN8CIoCHx7n74By7rdRde7KCOjZHJOlRmRzntCMqWVd1ipL8tmap0S/z3TJdoJORo7yEvZN3E70BvITaXDCXVFR6EdhOGIHJuFnonZVe3UuBW4QrAL1unoCj/N39PHfSYL6Ua5JjHCfrZfZ9Ngw0jhYao= 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 1731919136233608.9258736018262; Mon, 18 Nov 2024 00:38:56 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tCxHK-0001x0-L8; Mon, 18 Nov 2024 03:38:38 -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 1tCxGh-0001YT-MO for qemu-devel@nongnu.org; Mon, 18 Nov 2024 03:38:00 -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 1tCxGg-000465-8j for qemu-devel@nongnu.org; Mon, 18 Nov 2024 03:37:59 -0500 Received: from mx-prod-mc-01.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-372-VlvcK9zbMZe7wNECLEo8QQ-1; Mon, 18 Nov 2024 03:37:53 -0500 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C4CD419560B2; Mon, 18 Nov 2024 08:37:52 +0000 (UTC) Received: from corto.redhat.com (unknown [10.39.192.9]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E09771956054; Mon, 18 Nov 2024 08:37:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1731919075; 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: in-reply-to:in-reply-to:references:references; bh=FFMW8k47U5OHurm3wQXHfDb8dU2AP+okgUT5HYiHDCc=; b=bpLxMWyk6RwGoizGhsYk5Ch/z2eH+fZdl834MNY4B6UJ2u1Dec/sPefPZfpl4vFPyhM4hR oAAO4rx2CljknhRXoybKXEALqz0Mcjlc60Q3i3+XZdTyjU5XPIQpCt5AJwLW0NvmuTl6gL bGDAEZLWEWJtTuYjqwqhTWsseZgWZgQ= X-MC-Unique: VlvcK9zbMZe7wNECLEo8QQ-1 X-Mimecast-MFC-AGG-ID: VlvcK9zbMZe7wNECLEo8QQ 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: [PULL 3/3] vfio/container: Fix container object destruction Date: Mon, 18 Nov 2024 09:37:37 +0100 Message-ID: <20241118083737.174219-4-clg@redhat.com> In-Reply-To: <20241118083737.174219-1-clg@redhat.com> References: <20241118083737.174219-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.40 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: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.141, 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.01, RCVD_IN_MSPIKE_WL=-0.01, 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: 1731919136974116600 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") Reviewed-by: Zhenzhong Duan Signed-off-by: C=C3=A9dric Le Goater --- 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