From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4B8F8C3ABC9 for ; Fri, 16 May 2025 15:22:02 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uFwsJ-0004yg-4q; Fri, 16 May 2025 11:21:27 -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 1uFwsH-0004yM-N3 for qemu-devel@nongnu.org; Fri, 16 May 2025 11:21:25 -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 1uFwsD-0006OJ-MN for qemu-devel@nongnu.org; Fri, 16 May 2025 11:21:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1747408879; 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:autocrypt:autocrypt; bh=wFggqDWzMVFII9BooOwcYa/wOnzTJLJ6eiZQgD132/Y=; b=gCh/GuZecNysnSDHnBNZShwRyAgCVe/OVYVj0AhGfnLS+ER5Pg+bNx+ZocZ95a2pa8GK9t eQSlqbMYw6cgCgVT3v/NtA7xpEaGQ2WRfWrPiv855wFb68ktxuxKqjfgwe9eXWFORLLtfb hfK/otFm/LljwTaD/njNIt2o939Ly6A= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-312-P_LdyJwOOjm79I9pVROSXw-1; Fri, 16 May 2025 11:21:17 -0400 X-MC-Unique: P_LdyJwOOjm79I9pVROSXw-1 X-Mimecast-MFC-AGG-ID: P_LdyJwOOjm79I9pVROSXw_1747408877 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-442e0e6eb84so15477135e9.0 for ; Fri, 16 May 2025 08:21:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747408876; x=1748013676; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=wFggqDWzMVFII9BooOwcYa/wOnzTJLJ6eiZQgD132/Y=; b=awZePL07wKoKi8W2XHi4oYniUno+B9yjcIwdcZ1jghsSLxu4pFog1tOSIQATN4oBiq +roBuHV5FIOTVseIasViq0EvQHP+4aeC13vqdqhiZOCrc/99oTKOUxgIAJ6sZyRaDvkY sCI9nvOeGR70msDwFTd7XEhpuCkz634AuZ974YIQEwHzAFm7/YklxuQoVi6x/NNUJP93 WlLiCwW+XdJ6IQUquq6YGelUZNcnV/P0wpaMuHbMcUCwyjxiKss0/aOhhs0ANO/gcFNk JR2PKq2+TEUcY7LjUkrLBRFcVtdWWAbi6935CYGTLAIpZnZzAhssthYfONBrdNMKyxV9 q5og== X-Forwarded-Encrypted: i=1; AJvYcCVAXlzCFpvloECmJtdJZIwqbp43y4bpi6EbVFRBbuqjipRGZ77FkUGluy2Sg3vr/QmaxfNnaWiCNrQN@nongnu.org X-Gm-Message-State: AOJu0YzoXxF1ZUt9XaNp1wOZmVEp61HX9hMV1Favm7SGvoI2AVYqNGhY fc6kJgwkeoNWZPlt9WCQKnAM38X9vKJfiib9/ss6aLZk3iTWfGpNucgpbgXWRUKpZGRCNDu59fq 6ZKOm4M4UbcPcdqwFKFJbMKf0VTsPzinmiU4Ejx9elV/IWWfSM22XawqGttOHkvi+7bY= X-Gm-Gg: ASbGncsprNNTIbGbjwfncqnd15N7z1oIb2rvxi3sFoo7MdVGAOeRzBZz7jT2fVWgo5R AX1lSzHgL8c4U27jv7ujkFuZOfhd5fVG9UyOZfMshqAQp5DVsIFuhTi7Cyih+Wz7Lqnyen8B60k trbqjYv4IBoW6lhlK146D4n4KIo/ziPp5sXvq2dgRU9Sx2rQRzLgYCPd77ydX9nv2KO0sGw5uJP AjKzqIlp7frQojrl6O2YL6fovZPk682qyaZDhgh/Fj4bS9nYfWWLLpsy9+IRO5rqLHyCNlbDbBe jfEzZMIJzY3qwmXeQ4Qm9gSGU/M1pHqt/JD8kXBSd9AmuJw= X-Received: by 2002:a05:600c:3554:b0:442:cd13:f15d with SMTP id 5b1f17b1804b1-442fd67197dmr38960375e9.29.1747408876236; Fri, 16 May 2025 08:21:16 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG+NBLu/UuIOripSZmxtv5RZiGBc/cKpSYqTKlvev46Na/6/0jMmo6OdzVG/0wYkAnh71BHEw== X-Received: by 2002:a05:600c:3554:b0:442:cd13:f15d with SMTP id 5b1f17b1804b1-442fd67197dmr38960065e9.29.1747408875882; Fri, 16 May 2025 08:21:15 -0700 (PDT) Received: from ?IPV6:2a01:e0a:165:d60:bbdd:3c5e:7d8b:3f72? ([2a01:e0a:165:d60:bbdd:3c5e:7d8b:3f72]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442eb85a3b1sm87938605e9.0.2025.05.16.08.21.15 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 16 May 2025 08:21:15 -0700 (PDT) Message-ID: Date: Fri, 16 May 2025 17:21:14 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 03/27] vfio: move more cleanup into vfio_pci_put_device() To: John Levon , qemu-devel@nongnu.org Cc: =?UTF-8?Q?Marc-Andr=C3=A9_Lureau?= , Thanos Makatos , =?UTF-8?Q?Daniel_P=2E_Berrang=C3=A9?= , Paolo Bonzini , Peter Xu , David Hildenbrand , Stefano Garzarella , "Michael S. Tsirkin" , Alex Williamson , =?UTF-8?Q?Philippe_Mathieu-Daud=C3=A9?= References: <20250515154413.210315-1-john.levon@nutanix.com> <20250515154413.210315-4-john.levon@nutanix.com> Content-Language: en-US, fr From: =?UTF-8?Q?C=C3=A9dric_Le_Goater?= Autocrypt: addr=clg@redhat.com; keydata= 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 uVKe8BVz4atMOoktmt0GWTOC8P4= In-Reply-To: <20250515154413.210315-4-john.levon@nutanix.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit 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: -37 X-Spam_score: -3.8 X-Spam_bar: --- X-Spam_report: (-3.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.686, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 5/15/25 17:43, John Levon wrote: > All of the cleanup can be done in the same place, and vfio-user will > want to do the same. > > Signed-off-by: John Levon Reviewed-by: Cédric Le Goater Thanks, C. > --- > hw/vfio/pci.c | 23 ++++++++++++----------- > 1 file changed, 12 insertions(+), 11 deletions(-) > > diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c > index a1bfdfe375..d96b55f80c 100644 > --- a/hw/vfio/pci.c > +++ b/hw/vfio/pci.c > @@ -2854,6 +2854,18 @@ static bool vfio_populate_device(VFIOPCIDevice *vdev, Error **errp) > > static void vfio_pci_put_device(VFIOPCIDevice *vdev) > { > + vfio_display_finalize(vdev); > + vfio_bars_finalize(vdev); > + g_free(vdev->emulated_config_bits); > + g_free(vdev->rom); > + /* > + * XXX Leaking igd_opregion is not an oversight, we can't remove the > + * fw_cfg entry therefore leaking this allocation seems like the safest > + * option. > + * > + * g_free(vdev->igd_opregion); > + */ > + > vfio_device_detach(&vdev->vbasedev); > > g_free(vdev->vbasedev.name); > @@ -3302,17 +3314,6 @@ static void vfio_instance_finalize(Object *obj) > { > VFIOPCIDevice *vdev = VFIO_PCI_BASE(obj); > > - vfio_display_finalize(vdev); > - vfio_bars_finalize(vdev); > - g_free(vdev->emulated_config_bits); > - g_free(vdev->rom); > - /* > - * XXX Leaking igd_opregion is not an oversight, we can't remove the > - * fw_cfg entry therefore leaking this allocation seems like the safest > - * option. > - * > - * g_free(vdev->igd_opregion); > - */ > vfio_pci_put_device(vdev); > } >