From 4c2d5c3a2dacf58c46da5514315fbdffac72db1d Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 3 Feb 2022 16:08:05 +0100 Subject: [PATCH] 5.16-stable patches added patches: pci-pciehp-fix-infinite-loop-in-irq-handler-upon-power-fault.patch selftests-mptcp-fix-ipv6-routing-setup.patch --- ...loop-in-irq-handler-upon-power-fault.patch | 76 +++++++++++++++++++ ...lftests-mptcp-fix-ipv6-routing-setup.patch | 55 ++++++++++++++ queue-5.16/series | 2 + 3 files changed, 133 insertions(+) create mode 100644 queue-5.16/pci-pciehp-fix-infinite-loop-in-irq-handler-upon-power-fault.patch create mode 100644 queue-5.16/selftests-mptcp-fix-ipv6-routing-setup.patch create mode 100644 queue-5.16/series diff --git a/queue-5.16/pci-pciehp-fix-infinite-loop-in-irq-handler-upon-power-fault.patch b/queue-5.16/pci-pciehp-fix-infinite-loop-in-irq-handler-upon-power-fault.patch new file mode 100644 index 00000000000..2c812afab0d --- /dev/null +++ b/queue-5.16/pci-pciehp-fix-infinite-loop-in-irq-handler-upon-power-fault.patch @@ -0,0 +1,76 @@ +From 23584c1ed3e15a6f4bfab8dc5a88d94ab929ee12 Mon Sep 17 00:00:00 2001 +From: Lukas Wunner +Date: Wed, 17 Nov 2021 23:22:09 +0100 +Subject: PCI: pciehp: Fix infinite loop in IRQ handler upon power fault + +From: Lukas Wunner + +commit 23584c1ed3e15a6f4bfab8dc5a88d94ab929ee12 upstream. + +The Power Fault Detected bit in the Slot Status register differs from +all other hotplug events in that it is sticky: It can only be cleared +after turning off slot power. Per PCIe r5.0, sec. 6.7.1.8: + + If a power controller detects a main power fault on the hot-plug slot, + it must automatically set its internal main power fault latch [...]. + The main power fault latch is cleared when software turns off power to + the hot-plug slot. + +The stickiness used to cause interrupt storms and infinite loops which +were fixed in 2009 by commits 5651c48cfafe ("PCI pciehp: fix power fault +interrupt storm problem") and 99f0169c17f3 ("PCI: pciehp: enable +software notification on empty slots"). + +Unfortunately in 2020 the infinite loop issue was inadvertently +reintroduced by commit 8edf5332c393 ("PCI: pciehp: Fix MSI interrupt +race"): The hardirq handler pciehp_isr() clears the PFD bit until +pciehp's power_fault_detected flag is set. That happens in the IRQ +thread pciehp_ist(), which never learns of the event because the hardirq +handler is stuck in an infinite loop. Fix by setting the +power_fault_detected flag already in the hardirq handler. + +Link: https://bugzilla.kernel.org/show_bug.cgi?id=214989 +Link: https://lore.kernel.org/linux-pci/DM8PR11MB5702255A6A92F735D90A4446868B9@DM8PR11MB5702.namprd11.prod.outlook.com +Fixes: 8edf5332c393 ("PCI: pciehp: Fix MSI interrupt race") +Link: https://lore.kernel.org/r/66eaeef31d4997ceea357ad93259f290ededecfd.1637187226.git.lukas@wunner.de +Reported-by: Joseph Bao +Tested-by: Joseph Bao +Signed-off-by: Lukas Wunner +Signed-off-by: Bjorn Helgaas +Cc: stable@vger.kernel.org # v4.19+ +Cc: Stuart Hayes +Signed-off-by: Greg Kroah-Hartman +--- + drivers/pci/hotplug/pciehp_hpc.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +--- a/drivers/pci/hotplug/pciehp_hpc.c ++++ b/drivers/pci/hotplug/pciehp_hpc.c +@@ -642,6 +642,8 @@ read_status: + */ + if (ctrl->power_fault_detected) + status &= ~PCI_EXP_SLTSTA_PFD; ++ else if (status & PCI_EXP_SLTSTA_PFD) ++ ctrl->power_fault_detected = true; + + events |= status; + if (!events) { +@@ -651,7 +653,7 @@ read_status: + } + + if (status) { +- pcie_capability_write_word(pdev, PCI_EXP_SLTSTA, events); ++ pcie_capability_write_word(pdev, PCI_EXP_SLTSTA, status); + + /* + * In MSI mode, all event bits must be zero before the port +@@ -725,8 +727,7 @@ static irqreturn_t pciehp_ist(int irq, v + } + + /* Check Power Fault Detected */ +- if ((events & PCI_EXP_SLTSTA_PFD) && !ctrl->power_fault_detected) { +- ctrl->power_fault_detected = 1; ++ if (events & PCI_EXP_SLTSTA_PFD) { + ctrl_err(ctrl, "Slot(%s): Power fault\n", slot_name(ctrl)); + pciehp_set_indicators(ctrl, PCI_EXP_SLTCTL_PWR_IND_OFF, + PCI_EXP_SLTCTL_ATTN_IND_ON); diff --git a/queue-5.16/selftests-mptcp-fix-ipv6-routing-setup.patch b/queue-5.16/selftests-mptcp-fix-ipv6-routing-setup.patch new file mode 100644 index 00000000000..af814cd982d --- /dev/null +++ b/queue-5.16/selftests-mptcp-fix-ipv6-routing-setup.patch @@ -0,0 +1,55 @@ +From 9846921dba4936d92f7608315b5d1e0a8ec3a538 Mon Sep 17 00:00:00 2001 +From: Paolo Abeni +Date: Thu, 20 Jan 2022 16:35:29 -0800 +Subject: selftests: mptcp: fix ipv6 routing setup + +From: Paolo Abeni + +commit 9846921dba4936d92f7608315b5d1e0a8ec3a538 upstream. + +MPJ ipv6 selftests currently lack per link route to the server +net. Additionally, ipv6 subflows endpoints are created without any +interface specified. The end-result is that in ipv6 self-tests +subflows are created all on the same link, leading to expected delays +and sporadic self-tests failures. + +Fix the issue by adding the missing setup bits. + +Fixes: 523514ed0a99 ("selftests: mptcp: add ADD_ADDR IPv6 test cases") +Reported-and-tested-by: Geliang Tang +Signed-off-by: Paolo Abeni +Signed-off-by: Mat Martineau +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + tools/testing/selftests/net/mptcp/mptcp_join.sh | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh ++++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh +@@ -75,6 +75,7 @@ init() + + # let $ns2 reach any $ns1 address from any interface + ip -net "$ns2" route add default via 10.0.$i.1 dev ns2eth$i metric 10$i ++ ip -net "$ns2" route add default via dead:beef:$i::1 dev ns2eth$i metric 10$i + done + } + +@@ -1386,7 +1387,7 @@ ipv6_tests() + reset + ip netns exec $ns1 ./pm_nl_ctl limits 0 1 + ip netns exec $ns2 ./pm_nl_ctl limits 0 1 +- ip netns exec $ns2 ./pm_nl_ctl add dead:beef:3::2 flags subflow ++ ip netns exec $ns2 ./pm_nl_ctl add dead:beef:3::2 dev ns2eth3 flags subflow + run_tests $ns1 $ns2 dead:beef:1::1 0 0 0 slow + chk_join_nr "single subflow IPv6" 1 1 1 + +@@ -1421,7 +1422,7 @@ ipv6_tests() + ip netns exec $ns1 ./pm_nl_ctl limits 0 2 + ip netns exec $ns1 ./pm_nl_ctl add dead:beef:2::1 flags signal + ip netns exec $ns2 ./pm_nl_ctl limits 1 2 +- ip netns exec $ns2 ./pm_nl_ctl add dead:beef:3::2 flags subflow ++ ip netns exec $ns2 ./pm_nl_ctl add dead:beef:3::2 dev ns2eth3 flags subflow + run_tests $ns1 $ns2 dead:beef:1::1 0 -1 -1 slow + chk_join_nr "remove subflow and signal IPv6" 2 2 2 + chk_add_nr 1 1 diff --git a/queue-5.16/series b/queue-5.16/series new file mode 100644 index 00000000000..7b46f3a0849 --- /dev/null +++ b/queue-5.16/series @@ -0,0 +1,2 @@ +pci-pciehp-fix-infinite-loop-in-irq-handler-upon-power-fault.patch +selftests-mptcp-fix-ipv6-routing-setup.patch -- 2.47.2