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 CB071C02192 for ; Wed, 5 Feb 2025 17:14:21 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tfiy9-0007eW-Pj; Wed, 05 Feb 2025 12:13:45 -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 1tfiy8-0007eJ-KZ for qemu-devel@nongnu.org; Wed, 05 Feb 2025 12:13:44 -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 1tfiy3-0005oh-AS for qemu-devel@nongnu.org; Wed, 05 Feb 2025 12:13:44 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1738775616; 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=uKQuKspoy51kZVHT4fsopiy1n4RLUnMW1sIYLVnPI+k=; b=EhETE1AGlirevR91qn2kVW/EEIep1dmRxCW+rGar9av1mYn60d+teEB9GcwOd8+Y9y7y2v 2csiS6G0jPwpq7W6s+kiFKs/akzySMEacFo4oM3ZwjBa3zYfdGEC467iDLJOfKwXnkDFFo ngwr7CHAt8OkLkeiXMGKn9z2qOc8YMk= Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-62-9VKQMxLwNoCdK4xUQn4u4w-1; Wed, 05 Feb 2025 12:13:35 -0500 X-MC-Unique: 9VKQMxLwNoCdK4xUQn4u4w-1 X-Mimecast-MFC-AGG-ID: 9VKQMxLwNoCdK4xUQn4u4w Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-7b6f2515eb3so678494085a.0 for ; Wed, 05 Feb 2025 09:13:35 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738775615; x=1739380415; 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=uKQuKspoy51kZVHT4fsopiy1n4RLUnMW1sIYLVnPI+k=; b=ZRer2cj7JOwEVubtxgLacMZoZHq3AeJLjnwvFSqQ4c+TBo1zJXgaSVwghzYwChUzMi 8KduDNNyQmhIN3lrn3RgWVSsAnZ+J7oQSSXMoXnAwtrQyaIMv7Y8FaPKehmQDwJtDDiZ ATx5lVPBMy7MBZn2tAmFTjFEhHBd3GAw6zPYUaAuqlADwnGDpE4egzbXbdQckhmFeZk9 ccTemBmsIelLLI6ifEtLa9/ZeNubnQ2oI/oIFIyj9XMpKrDThWx3vyvR0zSMXEPMUHe+ eSUoae5FRI7tJw6cstuFQRwsqvI8uEOk3Ybn1Zrg5sjdZXI0NdLLQZA24SCxPgqVxwm/ xRhQ== X-Forwarded-Encrypted: i=1; AJvYcCUzMn8Ip65NnVX7XSZtJCMOYcrE3FDBmTFlwBFyEx1tZ8oADiU/FD/l405IqontE6Q7eCHWzdXAG2du@nongnu.org X-Gm-Message-State: AOJu0Yx9UvoFEbcPAl44UB1pkMkBWMVFccjk7wLAi3g8RB2QROh3Y7ni wO8PCDo81uVJ9x4UXi4MsS9F/R6oZ+fDqn6tlJYMR5LAv1eu0+z++ovfQxTJO0lZJq+ZBQw58gV j04l5mvUDKTzYtm8uX/UCGUJSNwt6fvCwJVkv04CUk0CQbSfBr7Cp X-Gm-Gg: ASbGncv3a0Was8ycyofny+9yKIrDF83qDU7HY9iiP6OYdOCXR69qoNaqGsaEuf+RWpZ CBBsFrREqn64NQRRuABWJhlSsV4/vhW2anWt3tPYUw2Oj9gOMb84G3WEborLsQ+LlAqXliY8lEa Xb8JmVZE1RDVisNB6DSy63mc3Mf4Z60gqsQX1zOrdlFzQ6A3iiqqHsjoWl1yzCzLpz+NR+dlAL/ lAtK4mBrA/ewq7ibx/QkC0NeLtTNV/dxYJwSfeYSU0gkdq1iJ36PFc3mMIYZ3ttHQbWL8MFkLDT vxBtRONG7Me6VLRbjG1ucNUdZCy+ccxcKbzNl7jb0LM= X-Received: by 2002:a05:620a:198a:b0:7b6:5d83:123e with SMTP id af79cd13be357-7c03a0419camr685735885a.54.1738775614661; Wed, 05 Feb 2025 09:13:34 -0800 (PST) X-Google-Smtp-Source: AGHT+IFoKHfBEmguHM1GeQ+qjb1GSsWXlCQI6byoAzcwniOIcT23/HHZfNngVKVeYJVPnLBosNVkOg== X-Received: by 2002:a05:620a:198a:b0:7b6:5d83:123e with SMTP id af79cd13be357-7c03a0419camr685731285a.54.1738775614306; Wed, 05 Feb 2025 09:13:34 -0800 (PST) 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 af79cd13be357-7c00a9055adsm778395385a.73.2025.02.05.09.13.32 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 05 Feb 2025 09:13:33 -0800 (PST) Message-ID: <219faed4-284c-430c-8410-d2af398f588d@redhat.com> Date: Wed, 5 Feb 2025 18:13:31 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH V1 13/26] vfio-pci: preserve INTx To: Steve Sistare , qemu-devel@nongnu.org Cc: Alex Williamson , Yi Liu , Eric Auger , Zhenzhong Duan , "Michael S. Tsirkin" , Marcel Apfelbaum , Peter Xu , Fabiano Rosas References: <1738161802-172631-1-git-send-email-steven.sistare@oracle.com> <1738161802-172631-14-git-send-email-steven.sistare@oracle.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: <1738161802-172631-14-git-send-email-steven.sistare@oracle.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit 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: -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_H2=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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 1/29/25 15:43, Steve Sistare wrote: > Preserve vfio INTx state across cpr-transfer. Preserve VFIOINTx fields as > follows: > pin : Recover this from the vfio config in kernel space > interrupt : Preserve its eventfd descriptor across exec. > unmask : Ditto > route.irq : This could perhaps be recovered in vfio_pci_post_load by > calling pci_device_route_intx_to_irq(pin), whose implementation reads > config space for a bridge device such as ich9. However, there is no > guarantee that the bridge vmstate is read before vfio vmstate. Rather > than fiddling with MigrationPriority for vmstate handlers, explicitly > save route.irq in vfio vmstate. > pending : save in vfio vmstate. > mmap_timeout, mmap_timer : Re-initialize > bool kvm_accel : Re-initialize > > In vfio_realize, defer calling vfio_intx_enable until the vmstate > is available, in vfio_pci_post_load. Modify vfio_intx_enable and > vfio_intx_kvm_enable to skip vfio initialization, but still perform > kvm initialization. > > Signed-off-by: Steve Sistare > --- > hw/vfio/pci.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++---- > 1 file changed, 47 insertions(+), 4 deletions(-) > > diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c > index df6e298..c50dbef 100644 > --- a/hw/vfio/pci.c > +++ b/hw/vfio/pci.c > @@ -184,12 +184,17 @@ static bool vfio_intx_enable_kvm(VFIOPCIDevice *vdev, Error **errp) > return true; > } > > + if (vdev->vbasedev.reused) { 1 x vdev->vbasedev.reused > + goto skip_state; > + } > + > /* Get to a known interrupt state */ > qemu_set_fd_handler(irq_fd, NULL, NULL, vdev); > vfio_mask_single_irqindex(&vdev->vbasedev, VFIO_PCI_INTX_IRQ_INDEX); > vdev->intx.pending = false; > pci_irq_deassert(&vdev->pdev); > > +skip_state: hmm, this skip_state label and ... > /* Get an eventfd for resample/unmask */ > if (vfio_notifier_init(vdev, &vdev->intx.unmask, "intx-unmask", 0)) { > error_setg(errp, "vfio_notifier_init intx-unmask failed"); > @@ -204,6 +209,10 @@ static bool vfio_intx_enable_kvm(VFIOPCIDevice *vdev, Error **errp) > goto fail_irqfd; > } > > + if (vdev->vbasedev.reused) { 2 x vdev->vbasedev.reused > + goto skip_irq; > + } > + > if (!vfio_set_irq_signaling(&vdev->vbasedev, VFIO_PCI_INTX_IRQ_INDEX, 0, > VFIO_IRQ_SET_ACTION_UNMASK, > event_notifier_get_fd(&vdev->intx.unmask), > @@ -214,6 +223,7 @@ static bool vfio_intx_enable_kvm(VFIOPCIDevice *vdev, Error **errp) > /* Let'em rip */ > vfio_unmask_single_irqindex(&vdev->vbasedev, VFIO_PCI_INTX_IRQ_INDEX); > > +skip_irq: ... this skip_irq label are one "very quick" way to get things done :) > vdev->intx.kvm_accel = true; > > trace_vfio_intx_enable_kvm(vdev->vbasedev.name); > @@ -329,7 +339,13 @@ static bool vfio_intx_enable(VFIOPCIDevice *vdev, Error **errp) > return true; > } > > - vfio_disable_interrupts(vdev); > + /* > + * Do not alter interrupt state during vfio_realize and cpr load. The > + * reused flag is cleared thereafter. > + */ > + if (!vdev->vbasedev.reused) { 3 x vdev->vbasedev.reused > + vfio_disable_interrupts(vdev); > + } > > vdev->intx.pin = pin - 1; /* Pin A (1) -> irq[0] */ > pci_config_set_interrupt_pin(vdev->pdev.config, pin); > @@ -351,7 +367,8 @@ static bool vfio_intx_enable(VFIOPCIDevice *vdev, Error **errp) > fd = event_notifier_get_fd(&vdev->intx.interrupt); > qemu_set_fd_handler(fd, vfio_intx_interrupt, NULL, vdev); > > - if (!vfio_set_irq_signaling(&vdev->vbasedev, VFIO_PCI_INTX_IRQ_INDEX, 0, > + if (!vdev->vbasedev.reused && 4 x vdev->vbasedev.reused > + !vfio_set_irq_signaling(&vdev->vbasedev, VFIO_PCI_INTX_IRQ_INDEX, 0, > VFIO_IRQ_SET_ACTION_TRIGGER, fd, errp)) { > qemu_set_fd_handler(fd, NULL, NULL, vdev); > vfio_notifier_cleanup(vdev, &vdev->intx.interrupt, "intx-interrupt", 0); > @@ -3256,7 +3273,8 @@ static void vfio_realize(PCIDevice *pdev, Error **errp) > 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)) { > + /* Wait until cpr load reads intx routing data to enable */ > + if (!vdev->vbasedev.reused && !vfio_intx_enable(vdev, errp)) { 5 x vdev->vbasedev.reused This patch already adds a test on vdev->vbasedev.reused at the top of vfio_intx_enable(). This one seems redudant. Please duplicate the whole vfio_intx_enable() routine and move it under a cpr file. > goto out_deregister; > } > } > @@ -3578,12 +3596,36 @@ static int vfio_pci_post_load(void *opaque, int version_id) > vfio_claim_vectors(vdev, nr_vectors, false);> > } else if (vfio_pci_read_config(pdev, PCI_INTERRUPT_PIN, 1)) { > - g_assert_not_reached(); /* completed in a subsequent patch */ > + Error *err = NULL; > + if (!vfio_intx_enable(vdev, &err)) { > + error_report_err(err); > + return -1;> + } > } > > return 0; > } > > +static const VMStateDescription vfio_intx_vmstate = { > + .name = "vfio-intx", > + .version_id = 0, > + .minimum_version_id = 0, > + .fields = (VMStateField[]) { > + VMSTATE_BOOL(pending, VFIOINTx), > + VMSTATE_UINT32(route.mode, VFIOINTx), > + VMSTATE_INT32(route.irq, VFIOINTx), > + VMSTATE_END_OF_LIST() > + } > +}; > + > +#define VMSTATE_VFIO_INTX(_field, _state) { \ > + .name = (stringify(_field)), \ > + .size = sizeof(VFIOINTx), \ > + .vmsd = &vfio_intx_vmstate, \ > + .flags = VMS_STRUCT, \ > + .offset = vmstate_offset_value(_state, _field, VFIOINTx), \ > +} > + move these to cpr file please. Thanks, C. > static const VMStateDescription vfio_pci_vmstate = { > .name = "vfio-pci", > .version_id = 0, > @@ -3594,6 +3636,7 @@ static const VMStateDescription vfio_pci_vmstate = { > .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(pdev, VFIOPCIDevice), > VMSTATE_MSIX_TEST(pdev, VFIOPCIDevice, vfio_msix_present), > + VMSTATE_VFIO_INTX(intx, VFIOPCIDevice), > VMSTATE_END_OF_LIST() > } > };