On Mon, Oct 25, 2021 at 11:14:10AM +0200, Niklas Schnelle wrote: > On Mon, 2021-10-25 at 09:51 +0200, gregkh@xxxxxxxxxxxxxxxxxxx wrote: > > This is a note to let you know that I've just added the patch titled > > > > s390/pci: cleanup resources only if necessary > > > > to the 5.10-stable tree which can be found at: > > http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary > > > > The filename of the patch is: > > s390-pci-cleanup-resources-only-if-necessary.patch > > and it can be found in the queue-5.10 subdirectory. > > > > If you, or anyone else, feels it should not be added to the stable tree, > > please let <stable@xxxxxxxxxxxxxxx> know about it. > > > > > > From 02368b7cf6c7badefa13741aed7a8b91d9a11b19 Mon Sep 17 00:00:00 2001 > > From: Niklas Schnelle <schnelle@xxxxxxxxxxxxx> > > Date: Fri, 6 Aug 2021 10:28:40 +0200 > > Subject: s390/pci: cleanup resources only if necessary > > > > From: Niklas Schnelle <schnelle@xxxxxxxxxxxxx> > > > > commit 02368b7cf6c7badefa13741aed7a8b91d9a11b19 upstream. > > > > It's currently safe to call zpci_cleanup_bus_resources() even if the > > resources were never created but it makes no sense so check > > zdev->has_resources before we call zpci_cleanup_bus_resources() in > > zpci_release_device(). > > > > Reviewed-by: Matthew Rosato <mjrosato@xxxxxxxxxxxxx> > > Acked-by: Pierre Morel <pmorel@xxxxxxxxxxxxx> > > Signed-off-by: Niklas Schnelle <schnelle@xxxxxxxxxxxxx> > > Signed-off-by: Heiko Carstens <hca@xxxxxxxxxxxxx> > > Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > > --- > > arch/s390/pci/pci.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > --- a/arch/s390/pci/pci.c > > +++ b/arch/s390/pci/pci.c > > @@ -802,7 +802,8 @@ void zpci_release_device(struct kref *kr > > case ZPCI_FN_STATE_STANDBY: > > if (zdev->has_hp_slot) > > zpci_exit_slot(zdev); > > - zpci_cleanup_bus_resources(zdev); > > + if (zdev->has_resources) > > + zpci_cleanup_bus_resources(zdev); > > zpci_bus_device_unregister(zdev); > > zpci_destroy_iommu(zdev); > > fallthrough; > > > > > > Patches currently in stable-queue which might be from schnelle@xxxxxxxxxxxxx are > > > > queue-5.10/s390-pci-cleanup-resources-only-if-necessary.patch > > This doesn't work struct zpci_dev does not have the "has_resource" > attribute in v5.10.y. So the above patch will not build. The patch for > "s390/pci: fix zpci_zdev_put() on reserve" I sent does not check "zdev- > >has_resources" so will be fine. Sorry again for the mess. > Ah, ok, will go drop this now, thanks. greg k-h
