FAILED: patch "[PATCH] PCI: hv: Add hv_pci_remove_slots() when we unload the driver" failed to apply to 4.14-stable tree

PATCH Applied [email protected] 3 participants 3 messages May 15, 2019 – May 17, 2019

Subsystems (4)

Stable branch PCI PCI native host bridge and endpoint drivers Hyper-V/Azure core and drivers

lore

Share & tools

lore

[email protected]

author maintainer

2019-05-15 08:35 UTC #0 lore raw

The patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 15becc2b56c6eda3d9bf5ae993bafd5661c1fad1 Mon Sep 17 00:00:00 2001
From: Dexuan Cui <[email protected]>
Date: Mon, 4 Mar 2019 21:34:48 +0000
Subject: [PATCH] PCI: hv: Add hv_pci_remove_slots() when we unload the driver

When we unload the pci-hyperv host controller driver, the host does not send us a PCI_EJECT message.

In this case we also need to make sure the sysfs PCI slot directory is removed, otherwise a command on a slot file eg:

"cat /sys/bus/pci/slots/2/address"

will trigger a

"BUG: unable to handle kernel paging request"

and, if we unload/reload the driver several times we would end up with stale slot entries in PCI slot directories in /sys/bus/pci/slots/

root@localhost:~# ls -rtl  /sys/bus/pci/slots/
total 0
drwxr-xr-x 2 root root 0 Feb  7 10:49 2
drwxr-xr-x 2 root root 0 Feb  7 10:49 2-1
drwxr-xr-x 2 root root 0 Feb  7 10:51 2-2

Add the missing code to remove the PCI slot and fix the current behaviour.

Fixes a15f2c08c708 ("PCI: hv: support reporting serial number as slot information")

Signed-off-by Dexuan Cui <[email protected]>

[[email protected]: reformatted the log]

Signed-off-by Lorenzo Pieralisi <[email protected]>

Reviewed-by Stephen Hemminger <[email protected]>

Reviewed-by Michael Kelley <[email protected]>

Cc [email protected]

drivers/pci/controller/pci-hyperv.c +16 -0

index 30f16b882746..b489412e3502 100644
@@ -1486,6 +1486,21 @@ static void hv_pci_assign_slots(struct hv_pcibus_device *hbus)
 	}
 }
 
+/*
+ * Remove entries in sysfs pci slot directory.
+ */
+static void hv_pci_remove_slots(struct hv_pcibus_device *hbus)
+{
+	struct hv_pci_dev *hpdev;
+
+	list_for_each_entry(hpdev, &hbus->children, list_entry) {
+		if (!hpdev->pci_slot)
+			continue;
+		pci_destroy_slot(hpdev->pci_slot);
+		hpdev->pci_slot = NULL;
+	}
+}
+
 /**
  * create_root_hv_pci_bus() - Expose a new root PCI bus
  * @hbus:	Root PCI bus, as understood by this driver

@@ -2680,6 +2695,7 @@ static int hv_pci_remove(struct hv_device *hdev)
 		pci_lock_rescan_remove();
 		pci_stop_root_bus(hbus->pci_bus);
 		pci_remove_root_bus(hbus->pci_bus);
+		hv_pci_remove_slots(hbus);
 		pci_unlock_rescan_remove();
 		hbus->state = hv_pcibus_removed;
 	}

Dexuan Cui

maintainer

2019-05-15 23:23 UTC #1 lore raw

Quoted 90 lines

From: [email protected] <[email protected]>
Sent: Wednesday, May 15, 2019 1:35 AM
To: Dexuan Cui <[email protected]>; [email protected]; Michael Kelley <[email protected]>; Stephen Hemminger <[email protected]>
Cc: [email protected]
Subject: FAILED: patch "[PATCH] PCI: hv: Add hv_pci_remove_slots() when we unload the driver" failed to apply to 4.14-stable tree
The patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 15becc2b56c6eda3d9bf5ae993bafd5661c1fad1 Mon Sep 17 00:00:00 2001
From: Dexuan Cui <[email protected]>
Date: Mon, 4 Mar 2019 21:34:48 +0000
Subject: [PATCH] PCI: hv: Add hv_pci_remove_slots() when we unload the driver
When we unload the pci-hyperv host controller driver, the host does not send us a PCI_EJECT message.
In this case we also need to make sure the sysfs PCI slot directory is removed, otherwise a command on a slot file eg:
"cat /sys/bus/pci/slots/2/address"
will trigger a
"BUG: unable to handle kernel paging request"
and, if we unload/reload the driver several times we would end up with stale slot entries in PCI slot directories in /sys/bus/pci/slots/
root@localhost:~# ls -rtl  /sys/bus/pci/slots/
total 0
drwxr-xr-x 2 root root 0 Feb  7 10:49 2
drwxr-xr-x 2 root root 0 Feb  7 10:49 2-1
drwxr-xr-x 2 root root 0 Feb  7 10:51 2-2
Add the missing code to remove the PCI slot and fix the current behaviour.
Fixes a15f2c08c708 ("PCI: hv: support reporting serial number as slot
information")
Signed-off-by Dexuan Cui <[email protected]>
[[email protected]: reformatted the log]
Signed-off-by Lorenzo Pieralisi <[email protected]>
Reviewed-by Stephen Hemminger <[email protected]>
Reviewed-by Michael Kelley <[email protected]>
Cc [email protected]
drivers/pci/controller/pci-hyperv.c +15 -0
index 30f16b882746..b489412e3502 100644
@@ -1486,6 +1486,21 @@ static void hv_pci_assign_slots(struct
 hv_pcibus_device *hbus)
 	}
 }
 
+/*
+ * Remove entries in sysfs pci slot directory.
+ */
+static void hv_pci_remove_slots(struct hv_pcibus_device *hbus)
+{
+	struct hv_pci_dev *hpdev;
+
+	list_for_each_entry(hpdev, &hbus->children, list_entry) {
+		if (!hpdev->pci_slot)
+			continue;
+		pci_destroy_slot(hpdev->pci_slot);
+		hpdev->pci_slot = NULL;
+	}
+}
+
 /**
  * create_root_hv_pci_bus() - Expose a new root PCI bus
* @hbus: Root PCI bus, as understood by this driver

drivers/pci/controller/pci-hyperv.c static int hv_pci_remove(struct hv_device *hdev) · line 2701

Quoted 7 lines

drivers/pci/controller/pci-hyperv.c +1 -0

@@ -2680,6 +2695,7 @@ static int hv_pci_remove(struct hv_device *hdev)
 		pci_lock_rescan_remove();
 		pci_stop_root_bus(hbus->pci_bus);
 		pci_remove_root_bus(hbus->pci_bus);
+		hv_pci_remove_slots(hbus);
 		pci_unlock_rescan_remove();
 		hbus->state = hv_pcibus_removed;
 	}

Hi,
I backported the patch for linux-4.14.y.

Please use the attached patch, which is [PATCH 2/3]

Thanks,
-- Dexuan

From 946e3d43b4378e040593ac5a3a48ee46d8f3cd77 Mon Sep 17 00:00:00 2001
From: Dexuan Cui <[email protected]>
Date: Wed, 15 May 2019 15:59:15 -0700
Subject: [PATCH for v4.14.119 2/3] PCI: hv: Add hv_pci_remove_slots() when we
unload the driver

This patch is backported for v4.14.119 from the mainline
commit 15becc2b56c6 ("PCI: hv: Add hv_pci_remove_slots() when we unload the driver")

Signed-off-by Dexuan Cui <[email protected]>

---
 drivers/pci/host/pci-hyperv.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

drivers/pci/host/pci-hyperv.c +16 -0

index 292450c7da62..a5825bbcded7 100644
@@ -1513,6 +1513,21 @@ static void hv_pci_assign_slots(struct hv_pcibus_device *hbus)
 	}
 }
 
+/*
+ * Remove entries in sysfs pci slot directory.
+ */
+static void hv_pci_remove_slots(struct hv_pcibus_device *hbus)
+{
+	struct hv_pci_dev *hpdev;
+
+	list_for_each_entry(hpdev, &hbus->children, list_entry) {
+		if (!hpdev->pci_slot)
+			continue;
+		pci_destroy_slot(hpdev->pci_slot);
+		hpdev->pci_slot = NULL;
+	}
+}
+
 /**
  * create_root_hv_pci_bus() - Expose a new root PCI bus
  * @hbus:	Root PCI bus, as understood by this driver

@@ -2719,6 +2734,7 @@ static int hv_pci_remove(struct hv_device *hdev)
 		pci_lock_rescan_remove();
 		pci_stop_root_bus(hbus->pci_bus);
 		pci_remove_root_bus(hbus->pci_bus);
+		hv_pci_remove_slots(hbus);
 		pci_unlock_rescan_remove();
 		hbus->state = hv_pcibus_removed;
 	}

Signature · 1 line

2.17.1

Sasha Levin

maintainer Applied

2019-05-17 00:48 UTC #2 lore raw

Quoted 101 lines · Dexuan Cui

Quoted 90 lines
From: [email protected] <[email protected]>
Sent: Wednesday, May 15, 2019 1:35 AM
To: Dexuan Cui <[email protected]>; [email protected]; Michael Kelley <[email protected]>; Stephen Hemminger <[email protected]>
Cc: [email protected]
Subject: FAILED: patch "[PATCH] PCI: hv: Add hv_pci_remove_slots() when we unload the driver" failed to apply to 4.14-stable tree
The patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 15becc2b56c6eda3d9bf5ae993bafd5661c1fad1 Mon Sep 17 00:00:00 2001
From: Dexuan Cui <[email protected]>
Date: Mon, 4 Mar 2019 21:34:48 +0000
Subject: [PATCH] PCI: hv: Add hv_pci_remove_slots() when we unload the driver
When we unload the pci-hyperv host controller driver, the host does not send us a PCI_EJECT message.
In this case we also need to make sure the sysfs PCI slot directory is removed, otherwise a command on a slot file eg:
"cat /sys/bus/pci/slots/2/address"
will trigger a
"BUG: unable to handle kernel paging request"
and, if we unload/reload the driver several times we would end up with stale slot entries in PCI slot directories in /sys/bus/pci/slots/
root@localhost:~# ls -rtl  /sys/bus/pci/slots/
total 0
drwxr-xr-x 2 root root 0 Feb  7 10:49 2
drwxr-xr-x 2 root root 0 Feb  7 10:49 2-1
drwxr-xr-x 2 root root 0 Feb  7 10:51 2-2
Add the missing code to remove the PCI slot and fix the current behaviour.
Fixes a15f2c08c708 ("PCI: hv: support reporting serial number as slot
information")
Signed-off-by Dexuan Cui <[email protected]>
[[email protected]: reformatted the log]
Signed-off-by Lorenzo Pieralisi <[email protected]>
Reviewed-by Stephen Hemminger <[email protected]>
Reviewed-by Michael Kelley <[email protected]>
Cc [email protected]
drivers/pci/controller/pci-hyperv.c +15 -0
index 30f16b882746..b489412e3502 100644
@@ -1486,6 +1486,21 @@ static void hv_pci_assign_slots(struct
 hv_pcibus_device *hbus)
 	}
 }
 
+/*
+ * Remove entries in sysfs pci slot directory.
+ */
+static void hv_pci_remove_slots(struct hv_pcibus_device *hbus)
+{
+	struct hv_pci_dev *hpdev;
+
+	list_for_each_entry(hpdev, &hbus->children, list_entry) {
+		if (!hpdev->pci_slot)
+			continue;
+		pci_destroy_slot(hpdev->pci_slot);
+		hpdev->pci_slot = NULL;
+	}
+}
+
 /**
  * create_root_hv_pci_bus() - Expose a new root PCI bus
* @hbus: Root PCI bus, as understood by this driver
drivers/pci/controller/pci-hyperv.c static int hv_pci_remove(struct hv_device *hdev) · line 2701
Quoted 7 lines
drivers/pci/controller/pci-hyperv.c +1 -0
@@ -2680,6 +2695,7 @@ static int hv_pci_remove(struct hv_device *hdev)
 		pci_lock_rescan_remove();
 		pci_stop_root_bus(hbus->pci_bus);
 		pci_remove_root_bus(hbus->pci_bus);
+		hv_pci_remove_slots(hbus);
 		pci_unlock_rescan_remove();
 		hbus->state = hv_pcibus_removed;
 	}
Hi,
I backported the patch for linux-4.14.y.

Quoted 4 lines

Please use the attached patch, which is [PATCH 2/3]
Thanks,
-- Dexuan

Queued for 4.14, thank you.

--
Thanks,
Sasha