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 6319BC3600C for ; Thu, 3 Apr 2025 09:24:10 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u0GnG-0006gq-T2; Thu, 03 Apr 2025 05:23:26 -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 1u0GnF-0006gW-9I for qemu-devel@nongnu.org; Thu, 03 Apr 2025 05:23:25 -0400 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 1u0Gn7-0007sN-V6 for qemu-devel@nongnu.org; Thu, 03 Apr 2025 05:23:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1743672196; 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=LC+gYGtECwfjOJawCLynEC/py1rd213xM3YAgBwzGO8=; b=fJbPh/SlW+Y2aVDUn8TKixXk5URsR24XncGp5KtOSXOSrsvtc879soKgvJdI6HVdVtI49f kshHTaHxxF+6S6L21ELum8wjEJZ2TR0v3MkjQezhFWvBwD1uQfdRLvNfn+/6phfxp+CMic eEI1rjduXhmpNuX25Hlnh7z62V6jR2s= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-187-9qd8oy05OhSktlH7ZSjSQw-1; Thu, 03 Apr 2025 05:23:13 -0400 X-MC-Unique: 9qd8oy05OhSktlH7ZSjSQw-1 X-Mimecast-MFC-AGG-ID: 9qd8oy05OhSktlH7ZSjSQw_1743672193 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-43ea256f039so5370495e9.0 for ; Thu, 03 Apr 2025 02:23:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743672192; x=1744276992; 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=LC+gYGtECwfjOJawCLynEC/py1rd213xM3YAgBwzGO8=; b=e1VdaZ+Mjh/qSONL6RU64V5xqetalTuSp5REoaf80QbO3DEfZUhR66j1fBZabouGIA H9QYifCQ+suX0aDfXJLeBY/yHVB37fkG/ygSYn0TXJnCG2WVtnS4HZEWxBZQyTiJO+vl m7bRU89JlV/ysCJ4k1VlId8SPE2TVAcyBYErCzm0Vc/xOdxJG90+XBnxXO+7gZTP5E4Q 5zCPxvZdzFgRZoj8pPIsG3bRLAJ4xoBM/gHRuTTlysbvO19W0R5/y4UzU7FyIYDKxymX Vsx9f9G70HAr+uercxLe/b78uLKeKItCUlDVGk7dZDRsZJoGBuQkcgYevb+1wyRzRXKq g2OA== X-Forwarded-Encrypted: i=1; AJvYcCVSy8LHHC4nykaNjAHgm34hv6vXhuNomXkS/FSYD3phiXbKi8vRdEtVCLZrAWseBnz+TntW1PJ+wt55@nongnu.org X-Gm-Message-State: AOJu0YxMkAicfDMLRk0rPw5evtxMA7H1UuugwLE+ksKN17PBWHcHsexC 31gWFxdRXjxq8I/83aNL9AfbLMtBSWUj1y6q3TK9WwNhnuCPRGd1OPRodGfrin6dPC8Z33NqIlu Wtyesh4BR3hfYSvs+UQfU1L/RI+FMh3ouBvHgGtUe04J5nnFJvN5u X-Gm-Gg: ASbGnct769E6+PohvJ9FVf16xAM5iX0d0Ui93bVLBUkFM4SduGaz4jdTvRL0foKJ98P 9F6T1XY+jNKks1FzaZXuRge2ZfVIm0MFP0fwHEkj4RYgS6Cc+dBiZVlPznf3K5EHdatM8uSGOym uSJmXJEhC4Zi4pnU9JLhghextY93Y+8e49akBpLwPZBe8s9VP90MJnexYrnlSKE4M1yIx4AQDAw 6YkMjJVydsB3TXrBrmyInXorf3AFMSrS0/kI8+d6xBgScXCunsAXSEsCH9dNdBCp97iidXpEvHn 9zhuRvCVv6l1pUhsSDDtr0d6c7lKKu6K+bhe+tn3VPlcdsiTAem5UQ== X-Received: by 2002:a05:600c:154d:b0:43d:738:4a9 with SMTP id 5b1f17b1804b1-43db62be3bbmr176996155e9.27.1743672192542; Thu, 03 Apr 2025 02:23:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFkPa+UEhHC8hV21NWGG5VPOalWrGTGn4ngbIbKgaSFabklCegA7y7B7S0jim+3Fa3fK9/Kpw== X-Received: by 2002:a05:600c:154d:b0:43d:738:4a9 with SMTP id 5b1f17b1804b1-43db62be3bbmr176995885e9.27.1743672192159; Thu, 03 Apr 2025 02:23:12 -0700 (PDT) Received: from ?IPV6:2a01:e0a:280:24f0:9db0:474c:ff43:9f5c? ([2a01:e0a:280:24f0:9db0:474c:ff43:9f5c]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43ec34a895fsm12744555e9.13.2025.04.03.02.23.10 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 03 Apr 2025 02:23:10 -0700 (PDT) Message-ID: Date: Thu, 3 Apr 2025 11:23:09 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v8 06/28] vfio: refactor out vfio_interrupt_setup() To: John Levon , qemu-devel@nongnu.org Cc: Jason Herne , Thanos Makatos , Halil Pasic , =?UTF-8?Q?Daniel_P=2E_Berrang=C3=A9?= , Eric Farman , Tony Krowiak , Thomas Huth , qemu-s390x@nongnu.org, Matthew Rosato , Paolo Bonzini , =?UTF-8?Q?Marc-Andr=C3=A9_Lureau?= , Stefano Garzarella , Alex Williamson , David Hildenbrand , Peter Xu , =?UTF-8?Q?Philippe_Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" References: <20250219144858.266455-1-john.levon@nutanix.com> <20250219144858.266455-7-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: <20250219144858.266455-7-john.levon@nutanix.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit 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.153, 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 2/19/25 15:48, John Levon wrote: > Refactor the interrupt setup code out of vfio_realize(), as we will > later need this for vfio-user too. > > Signed-off-by: John Levon > --- > hw/vfio/pci.c | 54 +++++++++++++++++++++++++++++++-------------------- > 1 file changed, 33 insertions(+), 21 deletions(-) > > diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c > index 89d900e9cf..5fb6c4c4c6 100644 > --- a/hw/vfio/pci.c > +++ b/hw/vfio/pci.c > @@ -2957,6 +2957,37 @@ static void vfio_unregister_req_notifier(VFIOPCIDevice *vdev) > vdev->req_enabled = false; > } > > +static bool vfio_interrupt_setup(VFIOPCIDevice *vdev, Error **errp) > +{ > + PCIDevice *pdev = &vdev->pdev; > + > + /* QEMU emulates all of MSI & MSIX */ > + if (pdev->cap_present & QEMU_PCI_CAP_MSIX) { > + memset(vdev->emulated_config_bits + pdev->msix_cap, 0xff, > + MSIX_CAP_LENGTH); > + } > + > + if (pdev->cap_present & QEMU_PCI_CAP_MSI) { > + memset(vdev->emulated_config_bits + pdev->msi_cap, 0xff, > + vdev->msi_cap_size); > + } > + > + if (vfio_pci_read_config(&vdev->pdev, PCI_INTERRUPT_PIN, 1)) { > + vdev->intx.mmap_timer = timer_new_ms(QEMU_CLOCK_VIRTUAL, > + vfio_intx_mmap_enable, vdev); > + pci_device_set_intx_routing_notifier(&vdev->pdev, > + vfio_intx_routing_notifier); > + vdev->irqchip_change_notifier.notify = vfio_irqchip_change; > + kvm_irqchip_add_change_notifier(&vdev->irqchip_change_notifier); > + if (!vfio_intx_enable(vdev, errp)) { > + pci_device_set_intx_routing_notifier(&vdev->pdev, NULL); > + kvm_irqchip_remove_change_notifier(&vdev->irqchip_change_notifier); > + return false; > + } > + } > + return true; > +} > + > static void vfio_realize(PCIDevice *pdev, Error **errp) > { > ERRP_GUARD(); > @@ -3157,27 +3188,8 @@ static void vfio_realize(PCIDevice *pdev, Error **errp) > } > } > > - /* QEMU emulates all of MSI & MSIX */ > - if (pdev->cap_present & QEMU_PCI_CAP_MSIX) { > - memset(vdev->emulated_config_bits + pdev->msix_cap, 0xff, > - MSIX_CAP_LENGTH); > - } > - > - if (pdev->cap_present & QEMU_PCI_CAP_MSI) { > - memset(vdev->emulated_config_bits + pdev->msi_cap, 0xff, > - vdev->msi_cap_size); > - } > - > - if (vfio_pci_read_config(&vdev->pdev, PCI_INTERRUPT_PIN, 1)) { > - vdev->intx.mmap_timer = timer_new_ms(QEMU_CLOCK_VIRTUAL, > - vfio_intx_mmap_enable, vdev); > - pci_device_set_intx_routing_notifier(&vdev->pdev, > - vfio_intx_routing_notifier); > - vdev->irqchip_change_notifier.notify = vfio_irqchip_change; > - kvm_irqchip_add_change_notifier(&vdev->irqchip_change_notifier); > - if (!vfio_intx_enable(vdev, errp)) { > - goto out_deregister; > - } > + if (!vfio_interrupt_setup(vdev, errp)) { > + goto out_teardown; is that the correct exit label ? Thanks, C. > } > > if (vdev->display != ON_OFF_AUTO_OFF) {