On Wed, Aug 16, 2023 at 08:10:25PM +0000, Michael Kelley (LINUX) wrote:
> From: Dexuan Cui <decui@xxxxxxxxxxxxx> Sent: Wednesday, August 16, 2023 11:00 AM
> >
> > When a Linux VM with an assigned PCI device runs on Hyper-V, if the PCI
> > device driver is not loaded yet (i.e. MSI-X/MSI is not enabled on the
> > device yet), doing a VM hibernation triggers a panic in
> > hv_pci_restore_msi_msg() -> msi_lock_descs(&pdev->dev), because
> > pdev->dev.msi.data is still NULL.
> >
> > Avoid the panic by checking if MSI-X/MSI is enabled.
> >
> > Fixes: dc2b453290c4 ("PCI: hv: Rework MSI handling")
> > Signed-off-by: Dexuan Cui <decui@xxxxxxxxxxxxx>
> > ---
> >
> > Changes in v2:
> > Replaced the test "if (!pdev->dev.msi.data)" with
> > "if (!pdev->msi_enabled && !pdev->msix_enabled)".
> > Thanks Michael!
> > Updated the changelog accordingly.
> >
> > drivers/pci/controller/pci-hyperv.c | 3 +++
> > 1 file changed, 3 insertions(+)
> >
> > diff --git a/drivers/pci/controller/pci-hyperv.c b/drivers/pci/controller/pci-hyperv.c
> > index 2d93d0c4f10d..bed3cefdaf19 100644
> > --- a/drivers/pci/controller/pci-hyperv.c
> > +++ b/drivers/pci/controller/pci-hyperv.c
> > @@ -3983,6 +3983,9 @@ static int hv_pci_restore_msi_msg(struct pci_dev *pdev, void *arg)
> > struct msi_desc *entry;
> > int ret = 0;
> >
> > + if (!pdev->msi_enabled && !pdev->msix_enabled)
> > + return 0;
> > +
> > msi_lock_descs(&pdev->dev);
> > msi_for_each_desc(entry, &pdev->dev, MSI_DESC_ASSOCIATED) {
> > irq_data = irq_get_irq_data(entry->irq);
> > --
> > 2.25.1
>
> Reviewed-by: Michael Kelley <mikelley@xxxxxxxxxxxxx>
>
>
I expect this to go through the PCI tree. Just let me know if I should
pick this up.
Thanks,
Wei.
